shinys000114/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2026-02-10 10:26:47 +09:00
Code Issues Packages Projects Releases Wiki Activity

Replace ssh_say with ssh_log.

Browse Source 
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@258 7dcaeef0-15fb-0310-b436-a5af3365683c
This commit is contained in:
Andreas Schneider
2009-03-11 09:56:58 +00:00
parent 39a8009e78
commit 3247a7683a
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libssh/client.c
View File

@@ -178,7 +178,7 @@ static int dh_handshake(SSH_SESSION *session){
leave_function(); leave_function();
return ret; return ret;
} }
ssh_say(2,"SSH_MSG_NEWKEYS sent\n"); ssh_log(session, SSH_LOG_RARE, "SSH_MSG_NEWKEYS sent\n");
session->dh_handshake_state=DH_STATE_NEWKEYS_SENT; session->dh_handshake_state=DH_STATE_NEWKEYS_SENT;
case DH_STATE_NEWKEYS_SENT: case DH_STATE_NEWKEYS_SENT:
ret=packet_wait(session,SSH2_MSG_NEWKEYS,1); ret=packet_wait(session,SSH2_MSG_NEWKEYS,1);
@@ -186,7 +186,7 @@ static int dh_handshake(SSH_SESSION *session){
leave_function(); leave_function();
return ret; return ret;
} }
ssh_say(2,"Got SSH_MSG_NEWKEYS\n"); ssh_log(session, SSH_LOG_RARE, "Got SSH_MSG_NEWKEYS\n");
make_sessionid(session); make_sessionid(session);
/* set the cryptographic functions for the next crypto */ /* set the cryptographic functions for the next crypto */
/* (it is needed for generate_session_keys for key lenghts) */ /* (it is needed for generate_session_keys for key lenghts) */
@@ -231,13 +231,15 @@ int ssh_service_request(SSH_SESSION *session,char *service){
buffer_add_ssh_string(session->out_buffer,service_s); buffer_add_ssh_string(session->out_buffer,service_s);
free(service_s); free(service_s);
packet_send(session); packet_send(session);
ssh_say(3,"Sent SSH_MSG_SERVICE_REQUEST (service %s)\n",service); ssh_log(session, SSH_LOG_PACKET,
"Sent SSH_MSG_SERVICE_REQUEST (service %s)\n", service);
if(packet_wait(session,SSH2_MSG_SERVICE_ACCEPT,1)){ if(packet_wait(session,SSH2_MSG_SERVICE_ACCEPT,1)){
ssh_set_error(session,SSH_FATAL,"did not receive SERVICE_ACCEPT"); ssh_set_error(session,SSH_FATAL,"did not receive SERVICE_ACCEPT");
leave_function(); leave_function();
return -1; return -1;
} }
ssh_say(3,"Received SSH_MSG_SERVICE_ACCEPT (service %s)\n",service); ssh_log(session, SSH_LOG_PACKET,
"Received SSH_MSG_SERVICE_ACCEPT (service %s)\n", service);
leave_function(); leave_function();
return 0; return 0;
} }
@@ -288,7 +290,7 @@ int ssh_connect(SSH_SESSION *session){
return -1; return -1;
} }
set_status(options,0.4); set_status(options,0.4);
ssh_say(2,"banner : %s\n",session->serverbanner); ssh_log(session, SSH_LOG_RARE, "banner: %s\n", session->serverbanner);
/* here we analyse the different protocols the server allows */ /* here we analyse the different protocols the server allows */
if(ssh_analyze_banner(session,&ssh1,&ssh2)){ if(ssh_analyze_banner(session,&ssh1,&ssh2)){
ssh_socket_close(session->socket); ssh_socket_close(session->socket);