diff options
| author | Havoc Pennington <hp@redhat.com> | 2003-03-31 08:19:50 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@redhat.com> | 2003-03-31 08:19:50 +0000 |
| commit | 29c71168cd17b11eed65023c97aff401d5305b01 (patch) | |
| tree | 431a05106d857cf38abbdea74a375326f395485e /dbus/dbus-server-protected.h | |
| parent | bc86794f23fa538a405813fb61b531c2eacc9ae1 (diff) | |
2003-03-31 Havoc Pennington <hp@pobox.com>
* dbus/dbus-transport-unix.c (_dbus_transport_new_for_domain_socket)
(_dbus_transport_new_for_tcp_socket): these didn't need the "server"
argument since they are always client side
* dbus/dbus-server.c (dbus_server_get_address): new function
* bus/main.c (main): take the configuration file as an argument.
* test/data/valid-config-files/debug-allow-all.conf: new file to
use with dispatch.c tests for example
* bus/test-main.c (main): require test data dir
* bus/bus.c (bus_context_new): change this to take a
configuration file name as argument
* doc/config-file.txt (Elements): add <servicedir>
* bus/system.conf, bus/session.conf: new files
* dbus/dbus-bus.c (dbus_bus_get): look for system bus on
well-known socket if none set
* configure.in: create system.conf and session.conf
Diffstat (limited to 'dbus/dbus-server-protected.h')
| -rw-r--r-- | dbus/dbus-server-protected.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/dbus/dbus-server-protected.h b/dbus/dbus-server-protected.h index d47215b7..475bf3a2 100644 --- a/dbus/dbus-server-protected.h +++ b/dbus/dbus-server-protected.h @@ -61,6 +61,8 @@ struct DBusServer * to this server */ + char *address; /**< Address this server is listening on. */ + int max_connections; /**< Max number of connections allowed at once. */ DBusDataSlotList slot_list; /**< Data stored by allocated integer ID */ @@ -78,7 +80,8 @@ struct DBusServer }; dbus_bool_t _dbus_server_init_base (DBusServer *server, - const DBusServerVTable *vtable); + const DBusServerVTable *vtable, + const DBusString *address); void _dbus_server_finalize_base (DBusServer *server); dbus_bool_t _dbus_server_add_watch (DBusServer *server, DBusWatch *watch); |