From c0069df57250f8254c40d3a0b5b07e8db2de7a7d Mon Sep 17 00:00:00 2001 From: Daniel Winzen Date: Wed, 7 Dec 2022 19:44:14 +0100 Subject: [PATCH] Fix pointer-sign and incompatible-pointer-types warnings --- src/authradius.c | 12 ++++++------ src/auto.c | 2 +- src/conf.c | 14 +++++++------- src/proxymain.c | 2 +- src/structures.h | 2 +- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/authradius.c b/src/authradius.c index 58872b9..3d86b77 100644 --- a/src/authradius.c +++ b/src/authradius.c @@ -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 11ecbfa..6e4a07b 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 @@ -781,7 +781,7 @@ static int h_parent(int argc, unsigned char **argv){ myfree(chains); return(4); } - cidr = strchr(argv[3], '/'); + cidr = strchr((char *)argv[3], '/'); if(cidr) *cidr = 0; getip46(46, argv[3], (struct sockaddr *)&chains->addr); chains->exthost = (unsigned char *)mystrdup((char *)argv[3]); @@ -844,7 +844,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; @@ -1405,16 +1405,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/proxymain.c b/src/proxymain.c index 40f7141..cf208df 100644 --- a/src/proxymain.c +++ b/src/proxymain.c @@ -618,7 +618,7 @@ int MODULEMAINFUNC (int argc, char** argv){ #endif #if defined SO_BINDTODEVICE if(srv.ibindtodevice && so._setsockopt(sock, SOL_SOCKET, SO_BINDTODEVICE, srv.ibindtodevice, strlen(srv.ibindtodevice) + 1)) { - dolog(&defparam, "failed to bind device"); + dolog(&defparam, (unsigned char *)"failed to bind device"); return -12; } #elif defined IP_BOUND_IF diff --git a/src/structures.h b/src/structures.h index db09675..0e3cd27 100644 --- a/src/structures.h +++ b/src/structures.h @@ -718,7 +718,7 @@ struct sockfuncs { int (*_getsockname)(SOCKET s, struct sockaddr * name, socklen_t * namelen); 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); + int (*_poll)(struct pollfd *fds, long 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);