# HG changeset patch # User Dennis # Date 1689878203 -3600 # Node ID 924e9a51321674425ef5effacbf023a72c613e1c # Parent dc97a1196f45b42bc601e445f11f961326088128 fix ipv6 bug diff -r dc97a1196f45 -r 924e9a513216 run.sh --- a/run.sh Thu Jul 20 09:40:44 2023 +0100 +++ b/run.sh Thu Jul 20 19:36:43 2023 +0100 @@ -1,7 +1,7 @@ #!/bin/bash -docker compose build -docker compose up -d +sudo docker compose build +sudo docker compose up -d #!/bin/bash @@ -16,4 +16,4 @@ echo "To view server logs run 'docker logs --follow hey-server-1' in other terminal" echo "" -docker exec -it hey-client-1 ./build/hey_client +sudo docker exec -it hey-client-1 ./build/hey_client diff -r dc97a1196f45 -r 924e9a513216 src/server/main.c --- a/src/server/main.c Thu Jul 20 09:40:44 2023 +0100 +++ b/src/server/main.c Thu Jul 20 19:36:43 2023 +0100 @@ -29,9 +29,9 @@ inet_ntop(AF_INET, &(ipv4->sin_addr), ipport.ipstr, sizeof(ipport.ipstr)); ipport.port = ntohs(ipv4->sin_port); } else { - struct sockaddr_in *ipv6 = (struct sockaddr_in *)sa; - inet_ntop(AF_INET, &(ipv6->sin_addr), ipport.ipstr, sizeof(ipport.ipstr)); - ipport.port = ntohs(ipv6->sin_port); + struct sockaddr_in6 *ipv6 = (struct sockaddr_in6 *)sa; + inet_ntop(AF_INET, &(ipv6->sin6_addr), ipport.ipstr, sizeof(ipport.ipstr)); + ipport.port = ntohs(ipv6->sin6_port); } return ipport; @@ -64,7 +64,6 @@ exit(1); } - if (listen(listenfd, 10) == -1) { perror("listen: "); exit(1);