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 e1209e7a546f40eba7c5a71e269907a259beab05..64a912720584244faf739cfe29a4812961092786 100644 (file)
--- a/source4/libcli/dgram/libdgram.h
+++ b/source4/libcli/dgram/libdgram.h
@@ -19,7 +19,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "libcli/netlogon.h"
+#include "../libcli/netlogon/netlogon.h"
 
 /*
   a datagram name request
@@ -39,11 +39,10 @@ struct nbt_dgram_request {
 */
 struct nbt_dgram_socket {
        struct socket_context *sock;
-       struct event_context *event_ctx;
-       struct smb_iconv_convenience *iconv_convenience;
+       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;
@@ -55,7 +54,7 @@ struct nbt_dgram_socket {
        struct {
                void (*handler)(struct nbt_dgram_socket *, struct nbt_dgram_packet *, 
                                struct socket_address *src);
-               void *private;
+               void *private_data;
        } incoming;
 };
 
@@ -79,7 +78,7 @@ struct dgram_mailslot_handler {
        const char *mailslot_name;
 
        dgram_mailslot_handler_t handler;
-       void *private;
+       void *private_data;
 };
 
 
@@ -91,10 +90,9 @@ NTSTATUS dgram_set_incoming_handler(struct nbt_dgram_socket *dgmsock,
                                    void (*handler)(struct nbt_dgram_socket *, 
                                                    struct nbt_dgram_packet *, 
                                                    struct socket_address *),
-                                   void *private);
+                                   void *private_data);
 struct nbt_dgram_socket *nbt_dgram_socket_init(TALLOC_CTX *mem_ctx, 
-                                              struct event_context *event_ctx,
-                                              struct smb_iconv_convenience *);
+                                              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,
@@ -102,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);
 
 
@@ -129,8 +127,7 @@ NTSTATUS dgram_mailslot_netlogon_reply(struct nbt_dgram_socket *dgmsock,
                                       const char *my_netbios_name,
                                       const char *mailslot_name,
                                       struct nbt_netlogon_response *reply);
-NTSTATUS dgram_mailslot_netlogon_parse_request(struct dgram_mailslot_handler *dgmslot,
-                                              TALLOC_CTX *mem_ctx,
+NTSTATUS dgram_mailslot_netlogon_parse_request(TALLOC_CTX *mem_ctx,
                                               struct nbt_dgram_packet *dgram,
                                               struct nbt_netlogon_packet *netlogon);