[PATCH] add support for multiple serial proxies configuration

Forrest Zhao
2009-07-17T05:48:51Z

serial/proxy.c | 89 ++++++++++++++++++++++++++++++++++++++++++++++++++++
serial/serial.conf | 9 +++++
3 files changed, 100 insertions(+), 0 deletions(-)
create mode 100644 serial/serial.conf

diff --git a/serial/Makefile.am b/serial/Makefile.am
index 4fa455f..c88a980 100644
--- a/serial/Makefile.am
+++ b/serial/Makefile.am
@@ -19,4 +19,6 @@ AM_CFLAGS = -fvisibility=hidden \

INCLUDES = -I$(top_srcdir)/common -I$(top_srcdir)/src

+EXTRA_DIST = serial.conf
+
MAINTAINERCLEANFILES = Makefile.in
diff --git a/serial/proxy.c b/serial/proxy.c
index 8c8a4b8..7962256 100644
--- a/serial/proxy.c
+++ b/serial/proxy.c
@@ -1210,6 +1210,93 @@ static struct serial_adapter *find_adapter(GSList *list,
return NULL;
}

+static void serial_proxy_init(struct serial_adapter *adapter)
+{
+ GKeyFile *config;
+ GError *err = NULL;
+ const char *file = CONFIGDIR "/serial.conf";
+ char **uuid_list, **address_list;
+ int i;
+
+ config = g_key_file_new();
+
+ if (!g_key_file_load_from_file(config, file, 0, &err)) {
+ error("Parsing %s failed: %s", file, err->message);
+ g_error_free(err);
+ g_key_file_free(config);
+ return;
+ }
+
+ uuid_list = g_key_file_get_string_list(config, "Proxy", "UUID",
+ NULL, &err);
+ if (err) {
+ debug("%s: %s", file, err->message);
+ g_error_free(err);
+ g_key_file_free(config);
+ return;
+ }
+
+ address_list = g_key_file_get_string_list(config, "Proxy", "Address",
+ NULL, &err);
+ if (err) {
+ debug("%s: %s", file, err->message);
+ g_error_free(err);
+ g_key_file_free(config);
+ g_strfreev(uuid_list);
+ return;
+ }
+
+ for (i = 0; uuid_list[i] != NULL && address_list[i] != NULL; i++) {
+ char *uuid_str = uuid_list[i], *address = address_list[i];
+ uuid_t uuid;
+ proxy_type_t type;
+ char path[MAX_PATH_LENGTH + 1];
+ const char *ppath = path;
+ int ret;
+
+ bt_string2uuid(&uuid, uuid_str);
+ type = addr2type(address);
+
+ if (g_slist_find_custom(adapter->proxies, address,
+ proxy_addrcmp)) {
+ debug("Proxy already exists.");
+ continue;
+ }
+ switch (type) {
+ case UNIX_SOCKET_PROXY:
+ ret = proxy_socket_register(adapter, uuid_str, address,
+ path, sizeof(path), TRUE);
+ break;
+ case TTY_PROXY:
+ ret = proxy_tty_register(adapter, uuid_str, address,
+ NULL, path, sizeof(path), TRUE);
+ break;
+ case TCP_SOCKET_PROXY:
+ ret = proxy_tcp_register(adapter, uuid_str, address,
+ path, sizeof(path), TRUE);
+ break;
+ default:
+ ret = -1;
+ }
+
+ if (ret < 0) {
+ error("proxy register failed.");
+ continue;
+ }
+
+ g_dbus_emit_signal(adapter->conn,
+ adapter_get_path(adapter->btd_adapter),
+ SERIAL_MANAGER_INTERFACE, "ProxyCreated",
+ DBUS_TYPE_STRING, &ppath,
+ DBUS_TYPE_INVALID);
+ }
+
+ g_strfreev(uuid_list);
+ g_strfreev(address_list);
+ g_key_file_free(config);
+ return;
+}
+
int proxy_register(DBusConnection *conn, struct btd_adapter *btd_adapter)
{
struct serial_adapter *adapter;
@@ -1241,6 +1328,8 @@ int proxy_register(DBusConnection *conn, struct btd_adapter *btd_adapter)
debug("Registered interface %s on path %s",
SERIAL_MANAGER_INTERFACE, path);

+ serial_proxy_init(adapter);
+
return 0;
}

diff --git a/serial/serial.conf b/serial/serial.conf
new file mode 100644
index 0000000..c4e3b9f
--- /dev/null
+++ b/serial/serial.conf
@@ -0,0 +1,9 @@
+# Configuration file for serial
+
+[Proxy]
+
+# UUID for serial proxy service