bughz/3proxy
1
0
Fork 0
mirror of https://github.com/3proxy/3proxy.git synced 2025-02-23 18:45:40 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix pointer-sign and incompatible-pointer-types warnings

Browse Source
This commit is contained in:
Daniel Winzen 2022-12-07 19:44:14 +01:00
parent a65286eb9d
commit c0069df572
No known key found for this signature in database
GPG Key ID: 222FCC3F35C41077
5 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/authradius.c
View File

@ -391,7 +391,7 @@ int radsend(struct clientparam * param, int auth, int stop){
/* NAS-Identifier */ /* NAS-Identifier */
if(conf.stringtable){ if(conf.stringtable){
*ptr++ = PW_NAS_IDENTIFIER; *ptr++ = PW_NAS_IDENTIFIER;
len = strlen(conf.stringtable[SERVICES+param->service]); len = strlen((char *)conf.stringtable[SERVICES+param->service]);
*ptr++ = (2 + len); *ptr++ = (2 + len);
memcpy(ptr, conf.stringtable[SERVICES+param->service], len); memcpy(ptr, conf.stringtable[SERVICES+param->service], len);
ptr += len; ptr += len;
@ -416,7 +416,7 @@ int radsend(struct clientparam * param, int auth, int stop){
/* Called-Station-ID */ /* Called-Station-ID */
if(param->hostname){ if(param->hostname){
*ptr++ = PW_CALLED_STATION_ID; *ptr++ = PW_CALLED_STATION_ID;
len = strlen(param->hostname); len = strlen((char *)param->hostname);
*ptr++ = (2 + len); *ptr++ = (2 + len);
memcpy(ptr, param->hostname, len); memcpy(ptr, param->hostname, len);
ptr += len; ptr += len;
@ -456,7 +456,7 @@ int radsend(struct clientparam * param, int auth, int stop){
/* Username */ /* Username */
if(param->username){ if(param->username){
len = strlen(param->username); len = strlen((char *)param->username);
if(len>128)len=128; if(len>128)len=128;
*ptr++ = PW_USER_NAME; *ptr++ = PW_USER_NAME;
*ptr++ = len + 2; *ptr++ = len + 2;
@ -499,12 +499,12 @@ int radsend(struct clientparam * param, int auth, int stop){
} }
if(auth && param->password){ if(auth && param->password){
len = strlen(param->password); len = strlen((char *)param->password);
if(len > 128) len = 128; if(len > 128) len = 128;
*ptr++ = PW_PASSWORD; *ptr++ = PW_PASSWORD;
ptr++; ptr++;
memcpy(ptr, param->password, len); memcpy(ptr, param->password, len);
rad_pwencode(ptr, rad_pwencode((char *)ptr,
&len, &len,
radiussecret, radiussecret,
(char *)packet.vector); (char *)packet.vector);
@ -582,7 +582,7 @@ int radsend(struct clientparam * param, int auth, int stop){
continue; continue;
} }
if (calc_replydigest((char *)&rpacket, packet.vector, radiussecret, if (calc_replydigest((char *)&rpacket, (char *)packet.vector, radiussecret,
data_len) ){ data_len) ){
continue; continue;
} }

2
src/auto.c
View File

@ -20,7 +20,7 @@ void * autochild(struct clientparam* param) {
len = sockfillbuffcli(param, 1, CONNECTION_S); len = sockfillbuffcli(param, 1, CONNECTION_S);
if (len != 1){ if (len != 1){
param->res = 801; param->res = 801;
dolog(param, ""); dolog(param, (unsigned char *)"");
} }
if(*param->clibuf == 4 || *param->clibuf == 5) return sockschild(param); if(*param->clibuf == 4 || *param->clibuf == 5) return sockschild(param);
return proxychild(param); return proxychild(param);

14
src/conf.c
View File

@ -324,7 +324,7 @@ static int h_log(int argc, unsigned char ** argv){
} }
#endif #endif
#ifndef NORADIUS #ifndef NORADIUS
else if(!strcmp(argv[1],"radius")){ else if(!strcmp((char *)argv[1],"radius")){
conf.logfunc = logradius; conf.logfunc = logradius;
} }
#endif #endif
@ -781,7 +781,7 @@ static int h_parent(int argc, unsigned char **argv){
myfree(chains); myfree(chains);
return(4); return(4);
} }
cidr = strchr(argv[3], '/'); cidr = strchr((char *)argv[3], '/');
if(cidr) *cidr = 0; if(cidr) *cidr = 0;
getip46(46, argv[3], (struct sockaddr *)&chains->addr); getip46(46, argv[3], (struct sockaddr *)&chains->addr);
chains->exthost = (unsigned char *)mystrdup((char *)argv[3]); 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)); memcpy(&dst->ip_from, SAADDR(&sa), SAADDRLEN(&sa));
dst->family = *SAFAMILY(&sa); dst->family = *SAFAMILY(&sa);
if(dash){ 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; if(!getip46(46, (unsigned char *)dash+1, (struct sockaddr *)&sa)) return 2;
memcpy(&dst->ip_to, SAADDR(&sa), SAADDRLEN(&sa)); 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; 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)); memset(radiuslist, 0, sizeof(radiuslist));
if(strlen(argv[1]) > 63) argv[1][63] = 0; if(strlen((char *)argv[1]) > 63) argv[1][63] = 0;
strcpy(radiussecret, argv[1]); strcpy(radiussecret, (char *)argv[1]);
for( nradservers=0; nradservers < MAXRADIUS && nradservers < argc -2; nradservers++){ for( nradservers=0; nradservers < MAXRADIUS && nradservers < argc -2; nradservers++){
char *s = 0; char *s = 0;
if((s=strchr(argv[nradservers + 2], '/'))){ if((s=strchr((char *)argv[nradservers + 2], '/'))){
*s = 0; *s = 0;
s++; s++;
} }
if( !getip46(46, argv[nradservers + 2], (struct sockaddr *)&radiuslist[nradservers].authaddr)) return 1; 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); if(!*SAPORT(&radiuslist[nradservers].authaddr))*SAPORT(&radiuslist[nradservers].authaddr) = htons(1812);
port = ntohs(*SAPORT(&radiuslist[nradservers].authaddr)); port = ntohs(*SAPORT(&radiuslist[nradservers].authaddr));
radiuslist[nradservers].logaddr = radiuslist[nradservers].authaddr; radiuslist[nradservers].logaddr = radiuslist[nradservers].authaddr;

2
src/proxymain.c
View File

@ -618,7 +618,7 @@ int MODULEMAINFUNC (int argc, char** argv){
#endif #endif
#if defined SO_BINDTODEVICE #if defined SO_BINDTODEVICE
if(srv.ibindtodevice && so._setsockopt(sock, SOL_SOCKET, SO_BINDTODEVICE, srv.ibindtodevice, strlen(srv.ibindtodevice) + 1)) { 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; return -12;
} }
#elif defined IP_BOUND_IF #elif defined IP_BOUND_IF

2
src/structures.h
View File

@ -718,7 +718,7 @@ struct sockfuncs {
int (*_getsockname)(SOCKET s, struct sockaddr * name, socklen_t * namelen); int (*_getsockname)(SOCKET s, struct sockaddr * name, socklen_t * namelen);
int (*_getsockopt)(SOCKET s, int level, int optname, void * optval, socklen_t * optlen); 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 (*_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 (*_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 (*_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 (*_recv)(SOCKET s, void *buf, size_t len, int flags);