Index: uspace/lib/c/generic/async.c
===================================================================
--- uspace/lib/c/generic/async.c	(revision b10460aa6a666f2289836624216d445ff03a7816)
+++ uspace/lib/c/generic/async.c	(revision b688fd884822ca3ea5bb45f1b6b2ca18b04efbcc)
@@ -77,5 +77,5 @@
  *   }
  *
- *   my_client_connection(icallid, *icall)
+ *   port_handler(icallid, *icall)
  *   {
  *     if (want_refuse) {
@@ -232,8 +232,7 @@
 	/** Identification of the opening call. */
 	ipc_callid_t callid;
+	
 	/** Call data of the opening call. */
 	ipc_call_t call;
-	/** Local argument or NULL if none. */
-	void *carg;
 	
 	/** Identification of the closing call. */
@@ -241,5 +240,8 @@
 	
 	/** Fibril function that will be used to handle the connection. */
-	async_client_conn_t cfibril;
+	async_port_handler_t handler;
+	
+	/** Client data */
+	void *data;
 } connection_t;
 
@@ -335,7 +337,8 @@
 }
 
-/** Default fibril function that gets called to handle new connection.
- *
- * This function is defined as a weak symbol - to be redefined in user code.
+/** Default fallback fibril function.
+ *
+ * This fallback fibril function gets called on incomming
+ * connections that do not have a specific handler defined.
  *
  * @param callid Hash of the incoming call.
@@ -344,5 +347,5 @@
  *
  */
-static void default_client_connection(ipc_callid_t callid, ipc_call_t *call,
+static void default_fallback_port_handler(ipc_callid_t callid, ipc_call_t *call,
     void *arg)
 {
@@ -350,18 +353,10 @@
 }
 
-static async_client_conn_t client_connection = default_client_connection;
+static async_port_handler_t fallback_port_handler =
+    default_fallback_port_handler;
+static void *fallback_port_data = NULL;
+
 static size_t notification_handler_stksz = FIBRIL_DFLT_STK_SIZE;
 
-/** Setter for client_connection function pointer.
- *
- * @param conn Function that will implement a new connection fibril.
- *
- */
-void async_set_client_connection(async_client_conn_t conn)
-{
-	assert(client_connection == default_client_connection);
-	client_connection = conn;
-}
-
 /** Set the stack size for the notification handler notification fibrils.
  *
@@ -387,4 +382,12 @@
  */
 static FIBRIL_CONDVAR_INITIALIZE(avail_phone_cv);
+
+void async_set_fallback_port_handler(async_port_handler_t handler, void *data)
+{
+	assert(handler != NULL);
+	
+	fallback_port_handler = handler;
+	fallback_port_data = data;
+}
 
 static hash_table_t client_hash_table;
@@ -959,5 +962,5 @@
  *
  * When a new connection arrives, a fibril with this implementing function is
- * created. It calls client_connection() and does the final cleanup.
+ * created. It calls handler() and does the final cleanup.
  *
  * @param arg Connection structure pointer.
@@ -992,6 +995,6 @@
 	 * Call the connection handler function.
 	 */
-	fibril_connection->cfibril(fibril_connection->callid,
-	    &fibril_connection->call, fibril_connection->carg);
+	fibril_connection->handler(fibril_connection->callid,
+	    &fibril_connection->call, fibril_connection->data);
 	
 	/*
@@ -1044,7 +1047,7 @@
  *                      is called directly by the server.
  * @param call          Call data of the opening call.
- * @param cfibril       Fibril function that should be called upon opening the
+ * @param handler       Fibril function that should be called upon opening the
  *                      connection.
- * @param carg          Extra argument to pass to the connection fibril
+ * @param data          Extra argument to pass to the connection fibril
  *
  * @return New fibril id or NULL on failure.
@@ -1053,5 +1056,5 @@
 fid_t async_new_connection(task_id_t in_task_id, sysarg_t in_phone_hash,
     ipc_callid_t callid, ipc_call_t *call,
-    async_client_conn_t cfibril, void *carg)
+    async_port_handler_t handler, void *data)
 {
 	connection_t *conn = malloc(sizeof(*conn));
@@ -1068,5 +1071,5 @@
 	conn->callid = callid;
 	conn->close_callid = 0;
-	conn->carg = carg;
+	conn->data = data;
 	
 	if (call)
@@ -1075,5 +1078,5 @@
 	/* We will activate the fibril ASAP */
 	conn->wdata.active = true;
-	conn->cfibril = cfibril;
+	conn->handler = handler;
 	conn->wdata.fid = fibril_create(connection_fibril, conn);
 	
@@ -1111,5 +1114,5 @@
 	assert(call);
 	
-	/* Unrouted call - take some default action */
+	/* Kernel notification */
 	if ((callid & IPC_CALLID_NOTIFICATION)) {
 		process_notification(callid, call);
@@ -1122,5 +1125,5 @@
 		/* Open new connection with fibril, etc. */
 		async_new_connection(call->in_task_id, IPC_GET_ARG5(*call),
-		    callid, call, client_connection, NULL);
+		    callid, call, fallback_port_handler, fallback_port_data);
 		return;
 	}
@@ -1820,5 +1823,5 @@
  */
 int async_connect_to_me(async_exch_t *exch, sysarg_t arg1, sysarg_t arg2,
-    sysarg_t arg3, async_client_conn_t client_receiver, void *carg)
+    sysarg_t arg3, async_port_handler_t client_receiver, void *data)
 {
 	if (exch == NULL)
@@ -1840,5 +1843,5 @@
 	if (client_receiver != NULL)
 		async_new_connection(answer.in_task_id, phone_hash, 0, NULL,
-		    client_receiver, carg);
+		    client_receiver, data);
 	
 	return EOK;
Index: uspace/lib/c/generic/ns.c
===================================================================
--- uspace/lib/c/generic/ns.c	(revision b10460aa6a666f2289836624216d445ff03a7816)
+++ uspace/lib/c/generic/ns.c	(revision b688fd884822ca3ea5bb45f1b6b2ca18b04efbcc)
@@ -109,5 +109,5 @@
  */
 async_sess_t *service_bind(services_t service, sysarg_t arg1, sysarg_t arg2,
-    sysarg_t arg3, async_client_conn_t client_receiver)
+    sysarg_t arg3, async_port_handler_t client_receiver)
 {
 	/* Connect to the needed service */
Index: uspace/lib/c/include/async.h
===================================================================
--- uspace/lib/c/include/async.h	(revision b10460aa6a666f2289836624216d445ff03a7816)
+++ uspace/lib/c/include/async.h	(revision b688fd884822ca3ea5bb45f1b6b2ca18b04efbcc)
@@ -54,5 +54,5 @@
 typedef void (*async_client_data_dtor_t)(void *);
 
-/** Client connection handler
+/** Port connection handler
  *
  * @param callid ID of incoming call or 0 if connection initiated from
@@ -62,5 +62,5 @@
  *               async_connect_to_me()
  */
-typedef void (*async_client_conn_t)(ipc_callid_t, ipc_call_t *, void *);
+typedef void (*async_port_handler_t)(ipc_callid_t, ipc_call_t *, void *);
 
 /** Notification handler */
@@ -148,5 +148,5 @@
 
 extern fid_t async_new_connection(task_id_t, sysarg_t, ipc_callid_t,
-    ipc_call_t *, async_client_conn_t, void *);
+    ipc_call_t *, async_port_handler_t, void *);
 
 extern void async_usleep(suseconds_t);
@@ -160,5 +160,5 @@
 extern void async_put_client_data_by_id(task_id_t);
 
-extern void async_set_client_connection(async_client_conn_t);
+extern void async_set_fallback_port_handler(async_port_handler_t, void *);
 extern void async_set_notification_handler_stack_size(size_t);
 
@@ -348,5 +348,5 @@
 
 extern int async_connect_to_me(async_exch_t *, sysarg_t, sysarg_t, sysarg_t,
-    async_client_conn_t, void *);
+    async_port_handler_t, void *);
 
 extern int async_hangup(async_sess_t *);
Index: uspace/lib/c/include/ns.h
===================================================================
--- uspace/lib/c/include/ns.h	(revision b10460aa6a666f2289836624216d445ff03a7816)
+++ uspace/lib/c/include/ns.h	(revision b688fd884822ca3ea5bb45f1b6b2ca18b04efbcc)
@@ -46,5 +46,5 @@
     sysarg_t);
 extern async_sess_t *service_bind(services_t, sysarg_t, sysarg_t, sysarg_t,
-    async_client_conn_t);
+    async_port_handler_t);
 
 extern int ns_ping(void);
Index: uspace/lib/drv/generic/driver.c
===================================================================
--- uspace/lib/drv/generic/driver.c	(revision b10460aa6a666f2289836624216d445ff03a7816)
+++ uspace/lib/drv/generic/driver.c	(revision b688fd884822ca3ea5bb45f1b6b2ca18b04efbcc)
@@ -916,5 +916,5 @@
  * This allows handling connections the non-devman way.
  */
-void ddf_fun_set_conn_handler(ddf_fun_t *fun, async_client_conn_t conn)
+void ddf_fun_set_conn_handler(ddf_fun_t *fun, async_port_handler_t conn)
 {
 	assert(fun->ops == NULL);
@@ -955,5 +955,5 @@
 	 * incoming connections.
 	 */
-	async_set_client_connection(driver_connection);
+	async_set_fallback_port_handler(driver_connection, NULL);
 	int rc = devman_driver_register(driver->name);
 	if (rc != EOK) {
Index: uspace/lib/drv/generic/private/driver.h
===================================================================
--- uspace/lib/drv/generic/private/driver.h	(revision b10460aa6a666f2289836624216d445ff03a7816)
+++ uspace/lib/drv/generic/private/driver.h	(revision b688fd884822ca3ea5bb45f1b6b2ca18b04efbcc)
@@ -96,5 +96,5 @@
 	
 	/** Connection handler or @c NULL to use the DDF default handler. */
-	async_client_conn_t conn_handler;
+	async_port_handler_t conn_handler;
 	
 	/** Link in the list of functions handled by the driver */
Index: uspace/lib/drv/generic/remote_audio_pcm.c
===================================================================
--- uspace/lib/drv/generic/remote_audio_pcm.c	(revision b10460aa6a666f2289836624216d445ff03a7816)
+++ uspace/lib/drv/generic/remote_audio_pcm.c	(revision b688fd884822ca3ea5bb45f1b6b2ca18b04efbcc)
@@ -316,5 +316,5 @@
  */
 int audio_pcm_register_event_callback(audio_pcm_sess_t *sess,
-    async_client_conn_t event_callback, void *arg)
+    async_port_handler_t event_callback, void *arg)
 {
 	if (!event_callback)
Index: uspace/lib/drv/generic/remote_nic.c
===================================================================
--- uspace/lib/drv/generic/remote_nic.c	(revision b10460aa6a666f2289836624216d445ff03a7816)
+++ uspace/lib/drv/generic/remote_nic.c	(revision b688fd884822ca3ea5bb45f1b6b2ca18b04efbcc)
@@ -126,5 +126,5 @@
  *
  */
-int nic_callback_create(async_sess_t *dev_sess, async_client_conn_t cfun,
+int nic_callback_create(async_sess_t *dev_sess, async_port_handler_t cfun,
     void *carg)
 {
Index: uspace/lib/drv/include/audio_pcm_iface.h
===================================================================
--- uspace/lib/drv/include/audio_pcm_iface.h	(revision b10460aa6a666f2289836624216d445ff03a7816)
+++ uspace/lib/drv/include/audio_pcm_iface.h	(revision b688fd884822ca3ea5bb45f1b6b2ca18b04efbcc)
@@ -85,5 +85,5 @@
 int audio_pcm_query_cap(audio_pcm_sess_t *, audio_cap_t);
 int audio_pcm_register_event_callback(audio_pcm_sess_t *,
-    async_client_conn_t, void *);
+    async_port_handler_t, void *);
 int audio_pcm_unregister_event_callback(audio_pcm_sess_t *);
 
Index: uspace/lib/drv/include/ddf/driver.h
===================================================================
--- uspace/lib/drv/include/ddf/driver.h	(revision b10460aa6a666f2289836624216d445ff03a7816)
+++ uspace/lib/drv/include/ddf/driver.h	(revision b688fd884822ca3ea5bb45f1b6b2ca18b04efbcc)
@@ -133,5 +133,5 @@
 extern int ddf_fun_add_match_id(ddf_fun_t *, const char *, int);
 extern void ddf_fun_set_ops(ddf_fun_t *, ddf_dev_ops_t *);
-extern void ddf_fun_set_conn_handler(ddf_fun_t *, async_client_conn_t);
+extern void ddf_fun_set_conn_handler(ddf_fun_t *, async_port_handler_t);
 extern int ddf_fun_add_to_category(ddf_fun_t *, const char *);
 
Index: uspace/lib/drv/include/nic_iface.h
===================================================================
--- uspace/lib/drv/include/nic_iface.h	(revision b10460aa6a666f2289836624216d445ff03a7816)
+++ uspace/lib/drv/include/nic_iface.h	(revision b688fd884822ca3ea5bb45f1b6b2ca18b04efbcc)
@@ -48,5 +48,5 @@
 
 extern int nic_send_frame(async_sess_t *, void *, size_t);
-extern int nic_callback_create(async_sess_t *, async_client_conn_t, void *);
+extern int nic_callback_create(async_sess_t *, async_port_handler_t, void *);
 extern int nic_get_state(async_sess_t *, nic_device_state_t *);
 extern int nic_set_state(async_sess_t *, nic_device_state_t);
Index: uspace/lib/fs/libfs.c
===================================================================
--- uspace/lib/fs/libfs.c	(revision b10460aa6a666f2289836624216d445ff03a7816)
+++ uspace/lib/fs/libfs.c	(revision b688fd884822ca3ea5bb45f1b6b2ca18b04efbcc)
@@ -371,5 +371,5 @@
 	 * the same connection fibril as well.
 	 */
-	async_set_client_connection(vfs_connection);
+	async_set_fallback_port_handler(vfs_connection, NULL);
 	
 	return IPC_GET_RETVAL(answer);
Index: uspace/lib/gui/terminal.c
===================================================================
--- uspace/lib/gui/terminal.c	(revision b10460aa6a666f2289836624216d445ff03a7816)
+++ uspace/lib/gui/terminal.c	(revision b688fd884822ca3ea5bb45f1b6b2ca18b04efbcc)
@@ -744,5 +744,5 @@
 	term->top_row = 0;
 	
-	async_set_client_connection(term_connection);
+	async_set_fallback_port_handler(term_connection, NULL);
 	con_srvs_init(&term->srvs);
 	term->srvs.ops = &con_ops;
Index: uspace/srv/audio/hound/main.c
===================================================================
--- uspace/srv/audio/hound/main.c	(revision b10460aa6a666f2289836624216d445ff03a7816)
+++ uspace/srv/audio/hound/main.c	(revision b688fd884822ca3ea5bb45f1b6b2ca18b04efbcc)
@@ -85,5 +85,5 @@
 	hound_iface.server = &hound;
 	hound_service_set_server_iface(&hound_iface);
-	async_set_client_connection(hound_connection_handler);
+	async_set_fallback_port_handler(hound_connection_handler, NULL);
 
 	service_id_t id = 0;
Index: uspace/srv/bd/file_bd/file_bd.c
===================================================================
--- uspace/srv/bd/file_bd/file_bd.c	(revision b10460aa6a666f2289836624216d445ff03a7816)
+++ uspace/srv/bd/file_bd/file_bd.c	(revision b688fd884822ca3ea5bb45f1b6b2ca18b04efbcc)
@@ -157,5 +157,5 @@
 	bd_srvs.ops = &file_bd_ops;
 	
-	async_set_client_connection(file_bd_connection);
+	async_set_fallback_port_handler(file_bd_connection, NULL);
 	int rc = loc_server_register(NAME);
 	if (rc != EOK) {
Index: uspace/srv/bd/part/guid_part/guid_part.c
===================================================================
--- uspace/srv/bd/part/guid_part/guid_part.c	(revision b10460aa6a666f2289836624216d445ff03a7816)
+++ uspace/srv/bd/part/guid_part/guid_part.c	(revision b688fd884822ca3ea5bb45f1b6b2ca18b04efbcc)
@@ -185,5 +185,5 @@
 
 	/* Register server with location service. */
-	async_set_client_connection(gpt_connection);
+	async_set_fallback_port_handler(gpt_connection, NULL);
 	rc = loc_server_register(NAME);
 	if (rc != EOK) {
Index: uspace/srv/bd/part/mbr_part/mbr_part.c
===================================================================
--- uspace/srv/bd/part/mbr_part/mbr_part.c	(revision b10460aa6a666f2289836624216d445ff03a7816)
+++ uspace/srv/bd/part/mbr_part/mbr_part.c	(revision b688fd884822ca3ea5bb45f1b6b2ca18b04efbcc)
@@ -235,5 +235,5 @@
 
 	/* Register server with location service. */
-	async_set_client_connection(mbr_connection);
+	async_set_fallback_port_handler(mbr_connection, NULL);
 	rc = loc_server_register(NAME);
 	if (rc != EOK) {
Index: uspace/srv/bd/rd/rd.c
===================================================================
--- uspace/srv/bd/rd/rd.c	(revision b10460aa6a666f2289836624216d445ff03a7816)
+++ uspace/srv/bd/rd/rd.c	(revision b688fd884822ca3ea5bb45f1b6b2ca18b04efbcc)
@@ -178,5 +178,5 @@
 	bd_srvs.ops = &rd_bd_ops;
 	
-	async_set_client_connection(rd_client_conn);
+	async_set_fallback_port_handler(rd_client_conn, NULL);
 	ret = loc_server_register(NAME);
 	if (ret != EOK) {
Index: uspace/srv/bd/sata_bd/sata_bd.c
===================================================================
--- uspace/srv/bd/sata_bd/sata_bd.c	(revision b10460aa6a666f2289836624216d445ff03a7816)
+++ uspace/srv/bd/sata_bd/sata_bd.c	(revision b688fd884822ca3ea5bb45f1b6b2ca18b04efbcc)
@@ -247,5 +247,5 @@
 	int rc;
 	
-	async_set_client_connection(sata_bd_connection);
+	async_set_fallback_port_handler(sata_bd_connection, NULL);
 	rc = loc_server_register(NAME);
 	if (rc < 0) {
Index: uspace/srv/clipboard/clipboard.c
===================================================================
--- uspace/srv/clipboard/clipboard.c	(revision b10460aa6a666f2289836624216d445ff03a7816)
+++ uspace/srv/clipboard/clipboard.c	(revision b688fd884822ca3ea5bb45f1b6b2ca18b04efbcc)
@@ -180,5 +180,5 @@
 	printf("%s: HelenOS clipboard service\n", NAME);
 	
-	async_set_client_connection(clip_connection);
+	async_set_fallback_port_handler(clip_connection, NULL);
 	int rc = service_register(SERVICE_CLIPBOARD);
 	if (rc != EOK)
Index: uspace/srv/devman/main.c
===================================================================
--- uspace/srv/devman/main.c	(revision b10460aa6a666f2289836624216d445ff03a7816)
+++ uspace/srv/devman/main.c	(revision b688fd884822ca3ea5bb45f1b6b2ca18b04efbcc)
@@ -298,5 +298,5 @@
 	async_set_client_data_constructor(devman_client_data_create);
 	async_set_client_data_destructor(devman_client_data_destroy);
-	async_set_client_connection(devman_connection);
+	async_set_fallback_port_handler(devman_connection, NULL);
 	
 	if (!devman_init()) {
Index: uspace/srv/hid/compositor/compositor.c
===================================================================
--- uspace/srv/hid/compositor/compositor.c	(revision b10460aa6a666f2289836624216d445ff03a7816)
+++ uspace/srv/hid/compositor/compositor.c	(revision b688fd884822ca3ea5bb45f1b6b2ca18b04efbcc)
@@ -2240,5 +2240,5 @@
 	
 	/* Register compositor server. */
-	async_set_client_connection(client_connection);
+	async_set_fallback_port_handler(client_connection, NULL);
 	
 	int rc = loc_server_register(NAME);
Index: uspace/srv/hid/console/console.c
===================================================================
--- uspace/srv/hid/console/console.c	(revision b10460aa6a666f2289836624216d445ff03a7816)
+++ uspace/srv/hid/console/console.c	(revision b688fd884822ca3ea5bb45f1b6b2ca18b04efbcc)
@@ -586,5 +586,5 @@
 	
 	/* Register server */
-	async_set_client_connection(client_connection);
+	async_set_fallback_port_handler(client_connection, NULL);
 	rc = loc_server_register(NAME);
 	if (rc != EOK) {
Index: uspace/srv/hid/input/input.c
===================================================================
--- uspace/srv/hid/input/input.c	(revision b10460aa6a666f2289836624216d445ff03a7816)
+++ uspace/srv/hid/input/input.c	(revision b688fd884822ca3ea5bb45f1b6b2ca18b04efbcc)
@@ -758,5 +758,5 @@
 	async_set_client_data_constructor(client_data_create);
 	async_set_client_data_destructor(client_data_destroy);
-	async_set_client_connection(client_connection);
+	async_set_fallback_port_handler(client_connection, NULL);
 	
 	int rc = loc_server_register(NAME);
Index: uspace/srv/hid/isdv4_tablet/main.c
===================================================================
--- uspace/srv/hid/isdv4_tablet/main.c	(revision b10460aa6a666f2289836624216d445ff03a7816)
+++ uspace/srv/hid/isdv4_tablet/main.c	(revision b688fd884822ca3ea5bb45f1b6b2ca18b04efbcc)
@@ -306,5 +306,5 @@
 	fibril_add_ready(fibril);
 
-	async_set_client_connection(mouse_connection);
+	async_set_fallback_port_handler(mouse_connection, NULL);
 	rc = loc_server_register(NAME);
 	if (rc != EOK) {
Index: uspace/srv/hid/output/output.c
===================================================================
--- uspace/srv/hid/output/output.c	(revision b10460aa6a666f2289836624216d445ff03a7816)
+++ uspace/srv/hid/output/output.c	(revision b688fd884822ca3ea5bb45f1b6b2ca18b04efbcc)
@@ -460,5 +460,5 @@
 	
 	/* Register server */
-	async_set_client_connection(client_connection);
+	async_set_fallback_port_handler(client_connection, NULL);
 	int rc = loc_server_register(NAME);
 	if (rc != EOK) {
Index: uspace/srv/hid/remcons/remcons.c
===================================================================
--- uspace/srv/hid/remcons/remcons.c	(revision b10460aa6a666f2289836624216d445ff03a7816)
+++ uspace/srv/hid/remcons/remcons.c	(revision b688fd884822ca3ea5bb45f1b6b2ca18b04efbcc)
@@ -348,5 +348,5 @@
 	inet_ep_t ep;
 
-	async_set_client_connection(client_connection);
+	async_set_fallback_port_handler(client_connection, NULL);
 	rc = loc_server_register(NAME);
 	if (rc != EOK) {
Index: uspace/srv/hid/rfb/main.c
===================================================================
--- uspace/srv/hid/rfb/main.c	(revision b10460aa6a666f2289836624216d445ff03a7816)
+++ uspace/srv/hid/rfb/main.c	(revision b688fd884822ca3ea5bb45f1b6b2ca18b04efbcc)
@@ -215,5 +215,5 @@
 	vis->dev_ctx = NULL;
 
-	async_set_client_connection(client_connection);
+	async_set_fallback_port_handler(client_connection, NULL);
 
 	int rc = loc_server_register(NAME);
Index: uspace/srv/hid/s3c24xx_ts/s3c24xx_ts.c
===================================================================
--- uspace/srv/hid/s3c24xx_ts/s3c24xx_ts.c	(revision b10460aa6a666f2289836624216d445ff03a7816)
+++ uspace/srv/hid/s3c24xx_ts/s3c24xx_ts.c	(revision b688fd884822ca3ea5bb45f1b6b2ca18b04efbcc)
@@ -85,5 +85,5 @@
 	printf("%s: S3C24xx touchscreen driver\n", NAME);
 	
-	async_set_client_connection(s3c24xx_ts_connection);
+	async_set_fallback_port_handler(s3c24xx_ts_connection, NULL);
 	int rc = loc_server_register(NAME);
 	if (rc != EOK) {
Index: uspace/srv/hw/bus/cuda_adb/cuda_adb.c
===================================================================
--- uspace/srv/hw/bus/cuda_adb/cuda_adb.c	(revision b10460aa6a666f2289836624216d445ff03a7816)
+++ uspace/srv/hw/bus/cuda_adb/cuda_adb.c	(revision b688fd884822ca3ea5bb45f1b6b2ca18b04efbcc)
@@ -169,5 +169,5 @@
 	}
 
-	async_set_client_connection(cuda_connection);
+	async_set_fallback_port_handler(cuda_connection, NULL);
 	rc = loc_server_register(NAME);
 	if (rc < 0) {
Index: uspace/srv/hw/char/s3c24xx_uart/s3c24xx_uart.c
===================================================================
--- uspace/srv/hw/char/s3c24xx_uart/s3c24xx_uart.c	(revision b10460aa6a666f2289836624216d445ff03a7816)
+++ uspace/srv/hw/char/s3c24xx_uart/s3c24xx_uart.c	(revision b688fd884822ca3ea5bb45f1b6b2ca18b04efbcc)
@@ -77,5 +77,5 @@
 	printf("%s: S3C24xx on-chip UART driver\n", NAME);
 	
-	async_set_client_connection(s3c24xx_uart_connection);
+	async_set_fallback_port_handler(s3c24xx_uart_connection, NULL);
 	int rc = loc_server_register(NAME);
 	if (rc != EOK) {
Index: uspace/srv/hw/irc/apic/apic.c
===================================================================
--- uspace/srv/hw/irc/apic/apic.c	(revision b10460aa6a666f2289836624216d445ff03a7816)
+++ uspace/srv/hw/irc/apic/apic.c	(revision b688fd884822ca3ea5bb45f1b6b2ca18b04efbcc)
@@ -215,5 +215,5 @@
 	}
 	
-	async_set_client_connection(apic_connection);
+	async_set_fallback_port_handler(apic_connection, NULL);
 	service_register(SERVICE_IRC);
 	
Index: uspace/srv/hw/irc/i8259/i8259.c
===================================================================
--- uspace/srv/hw/irc/i8259/i8259.c	(revision b10460aa6a666f2289836624216d445ff03a7816)
+++ uspace/srv/hw/irc/i8259/i8259.c	(revision b688fd884822ca3ea5bb45f1b6b2ca18b04efbcc)
@@ -153,5 +153,5 @@
 	}
 	
-	async_set_client_connection(i8259_connection);
+	async_set_fallback_port_handler(i8259_connection, NULL);
 	service_register(SERVICE_IRC);
 	
Index: uspace/srv/hw/irc/icp-ic/icp-ic.c
===================================================================
--- uspace/srv/hw/irc/icp-ic/icp-ic.c	(revision b10460aa6a666f2289836624216d445ff03a7816)
+++ uspace/srv/hw/irc/icp-ic/icp-ic.c	(revision b688fd884822ca3ea5bb45f1b6b2ca18b04efbcc)
@@ -150,5 +150,5 @@
 	icpic_regs = (icpic_regs_t *)regs;
 
-	async_set_client_connection(icpic_connection);
+	async_set_fallback_port_handler(icpic_connection, NULL);
 	service_register(SERVICE_IRC);
 
Index: uspace/srv/hw/irc/obio/obio.c
===================================================================
--- uspace/srv/hw/irc/obio/obio.c	(revision b10460aa6a666f2289836624216d445ff03a7816)
+++ uspace/srv/hw/irc/obio/obio.c	(revision b688fd884822ca3ea5bb45f1b6b2ca18b04efbcc)
@@ -137,5 +137,5 @@
 	printf("%s: OBIO registers with base at %zu\n", NAME, base_phys);
 	
-	async_set_client_connection(obio_connection);
+	async_set_fallback_port_handler(obio_connection, NULL);
 	service_register(SERVICE_IRC);
 	
Index: uspace/srv/loader/main.c
===================================================================
--- uspace/srv/loader/main.c	(revision b10460aa6a666f2289836624216d445ff03a7816)
+++ uspace/srv/loader/main.c	(revision b688fd884822ca3ea5bb45f1b6b2ca18b04efbcc)
@@ -444,5 +444,5 @@
 {
 	/* Set a handler of incomming connections. */
-	async_set_client_connection(ldr_connection);
+	async_set_fallback_port_handler(ldr_connection, NULL);
 	
 	/* Introduce this task to the NS (give it our task ID). */
Index: uspace/srv/locsrv/locsrv.c
===================================================================
--- uspace/srv/locsrv/locsrv.c	(revision b10460aa6a666f2289836624216d445ff03a7816)
+++ uspace/srv/locsrv/locsrv.c	(revision b688fd884822ca3ea5bb45f1b6b2ca18b04efbcc)
@@ -1537,5 +1537,5 @@
 	
 	/* Set a handler of incomming connections */
-	async_set_client_connection(loc_connection);
+	async_set_fallback_port_handler(loc_connection, NULL);
 	
 	/* Register location service at naming service */
Index: uspace/srv/logger/main.c
===================================================================
--- uspace/srv/logger/main.c	(revision b10460aa6a666f2289836624216d445ff03a7816)
+++ uspace/srv/logger/main.c	(revision b688fd884822ca3ea5bb45f1b6b2ca18b04efbcc)
@@ -74,5 +74,5 @@
 	}
 
-	async_set_client_connection(connection_handler);
+	async_set_fallback_port_handler(connection_handler, NULL);
 	
 	int rc = service_register(SERVICE_LOGGER);
Index: uspace/srv/net/dhcp/main.c
===================================================================
--- uspace/srv/net/dhcp/main.c	(revision b10460aa6a666f2289836624216d445ff03a7816)
+++ uspace/srv/net/dhcp/main.c	(revision b688fd884822ca3ea5bb45f1b6b2ca18b04efbcc)
@@ -65,5 +65,5 @@
 	}
 
-	async_set_client_connection(dhcp_client_conn);
+	async_set_fallback_port_handler(dhcp_client_conn, NULL);
 
 	rc = loc_server_register(NAME);
Index: uspace/srv/net/dnsrsrv/dnsrsrv.c
===================================================================
--- uspace/srv/net/dnsrsrv/dnsrsrv.c	(revision b10460aa6a666f2289836624216d445ff03a7816)
+++ uspace/srv/net/dnsrsrv/dnsrsrv.c	(revision b688fd884822ca3ea5bb45f1b6b2ca18b04efbcc)
@@ -64,5 +64,5 @@
 	}
 
-	async_set_client_connection(dnsr_client_conn);
+	async_set_fallback_port_handler(dnsr_client_conn, NULL);
 
 	rc = loc_server_register(NAME);
Index: uspace/srv/net/ethip/ethip.c
===================================================================
--- uspace/srv/net/ethip/ethip.c	(revision b10460aa6a666f2289836624216d445ff03a7816)
+++ uspace/srv/net/ethip/ethip.c	(revision b688fd884822ca3ea5bb45f1b6b2ca18b04efbcc)
@@ -79,5 +79,5 @@
 static int ethip_init(void)
 {
-	async_set_client_connection(ethip_client_conn);
+	async_set_fallback_port_handler(ethip_client_conn, NULL);
 	
 	int rc = loc_server_register(NAME);
Index: uspace/srv/net/inetsrv/inetsrv.c
===================================================================
--- uspace/srv/net/inetsrv/inetsrv.c	(revision b10460aa6a666f2289836624216d445ff03a7816)
+++ uspace/srv/net/inetsrv/inetsrv.c	(revision b688fd884822ca3ea5bb45f1b6b2ca18b04efbcc)
@@ -86,5 +86,5 @@
 	log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_init()");
 	
-	async_set_client_connection(inet_client_conn);
+	async_set_fallback_port_handler(inet_client_conn, NULL);
 	
 	int rc = loc_server_register(NAME);
Index: uspace/srv/net/loopip/loopip.c
===================================================================
--- uspace/srv/net/loopip/loopip.c	(revision b10460aa6a666f2289836624216d445ff03a7816)
+++ uspace/srv/net/loopip/loopip.c	(revision b688fd884822ca3ea5bb45f1b6b2ca18b04efbcc)
@@ -100,5 +100,5 @@
 static int loopip_init(void)
 {
-	async_set_client_connection(loopip_client_conn);
+	async_set_fallback_port_handler(loopip_client_conn, NULL);
 	
 	int rc = loc_server_register(NAME);
Index: uspace/srv/net/nconfsrv/nconfsrv.c
===================================================================
--- uspace/srv/net/nconfsrv/nconfsrv.c	(revision b10460aa6a666f2289836624216d445ff03a7816)
+++ uspace/srv/net/nconfsrv/nconfsrv.c	(revision b688fd884822ca3ea5bb45f1b6b2ca18b04efbcc)
@@ -77,5 +77,5 @@
 	}
 
-	async_set_client_connection(ncs_client_conn);
+	async_set_fallback_port_handler(ncs_client_conn, NULL);
 
 	rc = loc_server_register(NAME);
Index: uspace/srv/net/slip/slip.c
===================================================================
--- uspace/srv/net/slip/slip.c	(revision b10460aa6a666f2289836624216d445ff03a7816)
+++ uspace/srv/net/slip/slip.c	(revision b688fd884822ca3ea5bb45f1b6b2ca18b04efbcc)
@@ -300,5 +300,5 @@
 	slip_iplink.ops = &slip_iplink_ops;
 
-	async_set_client_connection(slip_client_conn);
+	async_set_fallback_port_handler(slip_client_conn, NULL);
 
 	rc = loc_server_register(NAME);
Index: uspace/srv/net/tcp/service.c
===================================================================
--- uspace/srv/net/tcp/service.c	(revision b10460aa6a666f2289836624216d445ff03a7816)
+++ uspace/srv/net/tcp/service.c	(revision b688fd884822ca3ea5bb45f1b6b2ca18b04efbcc)
@@ -1244,5 +1244,5 @@
 	service_id_t sid;
 
-	async_set_client_connection(tcp_client_conn);
+	async_set_fallback_port_handler(tcp_client_conn, NULL);
 
 	rc = loc_server_register(NAME);
Index: uspace/srv/net/udp/service.c
===================================================================
--- uspace/srv/net/udp/service.c	(revision b10460aa6a666f2289836624216d445ff03a7816)
+++ uspace/srv/net/udp/service.c	(revision b688fd884822ca3ea5bb45f1b6b2ca18b04efbcc)
@@ -704,5 +704,5 @@
 	service_id_t sid;
 
-	async_set_client_connection(udp_client_conn);
+	async_set_fallback_port_handler(udp_client_conn, NULL);
 
 	rc = loc_server_register(NAME);
Index: uspace/srv/taskmon/taskmon.c
===================================================================
--- uspace/srv/taskmon/taskmon.c	(revision b10460aa6a666f2289836624216d445ff03a7816)
+++ uspace/srv/taskmon/taskmon.c	(revision b688fd884822ca3ea5bb45f1b6b2ca18b04efbcc)
@@ -147,5 +147,5 @@
 	}
 	
-	async_set_client_connection(corecfg_client_conn);
+	async_set_fallback_port_handler(corecfg_client_conn, NULL);
 	
 	int rc = loc_server_register(NAME);
Index: uspace/srv/vfs/vfs.c
===================================================================
--- uspace/srv/vfs/vfs.c	(revision b10460aa6a666f2289836624216d445ff03a7816)
+++ uspace/srv/vfs/vfs.c	(revision b688fd884822ca3ea5bb45f1b6b2ca18b04efbcc)
@@ -181,5 +181,5 @@
 	 * Set a connection handling function/fibril.
 	 */
-	async_set_client_connection(vfs_connection);
+	async_set_fallback_port_handler(vfs_connection, NULL);
 
 	/*