diff options
| author | Colin Walters <walters@verbum.org> | 2004-11-09 06:11:33 +0000 |
|---|---|---|
| committer | Colin Walters <walters@verbum.org> | 2004-11-09 06:11:33 +0000 |
| commit | 935a41a04c3f638134fa905503fc41ddbd18902f (patch) | |
| tree | 0f6dee53c28bba5a8ce6658b634c66ba1cc5abda /dbus/dbus-message.c | |
| parent | 2f5e949851f7704b296f55ce1d1fcc4480176107 (diff) | |
2004-11-09 Colin Walters <walters@verbum.org>
* dbus/dbus-string.c (_dbus_string_get_length): New
function, writes DBusString to C buffer.
* dbus/dbus-string.h: Prototype it.
* dbus/dbus-message.c (dbus_message_type_to_string): New
function, converts message type into C string.
* dbus/dbus-message.h: Prototype it.
* bus/selinux.c (bus_selinux_check): Take source pid,
target pid, and audit data. Pass audit data to
avc_has_perm.
(log_audit_callback): New function, appends extra
audit information.
(bus_selinux_allows_acquire_service): Also take
service name, add it to audit data.
(bus_selinux_allows_send): Also take message
type, interface, method member, error name,
and destination, and add them to audit data.
(log_cb): Initialize func_audit.
* bus/selinux.h (bus_selinux_allows_acquire_service)
(bus_selinux_allows_send): Update prototypes
* bus/services.c (bus_registry_acquire_service): Pass
service name to bus_selinux_allows_acquire_service.
* bus/bus.c (bus_context_check_security_policy): Pass
additional audit data. Move assignment of dest
to its own line.
Diffstat (limited to 'dbus/dbus-message.c')
| -rw-r--r-- | dbus/dbus-message.c | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/dbus/dbus-message.c b/dbus/dbus-message.c index b191337e..df0ade26 100644 --- a/dbus/dbus-message.c +++ b/dbus/dbus-message.c @@ -5778,6 +5778,37 @@ dbus_message_type_from_string (const char *type_str) return DBUS_MESSAGE_TYPE_INVALID; } +/** + * Utility function to convert a D-BUS message type into a + * machine-readable string (not translated). + * + * @code + * DBUS_MESSAGE_TYPE_METHOD_CALL -> "method_call" + * DBUS_MESSAGE_TYPE_METHOD_RETURN -> "method_return" + * DBUS_MESSAGE_TYPE_SIGNAL -> "signal" + * DBUS_MESSAGE_TYPE_ERROR -> "error" + * DBUS_MESSAGE_TYPE_INVALID -> "invalid" + * @endcode + * + */ +const char * +dbus_message_type_to_string (int type) +{ + switch (type) + { + case DBUS_MESSAGE_TYPE_METHOD_CALL: + return "method_call"; + case DBUS_MESSAGE_TYPE_METHOD_RETURN: + return "method_return"; + case DBUS_MESSAGE_TYPE_SIGNAL: + return "signal"; + case DBUS_MESSAGE_TYPE_ERROR: + return "error"; + default: + return "invalid"; + } +} + /** @} */ #ifdef DBUS_BUILD_TESTS #include "dbus-test.h" |