libdgram: Remove an unused parameter

[samba.git] / source4 / libcli / dgram / libdgram.h

diff --git a/source4/libcli/dgram/libdgram.h b/source4/libcli/dgram/libdgram.h
index f913e90d8839d6b9801ba824e90a70f141d14fa4..64a912720584244faf739cfe29a4812961092786 100644 (file)
--- a/source4/libcli/dgram/libdgram.h
+++ b/source4/libcli/dgram/libdgram.h
@@ -7,7 +7,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
@@ -16,11 +16,10 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "librpc/gen_ndr/ndr_nbt.h"
+#include "../libcli/netlogon/netlogon.h"
 
 /*
   a datagram name request
@@ -29,7 +28,7 @@ struct nbt_dgram_request {
        struct nbt_dgram_request *next, *prev;
 
        /* where to send the request */
-       struct nbt_peer_socket dest;
+       struct socket_address *dest;
 
        /* the encoded request */
        DATA_BLOB encoded;
@@ -40,10 +39,10 @@ struct nbt_dgram_request {
 */
 struct nbt_dgram_socket {
        struct socket_context *sock;
-       struct event_context *event_ctx;
+       struct tevent_context *event_ctx;
 
        /* the fd event */
-       struct fd_event *fde;
+       struct tevent_fd *fde;
 
        /* a queue of outgoing requests */
        struct nbt_dgram_request *send_queue;
@@ -54,8 +53,8 @@ struct nbt_dgram_socket {
        /* what to do with incoming request packets */
        struct {
                void (*handler)(struct nbt_dgram_socket *, struct nbt_dgram_packet *, 
-                               const struct nbt_peer_socket *src);
-               void *private;
+                               struct socket_address *src);
+               void *private_data;
        } incoming;
 };
 
@@ -70,7 +69,7 @@ struct nbt_dgram_socket {
 
 typedef void (*dgram_mailslot_handler_t)(struct dgram_mailslot_handler *, 
                                         struct nbt_dgram_packet *, 
-                                        const struct nbt_peer_socket *src);
+                                        struct socket_address *src);
 
 struct dgram_mailslot_handler {
        struct dgram_mailslot_handler *next, *prev;
@@ -79,21 +78,21 @@ struct dgram_mailslot_handler {
        const char *mailslot_name;
 
        dgram_mailslot_handler_t handler;
-       void *private;
+       void *private_data;
 };
 
 
 /* prototypes */
 NTSTATUS nbt_dgram_send(struct nbt_dgram_socket *dgmsock,
                        struct nbt_dgram_packet *packet,
-                       const struct nbt_peer_socket *dest);
+                       struct socket_address *dest);
 NTSTATUS dgram_set_incoming_handler(struct nbt_dgram_socket *dgmsock,
                                    void (*handler)(struct nbt_dgram_socket *, 
                                                    struct nbt_dgram_packet *, 
-                                                   const struct nbt_peer_socket *),
-                                   void *private);
+                                                   struct socket_address *),
+                                   void *private_data);
 struct nbt_dgram_socket *nbt_dgram_socket_init(TALLOC_CTX *mem_ctx, 
-                                              struct event_context *event_ctx);
+                                              struct tevent_context *event_ctx);
 
 const char *dgram_mailslot_name(struct nbt_dgram_packet *packet);
 struct dgram_mailslot_handler *dgram_mailslot_find(struct nbt_dgram_socket *dgmsock,
@@ -101,11 +100,11 @@ struct dgram_mailslot_handler *dgram_mailslot_find(struct nbt_dgram_socket *dgms
 struct dgram_mailslot_handler *dgram_mailslot_listen(struct nbt_dgram_socket *dgmsock,
                                                     const char *mailslot_name,
                                                     dgram_mailslot_handler_t handler,
-                                                    void *private);
+                                                    void *private_data);
 struct dgram_mailslot_handler *dgram_mailslot_temp(struct nbt_dgram_socket *dgmsock,
                                                   const char *mailslot_name,
                                                   dgram_mailslot_handler_t handler,
-                                                  void *private);
+                                                  void *private_data);
 DATA_BLOB dgram_mailslot_data(struct nbt_dgram_packet *dgram);
 
 
@@ -113,35 +112,43 @@ NTSTATUS dgram_mailslot_send(struct nbt_dgram_socket *dgmsock,
                             enum dgram_msg_type msg_type,
                             const char *mailslot_name,
                             struct nbt_name *dest_name,
-                            const struct nbt_peer_socket *dest,
+                            struct socket_address *dest,
                             struct nbt_name *src_name,
                             DATA_BLOB *request);
 
 NTSTATUS dgram_mailslot_netlogon_send(struct nbt_dgram_socket *dgmsock,
                                      struct nbt_name *dest_name,
-                                     const struct nbt_peer_socket *dest,
+                                     struct socket_address *dest,
+                                     const char *mailslot_name,
                                      struct nbt_name *src_name,
                                      struct nbt_netlogon_packet *request);
 NTSTATUS dgram_mailslot_netlogon_reply(struct nbt_dgram_socket *dgmsock,
                                       struct nbt_dgram_packet *request,
+                                      const char *my_netbios_name,
                                       const char *mailslot_name,
-                                      struct nbt_netlogon_packet *reply);
-NTSTATUS dgram_mailslot_netlogon_parse(struct dgram_mailslot_handler *dgmslot,
-                                      TALLOC_CTX *mem_ctx,
-                                      struct nbt_dgram_packet *dgram,
-                                      struct nbt_netlogon_packet *netlogon);
-
-NTSTATUS dgram_mailslot_ntlogon_send(struct nbt_dgram_socket *dgmsock,
-                                     enum dgram_msg_type msg_type,
-                                     struct nbt_name *dest_name,
-                                     const struct nbt_peer_socket *dest,
-                                     struct nbt_name *src_name,
-                                     struct nbt_ntlogon_packet *request);
-NTSTATUS dgram_mailslot_ntlogon_reply(struct nbt_dgram_socket *dgmsock,
-                                      struct nbt_dgram_packet *request,
-                                      const char *mailslot_name,
-                                      struct nbt_ntlogon_packet *reply);
-NTSTATUS dgram_mailslot_ntlogon_parse(struct dgram_mailslot_handler *dgmslot,
-                                      TALLOC_CTX *mem_ctx,
-                                      struct nbt_dgram_packet *dgram,
-                                      struct nbt_ntlogon_packet *ntlogon);
+                                      struct nbt_netlogon_response *reply);
+NTSTATUS dgram_mailslot_netlogon_parse_request(TALLOC_CTX *mem_ctx,
+                                              struct nbt_dgram_packet *dgram,
+                                              struct nbt_netlogon_packet *netlogon);
+
+NTSTATUS dgram_mailslot_netlogon_parse_response(struct dgram_mailslot_handler *dgmslot,
+                                               TALLOC_CTX *mem_ctx,
+                                               struct nbt_dgram_packet *dgram,
+                                               struct nbt_netlogon_response *netlogon);
+
+NTSTATUS dgram_mailslot_browse_send(struct nbt_dgram_socket *dgmsock,
+                                   struct nbt_name *dest_name,
+                                   struct socket_address *dest,
+                                   struct nbt_name *src_name,
+                                   struct nbt_browse_packet *request);
+
+NTSTATUS dgram_mailslot_browse_reply(struct nbt_dgram_socket *dgmsock,
+                                    struct nbt_dgram_packet *request,
+                                    const char *mailslot_name,
+                                    const char *my_netbios_name,
+                                    struct nbt_browse_packet *reply);
+
+NTSTATUS dgram_mailslot_browse_parse(struct dgram_mailslot_handler *dgmslot,
+                                    TALLOC_CTX *mem_ctx,
+                                    struct nbt_dgram_packet *dgram,
+                                    struct nbt_browse_packet *pkt);