aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorAndreas Schneider <asn@cryptomilk.org>2011-09-17 20:17:11 +0200
committerAndreas Schneider <asn@cryptomilk.org>2011-09-18 21:37:18 +0200
commit508374219255bf7876acf5046d7b63f00f85a6e3 (patch)
treefb4eb1ccdbb9a710bdf1bcf9ca237173bf822213 /include
parentdc42a1757fdbbf5b0ffd877649b6cf08b1385420 (diff)
downloadlibssh-508374219255bf7876acf5046d7b63f00f85a6e3.tar.gz
libssh-508374219255bf7876acf5046d7b63f00f85a6e3.tar.xz
libssh-508374219255bf7876acf5046d7b63f00f85a6e3.zip
packet: Move packet callbacks to packet_cb.c.
Diffstat (limited to 'include')
-rw-r--r--include/libssh/packet.h10
-rw-r--r--include/libssh/priv.h11
2 files changed, 10 insertions, 11 deletions
diff --git a/include/libssh/packet.h b/include/libssh/packet.h
index 22138e49..9d934c61 100644
--- a/include/libssh/packet.h
+++ b/include/libssh/packet.h
@@ -56,6 +56,16 @@ int ssh_packet_socket_callback1(const void *data, size_t receivedlen, void *user
#endif
SSH_PACKET_CALLBACK(ssh_packet_unimplemented);
+SSH_PACKET_CALLBACK(ssh_packet_disconnect_callback);
+SSH_PACKET_CALLBACK(ssh_packet_ignore_callback);
+SSH_PACKET_CALLBACK(ssh_packet_dh_reply);
+SSH_PACKET_CALLBACK(ssh_packet_newkeys);
+SSH_PACKET_CALLBACK(ssh_packet_service_accept);
+
+#ifdef WITH_SERVER
+SSH_PACKET_CALLBACK(ssh_packet_kexdh_init);
+#endif
+
int ssh_packet_send_unimplemented(ssh_session session, uint32_t seqnum);
int ssh_packet_parse_type(ssh_session session);
//int packet_flush(ssh_session session, int enforce_blocking);
diff --git a/include/libssh/priv.h b/include/libssh/priv.h
index 4ac33a62..2e323b9b 100644
--- a/include/libssh/priv.h
+++ b/include/libssh/priv.h
@@ -171,18 +171,9 @@ void _ssh_set_error_invalid(void *error, const char *function);
-/* server data */
-
-
-SSH_PACKET_CALLBACK(ssh_packet_disconnect_callback);
-SSH_PACKET_CALLBACK(ssh_packet_ignore_callback);
-
/* client.c */
int ssh_send_banner(ssh_session session, int is_server);
-SSH_PACKET_CALLBACK(ssh_packet_dh_reply);
-SSH_PACKET_CALLBACK(ssh_packet_newkeys);
-SSH_PACKET_CALLBACK(ssh_packet_service_accept);
/* connect.c */
socket_t ssh_connect_host(ssh_session session, const char *host,const char
@@ -201,8 +192,6 @@ int decompress_buffer(ssh_session session,ssh_buffer buf, size_t maxlen);
/* match.c */
int match_hostname(const char *host, const char *pattern, unsigned int len);
-/* server.c */
-SSH_PACKET_CALLBACK(ssh_packet_kexdh_init);