Changeset 745 for trunk/server/source4/smb_server/tcon.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/smb_server/tcon.c (modified) (2 diffs)

trunk/server/source4/smb_server/tcon.c

@@ -23 +23 @@
 #include "smb_server/smb_server.h"
 #include "smbd/service_stream.h"
+#include "lib/tsocket/tsocket.h"
 #include "ntvfs/ntvfs.h"
-
-struct socket_address *smbsrv_get_my_addr(void *p, TALLOC_CTX *mem_ctx)
-{
-        struct smbsrv_connection *smb_conn = talloc_get_type(p,
-                                             struct smbsrv_connection);
-
-        return socket_get_my_addr(smb_conn->connection->socket, mem_ctx);
-}
-
-struct socket_address *smbsrv_get_peer_addr(void *p, TALLOC_CTX *mem_ctx)
-{
-        struct smbsrv_connection *smb_conn = talloc_get_type(p,
-                                             struct smbsrv_connection);
-
-        return socket_get_peer_addr(smb_conn->connection->socket, mem_ctx);
-}
 
 /****************************************************************************
@@ -113 +98 @@
 {
         struct smbsrv_tcons_context *tcons_ctx;
-        struct socket_address *client_addr;
+        struct tsocket_address *client_addr;
 
-        client_addr = socket_get_peer_addr(tcon->smb_conn->connection->socket, tcon);
+        client_addr = tcon->smb_conn->connection->remote_address;
+
         DEBUG(3,("%s closed connection to service %s\n",
-                 client_addr ? client_addr->addr : "(unknown)",
+                 tsocket_address_string(client_addr, tcon),
                  tcon->share_name));