Changeset 745 for trunk/server/lib/tsocket/tsocket_bsd.c

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• lib/tsocket/tsocket_bsd.c (modified) (25 diffs)

trunk/server/lib/tsocket/tsocket_bsd.c

@@ -264 +264 @@
 
         bsda->sa_socklen = sa_socklen;
+#ifdef HAVE_STRUCT_SOCKADDR_SA_LEN
+        bsda->u.sa.sa_len = bsda->sa_socklen;
+#endif
 
         *_addr = addr;
@@ -292 +295 @@
 
         memcpy(sa, &bsda->u.ss, sa_socklen);
+#ifdef HAVE_STRUCT_SOCKADDR_SA_LEN
+        sa->sa_len = sa_socklen;
+#endif
         return sa_socklen;
+}
+
+bool tsocket_address_is_inet(const struct tsocket_address *addr, const char *fam)
+{
+        struct tsocket_address_bsd *bsda = talloc_get_type(addr->private_data,
+                                           struct tsocket_address_bsd);
+
+        if (!bsda) {
+                return false;
+        }
+
+        switch (bsda->u.sa.sa_family) {
+        case AF_INET:
+                if (strcasecmp(fam, "ip") == 0) {
+                        return true;
+                }
+
+                if (strcasecmp(fam, "ipv4") == 0) {
+                        return true;
+                }
+
+                return false;
+#ifdef HAVE_IPV6
+        case AF_INET6:
+                if (strcasecmp(fam, "ip") == 0) {
+                        return true;
+                }
+
+                if (strcasecmp(fam, "ipv6") == 0) {
+                        return true;
+                }
+
+                return false;
+#endif
+        }
+
+        return false;
 }
 
@@ -465 +508 @@
 
         return 0;
+}
+
+bool tsocket_address_is_unix(const struct tsocket_address *addr)
+{
+        struct tsocket_address_bsd *bsda = talloc_get_type(addr->private_data,
+                                           struct tsocket_address_bsd);
+
+        if (!bsda) {
+                return false;
+        }
+
+        switch (bsda->u.sa.sa_family) {
+        case AF_UNIX:
+                return true;
+        }
+
+        return false;
 }
 
@@ -847 +907 @@
         ZERO_STRUCTP(bsda);
         bsda->sa_socklen = sizeof(bsda->u.ss);
+#ifdef HAVE_STRUCT_SOCKADDR_SA_LEN
+        bsda->u.sa.sa_len = bsda->sa_socklen;
+#endif
 
         ret = recvfrom(bsds->fd, state->buf, state->len, 0,
@@ -1054 +1117 @@
         }
 
+        TALLOC_FREE(bsds->fde);
         ret = close(bsds->fd);
         bsds->fd = -1;
@@ -1184 +1248 @@
         fd = socket(sa_fam, SOCK_DGRAM, 0);
         if (fd < 0) {
-                return fd;
+                return -1;
         }
 
         fd = tsocket_bsd_common_prepare_fd(fd, true);
         if (fd < 0) {
-                return fd;
+                return -1;
         }
 
@@ -1217 +1281 @@
                         talloc_free(dgram);
                         errno = saved_errno;
-                        return ret;
+                        return -1;
                 }
         }
@@ -1231 +1295 @@
                         talloc_free(dgram);
                         errno = saved_errno;
-                        return ret;
+                        return -1;
                 }
         }
@@ -1244 +1308 @@
                         talloc_free(dgram);
                         errno = saved_errno;
-                        return ret;
+                        return -1;
                 }
         }
@@ -1254 +1318 @@
                         talloc_free(dgram);
                         errno = saved_errno;
-                        return ret;
+                        return -1;
                 }
         }
@@ -1270 +1334 @@
                         talloc_free(dgram);
                         errno = saved_errno;
-                        return ret;
+                        return -1;
                 }
         }
@@ -1610 +1674 @@
                         base = (uint8_t *)state->vector[0].iov_base;
                         base += ret;
-                        state->vector[0].iov_base = base;
+                        state->vector[0].iov_base = (void *)base;
                         state->vector[0].iov_len -= ret;
                         break;
@@ -1770 +1834 @@
                         base = (uint8_t *)state->vector[0].iov_base;
                         base += ret;
-                        state->vector[0].iov_base = base;
+                        state->vector[0].iov_base = (void *)base;
                         state->vector[0].iov_len -= ret;
                         break;
@@ -1841 +1905 @@
         }
 
+        TALLOC_FREE(bsds->fde);
         ret = close(bsds->fd);
         bsds->fd = -1;
@@ -1918 +1983 @@
         struct tevent_fd *fde;
         struct tstream_conext *stream;
+        struct tsocket_address *local;
 };
 
@@ -1936 +2002 @@
                                             void *private_data);
 
-static struct tevent_req * tstream_bsd_connect_send(TALLOC_CTX *mem_ctx,
+static struct tevent_req *tstream_bsd_connect_send(TALLOC_CTX *mem_ctx,
                                         struct tevent_context *ev,
                                         int sys_errno,
@@ -1947 +2013 @@
                 talloc_get_type_abort(local->private_data,
                 struct tsocket_address_bsd);
+        struct tsocket_address_bsd *lrbsda = NULL;
         struct tsocket_address_bsd *rbsda =
                 talloc_get_type_abort(remote->private_data,
@@ -2026 +2093 @@
         }
 
+        if (is_inet) {
+                state->local = tsocket_address_create(state,
+                                                      &tsocket_address_bsd_ops,
+                                                      &lrbsda,
+                                                      struct tsocket_address_bsd,
+                                                      __location__ "bsd_connect");
+                if (tevent_req_nomem(state->local, req)) {
+                        goto post;
+                }
+
+                ZERO_STRUCTP(lrbsda);
+                lrbsda->sa_socklen = sizeof(lrbsda->u.ss);
+#ifdef HAVE_STRUCT_SOCKADDR_SA_LEN
+                lrbsda->u.sa.sa_len = lrbsda->sa_socklen;
+#endif
+        }
+
         state->fd = socket(sa_fam, SOCK_STREAM, 0);
         if (state->fd == -1) {
@@ -2082 +2166 @@
         }
         if (tevent_req_error(req, err)) {
+                goto post;
+        }
+
+        if (!state->local) {
+                tevent_req_done(req);
+                goto post;
+        }
+
+        ret = getsockname(state->fd, &lrbsda->u.sa, &lrbsda->sa_socklen);
+        if (ret == -1) {
+                tevent_req_error(req, errno);
                 goto post;
         }
@@ -2114 +2209 @@
         struct tstream_bsd_connect_state *state = tevent_req_data(req,
                                         struct tstream_bsd_connect_state);
+        struct tsocket_address_bsd *lrbsda = NULL;
         int ret;
         int error=0;
@@ -2136 +2232 @@
         }
 
+        if (!state->local) {
+                tevent_req_done(req);
+                return;
+        }
+
+        lrbsda = talloc_get_type_abort(state->local->private_data,
+                                       struct tsocket_address_bsd);
+
+        ret = getsockname(state->fd, &lrbsda->u.sa, &lrbsda->sa_socklen);
+        if (ret == -1) {
+                tevent_req_error(req, errno);
+                return;
+        }
+
         tevent_req_done(req);
 }
@@ -2143 +2253 @@
                                     TALLOC_CTX *mem_ctx,
                                     struct tstream_context **stream,
+                                    struct tsocket_address **local,
                                     const char *location)
 {
@@ -2161 +2272 @@
                 TALLOC_FREE(state->fde);
                 state->fd = -1;
+
+                if (local) {
+                        *local = talloc_move(mem_ctx, &state->local);
+                }
         }
 
@@ -2200 +2315 @@
                                    TALLOC_CTX *mem_ctx,
                                    struct tstream_context **stream,
+                                   struct tsocket_address **local,
                                    const char *location)
 {
-        return tstream_bsd_connect_recv(req, perrno, mem_ctx, stream, location);
+        return tstream_bsd_connect_recv(req, perrno,
+                                        mem_ctx, stream, local,
+                                        location);
 }
 
@@ -2235 +2353 @@
                                       const char *location)
 {
-        return tstream_bsd_connect_recv(req, perrno, mem_ctx, stream, location);
+        return tstream_bsd_connect_recv(req, perrno,
+                                        mem_ctx, stream, NULL,
+                                        location);
 }