aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAris Adamantiadis <aris@0xbadc0de.be>2015-07-07 12:38:34 +0200
committerAndreas Schneider <asn@cryptomilk.org>2016-05-02 17:34:09 +0200
commit32eea120af93fe56827718f63eb9a81ad5d9ec67 (patch)
tree6e49301c51aaab8cc208eb1be615d1a5bd4c31fd /src
parent8e42d3959cd14a1999d3d11ba3a199c12ef7f199 (diff)
downloadlibssh-32eea120af93fe56827718f63eb9a81ad5d9ec67.tar.gz
libssh-32eea120af93fe56827718f63eb9a81ad5d9ec67.tar.xz
libssh-32eea120af93fe56827718f63eb9a81ad5d9ec67.zip
sockets: Fix callback registration bug
Signed-off-by: Aris Adamantiadis <aris@0xbadc0de.be> Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
Diffstat (limited to 'src')
-rw-r--r--src/client.c5
-rw-r--r--src/packet.c1
2 files changed, 3 insertions, 3 deletions
diff --git a/src/client.c b/src/client.c
index 0cca1102..2b78add0 100644
--- a/src/client.c
+++ b/src/client.c
@@ -373,8 +373,9 @@ static void ssh_client_connection_callback(ssh_session session){
goto error;
}
/* from now, the packet layer is handling incoming packets */
- if(session->version==2)
- session->socket_callbacks.data=ssh_packet_socket_callback;
+ if (session->version == 2) {
+ ssh_packet_register_socket_callback(session, session->socket);
+ }
#ifdef WITH_SSH1
else
session->socket_callbacks.data=ssh_packet_socket_callback1;
diff --git a/src/packet.c b/src/packet.c
index f0a77d48..33943aef 100644
--- a/src/packet.c
+++ b/src/packet.c
@@ -388,7 +388,6 @@ void ssh_packet_register_socket_callback(ssh_session session, ssh_socket s){
session->socket_callbacks.data=ssh_packet_socket_callback;
session->socket_callbacks.connected=NULL;
session->socket_callbacks.controlflow = ssh_packet_socket_controlflow_callback;
- session->socket_callbacks.exception=NULL;
session->socket_callbacks.userdata=session;
ssh_socket_set_callbacks(s,&session->socket_callbacks);
}