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

Replace ssh_say with ssh_log.

Browse Source 
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@266 7dcaeef0-15fb-0310-b436-a5af3365683c
This commit is contained in:
Andreas Schneider
2009-03-11 12:20:47 +00:00
parent 1d3eeda7f9
commit 49c88c2cd7
1 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
libssh/channels1.c
View File

@@ -47,7 +47,7 @@ int channel_open_session1(CHANNEL *chan){
} }
session->exec_channel_opened=1; session->exec_channel_opened=1;
chan->open=1; chan->open=1;
ssh_say(2,"Opened a ssh1 channel session\n"); ssh_log(session, SSH_LOG_PACKET, "Opened a ssh1 channel session");
return 0; return 0;
} }
/* 10 SSH_CMSG_REQUEST_PTY /* 10 SSH_CMSG_REQUEST_PTY
@@ -75,7 +75,7 @@ int channel_request_pty_size1(CHANNEL *channel, char *terminal, int col,
buffer_add_u32(session->out_buffer,0); /* x */ buffer_add_u32(session->out_buffer,0); /* x */
buffer_add_u32(session->out_buffer,0); /* y */ buffer_add_u32(session->out_buffer,0); /* y */
buffer_add_u8(session->out_buffer,0); /* tty things */ buffer_add_u8(session->out_buffer,0); /* tty things */
ssh_say(2,"Opening a ssh1 pty\n"); ssh_log(session, SSH_LOG_FUNCTIONS, "Opening a ssh1 pty");
if(packet_send(session)) if(packet_send(session))
return -1; return -1;
if(packet_read(session)) if(packet_read(session))
@@ -84,16 +84,16 @@ int channel_request_pty_size1(CHANNEL *channel, char *terminal, int col,
return -1; return -1;
switch (session->in_packet.type){ switch (session->in_packet.type){
case SSH_SMSG_SUCCESS: case SSH_SMSG_SUCCESS:
ssh_say(2,"pty : Success\n"); ssh_log(session, SSH_LOG_RARE, "pty: Success");
return 0; return 0;
break; break;
case SSH_SMSG_FAILURE: case SSH_SMSG_FAILURE:
ssh_set_error(session,SSH_REQUEST_DENIED, ssh_set_error(session,SSH_REQUEST_DENIED,
"Server denied PTY allocation"); "Server denied PTY allocation");
ssh_say(2,"pty : denied\n"); ssh_log(session, SSH_LOG_RARE, "pty : denied\n");
break; break;
default: default:
ssh_say(2,"pty : error\n"); ssh_log(session, SSH_LOG_RARE, "pty : error\n");
ssh_set_error(session,SSH_FATAL, ssh_set_error(session,SSH_FATAL,
"Received unexpected packet type %d", "Received unexpected packet type %d",
session->in_packet.type); session->in_packet.type);
@@ -111,15 +111,15 @@ int channel_change_pty_size1(CHANNEL *channel, int cols, int rows){
buffer_add_u32(session->out_buffer,0); buffer_add_u32(session->out_buffer,0);
if(packet_send(session)) if(packet_send(session))
return -1; return -1;
ssh_say(2,"Change pty size send\n"); ssh_log(session, SSH_LOG_RARE, "Change pty size send");
packet_wait(session,SSH_SMSG_SUCCESS,1); packet_wait(session,SSH_SMSG_SUCCESS,1);
switch (session->in_packet.type){ switch (session->in_packet.type){
case SSH_SMSG_SUCCESS: case SSH_SMSG_SUCCESS:
ssh_say(2,"pty size changed\n"); ssh_log(session, SSH_LOG_RARE, "pty size changed");
return 0; return 0;
break; break;
case SSH_SMSG_FAILURE: case SSH_SMSG_FAILURE:
ssh_say(2,"pty size change denied\n"); ssh_log(session, SSH_LOG_RARE, "pty size change denied");
ssh_set_error(session,SSH_REQUEST_DENIED,"pty size change denied"); ssh_set_error(session,SSH_REQUEST_DENIED,"pty size change denied");
return -1; return -1;
} }
@@ -133,7 +133,7 @@ int channel_request_shell1(CHANNEL *channel){
buffer_add_u8(session->out_buffer,SSH_CMSG_EXEC_SHELL); buffer_add_u8(session->out_buffer,SSH_CMSG_EXEC_SHELL);
if(packet_send(session)) if(packet_send(session))
return -1; return -1;
ssh_say(2,"Launched a shell\n"); ssh_log(session, SSH_LOG_RARE, "Launched a shell");
return 0; return 0;
} }
@@ -145,7 +145,7 @@ int channel_request_exec1(CHANNEL *channel, char *cmd){
free(command); free(command);
if(packet_send(session)) if(packet_send(session))
return -1; return -1;
ssh_say(2,"executing %s...\n",cmd); ssh_log(session, SSH_LOG_RARE, "Executing %s ...",cmd);
return 0; return 0;
} }
@@ -156,10 +156,11 @@ static void channel_rcv_data1(SSH_SESSION *session, int is_stderr){
// are comming // are comming
str=buffer_get_ssh_string(session->in_buffer); str=buffer_get_ssh_string(session->in_buffer);
if(!str){ if(!str){
ssh_say(0,"Invalid data packet !\n"); ssh_log(session, SSH_LOG_FUNCTIONS, "Invalid data packet !\n");
return; return;
} }
ssh_say(3,"adding %d bytes data in %d\n",string_len(str),is_stderr); ssh_log(session, SSH_LOG_RARE,
"Adding %d bytes data in %d", string_len(str), is_stderr);
channel_default_bufferize(channel,str->string,string_len(str), channel_default_bufferize(channel,str->string,string_len(str),
is_stderr); is_stderr);
free(str); free(str);
@@ -180,7 +181,7 @@ static void channel_rcv_close1(SSH_SESSION *session){
} }
void channel_handle1(SSH_SESSION *session, int type){ void channel_handle1(SSH_SESSION *session, int type){
ssh_say(3,"Channel_handle1(%d)\n",type); ssh_log(session, SSH_LOG_RARE, "Channel_handle1(%d)", type);
switch (type){ switch (type){
case SSH_SMSG_STDOUT_DATA: case SSH_SMSG_STDOUT_DATA:
channel_rcv_data1(session,0); channel_rcv_data1(session,0);
@@ -189,7 +190,7 @@ void channel_handle1(SSH_SESSION *session, int type){
channel_rcv_close1(session); channel_rcv_close1(session);
break; break;
default: default:
ssh_say(0,"Unexepected message %d\n",type); ssh_log(session, SSH_LOG_FUNCTIONS, "Unexepected message %d", type);
} }
} }