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

[kai/samba.git] / source4 / smbd / service_stream.h

diff --git a/source4/smbd/service_stream.h b/source4/smbd/service_stream.h
index d57a54cdc9090cb136fd98b4dfe19b1ef8e7e064..685502a8bafe6c75f523c531171b7f81968e11a5 100644 (file)
--- a/source4/smbd/service_stream.h
+++ b/source4/smbd/service_stream.h
@@ -23,7 +23,7 @@
 #ifndef __SERVICE_STREAM_H__
 #define __SERVICE_STREAM_H__
 
-#include "librpc/gen_ndr/misc.h"
+#include "librpc/gen_ndr/server_id.h"
 
 /* modules can use the following to determine if the interface has changed
  * please increment the version number after each interface change
@@ -39,17 +39,20 @@ struct stream_connection {
        const struct stream_server_ops *ops;
        const struct model_ops *model_ops;
        struct server_id server_id;
-       void *private;
+       void *private_data;
 
        struct {
-               struct event_context *ctx;
-               struct fd_event *fde;
+               struct tevent_context *ctx;
+               struct tevent_fd *fde;
        } event;
 
        struct socket_context *socket;
        struct messaging_context *msg_ctx;
        struct loadparm_context *lp_ctx;
 
+       struct tsocket_address *local_address;
+       struct tsocket_address *remote_address;
+
        /*
         * this transport layer session info, normally NULL
         * which means the same as an anonymous session info