diff tcp-accept.c @ 1120:391bb7d560c6

Merge branch 'fix-pointer-sign-warnings' into fix-warnings
author Gaël PORTAY <gael.portay@gmail.com>
date Tue, 05 May 2015 20:42:38 +0200
parents 2c646a65a1e3
children d7b752525b91
line wrap: on
line diff
--- a/tcp-accept.c	Sat May 02 16:02:22 2015 +0200
+++ b/tcp-accept.c	Tue May 05 20:42:38 2015 +0200
@@ -75,7 +75,7 @@
 	}
 
 	if (send_msg_channel_open_init(fd, tcpinfo->chantype) == DROPBEAR_SUCCESS) {
-		unsigned char* addr = NULL;
+		char* addr = NULL;
 		unsigned int port = 0;
 
 		if (tcpinfo->tcp_type == direct) {
@@ -94,11 +94,11 @@
 		if (addr == NULL) {
 			addr = "localhost";
 		}
-		buf_putstring(ses.writepayload, addr, strlen(addr));
+		buf_putstring(ses.writepayload, (const unsigned char *)addr, strlen(addr));
 		buf_putint(ses.writepayload, port);
 
 		/* originator ip */
-		buf_putstring(ses.writepayload, ipstring, strlen(ipstring));
+		buf_putstring(ses.writepayload, (const unsigned char *)ipstring, strlen(ipstring));
 		/* originator port */
 		buf_putint(ses.writepayload, atol(portstring));