cuberite/libevent
1
0
Fork 0
mirror of https://github.com/cuberite/libevent.git synced 2025-09-11 13:24:43 -04:00
Code Issues Packages Projects Releases Wiki Activity

NM: Fix sample/http-server ipv6 fixes

Browse Source 
Fix 1: Use #include "../xyz" rather than #include <../xyz>

Fix 2: util-internal.h includes ipv6-internal.h, which in turn defines
       a replacement AF_INET6 on platforms that don't have it.  As such,
       the AF_INET6 checks shouldn't be needed.  (right?)
This commit is contained in:
Nick Mathewson 2011-02-13 01:27:06 -05:00
parent bbf55150b6
commit eb692be9c8
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sample/http-server.c
View File

@ -41,7 +41,7 @@
# endif # endif
#endif #endif
#include <../util-internal.h> #include "../util-internal.h"
#ifdef WIN32 #ifdef WIN32
#define stat _stat #define stat _stat
@ -371,11 +371,9 @@ main(int argc, char **argv)
if (ss.ss_family == AF_INET) { if (ss.ss_family == AF_INET) {
got_port = ntohs(((struct sockaddr_in*)&ss)->sin_port); got_port = ntohs(((struct sockaddr_in*)&ss)->sin_port);
inaddr = &((struct sockaddr_in*)&ss)->sin_addr; inaddr = &((struct sockaddr_in*)&ss)->sin_addr;
#ifdef AF_INET6
} else if (ss.ss_family == AF_INET6) { } else if (ss.ss_family == AF_INET6) {
got_port = ntohs(((struct sockaddr_in6*)&ss)->sin6_port); got_port = ntohs(((struct sockaddr_in6*)&ss)->sin6_port);
inaddr = &((struct sockaddr_in6*)&ss)->sin6_addr; inaddr = &((struct sockaddr_in6*)&ss)->sin6_addr;
#endif
} else { } else {
fprintf(stderr, "Weird address family %d\n", fprintf(stderr, "Weird address family %d\n",
ss.ss_family); ss.ss_family);