--- parser3/src/main/pa_socks.C 2004/04/01 11:43:54 1.22 +++ parser3/src/main/pa_socks.C 2006/04/09 13:38:47 1.25 @@ -1,11 +1,11 @@ /** @file Parser: socks initialization/finalization. - Copyright (c) 2001-2004 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001-2005 ArtLebedev Group (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char * const IDENT_SOCKS_C="$Date: 2004/04/01 11:43:54 $"; +static const char * const IDENT_SOCKS_C="$Date: 2006/04/09 13:38:47 $"; #define NO_UNISTD_H #include "pa_config_includes.h" @@ -17,6 +17,7 @@ static const char * const IDENT_SOCKS_C= // in cygwin: for pascal // in MSVC: for everything +#define WINVER 0x0400 #include #ifdef CYGWIN @@ -69,9 +70,37 @@ void pa_socks_done() { } } +const char* pa_socks_strerr(int no) { + char buf[MAX_STRING]; + buf[0]=0; + size_t error_size=FormatMessage( + FORMAT_MESSAGE_FROM_SYSTEM | + FORMAT_MESSAGE_IGNORE_INSERTS, + NULL, + no, + 0, // Default language + (LPTSTR) &buf, + sizeof(buf), + NULL + ); + if(error_size>3) // ".\r\n" + buf[error_size-3]=0; + return buf[0]? pa_strdup(buf): "unknown error"; +} +int pa_socks_errno() { + return WSAGetLastError(); +} + #else void pa_socks_init() {} void pa_socks_done() {} +const char* pa_socks_strerr(int no) { + return strerror(no); +} +int pa_socks_errno() { + return errno; +} + #endif