Changeset 740 for vendor/current/source3/smbd/globals.c

Timestamp:

Nov 14, 2012, 12:59:34 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to 3.6.0

File:

• vendor/current/source3/smbd/globals.c (modified) (10 diffs)

vendor/current/source3/smbd/globals.c

@@ -19 +19 @@
 
 #include "includes.h"
+#include "smbd/smbd.h"
 #include "smbd/globals.h"
+#include "memcache.h"
+#include "messages.h"
+#include <tdb.h>
 
 #if defined(WITH_AIO)
@@ -27 +31 @@
 int outstanding_aio_calls = 0;
 #endif
-
-/* dlink list we store pending lock records on. */
-struct blocking_lock_record *blocking_lock_queue = NULL;
-
-/* dlink list we move cancelled lock records onto. */
-struct blocking_lock_record *blocking_lock_cancelled_queue = NULL;
-
-/* The event that makes us process our blocking lock queue */
-struct timed_event *brl_timeout = NULL;
-
-bool blocking_lock_unlock_state = false;
-bool blocking_lock_cancel_state = false;
 
 #ifdef USE_DMAPI
@@ -50 +42 @@
 unsigned int allocated_write_caches = 0;
 
-int real_max_open_files = 0;
-struct bitmap *file_bmap = NULL;
-files_struct *Files = NULL;
-int files_used = 0;
-struct fsp_singleton_cache fsp_fi_cache = {
-        .fsp = NULL,
-        .id = {
-                .devid = 0,
-                .inode = 0,
-                .extid = 0
-        }
-};
-unsigned long file_gen_counter = 0;
-int first_file = 0;
-
 const struct mangle_fns *mangle_fns = NULL;
 
@@ -70 +47 @@
 TDB_CONTEXT *tdb_mangled_cache = NULL;
 
-/* these tables are used to provide fast tests for characters */
-unsigned char char_flags[256];
 /*
   this determines how many characters are used from the original filename
@@ -78 +53 @@
 */
 unsigned mangle_prefix = 0;
-unsigned char base_reverse[256];
-
-char *last_from = NULL;
-char *last_to = NULL;
 
 struct msg_state *smbd_msg_state = NULL;
@@ -87 +58 @@
 bool logged_ioctl_message = false;
 
-int trans_num = 0;
-pid_t mypid = 0;
 time_t last_smb_conf_reload_time = 0;
 time_t last_printer_reload_time = 0;
@@ -111 +80 @@
 uint16_t last_flags = 0;
 
-struct db_context *session_db_ctx_ptr = NULL;
-
 uint32_t global_client_caps = 0;
 
@@ -128 +95 @@
 int32_t exclusive_oplocks_open = 0;
 int32_t level_II_oplocks_open = 0;
-bool global_client_failed_oplock_break = false;
 struct kernel_oplocks *koplocks = NULL;
 
 int am_parent = 1;
-int server_fd = -1;
-struct event_context *smbd_event_ctx = NULL;
-struct messaging_context *smbd_msg_ctx = NULL;
 struct memcache *smbd_memcache_ctx = NULL;
 bool exit_firsttime = true;
@@ -142 +105 @@
 struct smbd_server_connection *smbd_server_conn = NULL;
 
+struct smbd_server_connection *msg_ctx_to_sconn(struct messaging_context *msg_ctx)
+{
+        struct server_id my_id, msg_id;
+
+        my_id = messaging_server_id(smbd_server_conn->msg_ctx);
+        msg_id = messaging_server_id(msg_ctx);
+
+        if (!procid_equal(&my_id, &msg_id)) {
+                return NULL;
+        }
+        return smbd_server_conn;
+}
+
+struct messaging_context *smbd_messaging_context(void)
+{
+        struct messaging_context *msg_ctx = server_messaging_context();
+        if (likely(msg_ctx != NULL)) {
+                return msg_ctx;
+        }
+        smb_panic("Could not init smbd's messaging context.\n");
+        return NULL;
+}
+
+struct memcache *smbd_memcache(void)
+{
+        if (!smbd_memcache_ctx) {
+                /*
+                 * Note we MUST use the NULL context here, not the
+                 * autofree context, to avoid side effects in forked
+                 * children exiting.
+                 */
+                smbd_memcache_ctx = memcache_init(NULL,
+                                                  lp_max_stat_cache_size()*1024);
+        }
+        if (!smbd_memcache_ctx) {
+                smb_panic("Could not init smbd memcache");
+        }
+
+        return smbd_memcache_ctx;
+}
+
+
 void smbd_init_globals(void)
 {
-        ZERO_STRUCT(char_flags);
-        ZERO_STRUCT(base_reverse);
-
         ZERO_STRUCT(conn_ctx_stack);
 
@@ -155 +157 @@
                 exit_server("failed to create smbd_server_connection");
         }
+
+        smbd_server_conn->smb1.echo_handler.trusted_fd = -1;
+        smbd_server_conn->smb1.echo_handler.socket_lock_fd = -1;
 }