Changeset 745 for trunk/server/source4/ntvfs/ntvfs_interface.c

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source4/ntvfs/ntvfs_interface.c (modified) (3 diffs)

trunk/server/source4/ntvfs/ntvfs_interface.c

@@ -21 +21 @@
 #include "includes.h"
 #include "ntvfs/ntvfs.h"
+#include "lib/tsocket/tsocket.h"
 
 /* connect/disconnect */
@@ -667 +668 @@
 }
 
+/* client connection callback */
+NTSTATUS ntvfs_set_addresses(struct ntvfs_context *ntvfs,
+                             const struct tsocket_address *local_address,
+                             const struct tsocket_address *remote_address)
+{
+        ntvfs->client.local_address = tsocket_address_copy(local_address, ntvfs);
+        NT_STATUS_HAVE_NO_MEMORY(ntvfs->client.local_address);
+
+        ntvfs->client.remote_address = tsocket_address_copy(remote_address, ntvfs);
+        NT_STATUS_HAVE_NO_MEMORY(ntvfs->client.remote_address);
+
+        return NT_STATUS_OK;
+}
+
+const struct tsocket_address *ntvfs_get_local_address(struct ntvfs_module_context *ntvfs)
+{
+        return ntvfs->ctx->client.local_address;
+}
+
+const struct tsocket_address *ntvfs_get_remote_address(struct ntvfs_module_context *ntvfs)
+{
+        return ntvfs->ctx->client.remote_address;
+}
+
 /* oplock helpers */
 NTSTATUS ntvfs_set_oplock_handler(struct ntvfs_context *ntvfs,
@@ -687 +712 @@
 }
 
-/* client connection callback */
-NTSTATUS ntvfs_set_addr_callbacks(struct ntvfs_context *ntvfs,
-                                           struct socket_address *(*my_addr)(void *private_data, TALLOC_CTX *mem_ctx),
-                                           struct socket_address *(*peer_addr)(void *private_data, TALLOC_CTX *mem_ctx),
-                                           void *private_data)
-{
-        ntvfs->client.get_peer_addr     = my_addr;
-        ntvfs->client.get_my_addr       = peer_addr;
-        ntvfs->client.private_data      = private_data;
-        return NT_STATUS_OK;
-}
-
-struct socket_address *ntvfs_get_my_addr(struct ntvfs_module_context *ntvfs, TALLOC_CTX *mem_ctx)
-{
-        if (!ntvfs->ctx->client.get_my_addr) {
-                return NULL;
-        }
-
-        return ntvfs->ctx->client.get_my_addr(ntvfs->ctx->client.private_data, mem_ctx);
-}
-
-struct socket_address *ntvfs_get_peer_addr(struct ntvfs_module_context *ntvfs, TALLOC_CTX *mem_ctx)
-{
-        if (!ntvfs->ctx->client.get_peer_addr) {
-                return NULL;
-        }
-
-        return ntvfs->ctx->client.get_peer_addr(ntvfs->ctx->client.private_data, mem_ctx);
-}