aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Schneider <asn@cryptomilk.org>2016-05-02 09:06:51 +0200
committerAndreas Schneider <asn@cryptomilk.org>2016-05-03 09:41:26 +0200
commit22799b107d628d1e66e865d7fd9683a72a37b30d (patch)
treef33979bc6877da7f44a2f13fa3efa4e75db06b1f
parentc3ce3d5cc347367aa9f3735aa957695973072702 (diff)
downloadlibssh-22799b107d628d1e66e865d7fd9683a72a37b30d.tar.gz
libssh-22799b107d628d1e66e865d7fd9683a72a37b30d.tar.xz
libssh-22799b107d628d1e66e865d7fd9683a72a37b30d.zip
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>
-rw-r--r--src/client.c112
1 files changed, 63 insertions, 49 deletions
diff --git a/src/client.c b/src/client.c
index d80ff869..a29f35e4 100644
--- a/src/client.c
+++ b/src/client.c
@@ -90,59 +90,73 @@ static void socket_callback_connected(int code, int errno_code, void *user){
* @param user is a pointer to session
* @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) {
- char *buffer = (char *)data;
- ssh_session session=(ssh_session) user;
- char *str = NULL;
- size_t i;
- int ret=0;
-
- 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);
-
- return SSH_ERROR;
- }
- for(i=0;i<len;++i){
+static int callback_receive_banner(const void *data, size_t len, void *user)
+{
+ char *buffer = (char *)data;
+ ssh_session session=(ssh_session) user;
+ char *str = NULL;
+ size_t i;
+ int ret=0;
+
+ 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);
+
+ return SSH_ERROR;
+ }
+ for (i = 0; i < len; ++i) {
#ifdef WITH_PCAP
- if(session->pcap_ctx && buffer[i] == '\n'){
- ssh_pcap_context_write(session->pcap_ctx,SSH_PCAP_DIR_IN,buffer,i+1,i+1);
- }
+ if (session->pcap_ctx && buffer[i] == '\n') {
+ ssh_pcap_context_write(session->pcap_ctx,
+ SSH_PCAP_DIR_IN,
+ buffer,i+1,
+ i+1);
+ }
#endif
- if(buffer[i]=='\r') {
- buffer[i]='\0';
- }
- if (buffer[i]=='\n') {
- buffer[i] = '\0';
- /* The server MAY send other lines of data... */
- if (strncmp(buffer, "SSH-", 4) == 0) {
- str = strdup(buffer);
- if (str == NULL) {
- return SSH_ERROR;
+ if (buffer[i] == '\r') {
+ buffer[i] = '\0';
}
- /* number of bytes read */
- ret = i + 1;
- session->serverbanner = str;
- session->session_state=SSH_SESSION_STATE_BANNER_RECEIVED;
- SSH_LOG(SSH_LOG_PACKET,"Received banner: %s",str);
- session->ssh_connection_callback(session);
-
- return ret;
- } else {
- SSH_LOG(SSH_LOG_DEBUG, "ssh_protocol_version_exchange: %s", buffer);
- ret = i + 1;
- break;
- }
- }
- if(i>127){
- /* Too big banner */
- session->session_state=SSH_SESSION_STATE_ERROR;
- ssh_set_error(session,SSH_FATAL,"Receiving banner: too large banner");
-
- return 0;
- }
- }
+ if (buffer[i] == '\n') {
+ int cmp;
+
+ buffer[i] = '\0';
+
+ /* The server MAY send other lines of data... */
+ cmp = strncmp(buffer, "SSH-", 4);
+ if (cmp == 0) {
+ str = strdup(buffer);
+ if (str == NULL) {
+ return SSH_ERROR;
+ }
+ /* number of bytes read */
+ ret = i + 1;
+ session->serverbanner = str;
+ session->session_state = SSH_SESSION_STATE_BANNER_RECEIVED;
+ SSH_LOG(SSH_LOG_PACKET, "Received banner: %s", str);
+ session->ssh_connection_callback(session);
+
+ return ret;
+ } else {
+ SSH_LOG(SSH_LOG_DEBUG,
+ "ssh_protocol_version_exchange: %s",
+ buffer);
+ ret = i + 1;
+ break;
+ }
+ }
+ if (i > 127) {
+ /* Too big banner */
+ session->session_state=SSH_SESSION_STATE_ERROR;
+ ssh_set_error(session,
+ SSH_FATAL,
+ "Receiving banner: too large banner");
+
+ return 0;
+ }
+ }
- return ret;
+ return ret;
}
/** @internal