diff options
author | Jeremy Allison <jra@samba.org> | 2010-10-19 13:25:51 -0700 |
---|---|---|
committer | Jeremy Allison <jra@samba.org> | 2010-10-19 15:13:17 -0700 |
commit | edefaf5bed75fd315b1ca9a3da096419a7a6cec3 (patch) | |
tree | ea95458d906c3a1653e876d411b113d9efb287e8 /source3/smbd/conn.c | |
parent | 492ab4d60fac5551b8c9b40d18871e677cd4187c (diff) | |
download | samba-edefaf5bed75fd315b1ca9a3da096419a7a6cec3.tar.gz samba-edefaf5bed75fd315b1ca9a3da096419a7a6cec3.tar.bz2 samba-edefaf5bed75fd315b1ca9a3da096419a7a6cec3.zip |
Move tcons.num_open from smb1 to sconn->num_tcons_open as this is needed for SMB2 also.
Diffstat (limited to 'source3/smbd/conn.c')
-rw-r--r-- | source3/smbd/conn.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/source3/smbd/conn.c b/source3/smbd/conn.c index d12495bf78..b18231f44c 100644 --- a/source3/smbd/conn.c +++ b/source3/smbd/conn.c @@ -33,7 +33,6 @@ 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_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; } @@ -161,7 +160,7 @@ find_again: bitmap_set(sconn->smb1.tcons.bmap, i); - sconn->smb1.tcons.num_open++; + sconn->num_tcons_open++; string_set(&conn->connectpath,""); string_set(&conn->origpath,""); @@ -329,8 +328,8 @@ void conn_free(connection_struct *conn) bitmap_clear(conn->sconn->smb1.tcons.bmap, conn->cnum); } - SMB_ASSERT(conn->sconn->smb1.tcons.num_open > 0); - conn->sconn->smb1.tcons.num_open--; + SMB_ASSERT(conn->sconn->num_tcons_open > 0); + conn->sconn->num_tcons_open--; conn_free_internal(conn); } |