---
serial/Makefile.am | 2 +
serial/proxy.c | 230 +++++++++++++++++++++++++++++++++++++++-------------
serial/serial.conf | 10 +++
3 files changed, 184 insertions(+), 58 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..5965a47 100644
--- a/serial/proxy.c
+++ b/serial/proxy.c
@@ -511,29 +511,27 @@ drop:
g_io_channel_shutdown(chan, TRUE, NULL);
}
-static DBusMessage *proxy_enable(DBusConnection *conn,
- DBusMessage *msg, void *data)
+static int enable_proxy(struct serial_proxy *prx)
{
- struct serial_proxy *prx = data;
sdp_record_t *record;
- GError *err = NULL;
- DBusMessage *reply;
+ GError *gerr = NULL;
+ int err;
if (prx->io)
- return failed(msg, "Already enabled");
+ return -EALREADY;
/* Listen */
prx->io = bt_io_listen(BT_IO_RFCOMM, NULL, confirm_event_cb, prx,
- NULL, &err,
+ NULL, &gerr,
BT_IO_OPT_SOURCE_BDADDR, &prx->src,
BT_IO_OPT_INVALID);
if (!prx->io)
goto failed;
- bt_io_get(prx->io, BT_IO_RFCOMM, &err,
+ bt_io_get(prx->io, BT_IO_RFCOMM, &gerr,
BT_IO_OPT_CHANNEL, &prx->channel,
BT_IO_OPT_INVALID);
- if (err) {
+ if (gerr) {
g_io_channel_unref(prx->io);
prx->io = NULL;
goto failed;
@@ -546,24 +544,42 @@ static DBusMessage *proxy_enable(DBusConnection *conn,
record = proxy_record_new(prx->uuid128, prx->channel);
if (!record) {
g_io_channel_unref(prx->io);
- return failed(msg, "Unable to allocate new service record");
+ return -ENOMEM;
}
- if (add_record_to_server(&prx->src, record) < 0) {
+ err = add_record_to_server(&prx->src, record);
+ if (err < 0) {
sdp_record_free(record);
g_io_channel_unref(prx->io);
- return failed(msg, "Service registration failed");
+ return err;
}
prx->record_id = record->handle;
- return dbus_message_new_method_return(msg);
+ return 0;
failed:
- error("%s", err->message);
- reply = failed(msg, err->message);
- g_error_free(err);
- return reply;
+ error("%s", gerr->message);
+ g_error_free(gerr);
+ return -EIO;
+
+}
+static DBusMessage *proxy_enable(DBusConnection *conn,
+ DBusMessage *msg, void *data)
+{
+ struct serial_proxy *prx = data;
+ int err;
+
+ err = enable_proxy(prx);
+ if (err == -EALREADY)
+ return failed(msg, "Already enabled");
+ else if (err == -ENOMEM)
+ return failed(msg, "Unable to allocate new service record");
+ else if (err < 0)
+ return g_dbus_create_error(msg, ERROR_INTERFACE "Failed",
+ "Proxy enable failed (%s)", strerror(-err));
+
+ return dbus_message_new_method_return(msg);
}
static DBusMessage *proxy_disable(DBusConnection *conn,
@@ -962,70 +978,84 @@ static int proxy_pathcmp(gconstpointer proxy, gconstpointer p)
return strcmp(prx->path, path);
}
-static DBusMessage *create_proxy(DBusConnection *conn,
- DBusMessage *msg, void *data)
+static int register_proxy(struct serial_adapter *adapter, const char *uuid_str,
+ const char *address, char *path, size_t length)
{
- struct serial_adapter *adapter = data;
- char path[MAX_PATH_LENGTH + 1];
- const char *pattern, *address, *ppath = path;
- char *uuid_str;
proxy_type_t type;
- uuid_t uuid;
- int ret;
-
- if (!dbus_message_get_args(msg, NULL,
- DBUS_TYPE_STRING, &pattern,
- DBUS_TYPE_STRING, &address,
- DBUS_TYPE_INVALID))
- return NULL;
-
- uuid_str = bt_name2string(pattern);
- if (!uuid_str)
- return invalid_arguments(msg, "Invalid UUID");
-
- bt_string2uuid(&uuid, uuid_str);
+ int err;
type = addr2type(address);
- if (type == UNKNOWN_PROXY_TYPE) {
- g_free(uuid_str);
- return invalid_arguments(msg, "Invalid address");
- }
+ if (type == UNKNOWN_PROXY_TYPE)
+ return -EINVAL;
/* Only one proxy per address(TTY or unix socket) is allowed */
- if (g_slist_find_custom(adapter->proxies, address, proxy_addrcmp)) {
- g_free(uuid_str);
- return g_dbus_create_error(msg, ERROR_INTERFACE ".AlreadyExist",
- "Proxy already exists");
- }
+ if (g_slist_find_custom(adapter->proxies, address, proxy_addrcmp))
+ return -EALREADY;
switch (type) {
case UNIX_SOCKET_PROXY:
- ret = proxy_socket_register(adapter, uuid_str, address,
- path, sizeof(path), TRUE);
+ err = proxy_socket_register(adapter, uuid_str, address,
+ path, length, TRUE);
break;
case TTY_PROXY:
- ret = proxy_tty_register(adapter, uuid_str, address,
- NULL, path, sizeof(path), TRUE);
+ err = proxy_tty_register(adapter, uuid_str, address,
+ NULL, path, length, TRUE);
break;
case TCP_SOCKET_PROXY:
- ret = proxy_tcp_register(adapter, uuid_str, address,
- path, sizeof(path), TRUE);
+ err = proxy_tcp_register(adapter, uuid_str, address,
+ path, length, TRUE);
break;
default:
- ret = -1;
+ err = -EINVAL;
}
- g_free(uuid_str);
-
- if (ret < 0)
- return failed(msg, "Create object path failed");
+ if (err < 0)
+ return err;
g_dbus_emit_signal(adapter->conn,
adapter_get_path(adapter->btd_adapter),
SERIAL_MANAGER_INTERFACE, "ProxyCreated",
- DBUS_TYPE_STRING, &ppath,
+ DBUS_TYPE_STRING, &path,
DBUS_TYPE_INVALID);
+ return 0;
+}
+
+static DBusMessage *create_proxy(DBusConnection *conn,
+ DBusMessage *msg, void *data)
+{
+ struct serial_adapter *adapter = data;
+ char path[MAX_PATH_LENGTH + 1];
+ const char *pattern, *address;
+ char *uuid_str, *ppath = path;
+ uuid_t uuid;
+ int err;
+
+ if (!dbus_message_get_args(msg, NULL,
+ DBUS_TYPE_STRING, &pattern,
+ DBUS_TYPE_STRING, &address,
+ DBUS_TYPE_INVALID))
+ return NULL;
+
+ uuid_str = bt_name2string(pattern);
+ if (!uuid_str)
+ return invalid_arguments(msg, "Invalid UUID");
+
+ bt_string2uuid(&uuid, uuid_str);
+
+ err = register_proxy(adapter, uuid_str, address, ppath,
+ sizeof(path));
+ g_free(uuid_str);
+
+ if (err == -EINVAL)
+ return invalid_arguments(msg, "Invalid address");
+ else if (err == -EALREADY)
+ return g_dbus_create_error(msg, ERROR_INTERFACE ".AlreadyExist",
+ "Proxy already exists");
+ else if (err < 0)
+ return g_dbus_create_error(msg, ERROR_INTERFACE "Failed",
+ "Proxy creation failed (%s)", strerror(-err));
+
return g_dbus_create_reply(msg, DBUS_TYPE_STRING, &ppath,
DBUS_TYPE_INVALID);
}
@@ -1210,6 +1240,89 @@ static struct serial_adapter *find_adapter(GSList *list,
return NULL;
}
+static void serial_proxy_init(struct serial_adapter *adapter)
+{
+ GKeyFile *config;
+ GError *gerr = NULL;
+ const char *file = CONFIGDIR "/serial.conf";
+ char **group_list;
+ int i;
+
+ config = g_key_file_new();
+
+ if (!g_key_file_load_from_file(config, file, 0, &gerr)) {
+ error("Parsing %s failed: %s", file, gerr->message);
+ g_error_free(gerr);
+ g_key_file_free(config);
+ return;
+ }
+
+ group_list = g_key_file_get_groups(config, NULL);
+
+ for (i = 0; group_list[i] != NULL; i++) {
+ char *group_str = group_list[i], *uuid_str, *address;
+ uuid_t uuid;
+ char path[MAX_PATH_LENGTH + 1];
+ char *ppath = path;
+ int err;
+ GSList *l;
+ struct serial_proxy *prx;
+
+ /* string length of "Proxy" is 5 */
+ if (strlen(group_str) < 5 || strncmp(group_str, "Proxy", 5))
+ continue;
+
+ uuid_str = g_key_file_get_string(config, group_str, "UUID",
+ &gerr);
+ if (gerr) {
+ debug("%s: %s", file, gerr->message);
+ g_error_free(gerr);
+ g_key_file_free(config);
+ return;
+ }
+ address = g_key_file_get_string(config, group_str, "Address",
+ &gerr);
+ if (gerr) {
+ debug("%s: %s", file, gerr->message);
+ g_error_free(gerr);
+ g_key_file_free(config);
+ g_free(uuid_str);
+ return;
+ }
+
+ bt_string2uuid(&uuid, uuid_str);
+
+ err = register_proxy(adapter, uuid_str, address, ppath,
+ sizeof(path));
+ if (err == -EINVAL)
+ error("Invalid address.");
+ else if (err == -EALREADY)
+ debug("Proxy already exists.");
+ else if (err < 0)
+ error("Proxy creation failed (%s)", strerror(-err));
+ else {
+ l = g_slist_find_custom(adapter->proxies, ppath,
+ proxy_pathcmp);
+ if (!l)
+ error("Can't find proxy.");
+ else {
+ prx = l->data;
+ err = enable_proxy(prx);
+ if (err < 0)
+ error("Proxy enable failed (%s)",
+ strerror(-err));
+ }
+ }
+
+ g_free(uuid_str);
+ g_free(address);
+ }
+
+ g_strfreev(group_list);
+ g_key_file_free(config);
+ return;
+}
+
int proxy_register(DBusConnection *conn, struct btd_adapter *btd_adapter)
{
struct serial_adapter *adapter;
@@ -1241,6 +1354,7 @@ 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..982dcdd
--- /dev/null
+++ b/serial/serial.conf
@@ -0,0 +1,10 @@
+# Configuration file for serial
+
+# There could be multiple proxy sections, the format is [Proxy <user chosen name>]
+[Proxy DUN]
+
+# UUID for DUN proxy service
+#UUID=00001103-0000-1000-8000-00805F9B34FB
+
+# Address for device node
+#Address=/dev/ttyx
--
1.5.4.5
Hi Forrest,
On Fri, Jul 24, 2009, Forrest Zhao wrote:
> ---
> serial/Makefile.am | 2 +
> serial/proxy.c | 230 +++++++++++++++++++++++++++++++++++++++-------------
> serial/serial.conf | 10 +++
> 3 files changed, 184 insertions(+), 58 deletions(-)
> create mode 100644 serial/serial.conf
I finally pushed this upstream but still had to make quite a lot of
changes.
> + return g_dbus_create_error(msg, ERROR_INTERFACE "Failed",
> + "Proxy enable failed (%s)", strerror(-err));
Two spaces before strerror.
> g_dbus_emit_signal(adapter->conn,
> adapter_get_path(adapter->btd_adapter),
> SERIAL_MANAGER_INTERFACE, "ProxyCreated",
> - DBUS_TYPE_STRING, &ppath,
> + DBUS_TYPE_STRING, &path,
> DBUS_TYPE_INVALID);
These could be indented at least with one more tab.
> +static DBusMessage *create_proxy(DBusConnection *conn,
> + DBusMessage *msg, void *data)
> +{
> + struct serial_adapter *adapter = data;
> + char path[MAX_PATH_LENGTH + 1];
> + const char *pattern, *address;
> + char *uuid_str, *ppath = path;
> + uuid_t uuid;
The uuid variable is never used in this function except for getting set
once by the following:
> + bt_string2uuid(&uuid, uuid_str);
> +static void serial_proxy_init(struct serial_adapter *adapter)
> +{
> + GKeyFile *config;
> + GError *gerr = NULL;
> + const char *file = CONFIGDIR "/serial.conf";
> + char **group_list;
> + int i;
> +
> + config = g_key_file_new();
> +
> + if (!g_key_file_load_from_file(config, file, 0, &gerr)) {
> + error("Parsing %s failed: %s", file, gerr->message);
> + g_error_free(gerr);
> + g_key_file_free(config);
> + return;
> + }
> +
> + group_list = g_key_file_get_groups(config, NULL);
> +
> + for (i = 0; group_list[i] != NULL; i++) {
> + char *group_str = group_list[i], *uuid_str, *address;
> + uuid_t uuid;
Same with this uuid variable.
> + /* string length of "Proxy" is 5 */
> + if (strlen(group_str) < 5 || strncmp(group_str, "Proxy", 5))
> + continue;
Hmm, I actually forgot to change this one, but isn't just the strncmp call
enough here (i.e. no need for strlen)?
> + uuid_str = g_key_file_get_string(config, group_str, "UUID",
> + &gerr);
> + if (gerr) {
> + debug("%s: %s", file, gerr->message);
> + g_error_free(gerr);
> + g_key_file_free(config);
> + return;
> + }
> + address = g_key_file_get_string(config, group_str, "Address",
> + &gerr);
> + if (gerr) {
There should be an empty line before address = ...
> + if (err < 0)
> + error("Proxy enable failed (%s)",
> + strerror(-err));
Mixing tabs and spaces for indentation.
> + g_strfreev(group_list);
> + g_key_file_free(config);
> + return;
> +}
Redundant return statement at the end of void function.
> diff --git a/serial/serial.conf b/serial/serial.conf
> new file mode 100644
> index 0000000..982dcdd
> --- /dev/null
> +++ b/serial/serial.conf
> @@ -0,0 +1,10 @@
> +# Configuration file for serial
> +
> +# There could be multiple proxy sections, the format is [Proxy <user chosen name>]
> +[Proxy DUN]
> +
> +# UUID for DUN proxy service
> +#UUID=00001103-0000-1000-8000-00805F9B34FB
> +
> +# Address for device node
> +#Address=/dev/ttyx
I think the [Proxy DUN] should also be commented out along with the other
lines.
Even after these changes there are still the following issues that need
fixing:
1. After creating a proxy through serial.conf the first time bluetoothd
stores some info about it in /var/lib/bluetooth/.../proxy. The next time
bluetoothd starts it fails to register (or at least I don't see the local
service record anymore)
2. The UUID in the service record should be reduced to 16 or 32 bit format
if it is derived from the Bluetooth base UUID.
3. The Name attribute for the records should (if we are going to keep them
generic) "Serial Proxy" instead of the current (imho confusing) "Port
Proxy Entity".
Johan