Slight tweak to setsockopt fix.

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@11824 e03df62e-2008-0410-955e-edbf42e46eb7
This commit is contained in:
peavey 2009-10-10 19:53:18 +00:00
parent 76b40d554b
commit bfa2a19d96
3 changed files with 10 additions and 2 deletions

View File

@ -97,8 +97,8 @@ int irc::sockets::OpenTCPSocket(const std::string& addr, int socktype)
linger.l_onoff = 1;
linger.l_linger = 1;
#ifdef WINDOWS
setsockopt(sockfd, SOL_SOCKET, SO_REUSEADDR, (char*)&on, sizeof(on));
setsockopt(sockfd, SOL_SOCKET, SO_LINGER, (char*)&linger, sizeof(linger));
insp_setsockopt(sockfd, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on));
insp_setsockopt(sockfd, SOL_SOCKET, SO_LINGER, &linger, sizeof(linger));
#elif
setsockopt(sockfd, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on));
setsockopt(sockfd, SOL_SOCKET, SO_LINGER, &linger, sizeof(linger));

View File

@ -91,6 +91,11 @@ int insp_inet_pton(int af, const char *src, void *dst)
return rv;
}
int insp_setsockopt(int sockfd, int level, int optname, void *optval, int optlen)
{
return setsockopt(sockfd, level, optname, (char*)optval, optlen);
}
void setcolor(int color_code)
{
SetConsoleTextAttribute(GetStdHandle(STD_OUTPUT_HANDLE), color_code);

View File

@ -132,6 +132,9 @@ CoreExport const char * insp_inet_ntop(int af, const void * src, char * dst, soc
#define inet_pton insp_inet_pton
#define inet_ntop insp_inet_ntop
/* slightly different format on setsockopt */
CoreExport int insp_setsockopt(int sockfd, int level, int optname, void *optval, int optlen);
/* Safe printf functions aren't defined in VC2003 */
#define snprintf _snprintf
#define vsnprintf _vsnprintf