Changeset 740 for vendor/current/source4/lib/socket

Timestamp:

Nov 14, 2012, 12:59:34 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to 3.6.0

Location:

vendor/current/source4/lib/socket

Files:

• access.c (modified) (1 diff)
• config.m4 (deleted)
• config.mk (deleted)
• connect_multi.c (modified) (7 diffs)
• interface.c (modified) (2 diffs)
• netif.c (modified) (2 diffs)
• socket.c (modified) (2 diffs)
• socket.h (modified) (4 diffs)
• socket_ip.c (modified) (2 diffs)
• testsuite.c (modified) (3 diffs)
• wscript_build (added)

vendor/current/source4/lib/socket/access.c

@@ -35 +35 @@
 #include "lib/socket/socket.h"
 #include "system/locale.h"
+#include "lib/util/util_net.h"
 
 #define FAIL            (-1)

vendor/current/source4/lib/socket/connect_multi.c

@@ -34 +34 @@
 */
 struct connect_multi_state {
-        const char *server_address;
+        struct socket_address *server_address;
         int num_ports;
         uint16_t *ports;
@@ -65 +65 @@
 _PUBLIC_ struct composite_context *socket_connect_multi_send(
                                                     TALLOC_CTX *mem_ctx,
-                                                    const char *server_address,
+                                                    const char *server_name,
                                                     int num_server_ports,
                                                     uint16_t *server_ports,
@@ -75 +75 @@
         int i;
 
+        struct nbt_name name;
+        struct composite_context *creq;
+                
         result = talloc_zero(mem_ctx, struct composite_context);
         if (result == NULL) return NULL;
@@ -84 +87 @@
         result->private_data = multi;
 
-        multi->server_address = talloc_strdup(multi, server_address);
-        if (composite_nomem(multi->server_address, result)) goto failed;
-
         multi->num_ports = num_server_ports;
         multi->ports = talloc_array(multi, uint16_t, multi->num_ports);
@@ -95 +95 @@
         }
 
-        if (!is_ipaddress(server_address)) {
-                /*  
-                    we don't want to do the name resolution separately
+        /*  
+            we don't want to do the name resolution separately
                     for each port, so start it now, then only start on
                     the real sockets once we have an IP
-                 */
-                struct nbt_name name;
-                struct composite_context *creq;
-                make_nbt_name_server(&name, server_address);
-                creq = resolve_name_send(resolve_ctx, multi, &name, result->event_ctx);
-                if (composite_nomem(creq, result)) goto failed;
-                composite_continue(result, creq, continue_resolve_name, result);
-                return result;
-        }
-
-        /* now we've setup the state we can process the first socket */
-        connect_multi_next_socket(result);
-
-        if (!NT_STATUS_IS_OK(result->status)) {
-                goto failed;
-        }
+        */
+        make_nbt_name_server(&name, server_name);
+
+        creq = resolve_name_all_send(resolve_ctx, multi, 0, multi->ports[0], &name, result->event_ctx);
+        if (composite_nomem(creq, result)) goto failed;
+
+        composite_continue(result, creq, continue_resolve_name, result);
 
         return result;
+
 
  failed:
@@ -149 +140 @@
         if (!composite_is_ok(result)) return;
 
-        /* Form up the particular address we are interested in */
-        state->addr = socket_address_from_strings(state, state->sock->backend_name, 
-                                                  multi->server_address, multi->ports[next]);
+        state->addr = socket_address_copy(state, multi->server_address);
         if (composite_nomem(state->addr, result)) return;
+
+        socket_address_set_port(state->addr, multi->ports[next]);
 
         talloc_steal(state, state->sock);
@@ -198 +189 @@
         struct connect_multi_state *multi = talloc_get_type(result->private_data, 
                                                             struct connect_multi_state);
-        const char *addr;
-
-        result->status = resolve_name_recv(creq, multi, &addr);
+        struct socket_address **addr;
+
+        result->status = resolve_name_all_recv(creq, multi, &addr, NULL);
         if (!composite_is_ok(result)) return;
 
-        multi->server_address = addr;
+        /* Let's just go for the first for now */
+        multi->server_address = addr[0];
 
         connect_multi_next_socket(result);

vendor/current/source4/lib/socket/interface.c

@@ -23 +23 @@
 #include "system/network.h"
 #include "lib/socket/netif.h"
+#include "../lib/util/util_net.h"
 #include "../lib/util/dlinklist.h"
 
@@ -94 +95 @@
         DLIST_ADD_END(*interfaces, iface, struct interface *);
 
-        DEBUG(2,("added interface ip=%s nmask=%s\n", iface->ip_s, iface->nmask_s));
+        DEBUG(3,("added interface ip=%s nmask=%s\n", iface->ip_s, iface->nmask_s));
 }
 

vendor/current/source4/lib/socket/netif.c

@@ -35 +35 @@
 #include "system/network.h"
 #include "netif.h"
+#include "lib/util/tsort.h"
 
 /****************************************************************************
@@ -110 +111 @@
 
         /* now we need to remove duplicates */
-        qsort(ifaces, total, sizeof(ifaces[0]), QSORT_CAST iface_comp);
+        TYPESAFE_QSORT(ifaces, total, iface_comp);
 
         for (i=1;i<total;) {

vendor/current/source4/lib/socket/socket.c

@@ -25 +25 @@
 #include "system/network.h"
 #include "param/param.h"
+#include "../lib/tsocket/tsocket.h"
+#include "lib/util/util_net.h"
 
 /*
@@ -343 +345 @@
 
         return sock->ops->fn_get_my_addr(sock, mem_ctx);
+}
+
+_PUBLIC_ struct tsocket_address *socket_address_to_tsocket_address(TALLOC_CTX *mem_ctx,
+                                                                   const struct socket_address *a)
+{
+        struct tsocket_address *r;
+        int ret;
+
+        if (a->sockaddr) {
+                ret = tsocket_address_bsd_from_sockaddr(mem_ctx,
+                                                        a->sockaddr,
+                                                        a->sockaddrlen,
+                                                        &r);
+        } else {
+                ret = tsocket_address_inet_from_strings(mem_ctx,
+                                                        a->family,
+                                                        a->addr,
+                                                        a->port,
+                                                        &r);
+        }
+
+        if (ret != 0) {
+                return NULL;
+        }
+
+        return r;
+}
+
+_PUBLIC_ void socket_address_set_port(struct socket_address *a,
+                                      uint16_t port)
+{
+        if (a->sockaddr) {
+                set_sockaddr_port(a->sockaddr, port);
+        } else {
+                a->port = port;
+        }
+
+}
+
+_PUBLIC_ struct socket_address *tsocket_address_to_socket_address(TALLOC_CTX *mem_ctx,
+                                                                  const struct tsocket_address *a)
+{
+        ssize_t ret;
+        struct sockaddr_storage ss;
+        size_t sslen = sizeof(ss);
+
+        ret = tsocket_address_bsd_sockaddr(a, (struct sockaddr *)(void *)&ss, sslen);
+        if (ret < 0) {
+                return NULL;
+        }
+
+        return socket_address_from_sockaddr(mem_ctx, (struct sockaddr *)(void *)&ss, ret);
+}
+
+_PUBLIC_ struct tsocket_address *socket_get_remote_addr(struct socket_context *sock, TALLOC_CTX *mem_ctx)
+{
+        struct socket_address *a;
+        struct tsocket_address *r;
+
+        a = socket_get_peer_addr(sock, mem_ctx);
+        if (a == NULL) {
+                return NULL;
+        }
+
+        r = socket_address_to_tsocket_address(mem_ctx, a);
+        talloc_free(a);
+        return r;
+}
+
+_PUBLIC_ struct tsocket_address *socket_get_local_addr(struct socket_context *sock, TALLOC_CTX *mem_ctx)
+{
+        struct socket_address *a;
+        struct tsocket_address *r;
+
+        a = socket_get_my_addr(sock, mem_ctx);
+        if (a == NULL) {
+                return NULL;
+        }
+
+        r = socket_address_to_tsocket_address(mem_ctx, a);
+        talloc_free(a);
+        return r;
 }
 

vendor/current/source4/lib/socket/socket.h

@@ -128 +128 @@
 
 struct resolve_context;
+struct tsocket_address;
 
 /* prototypes */
@@ -159 +160 @@
 struct socket_address *socket_get_peer_addr(struct socket_context *sock, TALLOC_CTX *mem_ctx);
 struct socket_address *socket_get_my_addr(struct socket_context *sock, TALLOC_CTX *mem_ctx);
+struct tsocket_address *socket_address_to_tsocket_address(TALLOC_CTX *mem_ctx,
+                                                          const struct socket_address *a);
+struct socket_address *tsocket_address_to_socket_address(TALLOC_CTX *mem_ctx,
+                                                         const struct tsocket_address *a);
+struct tsocket_address *socket_get_remote_addr(struct socket_context *sock, TALLOC_CTX *mem_ctx);
+struct tsocket_address *socket_get_local_addr(struct socket_context *sock, TALLOC_CTX *mem_ctx);
 int socket_get_fd(struct socket_context *sock);
 NTSTATUS socket_dup(struct socket_context *sock);
@@ -168 +175 @@
                                                     struct sockaddr *sockaddr, 
                                                     size_t addrlen);
+_PUBLIC_ void socket_address_set_port(struct socket_address *a,
+                                      uint16_t port);
 struct socket_address *socket_address_copy(TALLOC_CTX *mem_ctx,
                                            const struct socket_address *oaddr);
@@ -207 +216 @@
                               uint16_t *port);
 void set_socket_options(int fd, const char *options);
-void socket_set_flags(struct socket_context *socket, unsigned flags);
+void socket_set_flags(struct socket_context *sock, unsigned flags);
 
 void socket_tevent_fd_close_fn(struct tevent_context *ev,

vendor/current/source4/lib/socket/socket_ip.c

@@ -26 +26 @@
 #include "lib/socket/socket.h"
 #include "system/network.h"
+#include "lib/util/util_net.h"
 
 static NTSTATUS ipv4_init(struct socket_context *sock)
@@ -712 +713 @@
 static NTSTATUS ipv6_tcp_accept(struct socket_context *sock, struct socket_context **new_sock)
 {
-        struct sockaddr_in cli_addr;
+        struct sockaddr_in6 cli_addr;
         socklen_t cli_addr_len = sizeof(cli_addr);
         int new_fd;

vendor/current/source4/lib/socket/testsuite.c

@@ -43 +43 @@
         struct interface *ifaces;
 
-        load_interfaces(tctx, lp_interfaces(tctx->lp_ctx), &ifaces);
+        load_interfaces(tctx, lpcfg_interfaces(tctx->lp_ctx), &ifaces);
 
         status = socket_create("ip", SOCKET_TYPE_DGRAM, &sock1, 0);
@@ -136 +136 @@
         talloc_steal(mem_ctx, sock2);
 
-        load_interfaces(tctx, lp_interfaces(tctx->lp_ctx), &ifaces);
+        load_interfaces(tctx, lpcfg_interfaces(tctx->lp_ctx), &ifaces);
         localhost = socket_address_from_strings(sock1, sock1->backend_name, 
                                                 iface_best_ip(ifaces, "127.0.0.1"), 0);
@@ -189 +189 @@
 struct torture_suite *torture_local_socket(TALLOC_CTX *mem_ctx)
 {
-        struct torture_suite *suite = torture_suite_create(mem_ctx, 
-                                                                                                           "SOCKET");
+        struct torture_suite *suite = torture_suite_create(mem_ctx, "socket");
 
         torture_suite_add_simple_test(suite, "udp", test_udp);