Changeset 745 for trunk/server/source3/libsmb/smbsock_connect.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)
• source3/libsmb/smbsock_connect.c (modified) (21 diffs)

trunk/server/source3/libsmb/smbsock_connect.c

@@ -19 +19 @@
 
 #include "includes.h"
-#include "../lib/async_req/async_sock.h"
+#include "../lib/util/tevent_ntstatus.h"
+#include "client.h"
 #include "async_smb.h"
+#include "libsmb/nmblib.h"
 
 struct nb_connect_state {
@@ -177 +179 @@
         const struct sockaddr_storage *addr;
         const char *called_name;
+        uint8_t called_type;
         const char *calling_name;
+        uint8_t calling_type;
         struct tevent_req *req_139;
         struct tevent_req *req_445;
@@ -192 +196 @@
                                         struct tevent_context *ev,
                                         const struct sockaddr_storage *addr,
+                                        uint16_t port,
                                         const char *called_name,
-                                        const char *calling_name)
+                                        int called_type,
+                                        const char *calling_name,
+                                        int calling_type)
 {
         struct tevent_req *req, *subreq;
@@ -207 +214 @@
         state->called_name =
                 (called_name != NULL) ? called_name : "*SMBSERVER";
+        state->called_type =
+                (called_type != -1) ? called_type : 0x20;
         state->calling_name =
                 (calling_name != NULL) ? calling_name : global_myname();
+        state->calling_type =
+                (calling_type != -1) ? calling_type : 0x00;
 
         talloc_set_destructor(state, smbsock_connect_state_destructor);
+
+        if (port == 139) {
+                subreq = tevent_wakeup_send(state, ev, timeval_set(0, 0));
+                if (tevent_req_nomem(subreq, req)) {
+                        return tevent_req_post(req, ev);
+                }
+                tevent_req_set_callback(subreq, smbsock_connect_do_139, req);
+                return req;
+        }
+        if (port != 0) {
+                state->req_445 = open_socket_out_send(state, ev, addr, port,
+                                                      5000);
+                if (tevent_req_nomem(state->req_445, req)) {
+                        return tevent_req_post(req, ev);
+                }
+                tevent_req_set_callback(
+                        state->req_445, smbsock_connect_connected, req);
+                return req;
+        }
+
+        /*
+         * port==0, try both
+         */
 
         state->req_445 = open_socket_out_send(state, ev, addr, 445, 5000);
@@ -238 +272 @@
         if (state->sock != -1) {
                 close(state->sock);
+                state->sock = -1;
         }
         return 0;
@@ -257 +292 @@
         }
         state->req_139 = nb_connect_send(state, state->ev, state->addr,
-                                         state->called_name, 0x20,
-                                         state->calling_name, 0x0);
+                                         state->called_name,
+                                         state->called_type,
+                                         state->calling_name,
+                                         state->calling_type);
         if (tevent_req_nomem(state->req_139, req)) {
                 return;
@@ -314 +351 @@
 
 NTSTATUS smbsock_connect_recv(struct tevent_req *req, int *sock,
-                          uint16_t *port)
+                              uint16_t *ret_port)
 {
         struct smbsock_connect_state *state = tevent_req_data(
@@ -325 +362 @@
         *sock = state->sock;
         state->sock = -1;
-        if (port != NULL) {
-                *port = state->port;
+        if (ret_port != NULL) {
+                *ret_port = state->port;
         }
         return NT_STATUS_OK;
 }
 
-NTSTATUS smbsock_connect(const struct sockaddr_storage *addr,
-                         const char *called_name, const char *calling_name,
-                         int *pfd, uint16_t *port)
+NTSTATUS smbsock_connect(const struct sockaddr_storage *addr, uint16_t port,
+                         const char *called_name, int called_type,
+                         const char *calling_name, int calling_type,
+                         int *pfd, uint16_t *ret_port, int sec_timeout)
 {
         TALLOC_CTX *frame = talloc_stackframe();
@@ -344 +382 @@
                 goto fail;
         }
-        req = smbsock_connect_send(frame, ev, addr, called_name, calling_name);
+        req = smbsock_connect_send(frame, ev, addr, port,
+                                   called_name, called_type,
+                                   calling_name, calling_type);
         if (req == NULL) {
                 goto fail;
         }
+        if ((sec_timeout != 0) &&
+            !tevent_req_set_endtime(
+                    req, ev, timeval_current_ofs(sec_timeout, 0))) {
+                goto fail;
+        }
         if (!tevent_req_poll_ntstatus(req, ev, &status)) {
                 goto fail;
         }
-        status = smbsock_connect_recv(req, pfd, port);
+        status = smbsock_connect_recv(req, pfd, ret_port);
  fail:
         TALLOC_FREE(frame);
@@ -361 +406 @@
         const struct sockaddr_storage *addrs;
         const char **called_names;
+        int *called_types;
+        const char **calling_names;
+        int *calling_types;
         size_t num_addrs;
+        uint16_t port;
 
         struct tevent_req **requests;
@@ -368 +417 @@
 
         int fd;
-        uint16_t port;
+        uint16_t chosen_port;
         size_t chosen_index;
 };
@@ -381 +430 @@
                                             const struct sockaddr_storage *addrs,
                                             const char **called_names,
-                                            size_t num_addrs)
+                                            int *called_types,
+                                            const char **calling_names,
+                                            int *calling_types,
+                                            size_t num_addrs, uint16_t port)
 {
         struct tevent_req *req, *subreq;
@@ -395 +447 @@
         state->num_addrs = num_addrs;
         state->called_names = called_names;
+        state->called_types = called_types;
+        state->calling_names = calling_names;
+        state->calling_types = calling_types;
+        state->port = port;
 
         if (num_addrs == 0) {
@@ -459 +515 @@
         subreq = smbsock_connect_send(
                 state->requests, state->ev, &state->addrs[state->num_sent],
+                state->port,
                 (state->called_names != NULL)
                 ? state->called_names[state->num_sent] : NULL,
-                NULL);
+                (state->called_types != NULL)
+                ? state->called_types[state->num_sent] : -1,
+                (state->calling_names != NULL)
+                ? state->calling_names[state->num_sent] : NULL,
+                (state->calling_types != NULL)
+                ? state->calling_types[state->num_sent] : -1);
         if (tevent_req_nomem(subreq, req)) {
                 return false;
@@ -481 +543 @@
         NTSTATUS status;
         int fd;
-        uint16_t port;
+        uint16_t chosen_port;
         size_t i;
         size_t chosen_index = 0;
@@ -496 +558 @@
         }
 
-        status = smbsock_connect_recv(subreq, &fd, &port);
+        status = smbsock_connect_recv(subreq, &fd, &chosen_port);
 
         TALLOC_FREE(subreq);
@@ -507 +569 @@
                 TALLOC_FREE(state->requests);
                 state->fd = fd;
-                state->port = port;
+                state->chosen_port = chosen_port;
                 state->chosen_index = chosen_index;
                 tevent_req_done(req);
@@ -529 +591 @@
 
 NTSTATUS smbsock_any_connect_recv(struct tevent_req *req, int *pfd,
-                                  size_t *chosen_index, uint16_t *port)
+                                  size_t *chosen_index,
+                                  uint16_t *chosen_port)
 {
         struct smbsock_any_connect_state *state = tevent_req_data(
@@ -542 +605 @@
                 *chosen_index = state->chosen_index;
         }
-        if (port != NULL) {
-                *port = state->port;
+        if (chosen_port != NULL) {
+                *chosen_port = state->chosen_port;
         }
         return NT_STATUS_OK;
@@ -549 +612 @@
 
 NTSTATUS smbsock_any_connect(const struct sockaddr_storage *addrs,
-                             const char **called_names, size_t num_addrs,
-                             int *pfd, size_t *chosen_index, uint16_t *port)
+                             const char **called_names,
+                             int *called_types,
+                             const char **calling_names,
+                             int *calling_types,
+                             size_t num_addrs,
+                             uint16_t port,
+                             int sec_timeout,
+                             int *pfd, size_t *chosen_index,
+                             uint16_t *chosen_port)
 {
         TALLOC_CTX *frame = talloc_stackframe();
@@ -561 +631 @@
                 goto fail;
         }
-        req = smbsock_any_connect_send(frame, ev, addrs, called_names,
-                                       num_addrs);
+        req = smbsock_any_connect_send(frame, ev, addrs,
+                                       called_names, called_types,
+                                       calling_names, calling_types,
+                                       num_addrs, port);
         if (req == NULL) {
                 goto fail;
         }
+        if ((sec_timeout != 0) &&
+            !tevent_req_set_endtime(
+                    req, ev, timeval_current_ofs(sec_timeout, 0))) {
+                goto fail;
+        }
         if (!tevent_req_poll_ntstatus(req, ev, &status)) {
                 goto fail;
         }
-        status = smbsock_any_connect_recv(req, pfd, chosen_index, port);
+        status = smbsock_any_connect_recv(req, pfd, chosen_index, chosen_port);
  fail:
         TALLOC_FREE(frame);