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

Add more error checks to ssh_send_banner().

Browse Source 
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@488 7dcaeef0-15fb-0310-b436-a5af3365683c
This commit is contained in:
Andreas Schneider
2009-04-16 08:46:46 +00:00
parent a565f255f0
commit 2bbb005980
1 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
libssh/client.c
View File

@@ -139,32 +139,44 @@ static int ssh_analyze_banner(SSH_SESSION *session, int *ssh1, int *ssh2) {
* @return 0 on success, < 0 on error. * @return 0 on success, < 0 on error.
*/ */
int ssh_send_banner(SSH_SESSION *session, int server) { int ssh_send_banner(SSH_SESSION *session, int server) {
const char *banner; const char *banner = NULL;
char buffer[128] = {0}; char buffer[128] = {0};
enter_function(); enter_function();
banner = session->version == 1 ? CLIENTBANNER1 : CLIENTBANNER2; banner = session->version == 1 ? CLIENTBANNER1 : CLIENTBANNER2;
if (session->options->banner) { if (session->options->banner) {
banner=session->options->banner; banner = session->options->banner;
} }
if (server) { if (server) {
session->serverbanner = strdup(banner); session->serverbanner = strdup(banner);
if (session->serverbanner == NULL) { if (session->serverbanner == NULL) {
leave_function();
return -1; return -1;
} }
} else { } else {
session->clientbanner = strdup(banner); session->clientbanner = strdup(banner);
if (session->clientbanner == NULL) { if (session->clientbanner == NULL) {
leave_function();
return -1; return -1;
} }
} }
snprintf(buffer, 128, "%s\r\n", banner);
ssh_socket_write(session->socket, buffer, strlen(buffer));
ssh_socket_blocking_flush(session->socket);
leave_function();
snprintf(buffer, 128, "%s\r\n", banner);
if (ssh_socket_write(session->socket, buffer, strlen(buffer)) == SSH_ERROR) {
leave_function();
return -1;
}
if (ssh_socket_blocking_flush(session->socket) != SSH_OK) {
leave_function();
return -1;
}
leave_function();
return 0; return 0;
} }