Hi Gustavo,
On Tue, Sep 13, 2011 at 6:46 AM, Gustavo F. Padovan
<padovan@xxxxxxxxxxxxxx> wrote:
> From: "Gustavo F. Padovan" <padovan@xxxxxxxxxxxxxx>
>
> It's similar to Serial.Connect() but returns the actual RFCOMM file
> descriptor instead of creating a device in /dev
>
> It can't interact with Connect(), you can't use the both methods in the
> same channel. This is on purpose once ConnectFD() is experimental and
> Connect() will be removed in BlueZ 5.0.
iirc Johan would like to keep the Connect/tty, so I would just omit
the last part.
> ---
> doc/serial-api.txt | 16 ++++++++++++++++
> serial/port.c | 26 +++++++++++++++++++++++++-
> 2 files changed, 41 insertions(+), 1 deletions(-)
>
> diff --git a/doc/serial-api.txt b/doc/serial-api.txt
> index 5f9bd5f..98b0ad4 100644
> --- a/doc/serial-api.txt
> +++ b/doc/serial-api.txt
> @@ -26,6 +26,22 @@ Methods string Connect(string pattern)
> org.bluez.Error.ConnectionAttemptFailed
> org.bluez.Error.NotSupported
>
> +Methods fd ConnectFD(string pattern) [experimental]
> +
> + Connects to a specific RFCOMM based service on a
> + remote device and returns a file descriptor to talk
> + with this device.
> +
> + Possible patterns: UUID 128 bit as string
> + Profile short names, e.g: spp, dun
> + RFCOMM channel as string, 1-30
> +
> + Possible errors: org.bluez.Error.InvalidArguments
> + org.bluez.Error.InProgress
> + org.bluez.Error.ConnectionAttemptFailed
> + org.bluez.Error.NotSupported
> +
> +
> void Disconnect(string device)
>
> Disconnect a RFCOMM TTY device that has been
> diff --git a/serial/port.c b/serial/port.c
> index 2cdead4..d163319 100644
> --- a/serial/port.c
> +++ b/serial/port.c
> @@ -63,6 +63,10 @@
> #define MAX_OPEN_TRIES 5
> #define OPEN_WAIT 300 /* ms. udev node creation retry wait */
>
> +#ifndef DBUS_TYPE_UNIX_FD
> +#define DBUS_TYPE_UNIX_FD -1
> +#endif
> +
> struct serial_device {
> DBusConnection *conn; /* for name listener handling */
> bdaddr_t src; /* Source (local) address */
> @@ -318,6 +322,21 @@ static void rfcomm_connect_cb(GIOChannel *chan, GError *conn_err,
> goto fail;
> }
>
> + sk = g_io_channel_unix_get_fd(chan);
> +
> + if (g_str_equal(dbus_message_get_member(port->msg), "ConnectFD")) {
Just a cosmetic tip, It might be simpler to use dbus_message_has_member here.
> + reply = g_dbus_create_reply(port->msg, DBUS_TYPE_UNIX_FD, &sk,
> + DBUS_TYPE_INVALID);
> + g_dbus_send_message(device->conn, reply);
> +
> + close(sk);
> +
> + g_dbus_remove_watch(device->conn, port->listener_id);
> + port->listener_id = 0;
> +
> + return;
> + }
> +
> memset(&req, 0, sizeof(req));
> req.dev_id = -1;
> req.flags = (1 << RFCOMM_REUSE_DLC);
> @@ -328,7 +347,6 @@ static void rfcomm_connect_cb(GIOChannel *chan, GError *conn_err,
> g_io_channel_unref(port->io);
> port->io = NULL;
>
> - sk = g_io_channel_unix_get_fd(chan);
> port->id = ioctl(sk, RFCOMMCREATEDEV, &req);
> if (port->id < 0) {
> int err = -errno;
> @@ -476,6 +494,10 @@ static DBusMessage *port_connect(DBusConnection *conn,
> const char *pattern;
> int err;
>
> + if (g_str_equal(dbus_message_get_member(msg), "ConnectFD") &&
> + DBUS_TYPE_UNIX_FD < 0)
And here.
> + return btd_error_not_supported(msg);
> +
> if (dbus_message_get_args(msg, NULL, DBUS_TYPE_STRING, &pattern,
> DBUS_TYPE_INVALID) == FALSE)
> return NULL;
> @@ -499,6 +521,7 @@ static DBusMessage *port_connect(DBusConnection *conn,
> dbus_message_get_sender(msg),
> port_owner_exited, port,
> NULL);
> +
> port->msg = dbus_message_ref(msg);
>
> err = connect_port(port);
> @@ -546,6 +569,7 @@ static DBusMessage *port_disconnect(DBusConnection *conn,
>
> static GDBusMethodTable port_methods[] = {
> { "Connect", "s", "s", port_connect, G_DBUS_METHOD_FLAG_ASYNC },
> + { "ConnectFD", "s", "h", port_connect, G_DBUS_METHOD_FLAG_ASYNC },
> { "Disconnect", "s", "", port_disconnect },
> { }
> };
> --
> 1.7.6.2
Besides that looks pretty good and simple.
--
Luiz Augusto von Dentz
--
To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
