StarMirror/toxcore
1
0
Fork 0
mirror of https://github.com/irungentoo/toxcore.git synced 2024-03-22 13:30:51 +08:00
Code Issues Projects Releases Wiki Activity

Small fixes.

Browse Source
This commit is contained in:
irungentoo 2013-09-14 15:12:54 -04:00
parent 46a99a8774
commit 18cfda2dc7
1 changed files with 3 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
toxcore/network.c
View File

@ -307,7 +307,7 @@ Networking_Core *new_networking(IP ip, uint16_t port)
#else #else
if (temp->sock < 0) { if (temp->sock < 0) {
fprintf(stderr, "Failed to get a scoket?! %u, %s\n", errno, strerror(errno)); fprintf(stderr, "Failed to get a socket?! %u, %s\n", errno, strerror(errno));
free(temp); free(temp);
return NULL; return NULL;
} }
@ -474,7 +474,7 @@ Networking_Core *new_networking(IP ip, uint16_t port)
fprintf(stderr, "Failed to bind socket: %u, %s (IP/Port: %s:%u\n", errno, fprintf(stderr, "Failed to bind socket: %u, %s (IP/Port: %s:%u\n", errno,
strerror(errno), ip_ntoa(&ip), port); strerror(errno), ip_ntoa(&ip), port);
free(temp); kill_networking(temp);
return NULL; return NULL;
} }
@ -728,25 +728,13 @@ int addr_resolve(const char *address, IP *to, IP *extra)
hints.ai_family = family; hints.ai_family = family;
hints.ai_socktype = SOCK_DGRAM; // type of socket Tox uses. hints.ai_socktype = SOCK_DGRAM; // type of socket Tox uses.
#ifdef __WIN32__ if (at_startup() != 0)
WSADATA wsa_data;
/* CLEANUP: really not the best place to put this */
rc = WSAStartup(MAKEWORD(2, 2), &wsa_data);
if (rc != 0) {
return 0; return 0;
}
#endif
rc = getaddrinfo(address, NULL, &hints, &server); rc = getaddrinfo(address, NULL, &hints, &server);
// Lookup failed. // Lookup failed.
if (rc != 0) { if (rc != 0) {
#ifdef __WIN32__
WSACleanup();
#endif
return 0; return 0;
} }
@ -823,9 +811,6 @@ int addr_resolve(const char *address, IP *to, IP *extra)
freeaddrinfo(server); freeaddrinfo(server);
#ifdef __WIN32__
WSACleanup();
#endif
return rc; return rc;
} }