Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 15:02:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix DHCP from crashing, silence tcp and iphlp

Browse source 
svn path=/trunk/; revision=15485
This commit is contained in:
Alex Ionescu 2005-05-24 21:04:44 +00:00
parent d92b106774
commit ef8d82998d
4 changed files with 20 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
reactos/drivers/net/tcpip/tcpip/main.c
View file

@ -9,7 +9,7 @@
*/ */
#include "precomp.h" #include "precomp.h"
//#define NDEBUG #define NDEBUG
#ifndef NDEBUG #ifndef NDEBUG
DWORD DebugTraceLevel = DEBUG_ULTRA & ~(DEBUG_LOCK | DEBUG_PBUFFER); DWORD DebugTraceLevel = DEBUG_ULTRA & ~(DEBUG_LOCK | DEBUG_PBUFFER);

18
reactos/lib/iphlpapi/ifenum_reactos.c
View file

@ -129,15 +129,15 @@ NTSTATUS tdiGetSetOfThings( HANDLE tcpFile,
DWORD allocationSizeForEntityArray = entrySize * MAX_TDI_ENTITIES, DWORD allocationSizeForEntityArray = entrySize * MAX_TDI_ENTITIES,
arraySize = entrySize * MAX_TDI_ENTITIES; arraySize = entrySize * MAX_TDI_ENTITIES;
DbgPrint("TdiGetSetOfThings(tcpFile %x,toiClass %x,toiType %x,toiId %x," TRACE("TdiGetSetOfThings(tcpFile %x,toiClass %x,toiType %x,toiId %x,"
"teiEntity %x,fixedPart %d,entrySize %d)\n", "teiEntity %x,fixedPart %d,entrySize %d)\n",
(int)tcpFile, (int)tcpFile,
(int)toiClass, (int)toiClass,
(int)toiType, (int)toiType,
(int)toiId, (int)toiId,
(int)teiEntity, (int)teiEntity,
(int)fixedPart, (int)fixedPart,
(int)entrySize ); (int)entrySize );
req.ID.toi_class = toiClass; req.ID.toi_class = toiClass;
req.ID.toi_type = toiType; req.ID.toi_type = toiType;

11
reactos/lib/ws2_32/misc/dllmain.c
View file

@ -17,10 +17,10 @@
#ifdef DBG #ifdef DBG
/* See debug.h for debug/trace constants */ /* See debug.h for debug/trace constants */
DWORD DebugTraceLevel = MIN_TRACE; //DWORD DebugTraceLevel = MIN_TRACE;
//DWORD DebugTraceLevel = MAX_TRACE; //DWORD DebugTraceLevel = MAX_TRACE;
//DWORD DebugTraceLevel = DEBUG_ULTRA; //DWORD DebugTraceLevel = DEBUG_ULTRA;
DWORD DebugTraceLevel = 0;
#endif /* DBG */ #endif /* DBG */
/* To make the linker happy */ /* To make the linker happy */
@ -386,8 +386,8 @@ select(
Sleep( timeout->tv_sec * 1000 + (timeout->tv_usec / 1000) ); Sleep( timeout->tv_sec * 1000 + (timeout->tv_usec / 1000) );
} }
return 0; return 0;
} else { } else if (Provider->ProcTable.lpWSPSelect) {
WS_DbgPrint(MID_TRACE,("Calling WSPSelect\n")); WS_DbgPrint(MID_TRACE,("Calling WSPSelect:%x\n", Provider->ProcTable.lpWSPSelect));
Count = Provider->ProcTable.lpWSPSelect( Count = Provider->ProcTable.lpWSPSelect(
nfds, readfds, writefds, exceptfds, (LPTIMEVAL)timeout, &Errno); nfds, readfds, writefds, exceptfds, (LPTIMEVAL)timeout, &Errno);
@ -400,6 +400,9 @@ select(
WSASetLastError(Errno); WSASetLastError(Errno);
return SOCKET_ERROR; return SOCKET_ERROR;
} }
} else {
WSASetLastError(WSAEINVAL);
return SOCKET_ERROR;
} }
return Count; return Count;

4
reactos/subsys/system/dhcp/dispatch.c
View file

@ -186,8 +186,10 @@ dispatch(void)
if (errno == EAGAIN || errno == EINTR) { if (errno == EAGAIN || errno == EINTR) {
time(&cur_time); time(&cur_time);
continue; continue;
} else } else {
error("poll: %m"); error("poll: %m");
break;
}
} }
/* Get the current time... */ /* Get the current time... */