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

Commit 431735f0 authored by Elliott Hughes's avatar Elliott Hughes Committed by Gerrit Code Review
Browse files

Merge "libcutils: Socket type might contain bitwise OR flags"

parents ebb46d76 a7e2e763
Loading
Loading
Loading
Loading
+3 −1
Original line number Diff line number Diff line
@@ -43,6 +43,8 @@ int socket_local_server(const char *name, int namespaceId, int type)

#define LISTEN_BACKLOG 4

/* Only the bottom bits are really the socket type; there are flags too. */
#define SOCK_TYPE_MASK 0xf

/**
 * Binds a pre-created socket(AF_LOCAL) 's' to 'name'
@@ -107,7 +109,7 @@ int socket_local_server(const char *name, int namespace, int type)
        return -1;
    }

    if (type == SOCK_STREAM) {
    if ((type & SOCK_TYPE_MASK) == SOCK_STREAM) {
        int ret;

        ret = listen(s, LISTEN_BACKLOG);