-
-/*
+/*
Unix SMB/CIFS implementation.
SMB client library implementation (server cache)
Copyright (C) Andrew Tridgell 1998
Copyright (C) Richard Sharpe 2000
Copyright (C) John Terpstra 2000
- Copyright (C) Tom Jansen (Ninja ISD) 2002
-
+ Copyright (C) Tom Jansen (Ninja ISD) 2002
+
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 3 of the License, or
(at your option) any later version.
-
+
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
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, see <http://www.gnu.org/licenses/>.
*/
#include "includes.h"
+#include "libsmb/libsmb.h"
#include "libsmbclient.h"
#include "libsmb_internal.h"
/*
- * Structure we use if internal caching mechanism is used
+ * Structure we use if internal caching mechanism is used
* nothing fancy here.
*/
struct smbc_server_cache {
char *workgroup;
char *username;
SMBCSRV *server;
-
+
struct smbc_server_cache *next, *prev;
};
-
+
/*
* Add a new connection to the server cache.
- * This function is only used if the external cache is not enabled
+ * This function is only used if the external cache is not enabled
*/
int
SMBC_add_cached_server(SMBCCTX * context,
SMBCSRV * newsrv,
const char * server,
- const char * share,
+ const char * share,
const char * workgroup,
const char * username)
{
DEBUG(3, ("Not enough space for server cache allocation\n"));
return 1;
}
-
+
ZERO_STRUCTP(srvcache);
srvcache->server = newsrv;
goto failed;
}
- DLIST_ADD((context->cache.server_cache_data), srvcache);
+ DLIST_ADD(context->internal->server_cache, srvcache);
return 0;
- failed:
+failed:
SAFE_FREE(srvcache->server_name);
SAFE_FREE(srvcache->share_name);
SAFE_FREE(srvcache->workgroup);
SAFE_FREE(srvcache->username);
SAFE_FREE(srvcache);
-
+
return 1;
}
/*
- * Search the server cache for a server
+ * Search the server cache for a server
* returns server handle on success, NULL on error (not found)
- * This function is only used if the external cache is not enabled
+ * This function is only used if the external cache is not enabled
*/
SMBCSRV *
SMBC_get_cached_server(SMBCCTX * context,
- const char * server,
+ const char * server,
const char * share,
const char * workgroup,
const char * user)
{
struct smbc_server_cache * srv = NULL;
-
+
/* Search the cache lines */
- for (srv = context->cache.server_cache_data; srv; srv = srv->next) {
+ for (srv = context->internal->server_cache; srv; srv = srv->next) {
if (strcmp(server,srv->server_name) == 0 &&
strcmp(workgroup,srv->workgroup) == 0 &&
* a connection to the server (other than the
* attribute server connection) is cool.
*/
- if (context->options.one_share_per_server) {
+ if (smbc_getOptionOneSharePerServer(context)) {
+ NTSTATUS status;
/*
* The currently connected share name
* doesn't match the requested share, so
* disconnect from the current share.
*/
- if (! cli_tdis(srv->server->cli)) {
+ status = cli_tdis(srv->server->cli);
+ if (!NT_STATUS_IS_OK(status)) {
/* Sigh. Couldn't disconnect. */
cli_shutdown(srv->server->cli);
srv->server->cli = NULL;
- context->cache.remove_cached_server_fn(context, srv->server);
+ smbc_getFunctionRemoveCachedServer(context)(context, srv->server);
continue;
}
/* Out of memory. */
cli_shutdown(srv->server->cli);
srv->server->cli = NULL;
- context->cache.remove_cached_server_fn(context, srv->server);
+ smbc_getFunctionRemoveCachedServer(context)(context, srv->server);
continue;
}
-
return srv->server;
}
}
}
-/*
+/*
* Search the server cache for a server and remove it
* returns 0 on success
- * This function is only used if the external cache is not enabled
+ * This function is only used if the external cache is not enabled
*/
int
SMBC_remove_cached_server(SMBCCTX * context,
SMBCSRV * server)
{
struct smbc_server_cache * srv = NULL;
-
- for (srv = context->cache.server_cache_data; srv; srv = srv->next) {
- if (server == srv->server) {
+
+ for (srv = context->internal->server_cache; srv; srv = srv->next) {
+ if (server == srv->server) {
/* remove this sucker */
- DLIST_REMOVE(context->cache.server_cache_data, srv);
+ DLIST_REMOVE(context->internal->server_cache, srv);
SAFE_FREE(srv->server_name);
SAFE_FREE(srv->share_name);
SAFE_FREE(srv->workgroup);
struct smbc_server_cache * next;
int could_not_purge_all = 0;
- for (srv = context->cache.server_cache_data,
+ for (srv = context->internal->server_cache,
next = (srv ? srv->next :NULL);
srv;
srv = next,