diff options
| author | Aris Adamantiadis <aris@0xbadc0de.be> | 2009-12-12 00:23:53 +0100 |
|---|---|---|
| committer | Aris Adamantiadis <aris@0xbadc0de.be> | 2009-12-12 00:23:53 +0100 |
| commit | ad7e9d88fbf36d0fdfb169cfa45c67d15da13263 (patch) | |
| tree | f79a7ad6714eecafc7618feed9a5535f5ee33b9e /libssh/packet.c | |
| parent | 3ace7817b4c438d34f63313493cd82ae0dcf2757 (diff) | |
| download | libssh-ad7e9d88fbf36d0fdfb169cfa45c67d15da13263.tar.gz libssh-ad7e9d88fbf36d0fdfb169cfa45c67d15da13263.tar.xz libssh-ad7e9d88fbf36d0fdfb169cfa45c67d15da13263.zip | |
packet SSH_KEXINIT received and parsed
Resolved some bugs in the callback mechanism as well
Diffstat (limited to 'libssh/packet.c')
| -rw-r--r-- | libssh/packet.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libssh/packet.c b/libssh/packet.c index 09b0a745..db9f9fad 100644 --- a/libssh/packet.c +++ b/libssh/packet.c @@ -44,6 +44,7 @@ #include "libssh/session.h" #include "libssh/messages.h" #include "libssh/pcap.h" +#include "libssh/kex.h" ssh_packet_callback default_packet_handlers[]= { @@ -55,7 +56,7 @@ ssh_packet_callback default_packet_handlers[]= { NULL, //#define SSH2_MSG_SERVICE_ACCEPT 6 NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, // 7-19 - NULL, //#define SSH2_MSG_KEXINIT 20 + ssh_packet_kexinit, //#define SSH2_MSG_KEXINIT 20 NULL, //#define SSH2_MSG_NEWKEYS 21 NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, //22-29 NULL, //#define SSH2_MSG_KEXDH_INIT 30 SSH2_MSG_KEX_DH_GEX_REQUEST_OLD 30 @@ -298,7 +299,7 @@ void ssh_packet_set_callbacks(ssh_session session, ssh_packet_callbacks callback * @brief sets the default packet handlers */ void ssh_packet_set_default_callbacks(ssh_session session){ - session->default_packet_callbacks.start=0; + session->default_packet_callbacks.start=1; session->default_packet_callbacks.n_callbacks=sizeof(default_packet_handlers)/sizeof(ssh_packet_callback); session->default_packet_callbacks.user=session; session->default_packet_callbacks.callbacks=default_packet_handlers; @@ -327,7 +328,7 @@ void ssh_packet_process(ssh_session session, uint8_t type){ continue; if(cb->start > type) continue; - if(cb->start + cb->n_callbacks > type) + if(cb->start + cb->n_callbacks <= type) continue; if(cb->callbacks[type - cb->start]==NULL) continue; |