Mercurial > dropbear
diff svr-chansession.c @ 1121:bb3a03feb31f
Merge pull request #13 from gazoo74/fix-warnings
Fix warnings
author | Matt Johnston <matt@ucc.asn.au> |
---|---|
date | Thu, 04 Jun 2015 22:25:28 +0800 |
parents | 367d3800555b |
children | aaf576b27a10 |
line wrap: on
line diff
--- a/svr-chansession.c Wed Jun 03 22:59:59 2015 +0800 +++ b/svr-chansession.c Thu Jun 04 22:25:28 2015 +0800 @@ -183,7 +183,7 @@ buf_putbyte(ses.writepayload, SSH_MSG_CHANNEL_REQUEST); buf_putint(ses.writepayload, channel->remotechan); - buf_putstring(ses.writepayload, "exit-status", 11); + buf_putstring(ses.writepayload, (const unsigned char *) "exit-status", 11); buf_putbyte(ses.writepayload, 0); /* boolean FALSE */ buf_putint(ses.writepayload, chansess->exit.exitstatus); @@ -219,12 +219,12 @@ buf_putbyte(ses.writepayload, SSH_MSG_CHANNEL_REQUEST); buf_putint(ses.writepayload, channel->remotechan); - buf_putstring(ses.writepayload, "exit-signal", 11); + buf_putstring(ses.writepayload, (const unsigned char *) "exit-signal", 11); buf_putbyte(ses.writepayload, 0); /* boolean FALSE */ - buf_putstring(ses.writepayload, signame, strlen(signame)); + buf_putstring(ses.writepayload, (const unsigned char *) signame, strlen(signame)); buf_putbyte(ses.writepayload, chansess->exit.exitcore); - buf_putstring(ses.writepayload, "", 0); /* error msg */ - buf_putstring(ses.writepayload, "", 0); /* lang */ + buf_putstring(ses.writepayload, (const unsigned char *) "", 0); /* error msg */ + buf_putstring(ses.writepayload, (const unsigned char *) "", 0); /* lang */ encrypt_packet(); } @@ -343,7 +343,7 @@ * or x11/authagent forwarding. These are passed to appropriate handlers */ static void chansessionrequest(struct Channel *channel) { - unsigned char * type = NULL; + char * type = NULL; unsigned int typelen; unsigned char wantreply; int ret = 1; @@ -351,7 +351,7 @@ TRACE(("enter chansessionrequest")) - type = buf_getstring(ses.payload, &typelen); + type = (char *) buf_getstring(ses.payload, &typelen); wantreply = buf_getbool(ses.payload); if (typelen > MAX_NAME_LEN) { @@ -406,7 +406,7 @@ static int sessionsignal(struct ChanSess *chansess) { int sig = 0; - unsigned char* signame = NULL; + char* signame = NULL; int i; if (chansess->pid == 0) { @@ -414,7 +414,7 @@ return DROPBEAR_FAILURE; } - signame = buf_getstring(ses.payload, NULL); + signame = (char *) buf_getstring(ses.payload, NULL); i = 0; while (signames[i].name != 0) { @@ -557,7 +557,7 @@ static int sessionpty(struct ChanSess * chansess) { unsigned int termlen; - unsigned char namebuf[65]; + char namebuf[65]; struct passwd * pw = NULL; TRACE(("enter sessionpty")) @@ -567,7 +567,7 @@ return DROPBEAR_FAILURE; } - chansess->term = buf_getstring(ses.payload, &termlen); + chansess->term = (char *) buf_getstring(ses.payload, &termlen); if (termlen > MAX_TERM_LEN) { /* TODO send disconnect ? */ TRACE(("leave sessionpty: term len too long")) @@ -583,7 +583,7 @@ return DROPBEAR_FAILURE; } - chansess->tty = (char*)m_strdup(namebuf); + chansess->tty = m_strdup(namebuf); if (!chansess->tty) { dropbear_exit("Out of memory"); /* TODO disconnect */ } @@ -603,6 +603,7 @@ return DROPBEAR_SUCCESS; } +#ifndef USE_VFORK static void make_connection_string(struct ChanSess *chansess) { char *local_ip, *local_port, *remote_ip, *remote_port; size_t len; @@ -624,6 +625,7 @@ m_free(remote_ip); m_free(remote_port); } +#endif /* Handle a command request from the client. This is used for both shell * and command-execution requests, and passes the command to @@ -647,7 +649,7 @@ if (iscmd) { /* "exec" */ if (chansess->cmd == NULL) { - chansess->cmd = buf_getstring(ses.payload, &cmdlen); + chansess->cmd = (char *) buf_getstring(ses.payload, &cmdlen); if (cmdlen > MAX_CMD_LEN) { m_free(chansess->cmd);