client: Reformat callback_receive_banner()
The function is hard to read as the indentation is not correctly applied. Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
Этот коммит содержится в:
родитель
c3ce3d5cc3
Коммит
22799b107d
26
src/client.c
26
src/client.c
@ -90,7 +90,8 @@ static void socket_callback_connected(int code, int errno_code, void *user){
|
|||||||
* @param user is a pointer to session
|
* @param user is a pointer to session
|
||||||
* @returns Number of bytes processed, or zero if the banner is not complete.
|
* @returns Number of bytes processed, or zero if the banner is not complete.
|
||||||
*/
|
*/
|
||||||
static int callback_receive_banner(const void *data, size_t len, void *user) {
|
static int callback_receive_banner(const void *data, size_t len, void *user)
|
||||||
|
{
|
||||||
char *buffer = (char *)data;
|
char *buffer = (char *)data;
|
||||||
ssh_session session=(ssh_session) user;
|
ssh_session session=(ssh_session) user;
|
||||||
char *str = NULL;
|
char *str = NULL;
|
||||||
@ -98,23 +99,32 @@ static int callback_receive_banner(const void *data, size_t len, void *user) {
|
|||||||
int ret=0;
|
int ret=0;
|
||||||
|
|
||||||
if (session->session_state != SSH_SESSION_STATE_SOCKET_CONNECTED) {
|
if (session->session_state != SSH_SESSION_STATE_SOCKET_CONNECTED) {
|
||||||
ssh_set_error(session,SSH_FATAL,"Wrong state in callback_receive_banner : %d",session->session_state);
|
ssh_set_error(session,SSH_FATAL,
|
||||||
|
"Wrong state in callback_receive_banner : %d",
|
||||||
|
session->session_state);
|
||||||
|
|
||||||
return SSH_ERROR;
|
return SSH_ERROR;
|
||||||
}
|
}
|
||||||
for (i = 0; i < len; ++i) {
|
for (i = 0; i < len; ++i) {
|
||||||
#ifdef WITH_PCAP
|
#ifdef WITH_PCAP
|
||||||
if (session->pcap_ctx && buffer[i] == '\n') {
|
if (session->pcap_ctx && buffer[i] == '\n') {
|
||||||
ssh_pcap_context_write(session->pcap_ctx,SSH_PCAP_DIR_IN,buffer,i+1,i+1);
|
ssh_pcap_context_write(session->pcap_ctx,
|
||||||
|
SSH_PCAP_DIR_IN,
|
||||||
|
buffer,i+1,
|
||||||
|
i+1);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
if (buffer[i] == '\r') {
|
if (buffer[i] == '\r') {
|
||||||
buffer[i] = '\0';
|
buffer[i] = '\0';
|
||||||
}
|
}
|
||||||
if (buffer[i] == '\n') {
|
if (buffer[i] == '\n') {
|
||||||
|
int cmp;
|
||||||
|
|
||||||
buffer[i] = '\0';
|
buffer[i] = '\0';
|
||||||
|
|
||||||
/* The server MAY send other lines of data... */
|
/* The server MAY send other lines of data... */
|
||||||
if (strncmp(buffer, "SSH-", 4) == 0) {
|
cmp = strncmp(buffer, "SSH-", 4);
|
||||||
|
if (cmp == 0) {
|
||||||
str = strdup(buffer);
|
str = strdup(buffer);
|
||||||
if (str == NULL) {
|
if (str == NULL) {
|
||||||
return SSH_ERROR;
|
return SSH_ERROR;
|
||||||
@ -128,7 +138,9 @@ static int callback_receive_banner(const void *data, size_t len, void *user) {
|
|||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
} else {
|
} else {
|
||||||
SSH_LOG(SSH_LOG_DEBUG, "ssh_protocol_version_exchange: %s", buffer);
|
SSH_LOG(SSH_LOG_DEBUG,
|
||||||
|
"ssh_protocol_version_exchange: %s",
|
||||||
|
buffer);
|
||||||
ret = i + 1;
|
ret = i + 1;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@ -136,7 +148,9 @@ static int callback_receive_banner(const void *data, size_t len, void *user) {
|
|||||||
if (i > 127) {
|
if (i > 127) {
|
||||||
/* Too big banner */
|
/* Too big banner */
|
||||||
session->session_state=SSH_SESSION_STATE_ERROR;
|
session->session_state=SSH_SESSION_STATE_ERROR;
|
||||||
ssh_set_error(session,SSH_FATAL,"Receiving banner: too large banner");
|
ssh_set_error(session,
|
||||||
|
SSH_FATAL,
|
||||||
|
"Receiving banner: too large banner");
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user