TheCloneArmy/mcrcon
1
0
Fork 0
mirror of https://github.com/Tiiffi/mcrcon.git synced 2025-10-28 03:41:07 -04:00
Code Issues Packages Projects Releases Wiki Activity

Commented windows version define and changed net_init_WSA() to request Winsock version 2.2 instead of old 1.1.

Browse Source
This commit is contained in:
Tiiffi
2016-10-28 01:40:38 +03:00
parent 4b663958aa
commit a0d3d7f52e
1 changed files with 22 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
mcrcon.c
View File

@ -32,7 +32,7 @@
#ifdef _WIN32 #ifdef _WIN32
/* for name resolving on windows */ /* for name resolving on windows */
#define _WIN32_WINNT 0x0501 //#define _WIN32_WINNT 0x0501
#include <ws2tcpip.h> #include <ws2tcpip.h>
#include <winsock2.h> #include <winsock2.h>
@ -179,9 +179,9 @@ int main(int argc, char *argv[])
usage(); usage();
break; break;
default: abort(); default: exit(-1);
}
} }
}
if (host == NULL) if (host == NULL)
{ {
@ -270,31 +270,29 @@ void error(char *errstring)
void net_init_WSA(void) void net_init_WSA(void)
{ {
WSADATA wsadata; WSADATA wsadata;
int err;
err = WSAStartup(MAKEWORD(1, 1), &wsadata); // Request winsock 2.2 for now.
if(err != 0) // Should be compatible down to Win XP.
WORD version = MAKEWORD(2, 2);
int err = WSAStartup(version, &wsadata);
if (err != 0)
{ {
fprintf(stderr, "WSAStartup failed. Errno: %d.\n", err); fprintf(stderr, "WSAStartup failed. Error: %d.\n", err);
exit(-1); exit(-1);
} }
} }
#endif #endif
/*
void net_get_last_error(int ret)
{
}
*/
/* socket close and cleanup */ /* socket close and cleanup */
void net_close(int sd) void net_close(int sd)
{ {
#ifdef _WIN32 #ifdef _WIN32
closesocket(sd); closesocket(sd);
WSACleanup(); WSACleanup();
#else #else
close(sd); close(sd);
#endif #endif
} }
/* Opens and connects socket */ /* Opens and connects socket */