From 07e3f76f8e65af8d9de063c62af38c5b7495bc76 Mon Sep 17 00:00:00 2001 From: Havoc Pennington Date: Sat, 5 Apr 2003 23:50:47 +0000 Subject: 2003-04-05 Havoc Pennington * bus/bus.c (setup_server): fix this so dbus-daemon-1 doesn't crash on startup. Need to get "try starting the daemon" in the test suite I guess. ;-) * dbus/dbus-server.h, dbus/dbus-server.c: remove the stuff that tracked the number of open connections; it's better done in application-specific code as you want it to span all servers etc. --- dbus/dbus-server.c | 69 +----------------------------------------------------- 1 file changed, 1 insertion(+), 68 deletions(-) (limited to 'dbus/dbus-server.c') diff --git a/dbus/dbus-server.c b/dbus/dbus-server.c index be74ead0..566e9178 100644 --- a/dbus/dbus-server.c +++ b/dbus/dbus-server.c @@ -86,9 +86,7 @@ _dbus_server_init_base (DBusServer *server, server->connection_counter = _dbus_counter_new (); if (server->connection_counter == NULL) - goto failed; - - server->max_connections = 256; /* same as an X server, seems like a nice default */ + goto failed; _dbus_data_slot_list_init (&server->slot_list); @@ -632,71 +630,6 @@ dbus_server_set_auth_mechanisms (DBusServer *server, return TRUE; } -/** - * Sets the maximum number of connections that can be open at one - * time for this server. If the maximum is reached, and another - * client tries to connect, then the oldest unauthenticated client - * will be dropped. If no unauthenticated client exists, then - * the new connection will be refused. - * - * If the maximum is set to a number lower than the current - * number of connections, no current connections are - * disconnected. - * - * @todo honoring max_connections has not been implemented - * yet. The only real work involved is keeping a list - * of live connections on the DBusServer so the oldest - * unauthenticated client can be located when required. - * - * @todo for a systemwide daemon, we need a max number of connections - * per user, since any user can authenticate a bunch of connections - * and create a DOS. - * - * @todo a single process might listen on multiple mechanisms - * (multiple DBusServer) and might want the max connections - * value to span all those servers. Should consider - * changing the API accordingly, though I'm inclined to - * punt this to the app that wants to do it instead of - * putting it in the library. - * - * @param server the server - * @param max_connections maximum number of connections allowed - */ -void -dbus_server_set_max_connections (DBusServer *server, - int max_connections) -{ - server->max_connections = max_connections; -} - -/** - * Gets the maximum number of connections that can be active - * at a time for this server. - * - * @param server the server - * @returns maximum number of connections at once - */ -int -dbus_server_get_max_connections (DBusServer *server) -{ - return server->max_connections; -} - -/** - * Gets the number of #DBusConnection to this server that - * have not yet been finalized. i.e. all #DBusConnection that - * were passed to #DBusNewConnectionFunction and have not yet been - * finalized will count in this total. - * - * @param server the server - * @returns the number of connections - */ -int -dbus_server_get_n_connections (DBusServer *server) -{ - return _dbus_counter_get_value (server->connection_counter); -} - static DBusDataSlotAllocator slot_allocator; _DBUS_DEFINE_GLOBAL_LOCK (server_slots); -- cgit