r12804: This patch reworks the Samba4 sockets layer to use a socket_address

[bbaumbach/samba-autobuild/.git] / source4 / libcli / dgram / browse.c

diff --git a/source4/libcli/dgram/browse.c b/source4/libcli/dgram/browse.c
index d6813b36b9b3c9264b134219f38edcdeecc48b83..433d1c1971bd742b57bf10c7bc757d0245415b1b 100644 (file)
--- a/source4/libcli/dgram/browse.c
+++ b/source4/libcli/dgram/browse.c
@@ -22,14 +22,11 @@
 */
 
 #include "includes.h"
-#include "lib/events/events.h"
-#include "libcli/nbt/libnbt.h"
 #include "libcli/dgram/libdgram.h"
 #include "lib/socket/socket.h"
-#include "librpc/gen_ndr/ndr_nbt.h"
 
 NTSTATUS dgram_mailslot_browse_send(struct nbt_dgram_socket *dgmsock,
-     struct nbt_name *dest_name, const struct nbt_peer_socket *dest,
+     struct nbt_name *dest_name, struct socket_address *dest,
      struct nbt_name *src_name, struct nbt_browse_packet *request)
 {
        NTSTATUS status;
@@ -59,7 +56,7 @@ NTSTATUS dgram_mailslot_browse_reply(struct nbt_dgram_socket *dgmsock,
        DATA_BLOB blob;
        TALLOC_CTX *tmp_ctx = talloc_new(dgmsock);
        struct nbt_name myname;
-       struct nbt_peer_socket dest;
+       struct socket_address *dest;
 
        status = ndr_push_struct_blob(&blob, tmp_ctx, reply, 
                                      (ndr_push_flags_fn_t)ndr_push_nbt_browse_packet);
@@ -70,12 +67,17 @@ NTSTATUS dgram_mailslot_browse_reply(struct nbt_dgram_socket *dgmsock,
 
        make_nbt_name_client(&myname, lp_netbios_name());
 
-       dest.port = request->src_port;
-       dest.addr = request->src_addr;
+       dest = socket_address_from_strings(tmp_ctx, dgmsock->sock->backend_name, 
+                                          request->src_addr, request->src_port);
+       if (!dest) {
+               talloc_free(tmp_ctx);
+               return NT_STATUS_NO_MEMORY;
+       }
+
        status = dgram_mailslot_send(dgmsock, DGRAM_DIRECT_UNIQUE, 
                                     mailslot_name,
                                     &request->data.msg.source_name,
-                                    &dest,
+                                    dest,
                                     &myname, &blob);
        talloc_free(tmp_ctx);
        return status;