bughz/3proxy
1
0
Fork 0
mirror of https://github.com/3proxy/3proxy.git synced 2026-05-13 13:30:12 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Fix Windows build breakages in FilePlugin and WinSock includes

Browse Source 
Use the canonical lowercase ws2tcpip.h include so MinGW builds work on case-sensitive filesystems.

Adjust FilePlugin's Windows socket hook signatures to match struct sockfuncs and cast the cachedir argument consistently, fixing GCC/Clang Windows build failures caused by incompatible function pointer types and mixed signedness in the plugin entry path.
This commit is contained in:
Yudong An 2026-04-21 16:02:11 +08:00
parent 8bf0d3f4ae
commit a01df2e232
2 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -542,7 +542,13 @@ static fp_ssize_t WINAPI fp_send(void *state, SOCKET s, const char *msg, fp_size
} }
return sso._send(sso.state, s, msg, len, flags); return sso._send(sso.state, s, msg, len, flags);
} }
static fp_ssize_t WINAPI fp_sendto(void *state, SOCKET s, const void *msg, int len, int flags, const struct sockaddr *to, fp_size_t tolen){ static fp_ssize_t WINAPI fp_sendto(void *state, SOCKET s,
#ifdef _WIN32
const char *msg, int len, int flags, const struct sockaddr *to, int tolen
#else
const void *msg, fp_size_t len, int flags, const struct sockaddr *to, fp_size_t tolen
#endif
){
struct fp_stream *fps = NULL; struct fp_stream *fps = NULL;
int res; int res;
res = searchsocket(s, &fps); res = searchsocket(s, &fps);
@ -660,10 +666,22 @@ static fp_ssize_t WINAPI fp_sendto(void *state, SOCKET s, const void *msg, int l
} }
return sso._sendto(sso.state, s, msg, len, flags, to, tolen); return sso._sendto(sso.state, s, msg, len, flags, to, tolen);
} }
static fp_ssize_t WINAPI fp_recv(void *state, SOCKET s, void *buf, fp_size_t len, int flags){ static fp_ssize_t WINAPI fp_recv(void *state, SOCKET s,
#ifdef _WIN32
char *buf, int len, int flags
#else
void *buf, fp_size_t len, int flags
#endif
){
return sso._recv(sso.state, s, buf, len, flags); return sso._recv(sso.state, s, buf, len, flags);
} }
static fp_ssize_t WINAPI fp_recvfrom(void *state, SOCKET s, void * buf, fp_size_t len, int flags, struct sockaddr * from, fp_size_t * fromlen){ static fp_ssize_t WINAPI fp_recvfrom(void *state, SOCKET s,
#ifdef _WIN32
char *buf, int len, int flags, struct sockaddr * from, int * fromlen
#else
void *buf, fp_size_t len, int flags, struct sockaddr * from, fp_size_t * fromlen
#endif
){
return sso._recvfrom(sso.state, s, buf, len, flags, from, fromlen); return sso._recvfrom(sso.state, s, buf, len, flags, from, fromlen);
} }
static int WINAPI fp_shutdown(void *state, SOCKET s, int how){ static int WINAPI fp_shutdown(void *state, SOCKET s, int how){
@ -852,7 +870,7 @@ static int h_cachedir(int argc, unsigned char **argv){
char * dirp; char * dirp;
size_t len; size_t len;
dirp = (argc > 1)? argv[1] : getenv("TEMP"); dirp = (argc > 1)? (char *)argv[1] : getenv("TEMP");
len = strlen(dirp); len = strlen(dirp);
if(!dirp || !len || len > 200 || strchr(dirp, '%')) { if(!dirp || !len || len > 200 || strchr(dirp, '%')) {
fprintf(stderr, "FilePlugin: invalid directory path: %s\n", dirp); fprintf(stderr, "FilePlugin: invalid directory path: %s\n", dirp);

2
src/structures.h
View File

@ -54,7 +54,7 @@ int mutex_unlock(int *val);
#endif #endif
#else #else
#include <winsock2.h> #include <winsock2.h>
#include <Ws2tcpip.h> #include <ws2tcpip.h>
#define pthread_mutex_t CRITICAL_SECTION #define pthread_mutex_t CRITICAL_SECTION
#define pthread_mutex_init(x, y) InitializeCriticalSection(x) #define pthread_mutex_init(x, y) InitializeCriticalSection(x)
#define pthread_mutex_lock(x) EnterCriticalSection(x) #define pthread_mutex_lock(x) EnterCriticalSection(x)