lib: Add lib/util/server_id.h

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>

lib/util/debug_s3.c

@@ -19,6 +19,7 @@
 */
 
 #include "includes.h"
+#include "lib/util/server_id.h"
 #include "librpc/gen_ndr/messaging.h"
 #include "messages.h"
 #include "lib/util/memory.h"

lib/util/samba_util.h

@@ -688,36 +688,6 @@ char *data_path(TALLOC_CTX *mem_ctx, const char *name);
  **/
 const char *shlib_ext(void);
 
-struct server_id;
-
-struct server_id_buf { char buf[48]; }; /* probably a bit too large ... */
-char *server_id_str_buf(struct server_id id, struct server_id_buf *dst);
-size_t server_id_str_buf_unique(struct server_id id, char *buf, size_t buflen);
-
-bool server_id_same_process(const struct server_id *p1,
-			    const struct server_id *p2);
-bool server_id_equal(const struct server_id *p1, const struct server_id *p2);
-struct server_id server_id_from_string(uint32_t local_vnn,
-				       const char *pid_string);
-
-/**
- * Set the serverid to the special value that represents a disconnected
- * client for (e.g.) durable handles.
- */
-void server_id_set_disconnected(struct server_id *id);
-
-/**
- * check whether a serverid is the special placeholder for
- * a disconnected client
- */
-bool server_id_is_disconnected(const struct server_id *id);
-
-#define SERVER_ID_BUF_LENGTH 24
-void server_id_put(uint8_t buf[SERVER_ID_BUF_LENGTH],
-		   const struct server_id id);
-void server_id_get(struct server_id *id,
-		   const uint8_t buf[SERVER_ID_BUF_LENGTH]);
-
 /*
  * Samba code should use samba_tevent_context_init() instead of
  * tevent_context_init() in order to get the debug output.

lib/util/server_id.c

@@ -18,6 +18,7 @@
 */
 
 #include "includes.h"
+#include "lib/util/server_id.h"
 #include "librpc/gen_ndr/server_id.h"
 
 bool server_id_same_process(const struct server_id *p1,

lib/util/server_id.h

@@ -0,0 +1,56 @@
+/*
+   Unix SMB/CIFS implementation.
+   Samba utility functions
+   Copyright (C) Andrew Bartlett 2011
+
+   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/>.
+*/
+
+#ifndef __LIB_UTIL_SERVER_ID_H__
+#define __LIB_UTIL_SERVER_ID_H__
+
+#include "replace.h"
+
+struct server_id;
+
+struct server_id_buf { char buf[48]; }; /* probably a bit too large ... */
+
+bool server_id_same_process(const struct server_id *p1,
+			    const struct server_id *p2);
+bool server_id_equal(const struct server_id *p1, const struct server_id *p2);
+char *server_id_str_buf(struct server_id id, struct server_id_buf *dst);
+size_t server_id_str_buf_unique(struct server_id id, char *buf, size_t buflen);
+
+struct server_id server_id_from_string(uint32_t local_vnn,
+				       const char *pid_string);
+
+/**
+ * Set the serverid to the special value that represents a disconnected
+ * client for (e.g.) durable handles.
+ */
+void server_id_set_disconnected(struct server_id *id);
+
+/**
+ * check whether a serverid is the special placeholder for
+ * a disconnected client
+ */
+bool server_id_is_disconnected(const struct server_id *id);
+
+#define SERVER_ID_BUF_LENGTH 24
+void server_id_put(uint8_t buf[SERVER_ID_BUF_LENGTH],
+		   const struct server_id id);
+void server_id_get(struct server_id *id,
+		   const uint8_t buf[SERVER_ID_BUF_LENGTH]);
+
+#endif

lib/util/server_id_db.c

@@ -19,6 +19,7 @@
 
 #include "replace.h"
 #include "system/filesys.h"
+#include "lib/util/server_id.h"
 #include "lib/util/server_id_db.h"
 #include "lib/tdb_wrap/tdb_wrap.h"
 #include "lib/util/strv.h"

source3/lib/dbwrap/dbwrap_watch.c

@@ -19,6 +19,7 @@
 
 #include "includes.h"
 #include "system/filesys.h"
+#include "lib/util/server_id.h"
 #include "dbwrap/dbwrap.h"
 #include "dbwrap_watch.h"
 #include "dbwrap_open.h"

source3/lib/g_lock.c

@@ -19,6 +19,7 @@
 
 #include "includes.h"
 #include "system/filesys.h"
+#include "lib/util/server_id.h"
 #include "dbwrap/dbwrap.h"
 #include "dbwrap/dbwrap_open.h"
 #include "dbwrap/dbwrap_watch.h"

source3/lib/messages.c

@@ -46,6 +46,7 @@
 */
 
 #include "includes.h"
+#include "lib/util/server_id.h"
 #include "dbwrap/dbwrap.h"
 #include "serverid.h"
 #include "messages.h"

source3/lib/messages_ctdbd.c

@@ -18,6 +18,7 @@
 */
 
 #include "includes.h"
+#include "lib/util/server_id.h"
 #include "messages.h"
 #include "util_tdb.h"
 #include "lib/util/iov_buf.h"

source3/lib/messages_util.c

@@ -18,6 +18,7 @@
  */
 
 #include "replace.h"
+#include "lib/util/server_id.h"
 #include "lib/util/samba_util.h"
 #include "librpc/gen_ndr/server_id.h"
 #include "lib/util/byteorder.h"

source3/lib/server_id_db_util.c

@@ -19,6 +19,7 @@
 
 #include "replace.h"
 #include "server_id_db_util.h"
+#include "lib/util/server_id.h"
 #include "serverid.h"
 #include "lib/util/samba_util.h"
 

source3/lib/serverid.c

@@ -19,6 +19,7 @@
 
 #include "includes.h"
 #include "system/filesys.h"
+#include "lib/util/server_id.h"
 #include "serverid.h"
 #include "util_tdb.h"
 #include "dbwrap/dbwrap.h"

source3/lib/util.c

@@ -24,6 +24,7 @@
 #include "includes.h"
 #include "system/passwd.h"
 #include "system/filesys.h"
+#include "lib/util/server_id.h"
 #include "util_tdb.h"
 #include "ctdbd_conn.h"
 #include "../lib/util/util_pw.h"

source3/locking/brlock.c

@@ -26,6 +26,7 @@
 
 #include "includes.h"
 #include "system/filesys.h"
+#include "lib/util/server_id.h"
 #include "locking/proto.h"
 #include "smbd/globals.h"
 #include "dbwrap/dbwrap.h"

source3/locking/locking.c

@@ -37,6 +37,7 @@
 
 #include "includes.h"
 #include "system/filesys.h"
+#include "lib/util/server_id.h"
 #include "locking/proto.h"
 #include "smbd/globals.h"
 #include "dbwrap/dbwrap.h"

source3/locking/posix.c

@@ -23,6 +23,7 @@
 
 #include "includes.h"
 #include "system/filesys.h"
+#include "lib/util/server_id.h"
 #include "locking/proto.h"
 #include "dbwrap/dbwrap.h"
 #include "dbwrap/dbwrap_rbt.h"

source3/locking/share_mode_lock.c

@@ -37,6 +37,7 @@
 
 #include "includes.h"
 #include "system/filesys.h"
+#include "lib/util/server_id.h"
 #include "locking/proto.h"
 #include "smbd/globals.h"
 #include "dbwrap/dbwrap.h"

source3/rpc_server/srvsvc/srv_srvsvc_nt.c

@@ -25,6 +25,7 @@
 
 #include "includes.h"
 #include "system/passwd.h"
+#include "lib/util/server_id.h"
 #include "ntdomain.h"
 #include "../librpc/gen_ndr/srv_srvsvc.h"
 #include "../libcli/security/security.h"

source3/smbd/close.c

@@ -21,6 +21,7 @@
 
 #include "includes.h"
 #include "system/filesys.h"
+#include "lib/util/server_id.h"
 #include "printing.h"
 #include "smbd/smbd.h"
 #include "smbd/globals.h"

source3/smbd/durable.c

@@ -22,6 +22,7 @@
 
 #include "includes.h"
 #include "system/filesys.h"
+#include "lib/util/server_id.h"
 #include "smbd/smbd.h"
 #include "smbd/globals.h"
 #include "libcli/security/security.h"

source3/smbd/notify_msg.c

@@ -22,6 +22,7 @@
 #include "librpc/gen_ndr/messaging.h"
 #include "lib/dbwrap/dbwrap.h"
 #include "lib/dbwrap/dbwrap_rbt.h"
+#include "lib/util/server_id.h"
 #include "messages.h"
 #include "proto.h"
 #include "globals.h"

source3/smbd/notifyd/notifyd.c

@@ -19,6 +19,7 @@
 
 #include "replace.h"
 #include <tevent.h>
+#include "lib/util/server_id.h"
 #include "lib/util/data_blob.h"
 #include "librpc/gen_ndr/notify.h"
 #include "librpc/gen_ndr/messaging.h"

source3/smbd/open.c

@@ -21,6 +21,7 @@
 
 #include "includes.h"
 #include "system/filesys.h"
+#include "lib/util/server_id.h"
 #include "printing.h"
 #include "smbd/smbd.h"
 #include "smbd/globals.h"

source3/smbd/oplock.c

@@ -21,6 +21,7 @@
 
 #define DBGC_CLASS DBGC_LOCKING
 #include "includes.h"
+#include "lib/util/server_id.h"
 #include "smbd/smbd.h"
 #include "smbd/globals.h"
 #include "messages.h"

source3/smbd/scavenger.c

@@ -19,12 +19,12 @@
 */
 
 #include "includes.h"
-
 #include "messages.h"
 #include "serverid.h"
 #include "smbd/globals.h"
 #include "smbd/scavenger.h"
 #include "locking/proto.h"
+#include "lib/util/server_id.h"
 #include "lib/util/util_process.h"
 #include "lib/util/sys_rw_data.h"
 

source3/smbd/server.c

@@ -23,6 +23,7 @@
 
 #include "includes.h"
 #include "system/filesys.h"
+#include "lib/util/server_id.h"
 #include "popt_common.h"
 #include "smbd/smbd.h"
 #include "smbd/globals.h"

source3/smbd/sesssetup.c

@@ -24,6 +24,7 @@
 
 #include "includes.h"
 #include "../lib/tsocket/tsocket.h"
+#include "lib/util/server_id.h"
 #include "smbd/smbd.h"
 #include "smbd/globals.h"
 #include "auth.h"

source3/smbd/smbXsrv_client.c

@@ -20,6 +20,7 @@
 #include "includes.h"
 #include "system/filesys.h"
 #include <tevent.h>
+#include "lib/util/server_id.h"
 #include "smbd/smbd.h"
 #include "smbd/globals.h"
 #include "dbwrap/dbwrap.h"

source3/smbd/smbXsrv_open.c

@@ -20,6 +20,7 @@
 
 #include "includes.h"
 #include "system/filesys.h"
+#include "lib/util/server_id.h"
 #include "smbd/smbd.h"
 #include "smbd/globals.h"
 #include "dbwrap/dbwrap.h"

source3/smbd/smbXsrv_session.c

@@ -21,6 +21,7 @@
 #include "includes.h"
 #include "system/filesys.h"
 #include <tevent.h>
+#include "lib/util/server_id.h"
 #include "smbd/smbd.h"
 #include "smbd/globals.h"
 #include "dbwrap/dbwrap.h"

source3/smbd/smbXsrv_tcon.c

@@ -20,6 +20,7 @@
 
 #include "includes.h"
 #include "system/filesys.h"
+#include "lib/util/server_id.h"
 #include "smbd/smbd.h"
 #include "smbd/globals.h"
 #include "dbwrap/dbwrap.h"

source3/torture/msg_sink.c

@@ -19,6 +19,7 @@
 
 #include "replace.h"
 #include "includes.h"
+#include "lib/util/server_id.h"
 #include "messages.h"
 #include "lib/util/tevent_unix.h"
 #include <stdio.h>

source3/torture/msg_source.c

@@ -19,6 +19,7 @@
 
 #include "replace.h"
 #include "includes.h"
+#include "lib/util/server_id.h"
 #include "messages.h"
 #include "lib/util/tevent_unix.h"
 #include <stdio.h>

source3/utils/net_g_lock.c

@@ -19,6 +19,7 @@
 
 #include "includes.h"
 #include "net.h"
+#include "lib/util/server_id.h"
 #include "g_lock.h"
 #include "messages.h"
 

source3/utils/net_notify.c

@@ -18,6 +18,7 @@
 
 #include "includes.h"
 #include "utils/net.h"
+#include "lib/util/server_id.h"
 #include "lib/util/tevent_unix.h"
 #include "lib/util/server_id_db.h"
 #include "messages.h"

source3/utils/net_serverid.c

@@ -19,6 +19,7 @@
 
 #include "includes.h"
 #include "utils/net.h"
+#include "lib/util/server_id.h"
 #include "dbwrap/dbwrap.h"
 #include "dbwrap/dbwrap_rbt.h"
 #include "serverid.h"

source3/utils/net_status.c

@@ -17,6 +17,7 @@
    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"

source3/utils/smbcontrol.c

@@ -25,6 +25,7 @@
 
 #include "includes.h"
 #include "system/filesys.h"
+#include "lib/util/server_id.h"
 #include "popt_common.h"
 #include "librpc/gen_ndr/spoolss.h"
 #include "nt_printing.h"

source3/utils/status.c

@@ -31,6 +31,7 @@
  */
 
 #include "includes.h"
+#include "lib/util/server_id.h"
 #include "smbd/globals.h"
 #include "system/filesys.h"
 #include "popt_common.h"

source4/dsdb/samdb/ldb_modules/ridalloc.c

@@ -29,6 +29,7 @@
 
 #include "includes.h"
 #include "ldb_module.h"
+#include "lib/util/server_id.h"
 #include "dsdb/samdb/samdb.h"
 #include "dsdb/samdb/ldb_modules/util.h"
 #include "lib/messaging/irpc.h"

source4/lib/messaging/messaging.c

@@ -21,6 +21,7 @@
 
 #include "includes.h"
 #include "lib/events/events.h"
+#include "lib/util/server_id.h"
 #include "system/filesys.h"
 #include "messaging/messaging.h"
 #include "../lib/util/dlinklist.h"

source4/smb_server/smb/receive.c

@@ -21,6 +21,7 @@
 
 #include "includes.h"
 #include "system/time.h"
+#include "lib/util/server_id.h"
 #include "smbd/service_stream.h"
 #include "smb_server/smb_server.h"
 #include "system/filesys.h"

source4/smbd/service_stream.c

@@ -23,6 +23,7 @@
 #include "includes.h"
 #include <tevent.h>
 #include "process_model.h"
+#include "lib/util/server_id.h"
 #include "lib/messaging/irpc.h"
 #include "cluster/cluster.h"
 #include "param/param.h"