lib: Add lib/util/server_id.h

[kai/samba-autobuild/.git] / source3 / utils / net_status.c

diff --git a/source3/utils/net_status.c b/source3/utils/net_status.c
index ce7dbcaf206b39a16d9e4af5959570ff02c269d2..0d658a0c36e0eb632a925fb4b1f2a204a802e461 100644 (file)
--- a/source3/utils/net_status.c
+++ b/source3/utils/net_status.c
@@ -17,7 +17,11 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "includes.h"
+#include "lib/util/server_id.h"
 #include "utils/net.h"
+#include "session.h"
+#include "messages.h"
+#include "lib/conn_tdb.h"
 
 int net_status_usage(struct net_context *c, int argc, const char **argv)
 {
@@ -28,30 +32,28 @@ int net_status_usage(struct net_context *c, int argc, const char **argv)
        return -1;
 }
 
-static int show_session(struct db_record *rec, void *private_data)
+static int show_session(const char *key, struct sessionid *session,
+                       void *private_data)
 {
+       struct server_id_buf tmp;
        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;
        }
 
        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);
+                        server_id_str_buf(session->pid, &tmp),
+                        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);
+                        server_id_str_buf(session->pid, &tmp),
+                        uidtoname(session->uid),
+                        gidtoname(session->gid),
+                        session->remote_machine, session->hostname);
        }
 
        return 0;
@@ -59,7 +61,6 @@ static int show_session(struct db_record *rec, void *private_data)
 
 static int net_status_sessions(struct net_context *c, int argc, const char **argv)
 {
-       struct db_context *db;
        bool parseable;
 
        if (c->display_usage) {
@@ -88,26 +89,17 @@ static int net_status_sessions(struct net_context *c, int argc, const char **arg
                           "------------------------\n"));
        }
 
-       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;
 }
 
-static int show_share(struct db_record *rec,
-                     const struct connections_key *key,
+static int show_share(const struct connections_key *key,
                      const struct connections_data *crec,
                      void *state)
 {
-       if (crec->cnum == -1)
+       struct server_id_buf tmp;
+
+       if (crec->cnum == TID_FIELD_INVALID)
                return 0;
 
        if (!process_exists(crec->pid)) {
@@ -115,7 +107,7 @@ static int show_share(struct db_record *rec,
        }
 
        d_printf("%-10.10s   %s   %-12s  %s",
-              crec->servicename, procid_str_static(&crec->pid),
+              crec->servicename, server_id_str_buf(crec->pid, &tmp),
               crec->machine,
               time_to_asc(crec->start));
 
@@ -127,17 +119,12 @@ struct sessionids {
        struct sessionid *entries;
 };
 
-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;
 
        ids->num_entries += 1;
@@ -146,21 +133,21 @@ static int collect_pid(struct db_record *rec, void *private_data)
                ids->num_entries = 0;
                return 0;
        }
-       ids->entries[ids->num_entries-1] = sessionid;
+       ids->entries[ids->num_entries-1] = *session;
 
        return 0;
 }
 
-static int show_share_parseable(struct db_record *rec,
-                               const struct connections_key *key,
+static int show_share_parseable(const struct connections_key *key,
                                const struct connections_data *crec,
                                void *state)
 {
        struct sessionids *ids = (struct sessionids *)state;
+       struct server_id_buf tmp;
        int i;
        bool guest = true;
 
-       if (crec->cnum == -1)
+       if (crec->cnum == TID_FIELD_INVALID)
                return 0;
 
        if (!process_exists(crec->pid)) {
@@ -169,14 +156,14 @@ static int show_share_parseable(struct db_record *rec,
 
        for (i=0; i<ids->num_entries; i++) {
                struct server_id id = ids->entries[i].pid;
-               if (procid_equal(&id, &crec->pid)) {
+               if (serverid_equal(&id, &crec->pid)) {
                        guest = false;
                        break;
                }
        }
 
        d_printf("%s\\%s\\%s\\%s\\%s\\%s\\%s",
-                crec->servicename,procid_str_static(&crec->pid),
+                crec->servicename, server_id_str_buf(crec->pid, &tmp),
                 guest ? "" : uidtoname(ids->entries[i].uid),
                 guest ? "" : gidtoname(ids->entries[i].gid),
                 crec->machine,
@@ -189,23 +176,13 @@ static int show_share_parseable(struct db_record *rec,
 static int net_status_shares_parseable(struct net_context *c, int argc, const char **argv)
 {
        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);
+       sessionid_traverse_read(collect_pids, &ids);
 
-       connections_forall(show_share_parseable, &ids);
+       connections_forall_read(show_share_parseable, &ids);
 
        SAFE_FREE(ids.entries);
 
@@ -232,7 +209,7 @@ static int net_status_shares(struct net_context *c, int argc, const char **argv)
                           "-------------------------------------"
                           "------------------\n"));
 
-               connections_forall(show_share, NULL);
+               connections_forall_read(show_share, NULL);
 
                return 0;
        }