moonbridge

changeset 134:11269ec33cd7

Proper distinction between AF_* and PF_* constants (and commented where it is not the case)
author jbe
date Thu Apr 16 21:12:29 2015 +0200 (2015-04-16)
parents 891cdc4b43eb
children 795bc86be569
files moonbridge.c moonbridge_io.c
line diff
     1.1 --- a/moonbridge.c	Thu Apr 16 20:48:11 2015 +0200
     1.2 +++ b/moonbridge.c	Thu Apr 16 21:12:29 2015 +0200
     1.3 @@ -545,7 +545,7 @@
     1.4          break;
     1.5        case MOONBR_PROTO_TCP:
     1.6          moonbr_log(LOG_INFO, "Adding TCP listener on interface \"%s\", port %i", listener->proto_specific.tcp.ip, listener->proto_specific.tcp.port);
     1.7 -        listener->listenfd = socket(listener->type_specific.socket.addr.addr_abstract.sa_family, SOCK_STREAM|SOCK_CLOEXEC|SOCK_NONBLOCK, 0);
     1.8 +        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 */
     1.9          if (listener->listenfd == -1) goto moonbr_start_pool_error;
    1.10          {
    1.11            /* avoid "Address already in use" error when restarting service */
     2.1 --- a/moonbridge_io.c	Thu Apr 16 20:48:11 2015 +0200
     2.2 +++ b/moonbridge_io.c	Thu Apr 16 21:12:29 2015 +0200
     2.3 @@ -735,15 +735,15 @@
     2.4      return 2;
     2.5    }
     2.6    for (addrinfo=res; addrinfo; addrinfo=addrinfo->ai_next) {
     2.7 -    if (addrinfo->ai_family == PF_INET6) goto moonbr_io_tcpconnect_found;
     2.8 +    if (addrinfo->ai_family == AF_INET6) goto moonbr_io_tcpconnect_found;
     2.9    }
    2.10    for (addrinfo=res; addrinfo; addrinfo=addrinfo->ai_next) {
    2.11 -    if (addrinfo->ai_family == PF_INET) goto moonbr_io_tcpconnect_found;
    2.12 +    if (addrinfo->ai_family == AF_INET) goto moonbr_io_tcpconnect_found;
    2.13    }
    2.14    addrinfo = res;
    2.15    moonbr_io_tcpconnect_found:
    2.16    sock = socket(
    2.17 -    addrinfo->ai_family,
    2.18 +    addrinfo->ai_family,  /* NOTE: not correctly using PF_* but AF_* constants here */
    2.19      addrinfo->ai_socktype | SOCK_CLOEXEC | (nonblocking ? SOCK_NONBLOCK : 0),
    2.20      addrinfo->ai_protocol
    2.21    );
    2.22 @@ -862,16 +862,16 @@
    2.23      return 2;
    2.24    }
    2.25    for (addrinfo=res; addrinfo; addrinfo=addrinfo->ai_next) {
    2.26 -    if (addrinfo->ai_family == PF_INET6) goto moonbr_io_tcpconnect_found;
    2.27 +    if (addrinfo->ai_family == AF_INET6) goto moonbr_io_tcpconnect_found;
    2.28    }
    2.29    for (addrinfo=res; addrinfo; addrinfo=addrinfo->ai_next) {
    2.30 -    if (addrinfo->ai_family == PF_INET) goto moonbr_io_tcpconnect_found;
    2.31 +    if (addrinfo->ai_family == AF_INET) goto moonbr_io_tcpconnect_found;
    2.32    }
    2.33    addrinfo = res;
    2.34    moonbr_io_tcpconnect_found:
    2.35    listener->addrfam = addrinfo->ai_family;
    2.36    sock = socket(
    2.37 -    addrinfo->ai_family,
    2.38 +    addrinfo->ai_family,  /* NOTE: not correctly using PF_* but AF_* constants here */
    2.39      addrinfo->ai_socktype | SOCK_CLOEXEC,
    2.40      addrinfo->ai_protocol
    2.41    );

Impressum / About Us