Fixed libssh compilation without server support.

2 files changed, 41 insertions, 42 deletions

diff --git a/include/libssh/libssh.h b/include/libssh/libssh.h
index 5cf29235..ee8c7ff7 100644
--- a/include/libssh/libssh.h
+++ b/include/libssh/libssh.h
@@ -124,13 +124,36 @@ typedef int socket_t;
 #define SSH_AUTH_INFO 3
 #define SSH_AUTH_ERROR -1
 
-#define SSH_AUTH_METHOD_PASSWORD 0x0001
-#define SSH_AUTH_METHOD_PUBLICKEY 0x0002
-#define SSH_AUTH_METHOD_HOSTBASED 0x0004
-#define SSH_AUTH_METHOD_INTERACTIVE 0x0008
+/* auth flags */
+#define SSH_AUTH_METHOD_UNKNOWN 0
+#define SSH_AUTH_METHOD_NONE 0x0001
+#define SSH_AUTH_METHOD_PASSWORD 0x0002
+#define SSH_AUTH_METHOD_PUBLICKEY 0x0004
+#define SSH_AUTH_METHOD_HOSTBASED 0x0008
+#define SSH_AUTH_METHOD_INTERACTIVE 0x0010
+
+/* messages */
+#define SSH_REQUEST_AUTH 1
+#define SSH_REQUEST_CHANNEL_OPEN 2
+#define SSH_REQUEST_CHANNEL 3
+#define SSH_REQUEST_SERVICE 4
+#define SSH_REQUEST_GLOBAL 5
+
+#define SSH_CHANNEL_UNKNOWN 0
+#define SSH_CHANNEL_SESSION 1
+#define SSH_CHANNEL_DIRECT_TCPIP 2
+#define SSH_CHANNEL_FORWARDED_TCPIP 3
+#define SSH_CHANNEL_X11 4
+
+#define SSH_CHANNEL_REQUEST_UNKNOWN 0
+#define SSH_CHANNEL_REQUEST_PTY 1
+#define SSH_CHANNEL_REQUEST_EXEC 2
+#define SSH_CHANNEL_REQUEST_SHELL 3
+#define SSH_CHANNEL_REQUEST_ENV 4
+#define SSH_CHANNEL_REQUEST_SUBSYSTEM 5
+#define SSH_CHANNEL_REQUEST_WINDOW_CHANGE 6
 
 /* status flags */
-
 #define SSH_CLOSED (1<<0)
 #define SSH_READ_PENDING (1<<1)
 #define SSH_CLOSED_ERROR (1<<2)
@@ -389,6 +412,19 @@ int ssh_userauth_kbdint_setanswer(SSH_SESSION *session, unsigned int i,
 int ssh_init(void);
 int ssh_finalize(void);
 
+/* messages.c */
+typedef struct ssh_message SSH_MESSAGE;
+
+SSH_MESSAGE *ssh_message_retrieve(SSH_SESSION *session, uint32_t packettype);
+SSH_MESSAGE *ssh_message_get(SSH_SESSION *session);
+int ssh_message_type(SSH_MESSAGE *msg);
+int ssh_message_subtype(SSH_MESSAGE *msg);
+void ssh_message_free(SSH_MESSAGE *msg);
+
+ssh_channel ssh_message_channel_request_open_reply_accept(SSH_MESSAGE *msg);
+int ssh_message_channel_request_reply_success(SSH_MESSAGE *msg);
+
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/include/libssh/server.h b/include/libssh/server.h
index e5a921d5..c72c0e78 100644
--- a/include/libssh/server.h
+++ b/include/libssh/server.h
@@ -124,41 +124,7 @@ int ssh_accept(SSH_SESSION *session);
 int channel_write_stderr(ssh_channel channel, const void *data, uint32_t len);
 
 /* messages.c */
-
-#define SSH_AUTH_REQUEST 1
-#define SSH_CHANNEL_REQUEST_OPEN 2
-#define SSH_CHANNEL_REQUEST 3
-#define SSH_SERVICE_REQUEST 4
-
-#define SSH_AUTH_NONE (1<<0)
-#define SSH_AUTH_PASSWORD (1<<1)
-#define SSH_AUTH_HOSTBASED (1<<2)
-#define SSH_AUTH_PUBLICKEY (1<<3)
-#define SSH_AUTH_KEYBINT (1<<4)
-#define SSH_AUTH_UNKNOWN 0
-
-#define SSH_CHANNEL_SESSION 1
-#define SSH_CHANNEL_DIRECT_TCPIP 2
-#define SSH_CHANNEL_FORWARDED_TCPIP 3
-#define SSH_CHANNEL_X11 4
-#define SSH_CHANNEL_UNKNOWN 5
-
-#define SSH_CHANNEL_REQUEST_PTY 1
-#define SSH_CHANNEL_REQUEST_EXEC 2
-#define SSH_CHANNEL_REQUEST_SHELL 3
-#define SSH_CHANNEL_REQUEST_ENV 4
-#define SSH_CHANNEL_REQUEST_SUBSYSTEM 5
-#define SSH_CHANNEL_REQUEST_WINDOW_CHANGE 6
-#define SSH_CHANNEL_REQUEST_UNKNOWN 7
-
-typedef struct ssh_message SSH_MESSAGE;
-
-SSH_MESSAGE *ssh_message_retrieve(SSH_SESSION *session, uint32_t packettype);
-SSH_MESSAGE *ssh_message_get(SSH_SESSION *session);
-int ssh_message_type(SSH_MESSAGE *msg);
-int ssh_message_subtype(SSH_MESSAGE *msg);
 int ssh_message_reply_default(SSH_MESSAGE *msg);
-void ssh_message_free(SSH_MESSAGE *msg);
 
 char *ssh_message_auth_user(SSH_MESSAGE *msg);
 char *ssh_message_auth_password(SSH_MESSAGE *msg);
@@ -167,9 +133,6 @@ int ssh_message_auth_reply_success(SSH_MESSAGE *msg,int partial);
 int ssh_message_auth_reply_pk_ok(SSH_MESSAGE *msg, ssh_string algo, ssh_string pubkey);
 int ssh_message_auth_set_methods(SSH_MESSAGE *msg, int methods);
 
-ssh_channel ssh_message_channel_request_open_reply_accept(SSH_MESSAGE *msg);
-int ssh_message_channel_request_reply_success(SSH_MESSAGE *msg);
-
 int ssh_message_service_reply_success(SSH_MESSAGE *msg);
 char *ssh_message_service_service(SSH_MESSAGE *msg);