[SCM] Samba Shared Repository - branch master updated

[Stefan Metzmacher]

The branch, master has been updated
       via  54abb07... s4:smb_server: use tsocket_address_string() to display the client address
       via  8fce492... s4:smb_server: remove unused socket_address functions
      from  7c4d9fa... s4:ntvfs/ipc: remote // debug comments

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 54abb0724b5577eb7a9a132f647649dc30931b18
Author: Stefan Metzmacher <metze at samba.org>
Date:   Tue Apr 27 15:45:12 2010 +0200

    s4:smb_server: use tsocket_address_string() to display the client address
    
    metze

commit 8fce492ffc0f276d433825ebc1ec4c7ad4c33cfa
Author: Stefan Metzmacher <metze at samba.org>
Date:   Tue Apr 27 15:44:40 2010 +0200

    s4:smb_server: remove unused socket_address functions
    
    metze

-----------------------------------------------------------------------

Summary of changes:
 source4/smb_server/tcon.c |   24 +++++-------------------
 1 files changed, 5 insertions(+), 19 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/smb_server/tcon.c b/source4/smb_server/tcon.c
index f8243a0..34c303c 100644
--- a/source4/smb_server/tcon.c
+++ b/source4/smb_server/tcon.c
@@ -22,24 +22,9 @@
 #include "includes.h"
 #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);
-}
-
 /****************************************************************************
 init the tcon structures
 ****************************************************************************/
@@ -112,11 +97,12 @@ struct smbsrv_tcon *smbsrv_smb2_tcon_find(struct smbsrv_session *smb_sess,
 static int smbsrv_tcon_destructor(struct smbsrv_tcon *tcon)
 {
 	struct smbsrv_tcons_context *tcons_ctx;
-	struct socket_address *client_addr;
+	struct tsocket_address *client_addr;
+
+	client_addr = tcon->smb_conn->connection->remote_address;
 
-	client_addr = socket_get_peer_addr(tcon->smb_conn->connection->socket, tcon);
 	DEBUG(3,("%s closed connection to service %s\n",
-		 client_addr ? client_addr->addr : "(unknown)",
+		 tsocket_address_string(client_addr, tcon),
 		 tcon->share_name));
 
 	/* tell the ntvfs backend that we are disconnecting */


-- 
Samba Shared Repository