Move tcons.num_open from smb1 to sconn->num_tcons_open as this is needed for SMB2...

[abartlet/samba.git/.git] / source3 / smbd / conn.c

diff --git a/source3/smbd/conn.c b/source3/smbd/conn.c
index 3ddb4c094fc5172c087e09384bb274c55871e328..b18231f44cb4e4f5cf773a58bdc5c7059bf8feb1 100644 (file)
--- a/source3/smbd/conn.c
+++ b/source3/smbd/conn.c
@@ -33,8 +33,7 @@ init the conn structures
 void conn_init(struct smbd_server_connection *sconn)
 {
        sconn->smb1.tcons.Connections = NULL;
-       sconn->smb1.tcons.num_open = 0;
-       sconn->smb1.tcons.bmap = bitmap_allocate(BITMAP_BLOCK_SZ);
+       sconn->smb1.tcons.bmap = bitmap_talloc(sconn, BITMAP_BLOCK_SZ);
 }
 
 /****************************************************************************
@@ -42,7 +41,7 @@ return the number of open connections
 ****************************************************************************/
 int conn_num_open(struct smbd_server_connection *sconn)
 {
-       return sconn->smb1.tcons.num_open;
+       return sconn->num_tcons_open;
 }
 
 
@@ -94,13 +93,14 @@ connection_struct *conn_new(struct smbd_server_connection *sconn)
        int i;
         int find_offset = 1;
 
-       if (sconn->allow_smb2) {
+       if (sconn->using_smb2) {
                if (!(conn=TALLOC_ZERO_P(NULL, connection_struct)) ||
                    !(conn->params = TALLOC_P(conn, struct share_params))) {
                        DEBUG(0,("TALLOC_ZERO() failed!\n"));
                        TALLOC_FREE(conn);
                        return NULL;
                }
+               conn->sconn = sconn;
                return conn;
        }
 
@@ -123,14 +123,14 @@ find_again:
                DEBUG(4,("resizing connections bitmap from %d to %d\n",
                         oldsz, newsz));
 
-                nbmap = bitmap_allocate(newsz);
+                nbmap = bitmap_talloc(sconn, newsz);
                if (!nbmap) {
                        DEBUG(0,("ERROR! malloc fail.\n"));
                        return NULL;
                }
 
                 bitmap_copy(nbmap, sconn->smb1.tcons.bmap);
-                bitmap_free(sconn->smb1.tcons.bmap);
+               TALLOC_FREE(sconn->smb1.tcons.bmap);
 
                 sconn->smb1.tcons.bmap = nbmap;
                 find_offset = oldsz; /* Start next search in the new portion. */
@@ -154,15 +154,14 @@ find_again:
                TALLOC_FREE(conn);
                return NULL;
        }
+       conn->sconn = sconn;
        conn->cnum = i;
-       conn->force_recheck_perm = false;
        conn->force_group_gid = (gid_t)-1;
 
        bitmap_set(sconn->smb1.tcons.bmap, i);
 
-       sconn->smb1.tcons.num_open++;
+       sconn->num_tcons_open++;
 
-       string_set(&conn->dirpath,"");
        string_set(&conn->connectpath,"");
        string_set(&conn->origpath,"");
        
@@ -177,15 +176,33 @@ return true if any were closed
 ****************************************************************************/
 bool conn_close_all(struct smbd_server_connection *sconn)
 {
-       connection_struct *conn, *next;
-       bool ret = false;
-       for (conn=sconn->smb1.tcons.Connections;conn;conn=next) {
-               next=conn->next;
-               set_current_service(conn, 0, True);
-               close_cnum(sconn, conn, conn->vuid);
-               ret = true;
+       if (sconn->using_smb2) {
+               /* SMB2 */
+               if (sconn->smb2.sessions.list &&
+                               sconn->smb2.sessions.list->tcons.list) {
+                       struct smbd_smb2_tcon *tcon, *tc_next;
+
+                       for (tcon = sconn->smb2.sessions.list->tcons.list;
+                                       tcon; tcon = tc_next) {
+                               tc_next = tcon->next;
+                               TALLOC_FREE(tcon);
+                       }
+                       return true;
+               }
+               return false;
+       } else {
+               /* SMB1 */
+               connection_struct *conn, *next;
+               bool ret = false;
+
+               for (conn=sconn->smb1.tcons.Connections;conn;conn=next) {
+                       next=conn->next;
+                       set_current_service(conn, 0, True);
+                       close_cnum(conn, conn->vuid);
+                       ret = true;
+               }
+               return ret;
        }
-       return ret;
 }
 
 /****************************************************************************
@@ -195,7 +212,6 @@ bool conn_close_all(struct smbd_server_connection *sconn)
 bool conn_idle_all(struct smbd_server_connection *sconn,time_t t)
 {
        int deadtime = lp_deadtime()*60;
-       pipes_struct *plist = NULL;
        connection_struct *conn;
 
        if (deadtime <= 0)
@@ -225,14 +241,10 @@ bool conn_idle_all(struct smbd_server_connection *sconn,time_t t)
         * Check all pipes for any open handles. We cannot
         * idle with a handle open.
         */
-
-       for (plist = get_first_internal_pipe(); plist;
-            plist = get_next_internal_pipe(plist)) {
-               if (num_pipe_handles(plist->pipe_handles) != 0) {
-                       return False;
-               }
+       if (check_open_pipes()) {
+               return False;
        }
-       
+
        return True;
 }
 
@@ -256,9 +268,9 @@ void conn_clear_vuid_caches(struct smbd_server_connection *sconn,uint16_t vuid)
  Free a conn structure - internal part.
 ****************************************************************************/
 
-void conn_free_internal(connection_struct *conn)
+static void conn_free_internal(connection_struct *conn)
 {
-       vfs_handle_struct *handle = NULL, *thandle = NULL;
+       vfs_handle_struct *handle = NULL, *thandle = NULL;
        struct trans_state *state = NULL;
 
        /* Free vfs_connection_struct */
@@ -283,7 +295,6 @@ void conn_free_internal(connection_struct *conn)
        free_namearray(conn->veto_oplock_list);
        free_namearray(conn->aio_write_behind_list);
        
-       string_free(&conn->dirpath);
        string_free(&conn->connectpath);
        string_free(&conn->origpath);
 
@@ -295,19 +306,30 @@ void conn_free_internal(connection_struct *conn)
  Free a conn structure.
 ****************************************************************************/
 
-void conn_free(struct smbd_server_connection *sconn, connection_struct *conn)
+void conn_free(connection_struct *conn)
 {
-       if (sconn->allow_smb2) {
+       if (conn->sconn == NULL) {
+               conn_free_internal(conn);
+               return;
+       }
+
+       if (conn->sconn->using_smb2) {
                conn_free_internal(conn);
                return;
        }
 
-       DLIST_REMOVE(sconn->smb1.tcons.Connections, conn);
+       DLIST_REMOVE(conn->sconn->smb1.tcons.Connections, conn);
 
-       bitmap_clear(sconn->smb1.tcons.bmap, conn->cnum);
+       if (conn->sconn->smb1.tcons.bmap != NULL) {
+               /*
+                * Can be NULL for fake connections created by
+                * create_conn_struct()
+                */
+               bitmap_clear(conn->sconn->smb1.tcons.bmap, conn->cnum);
+       }
 
-       SMB_ASSERT(sconn->smb1.tcons.num_open > 0);
-       sconn->smb1.tcons.num_open--;
+       SMB_ASSERT(conn->sconn->num_tcons_open > 0);
+       conn->sconn->num_tcons_open--;
 
        conn_free_internal(conn);
 }
@@ -324,10 +346,16 @@ void msg_force_tdis(struct messaging_context *msg,
                    struct server_id server_id,
                    DATA_BLOB *data)
 {
-       struct smbd_server_connection *sconn = smbd_server_conn;
+       struct smbd_server_connection *sconn;
        connection_struct *conn, *next;
        fstring sharename;
 
+       sconn = msg_ctx_to_sconn(msg);
+       if (sconn == NULL) {
+               DEBUG(1, ("could not find sconn\n"));
+               return;
+       }
+
        fstrcpy(sharename, (const char *)data->data);
 
        if (strcmp(sharename, "*") == 0) {
@@ -341,7 +369,7 @@ void msg_force_tdis(struct messaging_context *msg,
                if (strequal(lp_servicename(SNUM(conn)), sharename)) {
                        DEBUG(1,("Forcing close of share %s cnum=%d\n",
                                 sharename, conn->cnum));
-                       close_cnum(sconn, conn, (uint16)-1);
+                       close_cnum(conn, (uint16)-1);
                }
        }
 }