Changeset 745 for trunk/server/source3/utils/net_status.c

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source3/utils/net_status.c (modified) (8 diffs)

trunk/server/source3/utils/net_status.c

@@ -19 +19 @@
 #include "includes.h"
 #include "utils/net.h"
+#include "session.h"
+#include "messages.h"
 
 int net_status_usage(struct net_context *c, int argc, const char **argv)
@@ -29 +31 @@
 }
 
-static int show_session(struct db_record *rec, void *private_data)
+static int show_session(const char *key, struct sessionid *session,
+                        void *private_data)
 {
         bool *parseable = (bool *)private_data;
-        struct sessionid sessionid;
-
-        if (rec->value.dsize != sizeof(sessionid))
-                return 0;
-
-        memcpy(&sessionid, rec->value.dptr, sizeof(sessionid));
-
-        if (!process_exists(sessionid.pid)) {
+
+        if (!process_exists(session->pid)) {
                 return 0;
         }
@@ -45 +42 @@
         if (*parseable) {
                 d_printf("%s\\%s\\%s\\%s\\%s\n",
-                         procid_str_static(&sessionid.pid), uidtoname(sessionid.uid),
-                         gidtoname(sessionid.gid),
-                         sessionid.remote_machine, sessionid.hostname);
+                         procid_str_static(&session->pid),
+                         uidtoname(session->uid),
+                         gidtoname(session->gid),
+                         session->remote_machine, session->hostname);
         } else {
                 d_printf("%7s   %-12s  %-12s  %-12s (%s)\n",
-                         procid_str_static(&sessionid.pid), uidtoname(sessionid.uid),
-                         gidtoname(sessionid.gid),
-                         sessionid.remote_machine, sessionid.hostname);
+                         procid_str_static(&session->pid),
+                         uidtoname(session->uid),
+                         gidtoname(session->gid),
+                         session->remote_machine, session->hostname);
         }
 
@@ -60 +59 @@
 static int net_status_sessions(struct net_context *c, int argc, const char **argv)
 {
-        struct db_context *db;
         bool parseable;
 
@@ -89 +87 @@
         }
 
-        db = db_open(NULL, lock_path("sessionid.tdb"), 0,
-                     TDB_CLEAR_IF_FIRST, O_RDONLY, 0644);
-        if (db == NULL) {
-                d_fprintf(stderr, _("%s not initialised\n"),
-                          lock_path("sessionid.tdb"));
-                return -1;
-        }
-
-        db->traverse_read(db, show_session, &parseable);
-        TALLOC_FREE(db);
-
+        sessionid_traverse_read(show_session, &parseable);
         return 0;
 }
@@ -128 +116 @@
 };
 
-static int collect_pid(struct db_record *rec, void *private_data)
+static int collect_pids(const char *key, struct sessionid *session,
+                        void *private_data)
 {
         struct sessionids *ids = (struct sessionids *)private_data;
-        struct sessionid sessionid;
-
-        if (rec->value.dsize != sizeof(sessionid))
-                return 0;
-
-        memcpy(&sessionid, rec->value.dptr, sizeof(sessionid));
-
-        if (!process_exists(sessionid.pid))
+
+        if (!process_exists(session->pid))
                 return 0;
 
@@ -147 +130 @@
                 return 0;
         }
-        ids->entries[ids->num_entries-1] = sessionid;
-
-        return 0;
-}
-
-static int show_share_parseable(struct db_record *rec,
-                                const struct connections_key *key,
+        ids->entries[ids->num_entries-1] = *session;
+
+        return 0;
+}
+
+static int show_share_parseable(const struct connections_key *key,
                                 const struct connections_data *crec,
                                 void *state)
@@ -190 +172 @@
 {
         struct sessionids ids;
-        struct db_context *db;
 
         ids.num_entries = 0;
         ids.entries = NULL;
 
-        db = db_open(NULL, lock_path("sessionid.tdb"), 0,
-                     TDB_CLEAR_IF_FIRST, O_RDONLY, 0644);
-        if (db == NULL) {
-                d_fprintf(stderr, _("%s not initialised\n"),
-                          lock_path("sessionid.tdb"));
-                return -1;
-        }
-
-        db->traverse_read(db, collect_pid, &ids);
-        TALLOC_FREE(db);
-
-        connections_forall(show_share_parseable, &ids);
+        sessionid_traverse_read(collect_pids, &ids);
+
+        connections_forall_read(show_share_parseable, &ids);
 
         SAFE_FREE(ids.entries);