Merge branch 'master' of ssh://git.samba.org/data/git/samba

[ira/wip.git] / source4 / libcli / dgram / libdgram.h

diff --git a/source4/libcli/dgram/libdgram.h b/source4/libcli/dgram/libdgram.h
index 51408d029e63a92944822960e360a301e22d42f7..a17a6042d97edd8c4c9487d9ebcae12f6263ae39 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.h"
 
 /*
   a datagram name request
@@ -39,11 +39,11 @@ struct nbt_dgram_request {
 */
 struct nbt_dgram_socket {
        struct socket_context *sock;
-       struct event_context *event_ctx;
+       struct tevent_context *event_ctx;
        struct smb_iconv_convenience *iconv_convenience;
 
        /* the fd event */
-       struct fd_event *fde;
+       struct tevent_fd *fde;
 
        /* a queue of outgoing requests */
        struct nbt_dgram_request *send_queue;
@@ -55,7 +55,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;
 };
 
@@ -70,7 +70,6 @@ struct nbt_dgram_socket {
 
 typedef void (*dgram_mailslot_handler_t)(struct dgram_mailslot_handler *, 
                                         struct nbt_dgram_packet *, 
-                                        const char *mailslot_name,
                                         struct socket_address *src);
 
 struct dgram_mailslot_handler {
@@ -80,7 +79,7 @@ struct dgram_mailslot_handler {
        const char *mailslot_name;
 
        dgram_mailslot_handler_t handler;
-       void *private;
+       void *private_data;
 };
 
 
@@ -92,9 +91,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 tevent_context *event_ctx,
                                               struct smb_iconv_convenience *);
 
 const char *dgram_mailslot_name(struct nbt_dgram_packet *packet);
@@ -103,11 +102,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);