backup/ipxwrapper
1
0
Fork 0
mirror of https://github.com/solemnwarning/ipxwrapper synced 2024-12-30 16:45:37 +01:00
Code Issues Projects Releases Activity

Free receive buffer used by router thread in DllMain() rather than leaving 64KiB floating about every time ipxwrapper.dll is unloaded...

Browse Source
This commit is contained in:
Daniel Collins 2011-04-24 23:49:58 +00:00
parent 84527b7eda
commit 9f14ffce42
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/ipxwrapper.c
View File

@ -39,6 +39,7 @@ ipx_nic *nics = NULL;
ipx_host *hosts = NULL; ipx_host *hosts = NULL;
SOCKET net_fd = -1; SOCKET net_fd = -1;
struct reg_global global_conf; struct reg_global global_conf;
static void *router_buf = NULL;
HMODULE winsock2_dll = NULL; HMODULE winsock2_dll = NULL;
HMODULE mswsock_dll = NULL; HMODULE mswsock_dll = NULL;
@ -112,13 +113,15 @@ BOOL WINAPI DllMain(HINSTANCE me, DWORD why, LPVOID res) {
if(!init_router()) { if(!init_router()) {
return FALSE; return FALSE;
} }
} }else if(why == DLL_PROCESS_DETACH) {
if(why == DLL_PROCESS_DETACH) {
if(router_thread && GetCurrentThreadId() != router_tid) { if(router_thread && GetCurrentThreadId() != router_tid) {
TerminateThread(router_thread, 0); TerminateThread(router_thread, 0);
router_thread = NULL; router_thread = NULL;
} }
free(router_buf);
router_buf = NULL;
if(net_fd >= 0) { if(net_fd >= 0) {
closesocket(net_fd); closesocket(net_fd);
net_fd = -1; net_fd = -1;
@ -279,14 +282,13 @@ static int init_router(void) {
setsockopt(net_fd, SOL_SOCKET, SO_RCVBUF, (char*)&bufsize, sizeof(int)); setsockopt(net_fd, SOL_SOCKET, SO_RCVBUF, (char*)&bufsize, sizeof(int));
setsockopt(net_fd, SOL_SOCKET, SO_SNDBUF, (char*)&bufsize, sizeof(int)); setsockopt(net_fd, SOL_SOCKET, SO_SNDBUF, (char*)&bufsize, sizeof(int));
/* Memory leak, ah well... */ router_buf = malloc(PACKET_BUF_SIZE);
void *pbuf = malloc(PACKET_BUF_SIZE); if(!router_buf) {
if(!pbuf) { debug("Not enough memory for router buffer (64KiB)");
debug("Not enough memory for packet buffer (64KiB)");
return 0; return 0;
} }
router_thread = CreateThread(NULL, 0, &router_main, pbuf, 0, &router_tid); router_thread = CreateThread(NULL, 0, &router_main, NULL, 0, &router_tid);
if(!router_thread) { if(!router_thread) {
debug("Failed to create router thread"); debug("Failed to create router thread");
return 0; return 0;
@ -301,7 +303,7 @@ static int init_router(void) {
* to the UDP sockets which emulate IPX. * to the UDP sockets which emulate IPX.
*/ */
static DWORD WINAPI router_main(LPVOID buf) { static DWORD WINAPI router_main(LPVOID buf) {
ipx_packet *packet = buf; ipx_packet *packet = router_buf;
int addrlen, rval, sval; int addrlen, rval, sval;
unsigned char f6[] = {0xFF,0xFF,0xFF,0xFF,0xFF,0xFF}; unsigned char f6[] = {0xFF,0xFF,0xFF,0xFF,0xFF,0xFF};
struct sockaddr_in addr; struct sockaddr_in addr;