fixup! DNS server refactor

Author: baranyaib90

src/dns_server.c

@@ -16,17 +16,18 @@ static int get_listen_sock(struct addrinfo *listen_addrinfo) {
     FLOG("Error creating socket: %s (%d)", strerror(errno), errno);
   }
 
+  uint16_t port;
   char ipstr[INET6_ADDRSTRLEN];
   if (listen_addrinfo->ai_family == AF_INET) {
-      inet_ntop(AF_INET, &((struct sockaddr_in *)listen_addrinfo->ai_addr)->sin_addr, ipstr, sizeof(ipstr));
+    port = ntohs(((struct sockaddr_in*) listen_addrinfo->ai_addr)->sin_port);
+    inet_ntop(AF_INET, &((struct sockaddr_in *)listen_addrinfo->ai_addr)->sin_addr, ipstr, sizeof(ipstr));
   } else if (listen_addrinfo->ai_family == AF_INET6) {
-      inet_ntop(AF_INET6, &((struct sockaddr_in6 *)listen_addrinfo->ai_addr)->sin6_addr, ipstr, sizeof(ipstr));
+    port = ntohs(((struct sockaddr_in6*) listen_addrinfo->ai_addr)->sin6_port);
+    inet_ntop(AF_INET6, &((struct sockaddr_in6 *)listen_addrinfo->ai_addr)->sin6_addr, ipstr, sizeof(ipstr));
   } else {
     FLOG("Unknown address family: %d", listen_addrinfo->ai_family);
   }
 
-  uint16_t port = ntohs(((struct sockaddr_in*) listen_addrinfo->ai_addr)->sin_port);
-
   int res = bind(sock, listen_addrinfo->ai_addr, listen_addrinfo->ai_addrlen);
   if (res < 0) {
     FLOG("Error binding on %s:%d UDP: %s (%d)", ipstr, port,

src/main.c

@@ -354,7 +354,12 @@ int main(int argc, char *argv[]) {
   https_client_init(&https_client, &opt, (opt.stats_interval ? &stat : NULL), loop);
 
   struct addrinfo *listen_addrinfo = get_listen_address(opt.listen_addr);
-  ((struct sockaddr_in*) listen_addrinfo->ai_addr)->sin_port = htons((uint16_t)opt.listen_port);
+
+  if (listen_addrinfo->ai_family == AF_INET) {
+    ((struct sockaddr_in*) listen_addrinfo->ai_addr)->sin_port = htons((uint16_t)opt.listen_port);
+  } else if (listen_addrinfo->ai_family == AF_INET6) {
+    ((struct sockaddr_in6*) listen_addrinfo->ai_addr)->sin6_port = htons((uint16_t)opt.listen_port);
+  }
 
   app_state_t app;
   app.https_client = &https_client;