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

clean up warnings

Browse Source
This commit is contained in:
Vladimir Dubrovin 2023-07-13 15:29:26 +03:00
parent 5f341806b7
commit 5e2b2a399e
6 changed files with 29 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/authradius.c
View File

@ -324,7 +324,7 @@ int radsend(struct clientparam * param, int auth, int stop){
char buf[64]; char buf[64];
if(!radiussecret || !nradservers) { if(!nradservers) {
return 4; return 4;
} }
@ -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
@ -764,7 +764,7 @@ static int h_parent(int argc, unsigned char **argv){
fprintf(stderr, "Chaining error: bad chain type (%s)\n", argv[2]); fprintf(stderr, "Chaining error: bad chain type (%s)\n", argv[2]);
return(4); return(4);
} }
cidr = strchr(argv[3], '/'); cidr = strchr((char *)argv[3], '/');
if(cidr) *cidr = 0; if(cidr) *cidr = 0;
if(!getip46(46, argv[3], (struct sockaddr *)&chains->addr)) return (5); if(!getip46(46, argv[3], (struct sockaddr *)&chains->addr)) return (5);
chains->exthost = (unsigned char *)mystrdup((char *)argv[3]); 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)); 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;
@ -1374,16 +1374,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;

10
src/plugins/FilePlugin/FilePlugin.c
View File

@ -37,8 +37,10 @@ extern "C" {
#ifndef _WIN32 #ifndef _WIN32
#define WINAPI #define WINAPI
#define fp_size_t size_t #define fp_size_t size_t
#define fp_ssize_t ssize_t
#else #else
#define fp_size_t int #define fp_size_t int
#define fp_ssize_t int
#endif #endif
static struct pluginlink * pl; 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); 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; struct fp_stream *fps = NULL;
int res; int res;
res = searchsocket(s, &fps); 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); 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; struct fp_stream *fps = NULL;
int res; int res;
res = searchsocket(s, &fps); 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); 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); 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); return sso._recvfrom(s, buf, len, flags, from, fromlen);
} }
static int WINAPI fp_shutdown(SOCKET s, int how){ static int WINAPI fp_shutdown(SOCKET s, int how){

8
src/plugins/SSLPlugin/ssl_plugin.c
View File

@ -110,7 +110,7 @@ struct sockfuncs sso;
#ifdef _WIN32 #ifdef _WIN32
static int WINAPI ssl_send(SOCKET s, const void *msg, int len, int flags){ static int WINAPI ssl_send(SOCKET s, const void *msg, int len, int flags){
#else #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 #endif
struct SSLqueue *sslq; struct SSLqueue *sslq;
@ -134,7 +134,7 @@ static int ssl_send(SOCKET s, const void *msg, size_t len, int flags){
#ifdef _WIN32 #ifdef _WIN32
static int WINAPI ssl_sendto(SOCKET s, const void *msg, int len, int flags, const struct sockaddr *to, int tolen){ static int WINAPI ssl_sendto(SOCKET s, const void *msg, int len, int flags, const struct sockaddr *to, int tolen){
#else #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 #endif
struct SSLqueue *sslq; 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 #ifdef _WIN32
static int WINAPI ssl_recvfrom(SOCKET s, void *msg, int len, int flags, struct sockaddr *from, int *fromlen){ static int WINAPI ssl_recvfrom(SOCKET s, void *msg, int len, int flags, struct sockaddr *from, int *fromlen){
#else #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 #endif
struct SSLqueue *sslq; struct SSLqueue *sslq;
@ -179,7 +179,7 @@ static int ssl_recvfrom(SOCKET s, void *msg, size_t len, int flags, struct socka
#ifdef _WIN32 #ifdef _WIN32
static int WINAPI ssl_recv(SOCKET s, void *msg, int len, int flags){ static int WINAPI ssl_recv(SOCKET s, void *msg, int len, int flags){
#else #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 #endif
struct SSLqueue *sslq; struct SSLqueue *sslq;

8
src/structures.h
View File

@ -720,10 +720,10 @@ struct sockfuncs {
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, unsigned int nfds, int timeout);
size_t (*_send)(SOCKET s, const void *msg, size_t len, int flags); ssize_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); ssize_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); ssize_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 (*_recvfrom)(SOCKET s, void * buf, size_t len, int flags, struct sockaddr * from, SASIZETYPE * fromlen);
int (*_shutdown)(SOCKET s, int how); int (*_shutdown)(SOCKET s, int how);
int (*_closesocket)(SOCKET s); int (*_closesocket)(SOCKET s);
#endif #endif