Changeset 988 for vendor/current/source3/lib/addrchange.c

Timestamp:

Nov 24, 2016, 1:14:11 PM (9 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to version 4.4.3

File:

• vendor/current/source3/lib/addrchange.c (modified) (12 diffs)

vendor/current/source3/lib/addrchange.c

@@ -26 +26 @@
 #include "linux/netlink.h"
 #include "linux/rtnetlink.h"
-#include "lib/async_req/async_sock.h"
+#include "lib/tsocket/tsocket.h"
 
 struct addrchange_context {
-        int sock;
+        struct tdgram_context *sock;
 };
-
-static int addrchange_context_destructor(struct addrchange_context *c);
 
 NTSTATUS addrchange_context_create(TALLOC_CTX *mem_ctx,
@@ -40 +38 @@
         struct sockaddr_nl addr;
         NTSTATUS status;
+        int sock = -1;
         int res;
+        bool ok;
 
         ctx = talloc(mem_ctx, struct addrchange_context);
@@ -47 +47 @@
         }
 
-        ctx->sock = socket(AF_NETLINK, SOCK_RAW, NETLINK_ROUTE);
-        if (ctx->sock == -1) {
-                status = map_nt_error_from_unix(errno);
-                goto fail;
-        }
-        talloc_set_destructor(ctx, addrchange_context_destructor);
+        sock = socket(AF_NETLINK, SOCK_RAW, NETLINK_ROUTE);
+        if (sock == -1) {
+                status = map_nt_error_from_unix(errno);
+                goto fail;
+        }
+
+        ok = smb_set_close_on_exec(sock);
+        if (!ok) {
+                status = map_nt_error_from_unix(errno);
+                goto fail;
+        }
+
+        res = set_blocking(sock, false);
+        if (res == -1) {
+                status = map_nt_error_from_unix(errno);
+                goto fail;
+        }
 
         /*
@@ -61 +72 @@
         addr.nl_groups = RTMGRP_IPV6_IFADDR | RTMGRP_IPV4_IFADDR;
 
-        res = bind(ctx->sock, (struct sockaddr *)(void *)&addr, sizeof(addr));
+        res = bind(sock, (struct sockaddr *)(void *)&addr, sizeof(addr));
+        if (res == -1) {
+                status = map_nt_error_from_unix(errno);
+                goto fail;
+        }
+
+        res = tdgram_bsd_existing_socket(ctx, sock, &ctx->sock);
         if (res == -1) {
                 status = map_nt_error_from_unix(errno);
@@ -70 +87 @@
         return NT_STATUS_OK;
 fail:
+        if (sock != -1) {
+                close(sock);
+        }
         TALLOC_FREE(ctx);
         return status;
-}
-
-static int addrchange_context_destructor(struct addrchange_context *c)
-{
-        if (c->sock != -1) {
-                close(c->sock);
-                c->sock = -1;
-        }
-        return 0;
 }
 
@@ -86 +97 @@
         struct tevent_context *ev;
         struct addrchange_context *ctx;
-        uint8_t buf[8192];
-        struct sockaddr_storage fromaddr;
-        socklen_t fromaddr_len;
+        uint8_t *buf;
+        struct tsocket_address *fromaddr;
 
         enum addrchange_type type;
@@ -110 +120 @@
         state->ctx = ctx;
 
-        state->fromaddr_len = sizeof(state->fromaddr);
-        subreq = recvfrom_send(state, state->ev, state->ctx->sock,
-                               state->buf, sizeof(state->buf), 0,
-                               &state->fromaddr, &state->fromaddr_len);
+        subreq = tdgram_recvfrom_send(state, state->ev, state->ctx->sock);
         if (tevent_req_nomem(subreq, req)) {
                 return tevent_req_post(req, state->ev);
@@ -127 +134 @@
         struct addrchange_state *state = tevent_req_data(
                 req, struct addrchange_state);
-        struct sockaddr_nl *addr;
+        union {
+                struct sockaddr sa;
+                struct sockaddr_nl nl;
+                struct sockaddr_storage ss;
+        } fromaddr;
         struct nlmsghdr *h;
         struct ifaddrmsg *ifa;
@@ -136 +147 @@
         bool found;
 
-        received = recvfrom_recv(subreq, &err);
+        received = tdgram_recvfrom_recv(subreq, &err, state,
+                                        &state->buf,
+                                        &state->fromaddr);
         TALLOC_FREE(subreq);
         if (received == -1) {
-                DEBUG(10, ("recvfrom returned %s\n", strerror(errno)));
+                DEBUG(10, ("tdgram_recvfrom_recv returned %s\n", strerror(err)));
                 tevent_req_nterror(req, map_nt_error_from_unix(err));
                 return;
         }
-        if ((state->fromaddr_len != sizeof(struct sockaddr_nl))
-            || (state->fromaddr.ss_family != AF_NETLINK)) {
+        len = tsocket_address_bsd_sockaddr(state->fromaddr,
+                                           &fromaddr.sa,
+                                           sizeof(fromaddr));
+
+        if ((len != sizeof(fromaddr.nl) ||
+            fromaddr.sa.sa_family != AF_NETLINK))
+        {
                 DEBUG(10, ("Got message from wrong addr\n"));
                 goto retry;
         }
 
-        addr = (struct sockaddr_nl *)(void *)&state->addr;
-        if (addr->nl_pid != 0) {
+        if (fromaddr.nl.nl_pid != 0) {
                 DEBUG(10, ("Got msg from pid %d, not from the kernel\n",
-                           (int)addr->nl_pid));
+                           (int)fromaddr.nl.nl_pid));
                 goto retry;
         }
@@ -247 +264 @@
 
 retry:
-        state->fromaddr_len = sizeof(state->fromaddr);
-        subreq = recvfrom_send(state, state->ev, state->ctx->sock,
-                               state->buf, sizeof(state->buf), 0,
-                               &state->fromaddr, &state->fromaddr_len);
+        TALLOC_FREE(state->buf);
+        TALLOC_FREE(state->fromaddr);
+
+        subreq = tdgram_recvfrom_send(state, state->ev, state->ctx->sock);
         if (tevent_req_nomem(subreq, req)) {
                 return;
@@ -265 +282 @@
 
         if (tevent_req_is_nterror(req, &status)) {
+                tevent_req_received(req);
                 return status;
         }
@@ -270 +288 @@
         *type = state->type;
         *addr = state->addr;
+        tevent_req_received(req);
         return NT_STATUS_OK;
 }