Major cleanup of all leftovers after rebasing on master.

[elogind.git] / src / libelogind / sd-bus / bus-introspect.h

diff --git a/src/libelogind/sd-bus/bus-introspect.h b/src/libelogind/sd-bus/bus-introspect.h
index 6aac650ac93a8e469e3cadfc97f51d34b756a99b..1914e6cb8b35c04c509147f0a35eb3e39d1495b0 100644 (file)
--- a/src/libelogind/sd-bus/bus-introspect.h
+++ b/src/libelogind/sd-bus/bus-introspect.h
@@ -5,7 +5,7 @@
 /***
   This file is part of systemd.
 
-  Copyright 2014 David Herrmann
+  Copyright 2013 Lennart Poettering
 
   systemd is free software; you can redistribute it and/or modify it
   under the terms of the GNU Lesser General Public License as published by
@@ -21,47 +21,21 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "sd-bus.h"
-#include "bus-xml-policy.h"
-
-typedef struct Proxy Proxy;
-typedef struct ProxyActivation ProxyActivation;
-
-#define PROXY_ACTIVATIONS_MAX (16) /* max parallel activation requests */
-
-struct Proxy {
-        sd_bus *local_bus;
-        struct ucred local_creds;
-        int local_in;
-        int local_out;
-
-        sd_bus *destination_bus;
-
-        Set *owned_names;
-        SharedPolicy *policy;
+#include <stdio.h>
 
-        LIST_HEAD(ProxyActivation, activations);
-        size_t n_activations;
-
-        bool got_hello : 1;
-        bool queue_overflow : 1;
-        bool message_matched : 1;
-        bool synthetic_matched : 1;
-};
+#include "sd-bus.h"
+#include "set.h"
 
-struct ProxyActivation {
-        LIST_FIELDS(ProxyActivation, activations_by_proxy);
-        Proxy *proxy;
-        sd_bus_message *request;
-        sd_bus_slot *slot;
+struct introspect {
+        FILE *f;
+        char *introspection;
+        size_t size;
+        bool trusted;
 };
 
-int proxy_new(Proxy **out, int in_fd, int out_fd, const char *dest);
-Proxy *proxy_free(Proxy *p);
-
-int proxy_set_policy(Proxy *p, SharedPolicy *policy, char **configuration);
-int proxy_hello_policy(Proxy *p, uid_t original_uid);
-int proxy_match(sd_bus_message *m, void *userdata, sd_bus_error *error);
-int proxy_run(Proxy *p);
-
-DEFINE_TRIVIAL_CLEANUP_FUNC(Proxy*, proxy_free);
+int introspect_begin(struct introspect *i, bool trusted);
+int introspect_write_default_interfaces(struct introspect *i, bool object_manager);
+int introspect_write_child_nodes(struct introspect *i, Set *s, const char *prefix);
+int introspect_write_interface(struct introspect *i, const sd_bus_vtable *v);
+int introspect_finish(struct introspect *i, sd_bus *bus, sd_bus_message *m, sd_bus_message **reply);
+void introspect_free(struct introspect *i);