Mercurial > public > hey

changeset 13:924e9a513216

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix ipv6 bug
author Dennis <dennisconcepcionmartin@gmail.com>
date Thu, 20 Jul 2023 19:36:43 +0100
parents dc97a1196f45
children f6fc13a3fe88
files run.sh src/server/main.c
diffstat 2 files changed, 6 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- 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
--- 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);