[SCM] Samba Shared Repository - branch master updated

Volker Lendecke vlendec at samba.org
Mon Feb 16 06:49:03 MST 2015


The branch, master has been updated
       via  d1da1f7 s4-messaging: Unify list of possible messages into messaging.idl
       via  eedd127 librpc: Move messaging.idl to the top level
       via  11a513b s4-messaging: Remove unused struct imessaging_rec
      from  1d95b0a debug: Set close-on-exec for the main log file FD

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit d1da1f78a5e5cb2778bf0f5483c01edcf178143a
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Mon Feb 16 12:43:40 2015 +1300

    s4-messaging: Unify list of possible messages into messaging.idl
    
    Signed-off-by: Andrew Bartlett <abartlet at samba.org>
    Pair-programmed-with: Garming Sam <garming at catalyst.net.nz>
    Signed-off-by: Garming Sam <garming at catalyst.net.nz>
    Reviewed-by: Volker Lendecke <vl at samba.org>
    
    Autobuild-User(master): Volker Lendecke <vl at samba.org>
    Autobuild-Date(master): Mon Feb 16 14:48:41 CET 2015 on sn-devel-104

commit eedd127c25a479e1b6bfe809d4f0f5d8c0c367f3
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Mon Feb 16 12:25:44 2015 +1300

    librpc: Move messaging.idl to the top level
    
    Pair-programmed-with: Garming Sam <garming at catalyst.net.nz>
    Signed-off-by: Garming Sam <garming at catalyst.net.nz>
    Signed-off-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Volker Lendecke <vl at samba.org>

commit 11a513b8745698e6b287f185f5d4d80b8d59205b
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Mon Feb 16 12:16:03 2015 +1300

    s4-messaging: Remove unused struct imessaging_rec
    
    Signed-off-by: Andrew Bartlett <abartlet at samba.org>
    Pair-programmed-with: Garming Sam <garming at catalyst.net.nz>
    Signed-off-by: Garming Sam <garming at catalyst.net.nz>
    Reviewed-by: Volker Lendecke <vl at samba.org>

-----------------------------------------------------------------------

Summary of changes:
 {source3/librpc => librpc}/idl/messaging.idl | 17 ++++++++++++++++-
 librpc/idl/wscript_build                     |  5 +++++
 librpc/wscript_build                         |  5 +++++
 source3/librpc/idl/wscript_build             |  2 +-
 source3/librpc/wscript_build                 |  5 -----
 source4/lib/messaging/messaging.c            | 19 -------------------
 source4/lib/messaging/messaging.h            | 17 +----------------
 7 files changed, 28 insertions(+), 42 deletions(-)
 rename {source3/librpc => librpc}/idl/messaging.idl (86%)


Changeset truncated at 500 lines:

diff --git a/source3/librpc/idl/messaging.idl b/librpc/idl/messaging.idl
similarity index 86%
rename from source3/librpc/idl/messaging.idl
rename to librpc/idl/messaging.idl
index ce40a7b..99b2af2 100644
--- a/source3/librpc/idl/messaging.idl
+++ b/librpc/idl/messaging.idl
@@ -116,10 +116,25 @@ interface messaging
 		/* smbXsrv messages */
 		MSG_SMBXSRV_SESSION_CLOSE	= 0x0600,
 
+		/* source4 and NTVFS smb server messages */
+		MSG_BRL_RETRY                   = 0x0700,
+		MSG_PVFS_RETRY_OPEN             = 0x0701,
+		MSG_IRPC                        = 0x0702,
+		MSG_NTVFS_OPLOCK_BREAK          = 0x0703,
+		MSG_DREPL_ALLOCATE_RID          = 0x0704,
+
 		/* dbwrap messages 4001-4999 (0x0FA0 - 0x1387) */
 		/* MSG_DBWRAP_TDB2_CHANGES		= 4001, */
 		/* MSG_DBWRAP_G_LOCK_RETRY		= 4002, */
-		MSG_DBWRAP_MODIFIED		= 4003
+		MSG_DBWRAP_MODIFIED		= 4003,
+
+		/*
+		 * source4 allows new messages to be registered at
+		 * runtime (currently used in python bindings and in
+		 * smbtorture). Temporary messaging endpoints are
+		 * allocated above this line
+		 */
+		MSG_TMP_BASE                    = 0xF000
 	} messaging_type;
 
 	/* messaging struct sent across the sockets and stored in the tdb */
diff --git a/librpc/idl/wscript_build b/librpc/idl/wscript_build
index ad6664f..4fdd8c2 100644
--- a/librpc/idl/wscript_build
+++ b/librpc/idl/wscript_build
@@ -28,6 +28,11 @@ bld.SAMBA_PIDL_LIST('PIDL',
                     output_dir='../gen_ndr')
 
 bld.SAMBA_PIDL_LIST('PIDL',
+                    'messaging.idl',
+                    options='--header --ndr-parser',
+                    output_dir='../gen_ndr')
+
+bld.SAMBA_PIDL_LIST('PIDL',
                     'rap.idl ntprinting.idl preg.idl ioctl.idl printcap.idl',
                     options='--header --ndr-parser',
                     output_dir='../gen_ndr')
diff --git a/librpc/wscript_build b/librpc/wscript_build
index f598d74..da781ca 100644
--- a/librpc/wscript_build
+++ b/librpc/wscript_build
@@ -408,6 +408,11 @@ bld.SAMBA_SUBSYSTEM('NDR_FILE_ID',
     public_deps='ndr'
     )
 
+bld.SAMBA_SUBSYSTEM('NDR_MESSAGING',
+    source='gen_ndr/ndr_messaging.c',
+    public_deps='ndr NDR_SERVER_ID'
+    )
+
 bld.SAMBA_SUBSYSTEM('RPC_NDR_XATTR',
     source='gen_ndr/ndr_xattr_c.c',
     public_deps='NDR_XATTR dcerpc-binding'
diff --git a/source3/librpc/idl/wscript_build b/source3/librpc/idl/wscript_build
index f9b1bd7..183226e 100644
--- a/source3/librpc/idl/wscript_build
+++ b/source3/librpc/idl/wscript_build
@@ -5,7 +5,7 @@ import os
 topinclude=os.path.join(bld.srcnode.abspath(), 'librpc/idl')
 
 bld.SAMBA_PIDL_LIST('PIDL',
-                    '''messaging.idl libnetapi.idl open_files.idl
+                    '''libnetapi.idl open_files.idl
                        perfcount.idl secrets.idl libnet_join.idl
                        smbXsrv.idl
                        leases_db.idl
diff --git a/source3/librpc/wscript_build b/source3/librpc/wscript_build
index 5c83cf2..2445859 100644
--- a/source3/librpc/wscript_build
+++ b/source3/librpc/wscript_build
@@ -10,11 +10,6 @@ bld.SAMBA3_SUBSYSTEM('NDR_LIBNET_JOIN',
 	public_deps='ndr krb5samba'
 	)
 
-bld.SAMBA3_SUBSYSTEM('NDR_MESSAGING',
-	source='gen_ndr/ndr_messaging.c',
-	public_deps='ndr NDR_SERVER_ID'
-	)
-
 bld.SAMBA3_SUBSYSTEM('NDR_OPEN_FILES',
 	source='gen_ndr/ndr_open_files.c',
 	public_deps='ndr NDR_SERVER_ID NDR_FILE_ID NDR_SECURITY NDR_SMB2_LEASE_STRUCT'
diff --git a/source4/lib/messaging/messaging.c b/source4/lib/messaging/messaging.c
index 66f9f1c..6ce1ce7 100644
--- a/source4/lib/messaging/messaging.c
+++ b/source4/lib/messaging/messaging.c
@@ -62,8 +62,6 @@ struct imessaging_context {
 	struct dispatch_fn **dispatch;
 	uint32_t num_types;
 	struct idr_context *dispatch_tree;
-	struct imessaging_rec *pending;
-	struct imessaging_rec *retry_queue;
 	struct irpc_list *irpc;
 	struct idr_context *idr;
 	struct server_id_db *names;
@@ -81,23 +79,6 @@ struct dispatch_fn {
 };
 
 /* an individual message */
-struct imessaging_rec {
-	struct imessaging_rec *next, *prev;
-	struct imessaging_context *msg;
-	const char *path;
-
-	struct imessaging_header {
-		uint32_t version;
-		uint32_t msg_type;
-		struct server_id from;
-		struct server_id to;
-		uint32_t length;
-	} *header;
-
-	DATA_BLOB packet;
-	uint32_t retries;
-};
-
 
 static void irpc_handler(struct imessaging_context *, void *,
 			 uint32_t, struct server_id, DATA_BLOB *);
diff --git a/source4/lib/messaging/messaging.h b/source4/lib/messaging/messaging.h
index 920e39d..c3477f2 100644
--- a/source4/lib/messaging/messaging.h
+++ b/source4/lib/messaging/messaging.h
@@ -22,25 +22,10 @@
 #define _SOURCE4_LIB_MESSAGING_MESSAGES_H_
 
 #include "librpc/gen_ndr/server_id.h"
+#include "librpc/gen_ndr/messaging.h"
 
 struct imessaging_context;
 
-/* general messages */
-#define MSG_DEBUG		1
-#define MSG_PING		2
-#define MSG_PONG		3
-#define MSG_BRL_RETRY		4
-#define MSG_PVFS_RETRY_OPEN	5
-#define MSG_IRPC                6
-#define MSG_PVFS_NOTIFY		7
-#define MSG_NTVFS_OPLOCK_BREAK	8
-#define MSG_REQ_POOL_USAGE	9
-#define MSG_POOL_USAGE          10
-#define MSG_DREPL_ALLOCATE_RID	11
-
-/* temporary messaging endpoints are allocated above this line */
-#define MSG_TMP_BASE		1000
-
 /* taskid for messaging of parent process */
 #define SAMBA_PARENT_TASKID     0
 


-- 
Samba Shared Repository


More information about the samba-cvs mailing list