diff --git a/src/authradius.c b/src/authradius.c index 58872b9..7163c2a 100644 --- a/src/authradius.c +++ b/src/authradius.c @@ -324,7 +324,7 @@ int radsend(struct clientparam * param, int auth, int stop){ char buf[64]; - if(!radiussecret || !nradservers) { + if(!nradservers) { return 4; } @@ -391,7 +391,7 @@ int radsend(struct clientparam * param, int auth, int stop){ /* NAS-Identifier */ if(conf.stringtable){ *ptr++ = PW_NAS_IDENTIFIER; - len = strlen(conf.stringtable[SERVICES+param->service]); + len = strlen((char *)conf.stringtable[SERVICES+param->service]); *ptr++ = (2 + len); memcpy(ptr, conf.stringtable[SERVICES+param->service], len); ptr += len; @@ -416,7 +416,7 @@ int radsend(struct clientparam * param, int auth, int stop){ /* Called-Station-ID */ if(param->hostname){ *ptr++ = PW_CALLED_STATION_ID; - len = strlen(param->hostname); + len = strlen((char *)param->hostname); *ptr++ = (2 + len); memcpy(ptr, param->hostname, len); ptr += len; @@ -456,7 +456,7 @@ int radsend(struct clientparam * param, int auth, int stop){ /* Username */ if(param->username){ - len = strlen(param->username); + len = strlen((char *)param->username); if(len>128)len=128; *ptr++ = PW_USER_NAME; *ptr++ = len + 2; @@ -499,12 +499,12 @@ int radsend(struct clientparam * param, int auth, int stop){ } if(auth && param->password){ - len = strlen(param->password); + len = strlen((char *)param->password); if(len > 128) len = 128; *ptr++ = PW_PASSWORD; ptr++; memcpy(ptr, param->password, len); - rad_pwencode(ptr, + rad_pwencode((char *)ptr, &len, radiussecret, (char *)packet.vector); @@ -582,7 +582,7 @@ int radsend(struct clientparam * param, int auth, int stop){ continue; } - if (calc_replydigest((char *)&rpacket, packet.vector, radiussecret, + if (calc_replydigest((char *)&rpacket, (char *)packet.vector, radiussecret, data_len) ){ continue; } diff --git a/src/auto.c b/src/auto.c index 9ace9b5..54d4d0a 100644 --- a/src/auto.c +++ b/src/auto.c @@ -20,7 +20,7 @@ void * autochild(struct clientparam* param) { len = sockfillbuffcli(param, 1, CONNECTION_S); if (len != 1){ param->res = 801; - dolog(param, ""); + dolog(param, (unsigned char *)""); } if(*param->clibuf == 4 || *param->clibuf == 5) return sockschild(param); return proxychild(param); diff --git a/src/conf.c b/src/conf.c index 8409772..724d408 100644 --- a/src/conf.c +++ b/src/conf.c @@ -324,7 +324,7 @@ static int h_log(int argc, unsigned char ** argv){ } #endif #ifndef NORADIUS - else if(!strcmp(argv[1],"radius")){ + else if(!strcmp((char *)argv[1],"radius")){ conf.logfunc = logradius; } #endif @@ -764,7 +764,7 @@ static int h_parent(int argc, unsigned char **argv){ fprintf(stderr, "Chaining error: bad chain type (%s)\n", argv[2]); return(4); } - cidr = strchr(argv[3], '/'); + cidr = strchr((char *)argv[3], '/'); if(cidr) *cidr = 0; if(!getip46(46, argv[3], (struct sockaddr *)&chains->addr)) return (5); chains->exthost = (unsigned char *)mystrdup((char *)argv[3]); @@ -827,7 +827,7 @@ int scanipl(unsigned char *arg, struct iplist *dst){ memcpy(&dst->ip_from, SAADDR(&sa), SAADDRLEN(&sa)); dst->family = *SAFAMILY(&sa); if(dash){ - if(afdetect(dash+1) == -1) return 1; + if(afdetect((unsigned char *)dash+1) == -1) return 1; if(!getip46(46, (unsigned char *)dash+1, (struct sockaddr *)&sa)) return 2; memcpy(&dst->ip_to, SAADDR(&sa), SAADDRLEN(&sa)); if(*SAFAMILY(&sa) != dst->family || memcmp(&dst->ip_to, &dst->ip_from, SAADDRLEN(&sa)) < 0) return 3; @@ -1374,16 +1374,16 @@ static int h_radius(int argc, unsigned char **argv){ } */ memset(radiuslist, 0, sizeof(radiuslist)); - if(strlen(argv[1]) > 63) argv[1][63] = 0; - strcpy(radiussecret, argv[1]); + if(strlen((char *)argv[1]) > 63) argv[1][63] = 0; + strcpy(radiussecret, (char *)argv[1]); for( nradservers=0; nradservers < MAXRADIUS && nradservers < argc -2; nradservers++){ char *s = 0; - if((s=strchr(argv[nradservers + 2], '/'))){ + if((s=strchr((char *)argv[nradservers + 2], '/'))){ *s = 0; s++; } if( !getip46(46, argv[nradservers + 2], (struct sockaddr *)&radiuslist[nradservers].authaddr)) return 1; - if( s && !getip46(46, s+1, (struct sockaddr *)&radiuslist[nradservers].localaddr)) return 2; + if( s && !getip46(46, (unsigned char *)s+1, (struct sockaddr *)&radiuslist[nradservers].localaddr)) return 2; if(!*SAPORT(&radiuslist[nradservers].authaddr))*SAPORT(&radiuslist[nradservers].authaddr) = htons(1812); port = ntohs(*SAPORT(&radiuslist[nradservers].authaddr)); radiuslist[nradservers].logaddr = radiuslist[nradservers].authaddr; diff --git a/src/plugins/FilePlugin/FilePlugin.c b/src/plugins/FilePlugin/FilePlugin.c index 0b8255e..e597f77 100644 --- a/src/plugins/FilePlugin/FilePlugin.c +++ b/src/plugins/FilePlugin/FilePlugin.c @@ -37,8 +37,10 @@ extern "C" { #ifndef _WIN32 #define WINAPI #define fp_size_t size_t +#define fp_ssize_t ssize_t #else #define fp_size_t int +#define fp_ssize_t int #endif static struct pluginlink * pl; @@ -457,7 +459,7 @@ static int WINAPI fp_poll(struct pollfd *fds, unsigned int nfds, int timeout){ return sso._poll(fds, nfds, timeout); } -static int WINAPI fp_send(SOCKET s, const char *msg, fp_size_t len, int flags){ +static fp_ssize_t WINAPI fp_send(SOCKET s, const char *msg, fp_size_t len, int flags){ struct fp_stream *fps = NULL; int res; res = searchsocket(s, &fps); @@ -541,7 +543,7 @@ static int WINAPI fp_send(SOCKET s, const char *msg, fp_size_t len, int flags){ } return sso._send(s, msg, len, flags); } -static int WINAPI fp_sendto(SOCKET s, const void *msg, int len, int flags, const struct sockaddr *to, fp_size_t tolen){ +static fp_ssize_t WINAPI fp_sendto(SOCKET s, const void *msg, int len, int flags, const struct sockaddr *to, fp_size_t tolen){ struct fp_stream *fps = NULL; int res; res = searchsocket(s, &fps); @@ -659,10 +661,10 @@ static int WINAPI fp_sendto(SOCKET s, const void *msg, int len, int flags, const } return sso._sendto(s, msg, len, flags, to, tolen); } -static int WINAPI fp_recv(SOCKET s, void *buf, fp_size_t len, int flags){ +static fp_ssize_t WINAPI fp_recv(SOCKET s, void *buf, fp_size_t len, int flags){ return sso._recv(s, buf, len, flags); } -static int WINAPI fp_recvfrom(SOCKET s, void * buf, fp_size_t len, int flags, struct sockaddr * from, fp_size_t * fromlen){ +static fp_ssize_t WINAPI fp_recvfrom(SOCKET s, void * buf, fp_size_t len, int flags, struct sockaddr * from, fp_size_t * fromlen){ return sso._recvfrom(s, buf, len, flags, from, fromlen); } static int WINAPI fp_shutdown(SOCKET s, int how){ diff --git a/src/plugins/SSLPlugin/ssl_plugin.c b/src/plugins/SSLPlugin/ssl_plugin.c index 56ae11f..8bfbab4 100644 --- a/src/plugins/SSLPlugin/ssl_plugin.c +++ b/src/plugins/SSLPlugin/ssl_plugin.c @@ -110,7 +110,7 @@ struct sockfuncs sso; #ifdef _WIN32 static int WINAPI ssl_send(SOCKET s, const void *msg, int len, int flags){ #else -static int ssl_send(SOCKET s, const void *msg, size_t len, int flags){ +static ssize_t ssl_send(SOCKET s, const void *msg, size_t len, int flags){ #endif struct SSLqueue *sslq; @@ -134,7 +134,7 @@ static int ssl_send(SOCKET s, const void *msg, size_t len, int flags){ #ifdef _WIN32 static int WINAPI ssl_sendto(SOCKET s, const void *msg, int len, int flags, const struct sockaddr *to, int tolen){ #else -static int ssl_sendto(SOCKET s, const void *msg, size_t len, int flags, const struct sockaddr *to, SASIZETYPE tolen){ +static ssize_t ssl_sendto(SOCKET s, const void *msg, size_t len, int flags, const struct sockaddr *to, SASIZETYPE tolen){ #endif struct SSLqueue *sslq; @@ -157,7 +157,7 @@ static int ssl_sendto(SOCKET s, const void *msg, size_t len, int flags, const st #ifdef _WIN32 static int WINAPI ssl_recvfrom(SOCKET s, void *msg, int len, int flags, struct sockaddr *from, int *fromlen){ #else -static int ssl_recvfrom(SOCKET s, void *msg, size_t len, int flags, struct sockaddr *from, SASIZETYPE *fromlen){ +static ssize_t ssl_recvfrom(SOCKET s, void *msg, size_t len, int flags, struct sockaddr *from, SASIZETYPE *fromlen){ #endif struct SSLqueue *sslq; @@ -179,7 +179,7 @@ static int ssl_recvfrom(SOCKET s, void *msg, size_t len, int flags, struct socka #ifdef _WIN32 static int WINAPI ssl_recv(SOCKET s, void *msg, int len, int flags){ #else -static int WINAPI ssl_recv(SOCKET s, void *msg, size_t len, int flags){ +static ssize_t ssl_recv(SOCKET s, void *msg, size_t len, int flags){ #endif struct SSLqueue *sslq; diff --git a/src/structures.h b/src/structures.h index 82c910a..020a16e 100644 --- a/src/structures.h +++ b/src/structures.h @@ -720,10 +720,10 @@ struct sockfuncs { int (*_getsockopt)(SOCKET s, int level, int optname, void * optval, socklen_t * optlen); int (*_setsockopt)(int s, int level, int optname, const void *optval, socklen_t optlen); int (*_poll)(struct pollfd *fds, unsigned int nfds, int timeout); - size_t (*_send)(SOCKET s, const void *msg, size_t len, int flags); - size_t (*_sendto)(SOCKET s, const void *msg, size_t len, int flags, const struct sockaddr *to, SASIZETYPE tolen); - size_t (*_recv)(SOCKET s, void *buf, size_t len, int flags); - size_t (*_recvfrom)(SOCKET s, void * buf, size_t len, int flags, struct sockaddr * from, SASIZETYPE * fromlen); + ssize_t (*_send)(SOCKET s, const void *msg, size_t len, int flags); + ssize_t (*_sendto)(SOCKET s, const void *msg, size_t len, int flags, const struct sockaddr *to, SASIZETYPE tolen); + ssize_t (*_recv)(SOCKET s, void *buf, size_t len, int flags); + ssize_t (*_recvfrom)(SOCKET s, void * buf, size_t len, int flags, struct sockaddr * from, SASIZETYPE * fromlen); int (*_shutdown)(SOCKET s, int how); int (*_closesocket)(SOCKET s); #endif