lib/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2025-11-27 13:21:11 +03:00
Code Activity

sockets: Fix callback registration bug

Browse Source 
Signed-off-by: Aris Adamantiadis <aris@0xbadc0de.be>
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
This commit is contained in:
Aris Adamantiadis
2015-07-07 12:38:34 +02:00
committed by Andreas Schneider
parent 8e42d3959c
commit 32eea120af
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/client.c
View File

@@ -373,8 +373,9 @@ static void ssh_client_connection_callback(ssh_session session){
goto error; goto error;
} }
/* from now, the packet layer is handling incoming packets */ /* from now, the packet layer is handling incoming packets */
if(session->version==2) if (session->version == 2) {
session->socket_callbacks.data=ssh_packet_socket_callback; ssh_packet_register_socket_callback(session, session->socket);
}
#ifdef WITH_SSH1 #ifdef WITH_SSH1
else else
session->socket_callbacks.data=ssh_packet_socket_callback1; session->socket_callbacks.data=ssh_packet_socket_callback1;

1
src/packet.c
View File

@@ -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.data=ssh_packet_socket_callback;
session->socket_callbacks.connected=NULL; session->socket_callbacks.connected=NULL;
session->socket_callbacks.controlflow = ssh_packet_socket_controlflow_callback; session->socket_callbacks.controlflow = ssh_packet_socket_controlflow_callback;
session->socket_callbacks.exception=NULL;
session->socket_callbacks.userdata=session; session->socket_callbacks.userdata=session;
ssh_socket_set_callbacks(s,&session->socket_callbacks); ssh_socket_set_callbacks(s,&session->socket_callbacks);
} }