ClearML/dropbear
1
0
Fork 0
mirror of https://github.com/clearml/dropbear synced 2025-02-26 05:38:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Turn many local variables into char *

Browse Source 
reqname, bindaddr, request_addr, desthost and orighost to be exhaustive.
This commit is contained in:
Gaël PORTAY 2015-05-02 23:40:30 +02:00
parent 292656d899
commit 20f1e49b73
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
svr-tcpfwd.c
View File

@ -65,7 +65,7 @@ static const struct ChanType svr_chan_tcpremote = {
* similar to the request-switching in chansession.c */ * similar to the request-switching in chansession.c */
void recv_msg_global_request_remotetcp() { void recv_msg_global_request_remotetcp() {
unsigned char* reqname = NULL; char* reqname = NULL;
unsigned int namelen; unsigned int namelen;
unsigned int wantreply = 0; unsigned int wantreply = 0;
int ret = DROPBEAR_FAILURE; int ret = DROPBEAR_FAILURE;
@ -77,7 +77,7 @@ void recv_msg_global_request_remotetcp() {
goto out; goto out;
} }
reqname = buf_getstring(ses.payload, &namelen); reqname = (char *)buf_getstring(ses.payload, &namelen);
wantreply = buf_getbool(ses.payload); wantreply = buf_getbool(ses.payload);
if (namelen > MAX_NAME_LEN) { if (namelen > MAX_NAME_LEN) {
@ -120,7 +120,7 @@ static int matchtcp(void* typedata1, void* typedata2) {
static int svr_cancelremotetcp() { static int svr_cancelremotetcp() {
int ret = DROPBEAR_FAILURE; int ret = DROPBEAR_FAILURE;
unsigned char * bindaddr = NULL; char * bindaddr = NULL;
unsigned int addrlen; unsigned int addrlen;
unsigned int port; unsigned int port;
struct Listener * listener = NULL; struct Listener * listener = NULL;
@ -128,7 +128,7 @@ static int svr_cancelremotetcp() {
TRACE(("enter cancelremotetcp")) TRACE(("enter cancelremotetcp"))
bindaddr = buf_getstring(ses.payload, &addrlen); bindaddr = (char *)buf_getstring(ses.payload, &addrlen);
if (addrlen > MAX_IP_LEN) { if (addrlen > MAX_IP_LEN) {
TRACE(("addr len too long: %d", addrlen)) TRACE(("addr len too long: %d", addrlen))
goto out; goto out;
@ -155,14 +155,14 @@ out:
static int svr_remotetcpreq() { static int svr_remotetcpreq() {
int ret = DROPBEAR_FAILURE; int ret = DROPBEAR_FAILURE;
unsigned char * request_addr = NULL; char * request_addr = NULL;
unsigned int addrlen; unsigned int addrlen;
struct TCPListener *tcpinfo = NULL; struct TCPListener *tcpinfo = NULL;
unsigned int port; unsigned int port;
TRACE(("enter remotetcpreq")) TRACE(("enter remotetcpreq"))
request_addr = buf_getstring(ses.payload, &addrlen); request_addr = (char *)buf_getstring(ses.payload, &addrlen);
if (addrlen > MAX_IP_LEN) { if (addrlen > MAX_IP_LEN) {
TRACE(("addr len too long: %d", addrlen)) TRACE(("addr len too long: %d", addrlen))
goto out; goto out;
@ -232,9 +232,9 @@ const struct ChanType svr_chan_tcpdirect = {
* address */ * address */
static int newtcpdirect(struct Channel * channel) { static int newtcpdirect(struct Channel * channel) {
unsigned char* desthost = NULL; char* desthost = NULL;
unsigned int destport; unsigned int destport;
unsigned char* orighost = NULL; char* orighost = NULL;
unsigned int origport; unsigned int origport;
char portstring[NI_MAXSERV]; char portstring[NI_MAXSERV];
unsigned int len; unsigned int len;
@ -247,7 +247,7 @@ static int newtcpdirect(struct Channel * channel) {
goto out; goto out;
} }
desthost = buf_getstring(ses.payload, &len); desthost = (char *)buf_getstring(ses.payload, &len);
if (len > MAX_HOST_LEN) { if (len > MAX_HOST_LEN) {
TRACE(("leave newtcpdirect: desthost too long")) TRACE(("leave newtcpdirect: desthost too long"))
goto out; goto out;
@ -255,7 +255,7 @@ static int newtcpdirect(struct Channel * channel) {
destport = buf_getint(ses.payload); destport = buf_getint(ses.payload);
orighost = buf_getstring(ses.payload, &len); orighost = (char *)buf_getstring(ses.payload, &len);
if (len > MAX_HOST_LEN) { if (len > MAX_HOST_LEN) {
TRACE(("leave newtcpdirect: orighost too long")) TRACE(("leave newtcpdirect: orighost too long"))
goto out; goto out;