libcli/nbt: add nbt_name_socket_handle_response_packet()

Move the last part of nbt_name_socket_recv() into
a new function nbt_name_socket_handle_response_packet()
so that it can be reused by an unexpected handler.

metze
(from samba4wins tree cb0377f3b95e50c84fac999a49dde80acc933124)

diff --git a/libcli/nbt/libnbt.h b/libcli/nbt/libnbt.h
index 87183c2c13d5ba69d171e72c0abe9eb02abb0f66..491abd7b8ac98ce3d3774f461f0b36f00887d1f2 100644 (file)
--- a/libcli/nbt/libnbt.h
+++ b/libcli/nbt/libnbt.h
@@ -277,6 +277,9 @@ struct nbt_name_release {
 struct nbt_name_socket *nbt_name_socket_init(TALLOC_CTX *mem_ctx,
                                             struct tevent_context *event_ctx,
                                             struct smb_iconv_convenience *iconv_convenience);
 struct nbt_name_socket *nbt_name_socket_init(TALLOC_CTX *mem_ctx,
                                             struct tevent_context *event_ctx,
                                             struct smb_iconv_convenience *iconv_convenience);

+void nbt_name_socket_handle_response_packet(struct nbt_name_request *req,
+                                           struct nbt_name_packet *packet,
+                                           struct socket_address *src);

 struct nbt_name_request *nbt_name_query_send(struct nbt_name_socket *nbtsock,
                                             struct nbt_name_query *io);
 NTSTATUS nbt_name_query_recv(struct nbt_name_request *req,
 struct nbt_name_request *nbt_name_query_send(struct nbt_name_socket *nbtsock,
                                             struct nbt_name_query *io);
 NTSTATUS nbt_name_query_recv(struct nbt_name_request *req,

diff --git a/libcli/nbt/nbtsocket.c b/libcli/nbt/nbtsocket.c
index 4816b816fe2e155681c5ea8602e8d8a96d0b568c..0d269faa0efceb3582030e5ebecef5c5fb0af229 100644 (file)
--- a/libcli/nbt/nbtsocket.c
+++ b/libcli/nbt/nbtsocket.c
@@ -231,6 +231,16 @@ static void nbt_name_socket_recv(struct nbt_name_socket *nbtsock)
                return;
        }
 
                return;
        }
 

+       talloc_steal(req, packet);
+       talloc_steal(req, src);
+       talloc_free(tmp_ctx);
+       nbt_name_socket_handle_response_packet(req, packet, src);
+}
+
+void nbt_name_socket_handle_response_packet(struct nbt_name_request *req,
+                                           struct nbt_name_packet *packet,
+                                           struct socket_address *src)
+{

        /* if this is a WACK response, this we need to go back to waiting,
           but perhaps increase the timeout */
        if ((packet->operation & NBT_OPCODE) == NBT_OPCODE_WACK) {
        /* if this is a WACK response, this we need to go back to waiting,
           but perhaps increase the timeout */
        if ((packet->operation & NBT_OPCODE) == NBT_OPCODE_WACK) {


@@ -266,7 +276,6 @@ static void nbt_name_socket_recv(struct nbt_name_socket *nbtsock)
                req->te = event_add_timed(req->nbtsock->event_ctx, req,
                                          timeval_current_ofs(req->timeout, 0),
                                          nbt_name_socket_timeout, req);
                req->te = event_add_timed(req->nbtsock->event_ctx, req,
                                          timeval_current_ofs(req->timeout, 0),
                                          nbt_name_socket_timeout, req);

-               talloc_free(tmp_ctx);

                return;
        }
 
                return;
        }
 


@@ -288,7 +297,6 @@ static void nbt_name_socket_recv(struct nbt_name_socket *nbtsock)
        /* if we don't want multiple replies then we are done */
        if (req->allow_multiple_replies &&
            req->num_replies < NBT_MAX_REPLIES) {
        /* if we don't want multiple replies then we are done */
        if (req->allow_multiple_replies &&
            req->num_replies < NBT_MAX_REPLIES) {

-               talloc_free(tmp_ctx);

                return;
        }
 
                return;
        }
 


@@ -297,7 +305,6 @@ static void nbt_name_socket_recv(struct nbt_name_socket *nbtsock)
        req->status = NT_STATUS_OK;
 
 done:
        req->status = NT_STATUS_OK;
 
 done:

-       talloc_free(tmp_ctx);

        if (req->async.fn) {
                req->async.fn(req);
        }
        if (req->async.fn) {
                req->async.fn(req);
        }