/****************************************************************************
init the conn structures
****************************************************************************/
-void conn_init(void)
+void conn_init(struct smbd_server_connection *sconn)
{
- bmap = bitmap_allocate(BITMAP_BLOCK_SZ);
+ sconn->smb1.tcons.Connections = NULL;
+ sconn->smb1.tcons.bmap = bitmap_talloc(sconn, BITMAP_BLOCK_SZ);
}
/****************************************************************************
return the number of open connections
****************************************************************************/
-int conn_num_open(void)
+int conn_num_open(struct smbd_server_connection *sconn)
{
- return num_open;
+ return sconn->num_tcons_open;
}
****************************************************************************/
bool conn_snum_used(int snum)
{
+ struct smbd_server_connection *sconn = smbd_server_conn;
connection_struct *conn;
- for (conn=Connections;conn;conn=conn->next) {
+ for (conn=sconn->smb1.tcons.Connections;conn;conn=conn->next) {
if (conn->params->service == snum) {
return(True);
}
Find a conn given a cnum.
****************************************************************************/
-connection_struct *conn_find(unsigned cnum)
+connection_struct *conn_find(struct smbd_server_connection *sconn,unsigned cnum)
{
int count=0;
connection_struct *conn;
- for (conn=Connections;conn;conn=conn->next,count++) {
+ for (conn=sconn->smb1.tcons.Connections;conn;conn=conn->next,count++) {
if (conn->cnum == cnum) {
if (count > 10) {
- DLIST_PROMOTE(Connections, conn);
+ DLIST_PROMOTE(sconn->smb1.tcons.Connections,
+ conn);
}
return conn;
}
The randomisation stops problems with the server dieing and clients
thinking the server is still available.
****************************************************************************/
-connection_struct *conn_new(void)
+connection_struct *conn_new(struct smbd_server_connection *sconn)
{
connection_struct *conn;
int i;
int find_offset = 1;
+ 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;
+ }
+
find_again:
- i = bitmap_find(bmap, find_offset);
+ i = bitmap_find(sconn->smb1.tcons.bmap, find_offset);
if (i == -1) {
/* Expand the connections bitmap. */
- int oldsz = bmap->n;
- int newsz = bmap->n + BITMAP_BLOCK_SZ;
+ int oldsz = sconn->smb1.tcons.bmap->n;
+ int newsz = sconn->smb1.tcons.bmap->n +
+ BITMAP_BLOCK_SZ;
struct bitmap * nbmap;
if (newsz <= oldsz) {
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, bmap);
- bitmap_free(bmap);
+ bitmap_copy(nbmap, sconn->smb1.tcons.bmap);
+ TALLOC_FREE(sconn->smb1.tcons.bmap);
- bmap = nbmap;
+ sconn->smb1.tcons.bmap = nbmap;
find_offset = oldsz; /* Start next search in the new portion. */
goto find_again;
TALLOC_FREE(conn);
return NULL;
}
+ conn->sconn = sconn;
conn->cnum = i;
conn->force_group_gid = (gid_t)-1;
- bitmap_set(bmap, i);
+ bitmap_set(sconn->smb1.tcons.bmap, i);
- num_open++;
+ sconn->num_tcons_open++;
- string_set(&conn->dirpath,"");
string_set(&conn->connectpath,"");
string_set(&conn->origpath,"");
- DLIST_ADD(Connections, conn);
+ DLIST_ADD(sconn->smb1.tcons.Connections, conn);
return conn;
}
Close all conn structures.
return true if any were closed
****************************************************************************/
-bool conn_close_all(void)
+bool conn_close_all(struct smbd_server_connection *sconn)
{
- connection_struct *conn, *next;
- bool ret = false;
- for (conn=Connections;conn;conn=next) {
- next=conn->next;
- set_current_service(conn, 0, True);
- close_cnum(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;
}
/****************************************************************************
Idle inactive connections.
****************************************************************************/
-bool conn_idle_all(time_t t)
+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)
deadtime = DEFAULT_SMBD_TIMEOUT;
- for (conn=Connections;conn;conn=conn->next) {
+ for (conn=sconn->smb1.tcons.Connections;conn;conn=conn->next) {
time_t age = t - conn->lastused;
* 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;
}
Clear a vuid out of the validity cache, and as the 'owner' of a connection.
****************************************************************************/
-void conn_clear_vuid_caches(uint16_t vuid)
+void conn_clear_vuid_caches(struct smbd_server_connection *sconn,uint16_t vuid)
{
connection_struct *conn;
- for (conn=Connections;conn;conn=conn->next) {
+ for (conn=sconn->smb1.tcons.Connections;conn;conn=conn->next) {
if (conn->vuid == vuid) {
conn->vuid = UID_FIELD_INVALID;
}
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 */
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);
void conn_free(connection_struct *conn)
{
- DLIST_REMOVE(Connections, conn);
+ if (conn->sconn == NULL) {
+ conn_free_internal(conn);
+ return;
+ }
+
+ if (conn->sconn->using_smb2) {
+ conn_free_internal(conn);
+ return;
+ }
+
+ DLIST_REMOVE(conn->sconn->smb1.tcons.Connections, conn);
- bitmap_clear(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(num_open > 0);
- num_open--;
+ SMB_ASSERT(conn->sconn->num_tcons_open > 0);
+ conn->sconn->num_tcons_open--;
conn_free_internal(conn);
}
struct server_id server_id,
DATA_BLOB *data)
{
+ 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) {
DEBUG(1,("Forcing close of all shares\n"));
- conn_close_all();
+ conn_close_all(sconn);
return;
}
- for (conn=Connections;conn;conn=next) {
+ for (conn=sconn->smb1.tcons.Connections;conn;conn=next) {
next=conn->next;
if (strequal(lp_servicename(SNUM(conn)), sharename)) {
DEBUG(1,("Forcing close of share %s cnum=%d\n",
git.samba.org / abartlet / samba.git / .git / blobdiff