X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fsystemd%2Fsd-bus-protocol.h;h=5185a48b31ea422bfcf01ad415c489f5103c0711;hb=0042d824e3616aaf2e3eec23d3b2e6aec7c0470c;hp=8b40386cf22ea3d909c6766d3eb452ada5352b2f;hpb=75297aba8130cb1c1af2ae394039cbb9127161df;p=elogind.git
diff --git a/src/systemd/sd-bus-protocol.h b/src/systemd/sd-bus-protocol.h
index 8b40386cf..5185a48b3 100644
--- a/src/systemd/sd-bus-protocol.h
+++ b/src/systemd/sd-bus-protocol.h
@@ -22,20 +22,18 @@
along with systemd; If not, see .
***/
-#include
+#include "_sd-common.h"
-#ifdef __cplusplus
-extern "C" {
-#endif
+_SD_BEGIN_DECLARATIONS;
/* Types of message */
enum {
_SD_BUS_MESSAGE_TYPE_INVALID = 0,
- SD_BUS_MESSAGE_TYPE_METHOD_CALL,
- SD_BUS_MESSAGE_TYPE_METHOD_RETURN,
- SD_BUS_MESSAGE_TYPE_METHOD_ERROR,
- SD_BUS_MESSAGE_TYPE_SIGNAL,
+ SD_BUS_MESSAGE_METHOD_CALL,
+ SD_BUS_MESSAGE_METHOD_RETURN,
+ SD_BUS_MESSAGE_METHOD_ERROR,
+ SD_BUS_MESSAGE_SIGNAL,
_SD_BUS_MESSAGE_TYPE_MAX
};
@@ -66,125 +64,9 @@ enum {
SD_BUS_TYPE_DICT_ENTRY_END = '}',
};
-/* Endianness */
-
-enum {
- _SD_BUS_INVALID_ENDIAN = 0,
- SD_BUS_LITTLE_ENDIAN = 'l',
- SD_BUS_BIG_ENDIAN = 'B',
-#if __BYTE_ORDER == __BIG_ENDIAN
- SD_BUS_NATIVE_ENDIAN = SD_BUS_BIG_ENDIAN,
- SD_BUS_REVERSE_ENDIAN = SD_BUS_LITTLE_ENDIAN
-#else
- SD_BUS_NATIVE_ENDIAN = SD_BUS_LITTLE_ENDIAN,
- SD_BUS_REVERSE_ENDIAN = SD_BUS_BIG_ENDIAN
-#endif
-};
-
-/* Flags */
-
-enum {
- SD_BUS_MESSAGE_NO_REPLY_EXPECTED = 1,
- SD_BUS_MESSAGE_NO_AUTO_START = 2
-};
-
-/* Header fields */
-
-enum {
- _SD_BUS_MESSAGE_HEADER_INVALID = 0,
- SD_BUS_MESSAGE_HEADER_PATH,
- SD_BUS_MESSAGE_HEADER_INTERFACE,
- SD_BUS_MESSAGE_HEADER_MEMBER,
- SD_BUS_MESSAGE_HEADER_ERROR_NAME,
- SD_BUS_MESSAGE_HEADER_REPLY_SERIAL,
- SD_BUS_MESSAGE_HEADER_DESTINATION,
- SD_BUS_MESSAGE_HEADER_SENDER,
- SD_BUS_MESSAGE_HEADER_SIGNATURE,
- SD_BUS_MESSAGE_HEADER_UNIX_FDS,
- _SD_BUS_MESSAGE_HEADER_MAX
-};
-
-/* RequestName parameters */
-enum {
- SD_BUS_NAME_ALLOW_REPLACEMENT = 1,
- SD_BUS_NAME_REPLACE_EXISTING = 2,
- SD_BUS_NAME_DO_NOT_QUEUE = 4
-};
-
-/* RequestName returns */
-enum {
- SD_BUS_NAME_PRIMARY_OWNER = 1,
- SD_BUS_NAME_IN_QUEUE = 2,
- SD_BUS_NAME_EXISTS = 3,
- SD_BUS_NAME_ALREADY_OWNER = 4
-};
-
-/* ReleaseName returns */
-enum {
- SD_BUS_NAME_RELEASED = 1,
- SD_BUS_NAME_NON_EXISTENT = 2,
- SD_BUS_NAME_NOT_OWNER = 3,
-};
-
-#define SD_BUS_INTROSPECT_DOCTYPE \
- "\n"
-
-#define SD_BUS_INTROSPECT_INTERFACE_PEER \
- " \n" \
- " \n" \
- " \n" \
- " \n" \
- " \n" \
- " \n"
-
-#define SD_BUS_INTROSPECT_INTERFACE_INTROSPECTABLE \
- " \n" \
- " \n" \
- " \n" \
- " \n" \
- " \n"
-
-#define SD_BUS_INTROSPECT_INTERFACE_PROPERTIES \
- " \n" \
- " \n" \
- " \n" \
- " \n" \
- " \n" \
- " \n" \
- " \n" \
- " \n" \
- " \n" \
- " \n" \
- " \n" \
- " \n" \
- " \n" \
- " \n" \
- " \n" \
- " \n" \
- " \n" \
- " \n" \
- " \n" \
- " \n" \
- " \n"
-
-#define SD_BUS_INTROSPECT_INTERFACE_OBJECT_MANAGER \
- " \n" \
- " \n" \
- " \n" \
- " \n" \
- " \n" \
- " \n" \
- " \n" \
- " \n" \
- " \n" \
- " \n" \
- " \n" \
- " \n" \
- " \n"
-
/* Well-known errors. Note that this is only a sanitized subset of the
* errors that the reference implementation generates. */
+
#define SD_BUS_ERROR_FAILED "org.freedesktop.DBus.Error.Failed"
#define SD_BUS_ERROR_NO_MEMORY "org.freedesktop.DBus.Error.NoMemory"
#define SD_BUS_ERROR_SERVICE_UNKNOWN "org.freedesktop.DBus.Error.ServiceUnknown"
@@ -212,9 +94,11 @@ enum {
#define SD_BUS_ERROR_UNIX_PROCESS_ID_UNKNOWN "org.freedesktop.DBus.Error.UnixProcessIdUnknown"
#define SD_BUS_ERROR_INVALID_SIGNATURE "org.freedesktop.DBus.Error.InvalidSignature"
#define SD_BUS_ERROR_INCONSISTENT_MESSAGE "org.freedesktop.DBus.Error.InconsistentMessage"
+#define SD_BUS_ERROR_MATCH_RULE_NOT_FOUND "org.freedesktop.DBus.Error.MatchRuleNotFound"
+#define SD_BUS_ERROR_MATCH_RULE_INVALID "org.freedesktop.DBus.Error.MatchRuleInvalid"
+#define SD_BUS_ERROR_INTERACTIVE_AUTHORIZATION_REQUIRED \
+ "org.freedesktop.DBus.Error.InteractiveAuthorizationRequired"
-#ifdef __cplusplus
-}
-#endif
+_SD_END_DECLARATIONS;
#endif