From b3a3969897930eeda308113acbbb3f98069ee1ab Mon Sep 17 00:00:00 2001 From: Havoc Pennington Date: Tue, 22 Apr 2003 19:34:33 +0000 Subject: 2003-04-22 Havoc Pennington * test/data/valid-messages/opposite-endian.message: fix test to use proper type for rply field * test/data/invalid-messages: add tests for below validation * dbus/dbus-message.c (decode_header_data): validate field types, and validate that named fields are valid names (decode_name_field): consider messages in the org.freedesktop.Local. namespace to be invalid. * dbus/dbus-string.c (_dbus_string_validate_name): new --- dbus/dbus-protocol.h | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'dbus/dbus-protocol.h') diff --git a/dbus/dbus-protocol.h b/dbus/dbus-protocol.h index 651969c4..314a9934 100644 --- a/dbus/dbus-protocol.h +++ b/dbus/dbus-protocol.h @@ -53,7 +53,10 @@ extern "C" { #define DBUS_TYPE_DICT 10 #define DBUS_TYPE_LAST DBUS_TYPE_DICT - + +/* Max length in bytes of a service or message name */ +#define DBUS_MAXIMUM_NAME_LENGTH 256 + /* Header flags */ #define DBUS_HEADER_FLAG_ERROR 0x1 @@ -92,7 +95,12 @@ extern "C" { #define DBUS_MESSAGE_SERVICE_DELETED "org.freedesktop.DBus.ServiceDeleted" #define DBUS_MESSAGE_SERVICE_LOST "org.freedesktop.DBus.ServiceLost" -#define DBUS_MESSAGE_LOCAL_DISCONNECT "org.freedesktop.Local.Disconnect" + +/* This namespace is reserved for locally-synthesized messages, you can't + * send messages that have this namespace. + */ +#define DBUS_NAMESPACE_LOCAL_MESSAGE "org.freedesktop.Local." +#define DBUS_MESSAGE_LOCAL_DISCONNECT DBUS_NAMESPACE_LOCAL_MESSAGE"Disconnect" #ifdef __cplusplus } -- cgit