diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2015-02-16 12:43:40 +1300 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2015-02-16 14:48:41 +0100 |
| commit | d1da1f78a5e5cb2778bf0f5483c01edcf178143a (patch) | |
| tree | b9027a6127cd73979b3b7004a77b9d97476a05e5 | |
| parent | eedd127c25a479e1b6bfe809d4f0f5d8c0c367f3 (diff) | |
| download | samba-d1da1f78a5e5cb2778bf0f5483c01edcf178143a.tar.gz | |
s4-messaging: Unify list of possible messages into messaging.idl
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Pair-programmed-with: Garming Sam <garming@catalyst.net.nz>
Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Volker Lendecke <vl@samba.org>
Autobuild-User(master): Volker Lendecke <vl@samba.org>
Autobuild-Date(master): Mon Feb 16 14:48:41 CET 2015 on sn-devel-104
| -rw-r--r-- | librpc/idl/messaging.idl | 17 | ||||
| -rw-r--r-- | source4/lib/messaging/messaging.h | 17 |
2 files changed, 17 insertions, 17 deletions
diff --git a/librpc/idl/messaging.idl b/librpc/idl/messaging.idl index ce40a7bb256..99b2af28a8e 100644 --- a/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/source4/lib/messaging/messaging.h b/source4/lib/messaging/messaging.h index 920e39d2c5c..c3477f2d342 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 |