X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fsystemd%2Fsd-bus-protocol.h;h=623cee0c502d89e9376f611c7d5f92ad50845b86;hp=07fade6039459adce079cff516d46c475115e84c;hb=a1002c6e2e7933c03aa4f49bdbce31e246ab589d;hpb=0095c45415ad24338342369d76d5635088294eae

diff --git a/src/systemd/sd-bus-protocol.h b/src/systemd/sd-bus-protocol.h
index 07fade603..623cee0c5 100644
--- a/src/systemd/sd-bus-protocol.h
+++ b/src/systemd/sd-bus-protocol.h
@@ -1,5 +1,3 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
 #ifndef foosdbusprotocolhfoo
 #define foosdbusprotocolhfoo
 
@@ -22,8 +20,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <endian.h>
-
 #include "_sd-common.h"
 
 _SD_BEGIN_DECLARATIONS;
@@ -63,128 +59,12 @@ enum {
         SD_BUS_TYPE_STRUCT_END       = ')',
         SD_BUS_TYPE_DICT_ENTRY       = 'e', /* not actually used in signatures */
         SD_BUS_TYPE_DICT_ENTRY_BEGIN = '{',
-        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,
+        SD_BUS_TYPE_DICT_ENTRY_END   = '}'
 };
 
-#define SD_BUS_INTROSPECT_DOCTYPE                                       \
-        "<!DOCTYPE node PUBLIC \"-//freedesktop//DTD D-BUS Object Introspection 1.0//EN\"\n" \
-        "\"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd\">\n"
-
-#define SD_BUS_INTROSPECT_INTERFACE_PEER                                \
-        " <interface name=\"org.freedesktop.DBus.Peer\">\n"             \
-        "  <method name=\"Ping\"/>\n"                                   \
-        "  <method name=\"GetMachineId\">\n"                            \
-        "   <arg type=\"s\" name=\"machine_uuid\" direction=\"out\"/>\n" \
-        "  </method>\n"                                                 \
-        " </interface>\n"
-
-#define SD_BUS_INTROSPECT_INTERFACE_INTROSPECTABLE                      \
-        " <interface name=\"org.freedesktop.DBus.Introspectable\">\n"   \
-        "  <method name=\"Introspect\">\n"                              \
-        "   <arg name=\"data\" type=\"s\" direction=\"out\"/>\n"        \
-        "  </method>\n"                                                 \
-        " </interface>\n"
-
-#define SD_BUS_INTROSPECT_INTERFACE_PROPERTIES                          \
-        " <interface name=\"org.freedesktop.DBus.Properties\">\n"       \
-        "  <method name=\"Get\">\n"                                     \
-        "   <arg name=\"interface\" direction=\"in\" type=\"s\"/>\n"    \
-        "   <arg name=\"property\" direction=\"in\" type=\"s\"/>\n"     \
-        "   <arg name=\"value\" direction=\"out\" type=\"v\"/>\n"       \
-        "  </method>\n"                                                 \
-        "  <method name=\"GetAll\">\n"                                  \
-        "   <arg name=\"interface\" direction=\"in\" type=\"s\"/>\n"    \
-        "   <arg name=\"properties\" direction=\"out\" type=\"a{sv}\"/>\n" \
-        "  </method>\n"                                                 \
-        "  <method name=\"Set\">\n"                                     \
-        "   <arg name=\"interface\" direction=\"in\" type=\"s\"/>\n"    \
-        "   <arg name=\"property\" direction=\"in\" type=\"s\"/>\n"     \
-        "   <arg name=\"value\" direction=\"in\" type=\"v\"/>\n"        \
-        "  </method>\n"                                                 \
-        "  <signal name=\"PropertiesChanged\">\n"                       \
-        "   <arg type=\"s\" name=\"interface\"/>\n"                     \
-        "   <arg type=\"a{sv}\" name=\"changed_properties\"/>\n"        \
-        "   <arg type=\"as\" name=\"invalidated_properties\"/>\n"       \
-        "  </signal>\n"                                                 \
-        " </interface>\n"
-
-#define SD_BUS_INTROSPECT_INTERFACE_OBJECT_MANAGER                      \
-        " <interface name=\"org.freedesktop.DBus.ObjectManager\">\n"    \
-        "  <method name=\"GetManagedObjects\">\n"                       \
-        "   <arg type=\"a{oa{sa{sv}}}\" name=\"object_paths_interfaces_and_properties\" direction=\"out\"/>\n" \
-        "  </method>\n"                                                 \
-        "  <signal name=\"InterfacesAdded\">\n"                         \
-        "   <arg type=\"o\" name=\"object_path\"/>\n"                   \
-        "   <arg type=\"a{sa{sv}}\" name=\"interfaces_and_properties\"/>\n" \
-        "  </signal>\n"                                                 \
-        "  <signal name=\"InterfacesRemoved\">\n"                       \
-        "   <arg type=\"o\" name=\"object_path\"/>\n"                   \
-        "   <arg type=\"as\" name=\"interfaces\"/>\n"                   \
-        "  </signal>\n"                                                 \
-        " </interface>\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,6 +92,10 @@ 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"
 
 _SD_END_DECLARATIONS;