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

Changed format of log timestamp and fixed buffer overflow when converting some IPX addresses to text.

Browse Source
This commit is contained in:
Daniel Collins 2011-07-21 18:41:52 +00:00
parent fb68a9a593
commit 7b50221c63
3 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
changes.txt
View File

@ -19,6 +19,8 @@ Version 0.2.1:
Cleanup: Call r_ winsock calls directly in router code to prevent it from Cleanup: Call r_ winsock calls directly in router code to prevent it from
generating extra log messages. generating extra log messages.
Bugfix: Fixed buffer overflow when converting certain addresses to text.
Version 0.2: Version 0.2:
Implemented ioctlsocket() function with support for FIONREAD. Implemented ioctlsocket() function with support for FIONREAD.

20
src/ipxwrapper.h
View File

@ -54,21 +54,21 @@
#define NET_TO_STRING(s, net) \ #define NET_TO_STRING(s, net) \
sprintf( \ sprintf( \
s, "%02X:%02X:%02X:%02X", \ s, "%02X:%02X:%02X:%02X", \
(unsigned int)net[0], \ (unsigned int)(unsigned char)(net[0]), \
(unsigned int)net[1], \ (unsigned int)(unsigned char)(net[1]), \
(unsigned int)net[2], \ (unsigned int)(unsigned char)(net[2]), \
(unsigned int)net[3] \ (unsigned int)(unsigned char)(net[3]) \
) )
#define NODE_TO_STRING(s, node) \ #define NODE_TO_STRING(s, node) \
sprintf( \ sprintf( \
s, "%02X:%02X:%02X:%02X:%02X:%02X", \ s, "%02X:%02X:%02X:%02X:%02X:%02X", \
(unsigned int)node[0], \ (unsigned int)(unsigned char)(node[0]), \
(unsigned int)node[1], \ (unsigned int)(unsigned char)(node[1]), \
(unsigned int)node[2], \ (unsigned int)(unsigned char)(node[2]), \
(unsigned int)node[3], \ (unsigned int)(unsigned char)(node[3]), \
(unsigned int)node[4], \ (unsigned int)(unsigned char)(node[4]), \
(unsigned int)node[5] \ (unsigned int)(unsigned char)(node[5]) \
) )
typedef struct ipx_socket ipx_socket; typedef struct ipx_socket ipx_socket;

2
src/log.c
View File

@ -72,7 +72,7 @@ void log_printf(const char *fmt, ...) {
vsnprintf(msg, 1024, fmt, argv); vsnprintf(msg, 1024, fmt, argv);
va_end(argv); va_end(argv);
snprintf(tstr, 32, "[%u.%u] ", (unsigned int)(called/1000), (unsigned int)((called % 1000) / 10)); snprintf(tstr, 32, "[%u.%02u] ", (unsigned int)(called/1000), (unsigned int)((called % 1000) / 10));
OVERLAPPED off; OVERLAPPED off;
off.Offset = 0; off.Offset = 0;