r10997: r11980@SERNOX (orig r10037): metze | 2005-09-05 14:21:40 +0200

[garming/samba-autobuild/.git] / source4 / libcli / nbt / namequery.c

diff --git a/source4/libcli/nbt/namequery.c b/source4/libcli/nbt/namequery.c
index f222148f4d6fccb2b8dd314c285e40a4be96d6f5..c0a1e274e20df6538f1d99538f11e89d058952d3 100644 (file)
--- a/source4/libcli/nbt/namequery.c
+++ b/source4/libcli/nbt/namequery.c
@@ -31,6 +31,7 @@ struct nbt_name_request *nbt_name_query_send(struct nbt_name_socket *nbtsock,
 {
        struct nbt_name_request *req;
        struct nbt_name_packet *packet;
+       struct nbt_peer_socket dest;
 
        packet = talloc_zero(nbtsock, struct nbt_name_packet);
        if (packet == NULL) return NULL;
@@ -50,8 +51,10 @@ struct nbt_name_request *nbt_name_query_send(struct nbt_name_socket *nbtsock,
        packet->questions[0].name = io->in.name;
        packet->questions[0].question_type = NBT_QTYPE_NETBIOS;
        packet->questions[0].question_class = NBT_QCLASS_IP;
-       
-       req = nbt_name_request_send(nbtsock, io->in.dest_addr, lp_nbt_port(), packet,
+
+       dest.port = lp_nbt_port();
+       dest.addr = io->in.dest_addr;
+       req = nbt_name_request_send(nbtsock, &dest, packet,
                                    io->in.timeout, io->in.retries, False);
        if (req == NULL) goto failed;
 
@@ -81,7 +84,7 @@ NTSTATUS nbt_name_query_recv(struct nbt_name_request *req,
        }
        
        packet = req->replies[0].packet;
-       io->out.reply_from = talloc_steal(mem_ctx, req->replies[0].reply_addr);
+       io->out.reply_from = talloc_steal(mem_ctx, req->replies[0].dest.addr);
 
        if ((packet->operation & NBT_RCODE) != 0) {
                status = nbt_rcode_to_ntstatus(packet->operation & NBT_RCODE);
@@ -137,6 +140,7 @@ struct nbt_name_request *nbt_name_status_send(struct nbt_name_socket *nbtsock,
 {
        struct nbt_name_request *req;
        struct nbt_name_packet *packet;
+       struct nbt_peer_socket dest;
 
        packet = talloc_zero(nbtsock, struct nbt_name_packet);
        if (packet == NULL) return NULL;
@@ -150,8 +154,10 @@ struct nbt_name_request *nbt_name_status_send(struct nbt_name_socket *nbtsock,
        packet->questions[0].name = io->in.name;
        packet->questions[0].question_type = NBT_QTYPE_STATUS;
        packet->questions[0].question_class = NBT_QCLASS_IP;
-       
-       req = nbt_name_request_send(nbtsock, io->in.dest_addr, lp_nbt_port(), packet,
+
+       dest.port = lp_nbt_port();
+       dest.addr = io->in.dest_addr;
+       req = nbt_name_request_send(nbtsock, &dest, packet,
                                    io->in.timeout, io->in.retries, False);
        if (req == NULL) goto failed;
 
@@ -181,7 +187,7 @@ NTSTATUS nbt_name_status_recv(struct nbt_name_request *req,
        }
        
        packet = req->replies[0].packet;
-       io->out.reply_from = talloc_steal(mem_ctx, req->replies[0].reply_addr);
+       io->out.reply_from = talloc_steal(mem_ctx, req->replies[0].dest.addr);
 
        if ((packet->operation & NBT_RCODE) != 0) {
                status = nbt_rcode_to_ntstatus(packet->operation & NBT_RCODE);