From 730b627fb1cad24b454bc8c3b652ae5bbd21a839 Mon Sep 17 00:00:00 2001 From: Marvin Sielenkemper Date: Wed, 30 Nov 2016 22:13:57 +0100 Subject: use the ip4 socket address for ipv4 again --- src/c/http.c | 49 ++++++++++++++++++++++++++----------------------- 1 file changed, 26 insertions(+), 23 deletions(-) (limited to 'src/c/http.c') diff --git a/src/c/http.c b/src/c/http.c index d186e209..afa5de66 100644 --- a/src/c/http.c +++ b/src/c/http.c @@ -322,19 +322,27 @@ static void sigint(int signum) { exit(0); } +union uw_sockaddr { + struct sockaddr sa; + struct sockaddr_in ipv4; + struct sockaddr_in6 ipv6; +}; + int main(int argc, char *argv[]) { // The skeleton for this function comes from Beej's sockets tutorial. int sockfd; // listen on sock_fd - struct sockaddr_in6 my_addr; - struct sockaddr_in6 their_addr; // connector's address information + union uw_sockaddr my_addr; + union uw_sockaddr their_addr; // connector's address information socklen_t sin_size; - int yes = 1, no = 0, uw_port = 8080, nthreads = 1, i, *names, opt; + int yes = 1, uw_port = 8080, nthreads = 1, i, *names, opt; int recv_timeout_sec = 5; signal(SIGINT, sigint); signal(SIGPIPE, SIG_IGN); - my_addr.sin6_addr = in6addr_any; // auto-fill with my IP + // default if not specified: IPv4 with my IP + my_addr.sa.sa_family = AF_INET; + my_addr.ipv4.sin_addr.s_addr = INADDR_ANY; // auto-fill with my IP while ((opt = getopt(argc, argv, "hp:a:A:t:kqT:")) != -1) { switch (opt) { @@ -357,20 +365,17 @@ int main(int argc, char *argv[]) { break; case 'a': - { - char *buf = alloca(strlen(optarg) + 8); - strcpy(buf, "::FFFF:"); - strcpy(buf + 7, optarg); - if (!inet_pton(AF_INET6, buf, &my_addr.sin6_addr)) { - fprintf(stderr, "Invalid IPv4 address\n"); - help(argv[0]); - return 1; - } + my_addr.sa.sa_family = AF_INET; + if (!inet_pton(AF_INET, optarg, &my_addr.ipv4.sin_addr)) { + fprintf(stderr, "Invalid IPv4 address\n"); + help(argv[0]); + return 1; } break; case 'A': - if (!inet_pton(AF_INET6, optarg, &my_addr.sin6_addr)) { + my_addr.sa.sa_family = AF_INET6; + if (!inet_pton(AF_INET6, optarg, &my_addr.ipv6.sin6_addr)) { fprintf(stderr, "Invalid IPv6 address\n"); help(argv[0]); return 1; @@ -413,7 +418,7 @@ int main(int argc, char *argv[]) { names = calloc(nthreads, sizeof(int)); - sockfd = socket(AF_INET6, SOCK_STREAM, 0); // do some error checking! + sockfd = socket(my_addr.sa.sa_family, SOCK_STREAM, 0); // do some error checking! if (sockfd < 0) { fprintf(stderr, "Listener socket creation failed\n"); @@ -425,15 +430,13 @@ int main(int argc, char *argv[]) { return 1; } - if (setsockopt(sockfd, IPPROTO_IPV6, IPV6_V6ONLY, &no, sizeof(int)) < 0) { - fprintf(stderr, "Listener IPV6_V6ONLY option resetting failed\n"); - return 1; + switch (my_addr.sa.sa_family) + { + case AF_INET: my_addr.ipv4.sin_port = htons(uw_port); break; + case AF_INET6: my_addr.ipv6.sin6_port = htons(uw_port); break; } - my_addr.sin6_family = AF_INET6; // host byte order - my_addr.sin6_port = htons(uw_port); // short, network byte order - - if (bind(sockfd, (struct sockaddr *)&my_addr, sizeof my_addr) < 0) { + if (bind(sockfd, &my_addr.sa, sizeof my_addr) < 0) { fprintf(stderr, "Listener socket bind failed\n"); return 1; } @@ -470,7 +473,7 @@ int main(int argc, char *argv[]) { } while (1) { - int new_fd = accept(sockfd, (struct sockaddr *)&their_addr, &sin_size); + int new_fd = accept(sockfd, &their_addr.sa, &sin_size); if (new_fd < 0) { qfprintf(stderr, "Socket accept failed\n"); -- cgit v1.2.3 From 18876ba1e372323b3ed0361bf1d33bd7a22b097e Mon Sep 17 00:00:00 2001 From: Marvin Sielenkemper Date: Thu, 1 Dec 2016 08:29:51 +0100 Subject: zero initialize the socket address structure --- src/c/http.c | 1 + 1 file changed, 1 insertion(+) (limited to 'src/c/http.c') diff --git a/src/c/http.c b/src/c/http.c index afa5de66..f7fdc122 100644 --- a/src/c/http.c +++ b/src/c/http.c @@ -341,6 +341,7 @@ int main(int argc, char *argv[]) { signal(SIGPIPE, SIG_IGN); // default if not specified: IPv4 with my IP + memset(&my_addr, 0, sizeof my_addr); my_addr.sa.sa_family = AF_INET; my_addr.ipv4.sin_addr.s_addr = INADDR_ANY; // auto-fill with my IP -- cgit v1.2.3 From 40191906aa4b640838496174af7c594039bd6fd5 Mon Sep 17 00:00:00 2001 From: Marvin Sielenkemper Date: Thu, 1 Dec 2016 12:52:53 +0100 Subject: pass the proper size to the bind call --- src/c/http.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'src/c/http.c') diff --git a/src/c/http.c b/src/c/http.c index f7fdc122..f2d3a4c5 100644 --- a/src/c/http.c +++ b/src/c/http.c @@ -333,7 +333,7 @@ int main(int argc, char *argv[]) { int sockfd; // listen on sock_fd union uw_sockaddr my_addr; union uw_sockaddr their_addr; // connector's address information - socklen_t sin_size; + socklen_t my_size = 0, sin_size; int yes = 1, uw_port = 8080, nthreads = 1, i, *names, opt; int recv_timeout_sec = 5; @@ -433,11 +433,18 @@ int main(int argc, char *argv[]) { switch (my_addr.sa.sa_family) { - case AF_INET: my_addr.ipv4.sin_port = htons(uw_port); break; - case AF_INET6: my_addr.ipv6.sin6_port = htons(uw_port); break; + case AF_INET: + /*my_addr.ipv4.sin_len =*/ my_size = sizeof(my_addr.ipv4); + my_addr.ipv4.sin_port = htons(uw_port); + break; + + case AF_INET6: + /*my_addr.ipv6.sin6_len =*/ my_size = sizeof(my_addr.ipv6); + my_addr.ipv6.sin6_port = htons(uw_port); + break; } - if (bind(sockfd, &my_addr.sa, sizeof my_addr) < 0) { + if (bind(sockfd, &my_addr.sa, my_size) < 0) { fprintf(stderr, "Listener socket bind failed\n"); return 1; } -- cgit v1.2.3 From b3a56ca200a9657aceb32886e9108b732d609892 Mon Sep 17 00:00:00 2001 From: Marvin Sielenkemper Date: Thu, 1 Dec 2016 17:34:18 +0100 Subject: remove unnecessary code --- src/c/http.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/c/http.c') diff --git a/src/c/http.c b/src/c/http.c index f2d3a4c5..1bc58677 100644 --- a/src/c/http.c +++ b/src/c/http.c @@ -434,12 +434,12 @@ int main(int argc, char *argv[]) { switch (my_addr.sa.sa_family) { case AF_INET: - /*my_addr.ipv4.sin_len =*/ my_size = sizeof(my_addr.ipv4); + my_size = sizeof(my_addr.ipv4); my_addr.ipv4.sin_port = htons(uw_port); break; case AF_INET6: - /*my_addr.ipv6.sin6_len =*/ my_size = sizeof(my_addr.ipv6); + my_size = sizeof(my_addr.ipv6); my_addr.ipv6.sin6_port = htons(uw_port); break; } -- cgit v1.2.3