smbd: use sconn->root_ev_ctx for smbd_sig_{term,hup}_handler()

[samba.git] / source4 / smb_server / management.c

diff --git a/source4/smb_server/management.c b/source4/smb_server/management.c
index 828281836003fcecc4a1d6058136d0fc4e2f6bfd..af993717ef7d5f7e7fd7b6d4519c668690b5a250 100644 (file)
--- a/source4/smb_server/management.c
+++ b/source4/smb_server/management.c
@@ -7,7 +7,7 @@
    
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
    
    This program is distributed in the hope that it will be useful,
@@ -16,8 +16,7 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "includes.h"
@@ -26,6 +25,7 @@
 #include "lib/messaging/irpc.h"
 #include "librpc/gen_ndr/ndr_irpc.h"
 #include "auth/auth.h"
+#include "lib/tsocket/tsocket.h"
 
 /*
   return a list of open sessions
@@ -33,10 +33,17 @@
 static NTSTATUS smbsrv_session_information(struct irpc_message *msg, 
                                           struct smbsrv_information *r)
 {
-       struct smbsrv_connection *smb_conn = talloc_get_type(msg->private, struct smbsrv_connection);
+       struct smbsrv_connection *smb_conn = talloc_get_type(msg->private_data,
+                                            struct smbsrv_connection);
+       struct tsocket_address *client_addr = smb_conn->connection->remote_address;
+       char *client_addr_string;
        int i=0, count=0;
        struct smbsrv_session *sess;
 
+       /* This is for debugging only! */
+       client_addr_string = tsocket_address_string(client_addr, r);
+       NT_STATUS_HAVE_NO_MEMORY(client_addr_string);
+
        /* count the number of sessions */
        for (sess=smb_conn->sessions.list; sess; sess=sess->next) {
                count++;
@@ -48,17 +55,63 @@ static NTSTATUS smbsrv_session_information(struct irpc_message *msg,
 
        for (sess=smb_conn->sessions.list; sess; sess=sess->next) {
                struct smbsrv_session_info *info = &r->out.info.sessions.sessions[i];
+
+               info->client_ip    = client_addr_string;
+
                info->vuid         = sess->vuid;
-               info->account_name = sess->session_info->server_info->account_name;
-               info->domain_name  = sess->session_info->server_info->domain_name;
-               info->connect_time = timeval_to_nttime(&sess->connect_time);
-               info->client_ip    = socket_get_peer_addr(smb_conn->connection->socket, r);
+               info->account_name = sess->session_info->info->account_name;
+               info->domain_name  = sess->session_info->info->domain_name;
+               
+               info->connect_time = timeval_to_nttime(&sess->statistics.connect_time);
+               info->auth_time    = timeval_to_nttime(&sess->statistics.auth_time);
+               info->last_use_time= timeval_to_nttime(&sess->statistics.last_request_time);
                i++;
        }       
 
        return NT_STATUS_OK;
 }
 
+/*
+  return a list of tree connects
+*/
+static NTSTATUS smbsrv_tcon_information(struct irpc_message *msg, 
+                                       struct smbsrv_information *r)
+{
+       struct smbsrv_connection *smb_conn = talloc_get_type(msg->private_data,
+                                            struct smbsrv_connection);
+       struct tsocket_address *client_addr = smb_conn->connection->remote_address;
+       char *client_addr_string;
+       int i=0, count=0;
+       struct smbsrv_tcon *tcon;
+
+       /* This is for debugging only! */
+       client_addr_string = tsocket_address_string(client_addr, r);
+       NT_STATUS_HAVE_NO_MEMORY(client_addr_string);
+
+       /* count the number of tcons */
+       for (tcon=smb_conn->smb_tcons.list; tcon; tcon=tcon->next) {
+               count++;
+       }
+
+       r->out.info.tcons.num_tcons = count;
+       r->out.info.tcons.tcons = talloc_array(r, struct smbsrv_tcon_info, count);
+       NT_STATUS_HAVE_NO_MEMORY(r->out.info.tcons.tcons);
+
+       for (tcon=smb_conn->smb_tcons.list; tcon; tcon=tcon->next) {
+               struct smbsrv_tcon_info *info = &r->out.info.tcons.tcons[i];
+
+               info->client_ip    = client_addr_string;
+
+               info->tid          = tcon->tid;
+               info->share_name   = tcon->share_name;
+               info->connect_time = timeval_to_nttime(&tcon->statistics.connect_time);
+               info->last_use_time= timeval_to_nttime(&tcon->statistics.last_request_time);
+               i++;
+       }
+
+       return NT_STATUS_OK;
+}
+
 /*
   serve smbserver information via irpc
 */
@@ -68,6 +121,8 @@ static NTSTATUS smbsrv_information(struct irpc_message *msg,
        switch (r->in.level) {
        case SMBSRV_INFO_SESSIONS:
                return smbsrv_session_information(msg, r);
+       case SMBSRV_INFO_TCONS:
+               return smbsrv_tcon_information(msg, r);
        }
 
        return NT_STATUS_OK;