Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f6df8fce authored by Erik Kline's avatar Erik Kline Committed by android-build-merger
Browse files

Merge "Listen on dualstack sockets."

am: 1f7bcf3e

* commit '1f7bcf3e':
  Listen on dualstack sockets.
parents 65ab87dd 1f7bcf3e
Loading
Loading
Loading
Loading
+7 −7
Original line number Diff line number Diff line
@@ -34,15 +34,15 @@
/* open listen() port on any interface */
int socket_inaddr_any_server(int port, int type)
{
    struct sockaddr_in addr;
    struct sockaddr_in6 addr;
    int s, n;

    memset(&addr, 0, sizeof(addr));
    addr.sin_family = AF_INET;
    addr.sin_port = htons(port);
    addr.sin_addr.s_addr = htonl(INADDR_ANY);
    addr.sin6_family = AF_INET6;
    addr.sin6_port = htons(port);
    addr.sin6_addr = in6addr_any;

    s = socket(AF_INET, type, 0);
    s = socket(AF_INET6, type, 0);
    if (s < 0) return -1;

    n = 1;