# HG changeset patch
# User jbe
# Date 1429211549 -7200
# Node ID 11269ec33cd75f53bb583f343c88913a920254e5
# Parent  891cdc4b43eb43c63db3c6acdc91beaf1a8e1abc
Proper distinction between AF_* and PF_* constants (and commented where it is not the case)

diff -r 891cdc4b43eb -r 11269ec33cd7 moonbridge.c
--- a/moonbridge.c	Thu Apr 16 20:48:11 2015 +0200
+++ b/moonbridge.c	Thu Apr 16 21:12:29 2015 +0200
@@ -545,7 +545,7 @@
         break;
       case MOONBR_PROTO_TCP:
         moonbr_log(LOG_INFO, "Adding TCP listener on interface \"%s\", port %i", listener->proto_specific.tcp.ip, listener->proto_specific.tcp.port);
-        listener->listenfd = socket(listener->type_specific.socket.addr.addr_abstract.sa_family, SOCK_STREAM|SOCK_CLOEXEC|SOCK_NONBLOCK, 0);
+        listener->listenfd = socket(listener->type_specific.socket.addr.addr_abstract.sa_family, SOCK_STREAM|SOCK_CLOEXEC|SOCK_NONBLOCK, 0);  /* NOTE: not correctly using PF_* but AF_* constants here */
         if (listener->listenfd == -1) goto moonbr_start_pool_error;
         {
           /* avoid "Address already in use" error when restarting service */
diff -r 891cdc4b43eb -r 11269ec33cd7 moonbridge_io.c
--- a/moonbridge_io.c	Thu Apr 16 20:48:11 2015 +0200
+++ b/moonbridge_io.c	Thu Apr 16 21:12:29 2015 +0200
@@ -735,15 +735,15 @@
     return 2;
   }
   for (addrinfo=res; addrinfo; addrinfo=addrinfo->ai_next) {
-    if (addrinfo->ai_family == PF_INET6) goto moonbr_io_tcpconnect_found;
+    if (addrinfo->ai_family == AF_INET6) goto moonbr_io_tcpconnect_found;
   }
   for (addrinfo=res; addrinfo; addrinfo=addrinfo->ai_next) {
-    if (addrinfo->ai_family == PF_INET) goto moonbr_io_tcpconnect_found;
+    if (addrinfo->ai_family == AF_INET) goto moonbr_io_tcpconnect_found;
   }
   addrinfo = res;
   moonbr_io_tcpconnect_found:
   sock = socket(
-    addrinfo->ai_family,
+    addrinfo->ai_family,  /* NOTE: not correctly using PF_* but AF_* constants here */
     addrinfo->ai_socktype | SOCK_CLOEXEC | (nonblocking ? SOCK_NONBLOCK : 0),
     addrinfo->ai_protocol
   );
@@ -862,16 +862,16 @@
     return 2;
   }
   for (addrinfo=res; addrinfo; addrinfo=addrinfo->ai_next) {
-    if (addrinfo->ai_family == PF_INET6) goto moonbr_io_tcpconnect_found;
+    if (addrinfo->ai_family == AF_INET6) goto moonbr_io_tcpconnect_found;
   }
   for (addrinfo=res; addrinfo; addrinfo=addrinfo->ai_next) {
-    if (addrinfo->ai_family == PF_INET) goto moonbr_io_tcpconnect_found;
+    if (addrinfo->ai_family == AF_INET) goto moonbr_io_tcpconnect_found;
   }
   addrinfo = res;
   moonbr_io_tcpconnect_found:
   listener->addrfam = addrinfo->ai_family;
   sock = socket(
-    addrinfo->ai_family,
+    addrinfo->ai_family,  /* NOTE: not correctly using PF_* but AF_* constants here */
     addrinfo->ai_socktype | SOCK_CLOEXEC,
     addrinfo->ai_protocol
   );