* [PATCH 2/2] Remove redundante check for server when checking for usb
From: luiz.dentz @ 2011-02-26 19:49 UTC (permalink / raw)
To: linux-bluetooth; +Cc: Luiz Augusto von Dentz
In-Reply-To: <1298749782-24129-1-git-send-email-luiz.dentz@gmail.com>
From: Luiz Augusto von Dentz <luiz.dentz-von@nokia.com>
There is a check for this already on Makefile.am
---
configure.ac | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
index a17d0ca..9194843 100644
--- a/configure.ac
+++ b/configure.ac
@@ -155,8 +155,7 @@ AC_ARG_ENABLE(usb, AC_HELP_STRING([--enable-usb],
[enable usb plugin]), [
enable_usb=${enableval}
])
-AM_CONDITIONAL(USB, test "${enable_usb}" = "yes" &&
- test "${enable_server}" != "no")
+AM_CONDITIONAL(USB, test "${enable_usb}" = "yes")
AC_ARG_ENABLE(pcsuite, AC_HELP_STRING([--enable-pcsuite],
[enable Nokia PcSuite plugin]), [
--
1.7.1
^ permalink raw reply related
* [PATCH 1/2] Move pcsuite drivers to its own plugin
From: luiz.dentz @ 2011-02-26 19:49 UTC (permalink / raw)
To: linux-bluetooth; +Cc: Luiz Augusto von Dentz
From: Luiz Augusto von Dentz <luiz.dentz-von@nokia.com>
This make it easier to enable/disable this funcionality as a whole.
---
Makefile.am | 6 +-
configure.ac | 9 +-
plugins/ftp.c | 165 +---------------
plugins/ftp.h | 30 +++
plugins/nokia-backup.c | 309 -----------------------------
plugins/pcsuite.c | 515 ++++++++++++++++++++++++++++++++++++++++++++++++
6 files changed, 561 insertions(+), 473 deletions(-)
create mode 100644 plugins/ftp.h
delete mode 100644 plugins/nokia-backup.c
create mode 100644 plugins/pcsuite.c
diff --git a/Makefile.am b/Makefile.am
index fc996ec..d32d613 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -43,9 +43,9 @@ endif
builtin_modules += filesystem
builtin_sources += plugins/filesystem.c plugins/filesystem.h
-if NOKIA_BACKUP
-builtin_modules += backup
-builtin_sources += plugins/nokia-backup.c
+if NOKIA_PCSUITE
+builtin_modules += pcsuite
+builtin_sources += plugins/pcsuite.c
endif
builtin_modules += opp
diff --git a/configure.ac b/configure.ac
index da8fb64..a17d0ca 100644
--- a/configure.ac
+++ b/configure.ac
@@ -158,12 +158,11 @@ AC_ARG_ENABLE(usb, AC_HELP_STRING([--enable-usb],
AM_CONDITIONAL(USB, test "${enable_usb}" = "yes" &&
test "${enable_server}" != "no")
-AC_ARG_ENABLE(nokia_backup, AC_HELP_STRING([--enable-nokia-backup],
- [enable nokia-backup plugin]), [
- enable_nokia_backup=${enableval}
+AC_ARG_ENABLE(pcsuite, AC_HELP_STRING([--enable-pcsuite],
+ [enable Nokia PcSuite plugin]), [
+ enable_pcsuite=${enableval}
])
-AM_CONDITIONAL(NOKIA_BACKUP, test "${enable_nokia_backup}" = "yes" &&
- test "${enable_server}" != "no")
+AM_CONDITIONAL(NOKIA_PCSUITE, test "${enable_pcsuite}" = "yes")
AC_ARG_ENABLE(client, AC_HELP_STRING([--disable-client],
[disable compilation of OBEX client]), [
diff --git a/plugins/ftp.c b/plugins/ftp.c
index 633abf3..79223bf 100644
--- a/plugins/ftp.c
+++ b/plugins/ftp.c
@@ -50,6 +50,7 @@
#include "dbus.h"
#include "mimetype.h"
#include "service.h"
+#include "ftp.h"
#define LST_TYPE "x-obex/folder-listing"
#define CAP_TYPE "x-obex/capability"
@@ -189,7 +190,7 @@ static int get_by_type(struct ftp_session *ftp, const char *type)
return err;
}
-static void *ftp_connect(struct obex_session *os, int *err)
+void *ftp_connect(struct obex_session *os, int *err)
{
struct ftp_session *ftp;
const char *root_folder;
@@ -212,8 +213,8 @@ static void *ftp_connect(struct obex_session *os, int *err)
return ftp;
}
-static int ftp_get(struct obex_session *os, obex_object_t *obj,
- gboolean *stream, void *user_data)
+int ftp_get(struct obex_session *os, obex_object_t *obj, gboolean *stream,
+ void *user_data)
{
struct ftp_session *ftp = user_data;
const char *type = obex_get_type(os);
@@ -254,7 +255,7 @@ static int ftp_delete(struct ftp_session *ftp, const char *name)
return ret;
}
-static int ftp_chkput(struct obex_session *os, void *user_data)
+int ftp_chkput(struct obex_session *os, void *user_data)
{
struct ftp_session *ftp = user_data;
const char *name = obex_get_name(os);
@@ -278,8 +279,7 @@ static int ftp_chkput(struct obex_session *os, void *user_data)
return ret;
}
-static int ftp_put(struct obex_session *os, obex_object_t *obj,
- void *user_data)
+int ftp_put(struct obex_session *os, obex_object_t *obj, void *user_data)
{
struct ftp_session *ftp = user_data;
const char *name = obex_get_name(os);
@@ -299,8 +299,7 @@ static int ftp_put(struct obex_session *os, obex_object_t *obj,
return 0;
}
-static int ftp_setpath(struct obex_session *os, obex_object_t *obj,
- void *user_data)
+int ftp_setpath(struct obex_session *os, obex_object_t *obj, void *user_data)
{
struct ftp_session *ftp = user_data;
const char *root_folder, *name;
@@ -404,7 +403,7 @@ done:
return err;
}
-static void ftp_disconnect(struct obex_session *os, void *user_data)
+void ftp_disconnect(struct obex_session *os, void *user_data)
{
struct ftp_session *ftp = user_data;
@@ -416,145 +415,6 @@ static void ftp_disconnect(struct obex_session *os, void *user_data)
g_free(ftp);
}
-static void *pcsuite_connect(struct obex_session *os, int *err)
-{
- struct pcsuite_session *pcsuite;
- struct ftp_session *ftp;
- int fd;
- char *filename;
-
- DBG("");
-
- ftp = ftp_connect(os, err);
- if (ftp == NULL)
- return NULL;
-
- filename = g_build_filename(g_get_home_dir(), ".pcsuite", NULL);
-
- fd = open(filename, O_WRONLY | O_CREAT | O_EXCL, 0644);
- if (fd < 0 && errno != EEXIST) {
- error("open(%s): %s(%d)", filename, strerror(errno), errno);
- goto fail;
- }
-
- /* Try to remove the file before retrying since it could be
- that some process left/crash without removing it */
- if (fd < 0) {
- if (remove(filename) < 0) {
- error("remove(%s): %s(%d)", filename, strerror(errno),
- errno);
- goto fail;
- }
-
- fd = open(filename, O_WRONLY | O_CREAT | O_EXCL, 0644);
- if (fd < 0) {
- error("open(%s): %s(%d)", filename, strerror(errno),
- errno);
- goto fail;
- }
- }
-
- DBG("%s created", filename);
-
- pcsuite = g_new0(struct pcsuite_session, 1);
- pcsuite->ftp = ftp;
- pcsuite->lock_file = filename;
- pcsuite->fd = fd;
-
- DBG("session %p created", pcsuite);
-
- if (err)
- *err = 0;
-
- return pcsuite;
-
-fail:
- if (ftp)
- ftp_disconnect(os, ftp);
- if (err)
- *err = -errno;
-
- g_free(filename);
-
- return NULL;
-}
-
-static int pcsuite_get(struct obex_session *os, obex_object_t *obj,
- gboolean *stream, void *user_data)
-{
- struct pcsuite_session *pcsuite = user_data;
-
- DBG("%p", pcsuite);
-
- return ftp_get(os, obj, stream, pcsuite->ftp);
-}
-
-static int pcsuite_chkput(struct obex_session *os, void *user_data)
-{
- struct pcsuite_session *pcsuite = user_data;
-
- DBG("%p", pcsuite);
-
- return ftp_chkput(os, pcsuite->ftp);
-}
-
-static int pcsuite_put(struct obex_session *os, obex_object_t *obj,
- void *user_data)
-{
- struct pcsuite_session *pcsuite = user_data;
-
- DBG("%p", pcsuite);
-
- return ftp_put(os, obj, pcsuite->ftp);
-}
-
-static int pcsuite_setpath(struct obex_session *os, obex_object_t *obj,
- void *user_data)
-{
- struct pcsuite_session *pcsuite = user_data;
-
- DBG("%p", pcsuite);
-
- return ftp_setpath(os, obj, pcsuite->ftp);
-}
-
-static void pcsuite_disconnect(struct obex_session *os, void *user_data)
-{
- struct pcsuite_session *pcsuite = user_data;
-
- DBG("%p", pcsuite);
-
- if (pcsuite->fd >= 0)
- close(pcsuite->fd);
-
- if (pcsuite->lock_file) {
- remove(pcsuite->lock_file);
- g_free(pcsuite->lock_file);
- }
-
- if (pcsuite->ftp)
- ftp_disconnect(os, pcsuite->ftp);
-
- g_free(pcsuite);
-}
-
-static struct obex_service_driver pcsuite = {
- .name = "Nokia OBEX PC Suite Services",
- .service = OBEX_PCSUITE,
- .channel = PCSUITE_CHANNEL,
- .record = PCSUITE_RECORD,
- .target = FTP_TARGET,
- .target_size = TARGET_SIZE,
- .who = PCSUITE_WHO,
- .who_size = PCSUITE_WHO_SIZE,
- .connect = pcsuite_connect,
- .get = pcsuite_get,
- .put = pcsuite_put,
- .chkput = pcsuite_chkput,
- .setpath = pcsuite_setpath,
- .disconnect = pcsuite_disconnect
-};
-
static struct obex_service_driver ftp = {
.name = "File Transfer server",
.service = OBEX_FTP,
@@ -572,19 +432,12 @@ static struct obex_service_driver ftp = {
static int ftp_init(void)
{
- int err;
-
- err = obex_service_driver_register(&ftp);
- if (err < 0)
- return err;
-
- return obex_service_driver_register(&pcsuite);
+ return obex_service_driver_register(&ftp);
}
static void ftp_exit(void)
{
obex_service_driver_unregister(&ftp);
- obex_service_driver_unregister(&pcsuite);
}
OBEX_PLUGIN_DEFINE(ftp, ftp_init, ftp_exit)
diff --git a/plugins/ftp.h b/plugins/ftp.h
new file mode 100644
index 0000000..2374125
--- /dev/null
+++ b/plugins/ftp.h
@@ -0,0 +1,30 @@
+/*
+ *
+ * OBEX Server
+ *
+ * Copyright (C) 2007-2010 Marcel Holtmann <marcel@holtmann.org>
+ *
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ */
+
+void *ftp_connect(struct obex_session *os, int *err);
+int ftp_get(struct obex_session *os, obex_object_t *obj, gboolean *stream,
+ void *user_data);
+int ftp_chkput(struct obex_session *os, void *user_data);
+int ftp_put(struct obex_session *os, obex_object_t *obj, void *user_data);
+int ftp_setpath(struct obex_session *os, obex_object_t *obj, void *user_data);
+void ftp_disconnect(struct obex_session *os, void *user_data);
diff --git a/plugins/nokia-backup.c b/plugins/nokia-backup.c
deleted file mode 100644
index cf17e16..0000000
--- a/plugins/nokia-backup.c
+++ /dev/null
@@ -1,309 +0,0 @@
-/*
- *
- * OBEX Server
- *
- * Copyright (C) 2010 Nokia Corporation
- * Copyright (C) 2010 Marcel Holtmann <marcel@holtmann.org>
- *
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- *
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <stdio.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <dirent.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/statvfs.h>
-#include <fcntl.h>
-#include <wait.h>
-
-#include <glib.h>
-#include "gdbus.h"
-
-
-#include <openobex/obex.h>
-#include <openobex/obex_const.h>
-
-#include "plugin.h"
-#include "log.h"
-#include "obex.h"
-#include "mimetype.h"
-#include "service.h"
-
-#define BACKUP_BUS_NAME "com.nokia.backup.plugin"
-#define BACKUP_PATH "/com/nokia/backup"
-#define BACKUP_PLUGIN_INTERFACE "com.nokia.backup.plugin"
-#define BACKUP_DBUS_TIMEOUT (1000 * 60 * 15)
-
-static const uint8_t FTP_TARGET[TARGET_SIZE] = {
- 0xF9, 0xEC, 0x7B, 0xC4, 0x95, 0x3C, 0x11, 0xD2,
- 0x98, 0x4E, 0x52, 0x54, 0x00, 0xDC, 0x9E, 0x09 };
-
-struct backup_object{
- gchar *cmd;
- int fd;
- int oflag;
- int error_code;
- mode_t mode;
- DBusPendingCall *pending_call;
- DBusConnection *conn;
-};
-
-static void on_backup_dbus_notify(DBusPendingCall *pending_call,
- void *user_data)
-{
- struct backup_object *obj = user_data;
- DBusMessage *reply;
- const char *filename;
- int error_code;
-
- DBG("Notification received for pending call - %s", obj->cmd);
-
- reply = dbus_pending_call_steal_reply(pending_call);
-
- if (reply && dbus_message_get_args(reply, NULL, DBUS_TYPE_INT32,
- &error_code, DBUS_TYPE_STRING,
- &filename, DBUS_TYPE_INVALID)) {
-
- obj->error_code = error_code;
-
- if (filename) {
- DBG("Notification - file path = %s, error_code = %d",
- filename, error_code);
- if (error_code == 0)
- obj->fd = open(filename,obj->oflag,obj->mode);
- }
-
- } else
- DBG("Notification timed out or connection got closed");
-
- if (reply)
- dbus_message_unref(reply);
-
- dbus_pending_call_unref(pending_call);
- obj->pending_call = NULL;
- dbus_connection_unref(obj->conn);
- obj->conn = NULL;
-
- if (obj->fd >= 0) {
- DBG("File opened, setting io flags, cmd = %s",
- obj->cmd);
- if (obj->oflag == O_RDONLY)
- obex_object_set_io_flags(user_data, G_IO_IN, 0);
- else
- obex_object_set_io_flags(user_data, G_IO_OUT, 0);
- } else {
- DBG("File open error, setting io error, cmd = %s",
- obj->cmd);
- obex_object_set_io_flags(user_data, G_IO_ERR, -EPERM);
- }
-}
-
-static gboolean send_backup_dbus_message(const char *oper,
- struct backup_object *obj,
- size_t *size)
-{
- DBusConnection *conn;
- DBusMessage *msg;
- DBusPendingCall *pending_call;
- gboolean ret = FALSE;
- dbus_uint32_t file_size;
-
- file_size = size ? *size : 0;
-
- conn = g_dbus_setup_bus(DBUS_BUS_SESSION, NULL, NULL);
-
- if (conn == NULL)
- return FALSE;
-
- msg = dbus_message_new_method_call(BACKUP_BUS_NAME, BACKUP_PATH,
- BACKUP_PLUGIN_INTERFACE,
- "request");
- if (msg == NULL) {
- dbus_connection_unref(conn);
- return FALSE;
- }
-
- dbus_message_append_args(msg, DBUS_TYPE_STRING, &oper,
- DBUS_TYPE_STRING, &obj->cmd,
- DBUS_TYPE_INT32, &file_size,
- DBUS_TYPE_INVALID);
-
- if (strcmp(oper, "open") == 0) {
- ret = dbus_connection_send_with_reply(conn, msg, &pending_call,
- BACKUP_DBUS_TIMEOUT);
- dbus_message_unref(msg);
- if (ret) {
- obj->conn = conn;
- obj->pending_call = pending_call;
- ret = dbus_pending_call_set_notify(pending_call,
- on_backup_dbus_notify,
- obj, NULL);
- } else
- dbus_connection_unref(conn);
- } else {
- ret = dbus_connection_send(conn, msg, NULL);
- dbus_message_unref(msg);
- dbus_connection_unref(conn);
- }
-
- return ret;
-}
-
-static void *backup_open(const char *name, int oflag, mode_t mode,
- void *context, size_t *size, int *err)
-{
- struct backup_object *obj = g_new0(struct backup_object, 1);
-
- DBG("cmd = %s", name);
-
- obj->cmd = g_path_get_basename(name);
- obj->oflag = oflag;
- obj->mode = mode;
- obj->fd = -1;
- obj->pending_call = NULL;
- obj->conn = NULL;
- obj->error_code = 0;
-
- if (send_backup_dbus_message("open", obj, size) == FALSE) {
- g_free(obj);
- obj = NULL;
- }
-
- if (err)
- *err = 0;
-
- return obj;
-}
-
-static int backup_close(void *object)
-{
- struct backup_object *obj = object;
- size_t size = 0;
-
- DBG("cmd = %s", obj->cmd);
-
- if (obj->fd != -1)
- close(obj->fd);
-
- if (obj->pending_call) {
- dbus_pending_call_cancel(obj->pending_call);
- dbus_pending_call_unref(obj->pending_call);
- dbus_connection_unref(obj->conn);
- }
-
- send_backup_dbus_message("close", obj, &size);
-
- g_free(obj->cmd);
- g_free(obj);
-
- return 0;
-}
-
-static ssize_t backup_read(void *object, void *buf, size_t count,
- uint8_t *hi, unsigned int *flags)
-{
- struct backup_object *obj = object;
- ssize_t ret = 0;
-
- *hi = OBEX_HDR_BODY;
-
- if (flags)
- *flags = 0;
-
- if (obj->pending_call) {
- DBG("cmd = %s, IN WAITING STAGE", obj->cmd);
- return -EAGAIN;
- }
-
- if (obj->fd != -1) {
- DBG("cmd = %s, READING DATA", obj->cmd);
- ret = read(obj->fd, buf, count);
- if (ret < 0)
- ret = -errno;
- } else {
- DBG("cmd = %s, PERMANENT FAILURE", obj->cmd);
- ret = obj->error_code ? -obj->error_code : -ENOENT;
- }
-
- return ret;
-}
-
-static ssize_t backup_write(void *object, const void *buf, size_t count)
-{
- struct backup_object *obj = object;
- ssize_t ret = 0;
-
- if (obj->pending_call) {
- DBG("cmd = %s, IN WAITING STAGE", obj->cmd);
- return -EAGAIN;
- }
-
- if (obj->fd != -1) {
- ret = write(obj->fd, buf, count);
-
- DBG("cmd = %s, WRITTING", obj->cmd);
-
- if (ret < 0) {
- error("backup: cmd = %s", obj->cmd);
- ret = -errno;
- }
- } else {
- error("backup: cmd = %s", obj->cmd);
- ret = obj->error_code ? -obj->error_code : -ENOENT;
- }
-
- return ret;
-}
-
-static int backup_flush(void *object)
-{
- DBG("%p", object);
-
- return 0;
-}
-
-static struct obex_mime_type_driver backup = {
- .target = FTP_TARGET,
- .target_size = TARGET_SIZE,
- .mimetype = "application/vnd.nokia-backup",
- .open = backup_open,
- .close = backup_close,
- .read = backup_read,
- .write = backup_write,
- .flush = backup_flush,
-};
-
-static int backup_init(void)
-{
- return obex_mime_type_driver_register(&backup);
-}
-
-static void backup_exit(void)
-{
- obex_mime_type_driver_unregister(&backup);
-}
-
-OBEX_PLUGIN_DEFINE(backup, backup_init, backup_exit)
diff --git a/plugins/pcsuite.c b/plugins/pcsuite.c
new file mode 100644
index 0000000..9cf65c9
--- /dev/null
+++ b/plugins/pcsuite.c
@@ -0,0 +1,515 @@
+/*
+ *
+ * OBEX Server
+ *
+ * Copyright (C) 2007-2010 Nokia Corporation
+ * Copyright (C) 2007-2010 Marcel Holtmann <marcel@holtmann.org>
+ *
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <fcntl.h>
+#include <stdio.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+#include <dirent.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <unistd.h>
+#include <string.h>
+#include <stdio.h>
+
+#include <glib.h>
+#include "gdbus.h"
+
+#include <openobex/obex.h>
+#include <openobex/obex_const.h>
+
+#include "plugin.h"
+#include "log.h"
+#include "obex.h"
+#include "dbus.h"
+#include "mimetype.h"
+#include "service.h"
+#include "ftp.h"
+
+#define PCSUITE_CHANNEL 24
+#define PCSUITE_WHO_SIZE 8
+
+#define PCSUITE_RECORD "<?xml version=\"1.0\" encoding=\"UTF-8\" ?> \
+<record> \
+ <attribute id=\"0x0001\"> \
+ <sequence> \
+ <uuid value=\"00005005-0000-1000-8000-0002ee000001\"/> \
+ </sequence> \
+ </attribute> \
+ \
+ <attribute id=\"0x0004\"> \
+ <sequence> \
+ <sequence> \
+ <uuid value=\"0x0100\"/> \
+ </sequence> \
+ <sequence> \
+ <uuid value=\"0x0003\"/> \
+ <uint8 value=\"%u\" name=\"channel\"/> \
+ </sequence> \
+ <sequence> \
+ <uuid value=\"0x0008\"/> \
+ </sequence> \
+ </sequence> \
+ </attribute> \
+ \
+ <attribute id=\"0x0005\"> \
+ <sequence> \
+ <uuid value=\"0x1002\"/> \
+ </sequence> \
+ </attribute> \
+ \
+ <attribute id=\"0x0009\"> \
+ <sequence> \
+ <sequence> \
+ <uuid value=\"00005005-0000-1000-8000-0002ee000001\"/> \
+ <uint16 value=\"0x0100\" name=\"version\"/> \
+ </sequence> \
+ </sequence> \
+ </attribute> \
+ \
+ <attribute id=\"0x0100\"> \
+ <text value=\"%s\" name=\"name\"/> \
+ </attribute> \
+</record>"
+
+#define BACKUP_BUS_NAME "com.nokia.backup.plugin"
+#define BACKUP_PATH "/com/nokia/backup"
+#define BACKUP_PLUGIN_INTERFACE "com.nokia.backup.plugin"
+#define BACKUP_DBUS_TIMEOUT (1000 * 60 * 15)
+
+static const uint8_t FTP_TARGET[TARGET_SIZE] = {
+ 0xF9, 0xEC, 0x7B, 0xC4, 0x95, 0x3C, 0x11, 0xD2,
+ 0x98, 0x4E, 0x52, 0x54, 0x00, 0xDC, 0x9E, 0x09 };
+
+static const uint8_t PCSUITE_WHO[PCSUITE_WHO_SIZE] = {
+ 'P','C',' ','S','u','i','t','e' };
+
+struct pcsuite_session {
+ struct ftp_session *ftp;
+ char *lock_file;
+ int fd;
+};
+
+static void *pcsuite_connect(struct obex_session *os, int *err)
+{
+ struct pcsuite_session *pcsuite;
+ struct ftp_session *ftp;
+ int fd;
+ char *filename;
+
+ DBG("");
+
+ ftp = ftp_connect(os, err);
+ if (ftp == NULL)
+ return NULL;
+
+ filename = g_build_filename(g_get_home_dir(), ".pcsuite", NULL);
+
+ fd = open(filename, O_WRONLY | O_CREAT | O_EXCL, 0644);
+ if (fd < 0 && errno != EEXIST) {
+ error("open(%s): %s(%d)", filename, strerror(errno), errno);
+ goto fail;
+ }
+
+ /* Try to remove the file before retrying since it could be
+ that some process left/crash without removing it */
+ if (fd < 0) {
+ if (remove(filename) < 0) {
+ error("remove(%s): %s(%d)", filename, strerror(errno),
+ errno);
+ goto fail;
+ }
+
+ fd = open(filename, O_WRONLY | O_CREAT | O_EXCL, 0644);
+ if (fd < 0) {
+ error("open(%s): %s(%d)", filename, strerror(errno),
+ errno);
+ goto fail;
+ }
+ }
+
+ DBG("%s created", filename);
+
+ pcsuite = g_new0(struct pcsuite_session, 1);
+ pcsuite->ftp = ftp;
+ pcsuite->lock_file = filename;
+ pcsuite->fd = fd;
+
+ DBG("session %p created", pcsuite);
+
+ if (err)
+ *err = 0;
+
+ return pcsuite;
+
+fail:
+ if (ftp)
+ ftp_disconnect(os, ftp);
+ if (err)
+ *err = -errno;
+
+ g_free(filename);
+
+ return NULL;
+}
+
+static int pcsuite_get(struct obex_session *os, obex_object_t *obj,
+ gboolean *stream, void *user_data)
+{
+ struct pcsuite_session *pcsuite = user_data;
+
+ DBG("%p", pcsuite);
+
+ return ftp_get(os, obj, stream, pcsuite->ftp);
+}
+
+static int pcsuite_chkput(struct obex_session *os, void *user_data)
+{
+ struct pcsuite_session *pcsuite = user_data;
+
+ DBG("%p", pcsuite);
+
+ return ftp_chkput(os, pcsuite->ftp);
+}
+
+static int pcsuite_put(struct obex_session *os, obex_object_t *obj,
+ void *user_data)
+{
+ struct pcsuite_session *pcsuite = user_data;
+
+ DBG("%p", pcsuite);
+
+ return ftp_put(os, obj, pcsuite->ftp);
+}
+
+static int pcsuite_setpath(struct obex_session *os, obex_object_t *obj,
+ void *user_data)
+{
+ struct pcsuite_session *pcsuite = user_data;
+
+ DBG("%p", pcsuite);
+
+ return ftp_setpath(os, obj, pcsuite->ftp);
+}
+
+static void pcsuite_disconnect(struct obex_session *os, void *user_data)
+{
+ struct pcsuite_session *pcsuite = user_data;
+
+ DBG("%p", pcsuite);
+
+ if (pcsuite->fd >= 0)
+ close(pcsuite->fd);
+
+ if (pcsuite->lock_file) {
+ remove(pcsuite->lock_file);
+ g_free(pcsuite->lock_file);
+ }
+
+ if (pcsuite->ftp)
+ ftp_disconnect(os, pcsuite->ftp);
+
+ g_free(pcsuite);
+}
+
+static struct obex_service_driver pcsuite = {
+ .name = "Nokia OBEX PC Suite Services",
+ .service = OBEX_PCSUITE,
+ .channel = PCSUITE_CHANNEL,
+ .record = PCSUITE_RECORD,
+ .target = FTP_TARGET,
+ .target_size = TARGET_SIZE,
+ .who = PCSUITE_WHO,
+ .who_size = PCSUITE_WHO_SIZE,
+ .connect = pcsuite_connect,
+ .get = pcsuite_get,
+ .put = pcsuite_put,
+ .chkput = pcsuite_chkput,
+ .setpath = pcsuite_setpath,
+ .disconnect = pcsuite_disconnect
+};
+
+struct backup_object{
+ gchar *cmd;
+ int fd;
+ int oflag;
+ int error_code;
+ mode_t mode;
+ DBusPendingCall *pending_call;
+ DBusConnection *conn;
+};
+
+static void on_backup_dbus_notify(DBusPendingCall *pending_call,
+ void *user_data)
+{
+ struct backup_object *obj = user_data;
+ DBusMessage *reply;
+ const char *filename;
+ int error_code;
+
+ DBG("Notification received for pending call - %s", obj->cmd);
+
+ reply = dbus_pending_call_steal_reply(pending_call);
+
+ if (reply && dbus_message_get_args(reply, NULL, DBUS_TYPE_INT32,
+ &error_code, DBUS_TYPE_STRING,
+ &filename, DBUS_TYPE_INVALID)) {
+
+ obj->error_code = error_code;
+
+ if (filename) {
+ DBG("Notification - file path = %s, error_code = %d",
+ filename, error_code);
+ if (error_code == 0)
+ obj->fd = open(filename,obj->oflag,obj->mode);
+ }
+
+ } else
+ DBG("Notification timed out or connection got closed");
+
+ if (reply)
+ dbus_message_unref(reply);
+
+ dbus_pending_call_unref(pending_call);
+ obj->pending_call = NULL;
+ dbus_connection_unref(obj->conn);
+ obj->conn = NULL;
+
+ if (obj->fd >= 0) {
+ DBG("File opened, setting io flags, cmd = %s",
+ obj->cmd);
+ if (obj->oflag == O_RDONLY)
+ obex_object_set_io_flags(user_data, G_IO_IN, 0);
+ else
+ obex_object_set_io_flags(user_data, G_IO_OUT, 0);
+ } else {
+ DBG("File open error, setting io error, cmd = %s",
+ obj->cmd);
+ obex_object_set_io_flags(user_data, G_IO_ERR, -EPERM);
+ }
+}
+
+static gboolean send_backup_dbus_message(const char *oper,
+ struct backup_object *obj,
+ size_t *size)
+{
+ DBusConnection *conn;
+ DBusMessage *msg;
+ DBusPendingCall *pending_call;
+ gboolean ret = FALSE;
+ dbus_uint32_t file_size;
+
+ file_size = size ? *size : 0;
+
+ conn = g_dbus_setup_bus(DBUS_BUS_SESSION, NULL, NULL);
+
+ if (conn == NULL)
+ return FALSE;
+
+ msg = dbus_message_new_method_call(BACKUP_BUS_NAME, BACKUP_PATH,
+ BACKUP_PLUGIN_INTERFACE,
+ "request");
+ if (msg == NULL) {
+ dbus_connection_unref(conn);
+ return FALSE;
+ }
+
+ dbus_message_append_args(msg, DBUS_TYPE_STRING, &oper,
+ DBUS_TYPE_STRING, &obj->cmd,
+ DBUS_TYPE_INT32, &file_size,
+ DBUS_TYPE_INVALID);
+
+ if (strcmp(oper, "open") == 0) {
+ ret = dbus_connection_send_with_reply(conn, msg, &pending_call,
+ BACKUP_DBUS_TIMEOUT);
+ dbus_message_unref(msg);
+ if (ret) {
+ obj->conn = conn;
+ obj->pending_call = pending_call;
+ ret = dbus_pending_call_set_notify(pending_call,
+ on_backup_dbus_notify,
+ obj, NULL);
+ } else
+ dbus_connection_unref(conn);
+ } else {
+ ret = dbus_connection_send(conn, msg, NULL);
+ dbus_message_unref(msg);
+ dbus_connection_unref(conn);
+ }
+
+ return ret;
+}
+
+static void *backup_open(const char *name, int oflag, mode_t mode,
+ void *context, size_t *size, int *err)
+{
+ struct backup_object *obj = g_new0(struct backup_object, 1);
+
+ DBG("cmd = %s", name);
+
+ obj->cmd = g_path_get_basename(name);
+ obj->oflag = oflag;
+ obj->mode = mode;
+ obj->fd = -1;
+ obj->pending_call = NULL;
+ obj->conn = NULL;
+ obj->error_code = 0;
+
+ if (send_backup_dbus_message("open", obj, size) == FALSE) {
+ g_free(obj);
+ obj = NULL;
+ }
+
+ if (err)
+ *err = 0;
+
+ return obj;
+}
+
+static int backup_close(void *object)
+{
+ struct backup_object *obj = object;
+ size_t size = 0;
+
+ DBG("cmd = %s", obj->cmd);
+
+ if (obj->fd != -1)
+ close(obj->fd);
+
+ if (obj->pending_call) {
+ dbus_pending_call_cancel(obj->pending_call);
+ dbus_pending_call_unref(obj->pending_call);
+ dbus_connection_unref(obj->conn);
+ }
+
+ send_backup_dbus_message("close", obj, &size);
+
+ g_free(obj->cmd);
+ g_free(obj);
+
+ return 0;
+}
+
+static ssize_t backup_read(void *object, void *buf, size_t count,
+ uint8_t *hi, unsigned int *flags)
+{
+ struct backup_object *obj = object;
+ ssize_t ret = 0;
+
+ *hi = OBEX_HDR_BODY;
+
+ if (flags)
+ *flags = 0;
+
+ if (obj->pending_call) {
+ DBG("cmd = %s, IN WAITING STAGE", obj->cmd);
+ return -EAGAIN;
+ }
+
+ if (obj->fd != -1) {
+ DBG("cmd = %s, READING DATA", obj->cmd);
+ ret = read(obj->fd, buf, count);
+ if (ret < 0)
+ ret = -errno;
+ } else {
+ DBG("cmd = %s, PERMANENT FAILURE", obj->cmd);
+ ret = obj->error_code ? -obj->error_code : -ENOENT;
+ }
+
+ return ret;
+}
+
+static ssize_t backup_write(void *object, const void *buf, size_t count)
+{
+ struct backup_object *obj = object;
+ ssize_t ret = 0;
+
+ if (obj->pending_call) {
+ DBG("cmd = %s, IN WAITING STAGE", obj->cmd);
+ return -EAGAIN;
+ }
+
+ if (obj->fd != -1) {
+ ret = write(obj->fd, buf, count);
+
+ DBG("cmd = %s, WRITTING", obj->cmd);
+
+ if (ret < 0) {
+ error("backup: cmd = %s", obj->cmd);
+ ret = -errno;
+ }
+ } else {
+ error("backup: cmd = %s", obj->cmd);
+ ret = obj->error_code ? -obj->error_code : -ENOENT;
+ }
+
+ return ret;
+}
+
+static int backup_flush(void *object)
+{
+ DBG("%p", object);
+
+ return 0;
+}
+
+static struct obex_mime_type_driver backup = {
+ .target = FTP_TARGET,
+ .target_size = TARGET_SIZE,
+ .mimetype = "application/vnd.nokia-backup",
+ .open = backup_open,
+ .close = backup_close,
+ .read = backup_read,
+ .write = backup_write,
+ .flush = backup_flush,
+};
+
+static int pcsuite_init(void)
+{
+ int err;
+
+ err = obex_service_driver_register(&pcsuite);
+ if (err < 0)
+ return err;
+
+ err = obex_mime_type_driver_register(&backup);
+ if (err < 0)
+ obex_service_driver_unregister(&pcsuite);
+
+ return err;
+}
+
+static void pcsuite_exit(void)
+{
+ obex_mime_type_driver_unregister(&backup);
+ obex_service_driver_unregister(&pcsuite);
+}
+
+OBEX_PLUGIN_DEFINE(pcsuite, pcsuite_init, pcsuite_exit)
--
1.7.1
^ permalink raw reply related
* Re: [PATCH 5/6] Move pcsuite drivers to its own plugin
From: Luiz Augusto von Dentz @ 2011-02-26 18:52 UTC (permalink / raw)
To: Luiz Augusto von Dentz, linux-bluetooth; +Cc: Johan Hedberg
In-Reply-To: <20110223144413.GA26355@jh-x301>
Hi,
On Wed, Feb 23, 2011 at 11:44 AM, Johan Hedberg <johan.hedberg@gmail.com> wrote:
> Hi Luiz,
>
> On Wed, Feb 23, 2011, Luiz Augusto von Dentz wrote:
>> This make it easier to enable/disable this funcionality as a whole.
>> ---
>> Makefile.am | 6 +-
>> configure.ac | 9 +-
>> plugins/ftp.c | 165 ++------------------------
>> plugins/nokia-backup.c | 309 ------------------------------------------------
>> 4 files changed, 16 insertions(+), 473 deletions(-)
>> delete mode 100644 plugins/nokia-backup.c
>
> It seems like you've forgotten to do git add plugins/pcsuite.c?
Apparently I did, I will resend it once a figure out where this file
is or just redo it.
> Anyway, I went ahead and applied patches 1-4.
>
> Johan
>
--
Luiz Augusto von Dentz
Computer Engineer
^ permalink raw reply
* Re: [PATCH] Bluetooth: Fix BT_L2CAP and BT_SCO in Kconfig
From: Vitaly Wool @ 2011-02-26 17:52 UTC (permalink / raw)
To: Gustavo F. Padovan; +Cc: davem, linville, linux-bluetooth, netdev
In-Reply-To: <1298684485-3081-1-git-send-email-padovan@profusion.mobi>
Hi Gustavo,
On Sat, Feb 26, 2011 at 2:41 AM, Gustavo F. Padovan
<padovan@profusion.mobi> wrote:
> If we want something "bool" built-in in something "tristate" it can't
> "depend on" the tristate config option.
>
> Report by DaveM:
>
> I give it 'y' just to make it happen, for both, and afterways no
> matter how many times I rerun "make oldconfig" I keep seeing things
> like this in my build:
>
> scripts/kconfig/conf --silentoldconfig Kconfig
> include/config/auto.conf:986:warning: symbol value 'm' invalid for BT_SCO
> include/config/auto.conf:3156:warning: symbol value 'm' invalid for BT_L2CAP
>
> Reported-by: David S. Miller <davem@davemloft.net>
> Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
> ---
> net/bluetooth/Kconfig | 6 ++++--
> 1 files changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/net/bluetooth/Kconfig b/net/bluetooth/Kconfig
> index c6f9c2f..6ae5ec5 100644
> --- a/net/bluetooth/Kconfig
> +++ b/net/bluetooth/Kconfig
> @@ -31,9 +31,10 @@ menuconfig BT
> to Bluetooth kernel modules are provided in the BlueZ packages. For
> more information, see <http://www.bluez.org/>.
>
> +if BT != n
> +
> config BT_L2CAP
> bool "L2CAP protocol support"
> - depends on BT
> select CRC16
> help
> L2CAP (Logical Link Control and Adaptation Protocol) provides
> @@ -42,11 +43,12 @@ config BT_L2CAP
>
> config BT_SCO
> bool "SCO links support"
> - depends on BT
> help
> SCO link provides voice transport over Bluetooth. SCO support is
> required for voice applications like Headset and Audio.
>
> +endif
> +
Ugh, isn't it far cleaner to change initial dependencies to "depends
on BT != n" ?
Thanks,
Vitaly
^ permalink raw reply
* Linux 2.6.28-10 Oops in hci_send_to_sock
From: lundman @ 2011-02-26 5:57 UTC (permalink / raw)
To: linux-bluetooth
I apologies to bring up such an old kernel, but with embedded devices, I
do not have the ability to change kernel. I am trying to start
bluetooth, but I get a kernel panic. I have one device attached.
# insmod bluetooth.ko
# insmod l2cap.ko
# insmod btusb.ko
# insmod sco.ko
# insmod uinput.ko
# ./bluetoothd -d -n
[snip]
bluetoothd[1786]: src/main.c:main() Entering main loop
bluetoothd[1786]: plugins/hciops.c:init_known_adapters()
bluetoothd[1786]: HCI dev 0 registered
bluetoothd[1786]: plugins/hciops.c:device_devreg_setup() hci0
bluetoothd[1786]: plugins/hciops.c:init_device() hci0
bluetoothd[1786]: Listening for HCI events on hci0
bluetoothd[1786]: plugins/hciops.c:init_device() child 1789 forked
# BUG: unable to handle kernel NULL pointer dereference at 00000008
IP: [<cf107ca2>] hci_send_to_sock+0x70/0x12c [bluetooth]
*pdpt = 000000000a197001 *pde = 0000000000000000
Oops: 0000 [#1] PREEMPT
last sysfs file: /sys/class/misc/uinput/dev
Modules linked in: uinput sco btusb l2cap bluetooth fusion pvrsrvkm
alsa_shim sx
Pid: 0, comm: swapper Not tainted (2.6.28 #1)
EIP: 0060:[<cf107ca2>] EFLAGS: 00010246 CPU: 0
EIP is at hci_send_to_sock+0x70/0x12c [bluetooth]
EAX: 00000001 EBX: 00000000 ECX: 00000204 EDX: ca1eb600
ESI: cc3cbf74 EDI: 00000008 EBP: cc3cbe00 ESP: c056fef8
DS: 007b ES: 007b FS: 0000 GS: 0000 SS: 0068
Process swapper (pid: 0, ti=c056e000 task=c0531380 task.ti=c056e000)
Stack:
ca1eb600 ca3a6400 cc3cbe08 00000000 ca1eb600 ca3a6400 0000000a cf103299
cc011380 00000001 00000040 cc011490 0000012c 00000000 00000000 00000014
00000102 0000000a c011ee03 00000001 c011ec7e cfb49f40 cfb2b989 00000004
Call Trace:
[<cf103299>] hci_rx_task+0x2a/0x209 [bluetooth]
[<c011ee03>] tasklet_action+0x34/0x69
[<c011ec7e>] __do_softirq+0x53/0xe7
[<cfb2b989>] SystemISRWrapper+0xe/0x24 [pvrsrvkm]
[<c013a8dc>] handle_IRQ_event+0x25/0x4a
[<c011ed39>] do_softirq+0x27/0x29
[<c011ef52>] irq_exit+0x32/0x34
[<c0104ed8>] do_IRQ+0x4c/0x94
[<c01039bf>] common_interrupt+0x23/0x28
[<c0108a16>] mwait_idle+0x2d/0x32
[<c0101b0c>] cpu_idle+0x1e/0x63
Code: 74 01 00 00 89 ca 83 e2 1f 80 f9 ff 0f 45 c2 0f a3 06 19 c0 85 c0
74 7f 8
EIP: [<cf107ca2>] hci_send_to_sock+0x70/0x12c [bluetooth] SS:ESP
0068:c056fef8
Kernel panic - not syncing: Fatal exception in interrupt
I was hoping I could jog someones memory, and maybe get references to
some existing patches maybe, that I can apply to the kernel module by hand?
Thanks for any reply,
Lund
^ permalink raw reply
* [PATCH] Bluetooth: Fix BT_L2CAP and BT_SCO in Kconfig
From: Gustavo F. Padovan @ 2011-02-26 1:41 UTC (permalink / raw)
To: davem; +Cc: linville, linux-bluetooth, netdev
In-Reply-To: <20110226013639.GA2166@joana>
If we want something "bool" built-in in something "tristate" it can't
"depend on" the tristate config option.
Report by DaveM:
I give it 'y' just to make it happen, for both, and afterways no
matter how many times I rerun "make oldconfig" I keep seeing things
like this in my build:
scripts/kconfig/conf --silentoldconfig Kconfig
include/config/auto.conf:986:warning: symbol value 'm' invalid for BT_SCO
include/config/auto.conf:3156:warning: symbol value 'm' invalid for BT_L2CAP
Reported-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
---
net/bluetooth/Kconfig | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/net/bluetooth/Kconfig b/net/bluetooth/Kconfig
index c6f9c2f..6ae5ec5 100644
--- a/net/bluetooth/Kconfig
+++ b/net/bluetooth/Kconfig
@@ -31,9 +31,10 @@ menuconfig BT
to Bluetooth kernel modules are provided in the BlueZ packages. For
more information, see <http://www.bluez.org/>.
+if BT != n
+
config BT_L2CAP
bool "L2CAP protocol support"
- depends on BT
select CRC16
help
L2CAP (Logical Link Control and Adaptation Protocol) provides
@@ -42,11 +43,12 @@ config BT_L2CAP
config BT_SCO
bool "SCO links support"
- depends on BT
help
SCO link provides voice transport over Bluetooth. SCO support is
required for voice applications like Headset and Audio.
+endif
+
source "net/bluetooth/rfcomm/Kconfig"
source "net/bluetooth/bnep/Kconfig"
--
1.7.4.1
^ permalink raw reply related
* Re: pull request: wireless-next-2.6 2011-02-22
From: Gustavo F. Padovan @ 2011-02-26 1:36 UTC (permalink / raw)
To: David Miller, linville, linux-wireless, linux-bluetooth, netdev
In-Reply-To: <20110225193618.GB2107@joana>
* Gustavo F. Padovan <padovan@profusion.mobi> [2011-02-25 16:36:18 -0300]:
> Hi David,
>
> * David Miller <davem@davemloft.net> [2011-02-25 11:15:00 -0800]:
>
> > From: David Miller <davem@davemloft.net>
> > Date: Thu, 24 Feb 2011 22:43:44 -0800 (PST)
> >
> > > From: "John W. Linville" <linville@tuxdriver.com>
> > > Date: Tue, 22 Feb 2011 16:52:30 -0500
> > >
> > >> Here is the latest batch of wireless bits intended for 2.6.39. It seems
> > >> I neglected to send a pull request last week, so this one is a bit big
> > >> -- I apologize!
> > >>
> > >> This includes a rather large batch of bluetooth bits by way of Gustavo.
> > >> It looks like a variety of bits, including some code refactoring, some
> > >> protocol support enhancements, some bugfixes, etc. -- nothing too
> > >> unusual.
> > >>
> > >> Other items of interest include a new driver from Realtek, some ssb
> > >> support enhancements, and the usual sort of updates for mac80211 and a
> > >> variety of drivers. Also included is a wireless-2.6 pull to resolve
> > >> some build breakage.
> > >>
> > >> Please let me know if there are problems!
> > >
> > > Pulled, thanks a lot John.
> >
> > John a few things:
> >
> > 1) I had to add some vmalloc.h includes to fix the build on sparc64,
> > see commit b08cd667c4b6641c4d16a3f87f4550f81a6d69ac in net-next-2.6
> >
> > 2) Something is screwey with the bluetooth config options now.
> >
> > I have an allmodconfig tree, and when I run "make oldconfig" after
> > this pull, BT_L2CAP and BT_SCO both prompt me, claiming that they
> > can only be built statically.
> >
> > I give it 'y' just to make it happen, for both, and afterways no
> > matter how many times I rerun "make oldconfig" I keep seeing things
> > like this in my build:
> >
> > scripts/kconfig/conf --silentoldconfig Kconfig
> > include/config/auto.conf:986:warning: symbol value 'm' invalid for BT_SCO
> > include/config/auto.conf:3156:warning: symbol value 'm' invalid for BT_L2CAP
> >
> > First, what the heck is going on here? Second, why the heck can't these
> > non-trivial pieces of code be built modular any more?
>
> We now have L2CAP and SCO built-in in the main bluetooth.ko module.
>
> >
> > You can't make something "bool", have it depend on something that
> > might be modular, and then build it into what could in fact be a
> > module. That's exactly what the bluetooth stuff seems to be doing
> > now.
>
> Seems I did the Kconfig change wrong, I'll fix it ASAP and send it to you
> guys.
I Figured the problem. When I first wrote this I based the work in other
Kconfig in net/ (as it was my very first time doing such kind of changes in a
Kconfig). For example, net/decnet/ and net/ax25/ do exactly the same as the
Bluetooth Kconfig. "bool" depending on "tristate" and build both together.
But doing another look after your report there is some places where this is
done a bit different, net/ipv6 and net/mac80211 are examples. Then I changed
to this new approach to remove the direct dependency from BT_L2CAP and BT_SCO.
Patch follows this e-mail.
That point me out that we may have other subsystems doing it wrong and we have
to fix this.
--
Gustavo F. Padovan
http://profusion.mobi
^ permalink raw reply
* [PATCH] Add filter option to test/test-discovery
From: Anderson Lizardo @ 2011-02-25 21:38 UTC (permalink / raw)
To: linux-bluetooth; +Cc: Anderson Lizardo
Add a new --filter option, which can be used to only show discovery
results which satisfy a given (Python) expression. This expression can
use any property of a discovered device. Example:
test-discovery -f "Name == 'BlueZ'"
test-discovery --filter="LegacyPairing == 1"
This option is useful for showing only devices which we are interested
on, e.g. LE devices (once we have a property to identify them).
---
test/test-discovery | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/test/test-discovery b/test/test-discovery
index 22c88c3..92f931d 100755
--- a/test/test-discovery
+++ b/test/test-discovery
@@ -7,6 +7,13 @@ import dbus.mainloop.glib
from optparse import OptionParser, make_option
def device_found(address, properties):
+ import sys
+ try:
+ if options.filter and not eval(options.filter, dict(properties)):
+ return
+ except NameError:
+ return
+
print "[ " + address + " ]"
for key in properties.keys():
@@ -30,6 +37,9 @@ if __name__ == '__main__':
option_list = [
make_option("-i", "--device", action="store",
type="string", dest="dev_id"),
+ make_option("-f", "--filter", action="store",
+ type="string", dest="filter", metavar="PYTHON_EXPR",
+ help="Filter results according to PYTHON_EXPR"),
]
parser = OptionParser(option_list=option_list)
--
1.7.0.4
^ permalink raw reply related
* Re: pull request: wireless-next-2.6 2011-02-22
From: John W. Linville @ 2011-02-25 19:48 UTC (permalink / raw)
To: David Miller; +Cc: linux-wireless, linux-bluetooth, netdev, padovan
In-Reply-To: <20110225.111500.59674472.davem@davemloft.net>
On Fri, Feb 25, 2011 at 11:15:00AM -0800, David Miller wrote:
> From: David Miller <davem@davemloft.net>
> Date: Thu, 24 Feb 2011 22:43:44 -0800 (PST)
> > Pulled, thanks a lot John.
>
> John a few things:
>
> 1) I had to add some vmalloc.h includes to fix the build on sparc64,
> see commit b08cd667c4b6641c4d16a3f87f4550f81a6d69ac in net-next-2.6
I have a patch in my tree for that -- seems they hit it on ARM as well.
> 2) Something is screwey with the bluetooth config options now.
>
> I have an allmodconfig tree, and when I run "make oldconfig" after
> this pull, BT_L2CAP and BT_SCO both prompt me, claiming that they
> can only be built statically.
>
> I give it 'y' just to make it happen, for both, and afterways no
> matter how many times I rerun "make oldconfig" I keep seeing things
> like this in my build:
>
> scripts/kconfig/conf --silentoldconfig Kconfig
> include/config/auto.conf:986:warning: symbol value 'm' invalid for BT_SCO
> include/config/auto.conf:3156:warning: symbol value 'm' invalid for BT_L2CAP
>
> First, what the heck is going on here? Second, why the heck can't these
> non-trivial pieces of code be built modular any more?
>
> You can't make something "bool", have it depend on something that
> might be modular, and then build it into what could in fact be a
> module. That's exactly what the bluetooth stuff seems to be doing
> now.
>
> I suspect commit 642745184f82688eb3ef0cdfaa4ba632055be9af
>
> Thanks.
Sorry, I overlooked that. Hopefully Gustavo will figure it out quickly.
Thanks,
John
--
John W. Linville Someday the world will need a hero, and you
linville@tuxdriver.com might be all we have. Be ready.
^ permalink raw reply
* Re: pull request: wireless-next-2.6 2011-02-22
From: Gustavo F. Padovan @ 2011-02-25 19:36 UTC (permalink / raw)
To: David Miller; +Cc: linville, linux-wireless, linux-bluetooth, netdev
In-Reply-To: <20110225.111500.59674472.davem@davemloft.net>
Hi David,
* David Miller <davem@davemloft.net> [2011-02-25 11:15:00 -0800]:
> From: David Miller <davem@davemloft.net>
> Date: Thu, 24 Feb 2011 22:43:44 -0800 (PST)
>
> > From: "John W. Linville" <linville@tuxdriver.com>
> > Date: Tue, 22 Feb 2011 16:52:30 -0500
> >
> >> Here is the latest batch of wireless bits intended for 2.6.39. It seems
> >> I neglected to send a pull request last week, so this one is a bit big
> >> -- I apologize!
> >>
> >> This includes a rather large batch of bluetooth bits by way of Gustavo.
> >> It looks like a variety of bits, including some code refactoring, some
> >> protocol support enhancements, some bugfixes, etc. -- nothing too
> >> unusual.
> >>
> >> Other items of interest include a new driver from Realtek, some ssb
> >> support enhancements, and the usual sort of updates for mac80211 and a
> >> variety of drivers. Also included is a wireless-2.6 pull to resolve
> >> some build breakage.
> >>
> >> Please let me know if there are problems!
> >
> > Pulled, thanks a lot John.
>
> John a few things:
>
> 1) I had to add some vmalloc.h includes to fix the build on sparc64,
> see commit b08cd667c4b6641c4d16a3f87f4550f81a6d69ac in net-next-2.6
>
> 2) Something is screwey with the bluetooth config options now.
>
> I have an allmodconfig tree, and when I run "make oldconfig" after
> this pull, BT_L2CAP and BT_SCO both prompt me, claiming that they
> can only be built statically.
>
> I give it 'y' just to make it happen, for both, and afterways no
> matter how many times I rerun "make oldconfig" I keep seeing things
> like this in my build:
>
> scripts/kconfig/conf --silentoldconfig Kconfig
> include/config/auto.conf:986:warning: symbol value 'm' invalid for BT_SCO
> include/config/auto.conf:3156:warning: symbol value 'm' invalid for BT_L2CAP
>
> First, what the heck is going on here? Second, why the heck can't these
> non-trivial pieces of code be built modular any more?
We now have L2CAP and SCO built-in in the main bluetooth.ko module.
>
> You can't make something "bool", have it depend on something that
> might be modular, and then build it into what could in fact be a
> module. That's exactly what the bluetooth stuff seems to be doing
> now.
Seems I did the Kconfig change wrong, I'll fix it ASAP and send it to you
guys.
--
Gustavo F. Padovan
http://profusion.mobi
^ permalink raw reply
* Re: pull request: wireless-next-2.6 2011-02-22
From: David Miller @ 2011-02-25 19:15 UTC (permalink / raw)
To: linville; +Cc: linux-wireless, linux-bluetooth, netdev, padovan
In-Reply-To: <20110224.224344.104068328.davem@davemloft.net>
From: David Miller <davem@davemloft.net>
Date: Thu, 24 Feb 2011 22:43:44 -0800 (PST)
> From: "John W. Linville" <linville@tuxdriver.com>
> Date: Tue, 22 Feb 2011 16:52:30 -0500
>
>> Here is the latest batch of wireless bits intended for 2.6.39. It seems
>> I neglected to send a pull request last week, so this one is a bit big
>> -- I apologize!
>>
>> This includes a rather large batch of bluetooth bits by way of Gustavo.
>> It looks like a variety of bits, including some code refactoring, some
>> protocol support enhancements, some bugfixes, etc. -- nothing too
>> unusual.
>>
>> Other items of interest include a new driver from Realtek, some ssb
>> support enhancements, and the usual sort of updates for mac80211 and a
>> variety of drivers. Also included is a wireless-2.6 pull to resolve
>> some build breakage.
>>
>> Please let me know if there are problems!
>
> Pulled, thanks a lot John.
John a few things:
1) I had to add some vmalloc.h includes to fix the build on sparc64,
see commit b08cd667c4b6641c4d16a3f87f4550f81a6d69ac in net-next-2.6
2) Something is screwey with the bluetooth config options now.
I have an allmodconfig tree, and when I run "make oldconfig" after
this pull, BT_L2CAP and BT_SCO both prompt me, claiming that they
can only be built statically.
I give it 'y' just to make it happen, for both, and afterways no
matter how many times I rerun "make oldconfig" I keep seeing things
like this in my build:
scripts/kconfig/conf --silentoldconfig Kconfig
include/config/auto.conf:986:warning: symbol value 'm' invalid for BT_SCO
include/config/auto.conf:3156:warning: symbol value 'm' invalid for BT_L2CAP
First, what the heck is going on here? Second, why the heck can't these
non-trivial pieces of code be built modular any more?
You can't make something "bool", have it depend on something that
might be modular, and then build it into what could in fact be a
module. That's exactly what the bluetooth stuff seems to be doing
now.
I suspect commit 642745184f82688eb3ef0cdfaa4ba632055be9af
Thanks.
^ permalink raw reply
* Re: [bluetooth-next 00/15] SMP Just Works Implementation
From: Vinicius Costa Gomes @ 2011-02-25 18:19 UTC (permalink / raw)
To: Brian Gix; +Cc: BlueZ development, Gustavo F. Padovan
In-Reply-To: <4D67E50D.8050302@codeaurora.org>
Hi,
On 09:21 Fri 25 Feb, Brian Gix wrote:
> Hi Gustavo, Vinicius,
>
> I would like to add my support for promoting these LE Security
> Manager patches into the bluetooth-next tip.
>
I would like to add my support as well :-)
On the other hand I did some (minor) improvements on the error handling.
It can be found on my personal repository[1].
As the difference is just a couple of lines, I am not spammig this list again.
> On 2/21/2011 9:23 AM, Vinicius Costa Gomes wrote:
> >Hi,
> >
> >This patch series implement the Just Works SMP procedures for LE links.
> >
> >These patches can also be reached from here[1].
> >
>
[ ... ]
>
> --
> Brian Gix
> bgix@codeaurora.org
> Employee of Qualcomm Innovation Center, Inc.
> Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum
--
Vinicius
[1] git://git.infradead.org/users/vcgomes/linux-2.6.git for-next
http://git.infradead.org/users/vcgomes/linux-2.6.git (for-next branch)
http://gitorious.org/bluetooth-next/bluetooth-next (mirror)
^ permalink raw reply
* [PATCH v3 3/3] Bluetooth: Validate data size before accessing mgmt commands
From: Szymon Janc @ 2011-02-25 18:05 UTC (permalink / raw)
To: linux-bluetooth; +Cc: par-gunnar.p.hjalmdahl, henrik.possung, Szymon Janc
In-Reply-To: <1298657149-3091-1-git-send-email-szymon.janc@tieto.com>
Crafted (too small) data buffer could result in reading data outside of buffer.
Validate buffer size and return EINVAL if size is wrong.
Signed-off-by: Szymon Janc <szymon.janc@tieto.com>
---
net/bluetooth/mgmt.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 52 insertions(+), 0 deletions(-)
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index 98c92ae..16c7a4d 100644
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -302,6 +302,9 @@ static int set_powered(struct sock *sk, u16 index, unsigned char *data, u16 len)
BT_DBG("request for hci%u", index);
+ if (len != sizeof(*cp))
+ return cmd_status(sk, index, MGMT_OP_SET_POWERED, EINVAL);
+
hdev = hci_dev_get(index);
if (!hdev)
return cmd_status(sk, index, MGMT_OP_SET_POWERED, ENODEV);
@@ -351,6 +354,9 @@ static int set_discoverable(struct sock *sk, u16 index, unsigned char *data,
BT_DBG("request for hci%u", index);
+ if (len != sizeof(*cp))
+ return cmd_status(sk, index, MGMT_OP_SET_DISCOVERABLE, EINVAL);
+
hdev = hci_dev_get(index);
if (!hdev)
return cmd_status(sk, index, MGMT_OP_SET_DISCOVERABLE, ENODEV);
@@ -409,6 +415,9 @@ static int set_connectable(struct sock *sk, u16 index, unsigned char *data,
BT_DBG("request for hci%u", index);
+ if (len != sizeof(*cp))
+ return cmd_status(sk, index, MGMT_OP_SET_CONNECTABLE, EINVAL);
+
hdev = hci_dev_get(index);
if (!hdev)
return cmd_status(sk, index, MGMT_OP_SET_CONNECTABLE, ENODEV);
@@ -499,6 +508,9 @@ static int set_pairable(struct sock *sk, u16 index, unsigned char *data,
BT_DBG("request for hci%u", index);
+ if (len != sizeof(*cp))
+ return cmd_status(sk, index, MGMT_OP_SET_PAIRABLE, EINVAL);
+
hdev = hci_dev_get(index);
if (!hdev)
return cmd_status(sk, index, MGMT_OP_SET_PAIRABLE, ENODEV);
@@ -569,6 +581,9 @@ static int add_uuid(struct sock *sk, u16 index, unsigned char *data, u16 len)
BT_DBG("request for hci%u", index);
+ if (len != sizeof(*cp))
+ return cmd_status(sk, index, MGMT_OP_ADD_UUID, EINVAL);
+
hdev = hci_dev_get(index);
if (!hdev)
return cmd_status(sk, index, MGMT_OP_ADD_UUID, ENODEV);
@@ -611,6 +626,9 @@ static int remove_uuid(struct sock *sk, u16 index, unsigned char *data, u16 len)
BT_DBG("request for hci%u", index);
+ if (len != sizeof(*cp))
+ return cmd_status(sk, index, MGMT_OP_REMOVE_UUID, EINVAL);
+
hdev = hci_dev_get(index);
if (!hdev)
return cmd_status(sk, index, MGMT_OP_REMOVE_UUID, ENODEV);
@@ -663,6 +681,9 @@ static int set_dev_class(struct sock *sk, u16 index, unsigned char *data,
BT_DBG("request for hci%u", index);
+ if (len != sizeof(*cp))
+ return cmd_status(sk, index, MGMT_OP_SET_DEV_CLASS, EINVAL);
+
hdev = hci_dev_get(index);
if (!hdev)
return cmd_status(sk, index, MGMT_OP_SET_DEV_CLASS, ENODEV);
@@ -692,6 +713,10 @@ static int set_service_cache(struct sock *sk, u16 index, unsigned char *data,
cp = (void *) data;
+ if (len != sizeof(*cp))
+ return cmd_status(sk, index, MGMT_OP_SET_SERVICE_CACHE,
+ EINVAL);
+
hdev = hci_dev_get(index);
if (!hdev)
return cmd_status(sk, index, MGMT_OP_SET_SERVICE_CACHE, ENODEV);
@@ -726,6 +751,10 @@ static int load_keys(struct sock *sk, u16 index, unsigned char *data, u16 len)
int i;
cp = (void *) data;
+
+ if (len < sizeof(*cp))
+ return -EINVAL;
+
key_count = get_unaligned_le16(&cp->key_count);
expected_len = sizeof(*cp) + key_count * sizeof(struct mgmt_key_info);
@@ -775,6 +804,9 @@ static int remove_key(struct sock *sk, u16 index, unsigned char *data, u16 len)
cp = (void *) data;
+ if (len != sizeof(*cp))
+ return cmd_status(sk, index, MGMT_OP_REMOVE_KEY, EINVAL);
+
hdev = hci_dev_get(index);
if (!hdev)
return cmd_status(sk, index, MGMT_OP_REMOVE_KEY, ENODEV);
@@ -821,6 +853,9 @@ static int disconnect(struct sock *sk, u16 index, unsigned char *data, u16 len)
cp = (void *) data;
+ if (len != sizeof(*cp))
+ return cmd_status(sk, index, MGMT_OP_DISCONNECT, EINVAL);
+
hdev = hci_dev_get(index);
if (!hdev)
return cmd_status(sk, index, MGMT_OP_DISCONNECT, ENODEV);
@@ -931,6 +966,9 @@ static int pin_code_reply(struct sock *sk, u16 index, unsigned char *data,
cp = (void *) data;
+ if (len != sizeof(*cp))
+ return cmd_status(sk, index, MGMT_OP_PIN_CODE_REPLY, EINVAL);
+
hdev = hci_dev_get(index);
if (!hdev)
return cmd_status(sk, index, MGMT_OP_PIN_CODE_REPLY, ENODEV);
@@ -975,6 +1013,10 @@ static int pin_code_neg_reply(struct sock *sk, u16 index, unsigned char *data,
cp = (void *) data;
+ if (len != sizeof(*cp))
+ return cmd_status(sk, index, MGMT_OP_PIN_CODE_NEG_REPLY,
+ EINVAL);
+
hdev = hci_dev_get(index);
if (!hdev)
return cmd_status(sk, index, MGMT_OP_PIN_CODE_NEG_REPLY,
@@ -1017,6 +1059,10 @@ static int set_io_capability(struct sock *sk, u16 index, unsigned char *data,
cp = (void *) data;
+ if (len != sizeof(*cp))
+ return cmd_status(sk, index, MGMT_OP_SET_IO_CAPABILITY,
+ EINVAL);
+
hdev = hci_dev_get(index);
if (!hdev)
return cmd_status(sk, index, MGMT_OP_SET_IO_CAPABILITY, ENODEV);
@@ -1107,6 +1153,9 @@ static int pair_device(struct sock *sk, u16 index, unsigned char *data, u16 len)
cp = (void *) data;
+ if (len != sizeof(*cp))
+ return cmd_status(sk, index, MGMT_OP_PAIR_DEVICE, EINVAL);
+
hdev = hci_dev_get(index);
if (!hdev)
return cmd_status(sk, index, MGMT_OP_PAIR_DEVICE, ENODEV);
@@ -1178,6 +1227,9 @@ static int user_confirm_reply(struct sock *sk, u16 index, unsigned char *data,
hci_op = HCI_OP_USER_CONFIRM_NEG_REPLY;
}
+ if (len != sizeof(*cp))
+ return cmd_status(sk, index, mgmt_op, EINVAL);
+
hdev = hci_dev_get(index);
if (!hdev)
return cmd_status(sk, index, mgmt_op, ENODEV);
--
1.7.0.4
on behalf of ST-Ericsson
^ permalink raw reply related
* [PATCH v3 2/3] Bluetooth: Move index to common header in management interface
From: Szymon Janc @ 2011-02-25 18:05 UTC (permalink / raw)
To: linux-bluetooth; +Cc: par-gunnar.p.hjalmdahl, henrik.possung, Szymon Janc
In-Reply-To: <1298657149-3091-1-git-send-email-szymon.janc@tieto.com>
Most mgmt commands and event are related to hci adapter. Moving index to
common header allow to easily use it in command status while reporting errors.
For those not related to adapter use MGMT_INDEX_NONE (0xFFFF) as index.
Signed-off-by: Szymon Janc <szymon.janc@tieto.com>
---
include/net/bluetooth/mgmt.h | 43 +----
net/bluetooth/mgmt.c | 407 +++++++++++++++++++-----------------------
2 files changed, 183 insertions(+), 267 deletions(-)
diff --git a/include/net/bluetooth/mgmt.h b/include/net/bluetooth/mgmt.h
index 1e63c31..5fabfa8 100644
--- a/include/net/bluetooth/mgmt.h
+++ b/include/net/bluetooth/mgmt.h
@@ -21,11 +21,13 @@
SOFTWARE IS DISCLAIMED.
*/
+#define MGMT_INDEX_NONE 0xFFFF
+
struct mgmt_hdr {
__le16 opcode;
+ __le16 index;
__le16 len;
} __packed;
-#define MGMT_HDR_SIZE 4
#define MGMT_OP_READ_VERSION 0x0001
struct mgmt_rp_read_version {
@@ -40,11 +42,7 @@ struct mgmt_rp_read_index_list {
} __packed;
#define MGMT_OP_READ_INFO 0x0004
-struct mgmt_cp_read_info {
- __le16 index;
-} __packed;
struct mgmt_rp_read_info {
- __le16 index;
__u8 type;
__u8 powered;
__u8 connectable;
@@ -60,7 +58,6 @@ struct mgmt_rp_read_info {
} __packed;
struct mgmt_mode {
- __le16 index;
__u8 val;
} __packed;
@@ -74,27 +71,23 @@ struct mgmt_mode {
#define MGMT_OP_ADD_UUID 0x0009
struct mgmt_cp_add_uuid {
- __le16 index;
__u8 uuid[16];
__u8 svc_hint;
} __packed;
#define MGMT_OP_REMOVE_UUID 0x000A
struct mgmt_cp_remove_uuid {
- __le16 index;
__u8 uuid[16];
} __packed;
#define MGMT_OP_SET_DEV_CLASS 0x000B
struct mgmt_cp_set_dev_class {
- __le16 index;
__u8 major;
__u8 minor;
} __packed;
#define MGMT_OP_SET_SERVICE_CACHE 0x000C
struct mgmt_cp_set_service_cache {
- __le16 index;
__u8 enable;
} __packed;
@@ -107,7 +100,6 @@ struct mgmt_key_info {
#define MGMT_OP_LOAD_KEYS 0x000D
struct mgmt_cp_load_keys {
- __le16 index;
__u8 debug_keys;
__le16 key_count;
struct mgmt_key_info keys[0];
@@ -115,75 +107,60 @@ struct mgmt_cp_load_keys {
#define MGMT_OP_REMOVE_KEY 0x000E
struct mgmt_cp_remove_key {
- __le16 index;
bdaddr_t bdaddr;
__u8 disconnect;
} __packed;
#define MGMT_OP_DISCONNECT 0x000F
struct mgmt_cp_disconnect {
- __le16 index;
bdaddr_t bdaddr;
} __packed;
struct mgmt_rp_disconnect {
- __le16 index;
bdaddr_t bdaddr;
} __packed;
#define MGMT_OP_GET_CONNECTIONS 0x0010
-struct mgmt_cp_get_connections {
- __le16 index;
-} __packed;
struct mgmt_rp_get_connections {
- __le16 index;
__le16 conn_count;
bdaddr_t conn[0];
} __packed;
#define MGMT_OP_PIN_CODE_REPLY 0x0011
struct mgmt_cp_pin_code_reply {
- __le16 index;
bdaddr_t bdaddr;
__u8 pin_len;
__u8 pin_code[16];
} __packed;
struct mgmt_rp_pin_code_reply {
- __le16 index;
bdaddr_t bdaddr;
uint8_t status;
} __packed;
#define MGMT_OP_PIN_CODE_NEG_REPLY 0x0012
struct mgmt_cp_pin_code_neg_reply {
- __le16 index;
bdaddr_t bdaddr;
} __packed;
#define MGMT_OP_SET_IO_CAPABILITY 0x0013
struct mgmt_cp_set_io_capability {
- __le16 index;
__u8 io_capability;
} __packed;
#define MGMT_OP_PAIR_DEVICE 0x0014
struct mgmt_cp_pair_device {
- __le16 index;
bdaddr_t bdaddr;
__u8 io_cap;
} __packed;
struct mgmt_rp_pair_device {
- __le16 index;
bdaddr_t bdaddr;
__u8 status;
} __packed;
#define MGMT_OP_USER_CONFIRM_REPLY 0x0015
struct mgmt_cp_user_confirm_reply {
- __le16 index;
bdaddr_t bdaddr;
} __packed;
struct mgmt_rp_user_confirm_reply {
- __le16 index;
bdaddr_t bdaddr;
__u8 status;
} __packed;
@@ -204,19 +181,12 @@ struct mgmt_ev_cmd_status {
#define MGMT_EV_CONTROLLER_ERROR 0x0003
struct mgmt_ev_controller_error {
- __le16 index;
__u8 error_code;
} __packed;
#define MGMT_EV_INDEX_ADDED 0x0004
-struct mgmt_ev_index_added {
- __le16 index;
-} __packed;
#define MGMT_EV_INDEX_REMOVED 0x0005
-struct mgmt_ev_index_removed {
- __le16 index;
-} __packed;
#define MGMT_EV_POWERED 0x0006
@@ -228,46 +198,39 @@ struct mgmt_ev_index_removed {
#define MGMT_EV_NEW_KEY 0x000A
struct mgmt_ev_new_key {
- __le16 index;
struct mgmt_key_info key;
__u8 old_key_type;
} __packed;
#define MGMT_EV_CONNECTED 0x000B
struct mgmt_ev_connected {
- __le16 index;
bdaddr_t bdaddr;
} __packed;
#define MGMT_EV_DISCONNECTED 0x000C
struct mgmt_ev_disconnected {
- __le16 index;
bdaddr_t bdaddr;
} __packed;
#define MGMT_EV_CONNECT_FAILED 0x000D
struct mgmt_ev_connect_failed {
- __le16 index;
bdaddr_t bdaddr;
__u8 status;
} __packed;
#define MGMT_EV_PIN_CODE_REQUEST 0x000E
struct mgmt_ev_pin_code_request {
- __le16 index;
bdaddr_t bdaddr;
} __packed;
#define MGMT_EV_USER_CONFIRM_REQUEST 0x000F
struct mgmt_ev_user_confirm_request {
- __le16 index;
bdaddr_t bdaddr;
__le32 value;
} __packed;
#define MGMT_EV_AUTH_FAILED 0x0010
struct mgmt_ev_auth_failed {
- __le16 index;
bdaddr_t bdaddr;
__u8 status;
} __packed;
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index 4543ede..98c92ae 100644
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -43,7 +43,7 @@ struct pending_cmd {
LIST_HEAD(cmd_list);
-static int cmd_status(struct sock *sk, u16 cmd, u8 status)
+static int cmd_status(struct sock *sk, u16 index, u16 cmd, u8 status)
{
struct sk_buff *skb;
struct mgmt_hdr *hdr;
@@ -58,6 +58,7 @@ static int cmd_status(struct sock *sk, u16 cmd, u8 status)
hdr = (void *) skb_put(skb, sizeof(*hdr));
hdr->opcode = cpu_to_le16(MGMT_EV_CMD_STATUS);
+ hdr->index = cpu_to_le16(index);
hdr->len = cpu_to_le16(sizeof(*ev));
ev = (void *) skb_put(skb, sizeof(*ev));
@@ -70,7 +71,8 @@ static int cmd_status(struct sock *sk, u16 cmd, u8 status)
return 0;
}
-static int cmd_complete(struct sock *sk, u16 cmd, void *rp, size_t rp_len)
+static int cmd_complete(struct sock *sk, u16 index, u16 cmd, void *rp,
+ size_t rp_len)
{
struct sk_buff *skb;
struct mgmt_hdr *hdr;
@@ -85,6 +87,7 @@ static int cmd_complete(struct sock *sk, u16 cmd, void *rp, size_t rp_len)
hdr = (void *) skb_put(skb, sizeof(*hdr));
hdr->opcode = cpu_to_le16(MGMT_EV_CMD_COMPLETE);
+ hdr->index = cpu_to_le16(index);
hdr->len = cpu_to_le16(sizeof(*ev) + rp_len);
ev = (void *) skb_put(skb, sizeof(*ev) + rp_len);
@@ -106,7 +109,8 @@ static int read_version(struct sock *sk)
rp.version = MGMT_VERSION;
put_unaligned_le16(MGMT_REVISION, &rp.revision);
- return cmd_complete(sk, MGMT_OP_READ_VERSION, &rp, sizeof(rp));
+ return cmd_complete(sk, MGMT_INDEX_NONE, MGMT_OP_READ_VERSION, &rp,
+ sizeof(rp));
}
static int read_index_list(struct sock *sk)
@@ -152,32 +156,24 @@ static int read_index_list(struct sock *sk)
read_unlock(&hci_dev_list_lock);
- err = cmd_complete(sk, MGMT_OP_READ_INDEX_LIST, rp, rp_len);
+ err = cmd_complete(sk, MGMT_INDEX_NONE, MGMT_OP_READ_INDEX_LIST, rp,
+ rp_len);
kfree(rp);
return err;
}
-static int read_controller_info(struct sock *sk, unsigned char *data, u16 len)
+static int read_controller_info(struct sock *sk, u16 index)
{
struct mgmt_rp_read_info rp;
- struct mgmt_cp_read_info *cp = (void *) data;
struct hci_dev *hdev;
- u16 dev_id;
- BT_DBG("sock %p", sk);
-
- if (len != 2)
- return cmd_status(sk, MGMT_OP_READ_INFO, EINVAL);
-
- dev_id = get_unaligned_le16(&cp->index);
+ BT_DBG("sock %p hci%u", sk, index);
- BT_DBG("request for hci%u", dev_id);
-
- hdev = hci_dev_get(dev_id);
+ hdev = hci_dev_get(index);
if (!hdev)
- return cmd_status(sk, MGMT_OP_READ_INFO, ENODEV);
+ return cmd_status(sk, index, MGMT_OP_READ_INFO, ENODEV);
hci_del_off_timer(hdev);
@@ -185,7 +181,6 @@ static int read_controller_info(struct sock *sk, unsigned char *data, u16 len)
set_bit(HCI_MGMT, &hdev->flags);
- put_unaligned_le16(hdev->id, &rp.index);
rp.type = hdev->dev_type;
rp.powered = test_bit(HCI_UP, &hdev->flags);
@@ -210,7 +205,7 @@ static int read_controller_info(struct sock *sk, unsigned char *data, u16 len)
hci_dev_unlock_bh(hdev);
hci_dev_put(hdev);
- return cmd_complete(sk, MGMT_OP_READ_INFO, &rp, sizeof(rp));
+ return cmd_complete(sk, index, MGMT_OP_READ_INFO, &rp, sizeof(rp));
}
static void mgmt_pending_free(struct pending_cmd *cmd)
@@ -296,37 +291,35 @@ static void mgmt_pending_remove(struct pending_cmd *cmd)
mgmt_pending_free(cmd);
}
-static int set_powered(struct sock *sk, unsigned char *data, u16 len)
+static int set_powered(struct sock *sk, u16 index, unsigned char *data, u16 len)
{
struct mgmt_mode *cp;
struct hci_dev *hdev;
struct pending_cmd *cmd;
- u16 dev_id;
int err, up;
cp = (void *) data;
- dev_id = get_unaligned_le16(&cp->index);
- BT_DBG("request for hci%u", dev_id);
+ BT_DBG("request for hci%u", index);
- hdev = hci_dev_get(dev_id);
+ hdev = hci_dev_get(index);
if (!hdev)
- return cmd_status(sk, MGMT_OP_SET_POWERED, ENODEV);
+ return cmd_status(sk, index, MGMT_OP_SET_POWERED, ENODEV);
hci_dev_lock_bh(hdev);
up = test_bit(HCI_UP, &hdev->flags);
if ((cp->val && up) || (!cp->val && !up)) {
- err = cmd_status(sk, MGMT_OP_SET_POWERED, EALREADY);
+ err = cmd_status(sk, index, MGMT_OP_SET_POWERED, EALREADY);
goto failed;
}
- if (mgmt_pending_find(MGMT_OP_SET_POWERED, dev_id)) {
- err = cmd_status(sk, MGMT_OP_SET_POWERED, EBUSY);
+ if (mgmt_pending_find(MGMT_OP_SET_POWERED, index)) {
+ err = cmd_status(sk, index, MGMT_OP_SET_POWERED, EBUSY);
goto failed;
}
- cmd = mgmt_pending_add(sk, MGMT_OP_SET_POWERED, dev_id, data, len);
+ cmd = mgmt_pending_add(sk, MGMT_OP_SET_POWERED, index, data, len);
if (!cmd) {
err = -ENOMEM;
goto failed;
@@ -345,44 +338,43 @@ failed:
return err;
}
-static int set_discoverable(struct sock *sk, unsigned char *data, u16 len)
+static int set_discoverable(struct sock *sk, u16 index, unsigned char *data,
+ u16 len)
{
struct mgmt_mode *cp;
struct hci_dev *hdev;
struct pending_cmd *cmd;
- u16 dev_id;
u8 scan;
int err;
cp = (void *) data;
- dev_id = get_unaligned_le16(&cp->index);
- BT_DBG("request for hci%u", dev_id);
+ BT_DBG("request for hci%u", index);
- hdev = hci_dev_get(dev_id);
+ hdev = hci_dev_get(index);
if (!hdev)
- return cmd_status(sk, MGMT_OP_SET_DISCOVERABLE, ENODEV);
+ return cmd_status(sk, index, MGMT_OP_SET_DISCOVERABLE, ENODEV);
hci_dev_lock_bh(hdev);
if (!test_bit(HCI_UP, &hdev->flags)) {
- err = cmd_status(sk, MGMT_OP_SET_DISCOVERABLE, ENETDOWN);
+ err = cmd_status(sk, index, MGMT_OP_SET_DISCOVERABLE, ENETDOWN);
goto failed;
}
- if (mgmt_pending_find(MGMT_OP_SET_DISCOVERABLE, dev_id) ||
- mgmt_pending_find(MGMT_OP_SET_CONNECTABLE, dev_id)) {
- err = cmd_status(sk, MGMT_OP_SET_DISCOVERABLE, EBUSY);
+ if (mgmt_pending_find(MGMT_OP_SET_DISCOVERABLE, index) ||
+ mgmt_pending_find(MGMT_OP_SET_CONNECTABLE, index)) {
+ err = cmd_status(sk, index, MGMT_OP_SET_DISCOVERABLE, EBUSY);
goto failed;
}
if (cp->val == test_bit(HCI_ISCAN, &hdev->flags) &&
test_bit(HCI_PSCAN, &hdev->flags)) {
- err = cmd_status(sk, MGMT_OP_SET_DISCOVERABLE, EALREADY);
+ err = cmd_status(sk, index, MGMT_OP_SET_DISCOVERABLE, EALREADY);
goto failed;
}
- cmd = mgmt_pending_add(sk, MGMT_OP_SET_DISCOVERABLE, dev_id, data, len);
+ cmd = mgmt_pending_add(sk, MGMT_OP_SET_DISCOVERABLE, index, data, len);
if (!cmd) {
err = -ENOMEM;
goto failed;
@@ -404,43 +396,42 @@ failed:
return err;
}
-static int set_connectable(struct sock *sk, unsigned char *data, u16 len)
+static int set_connectable(struct sock *sk, u16 index, unsigned char *data,
+ u16 len)
{
struct mgmt_mode *cp;
struct hci_dev *hdev;
struct pending_cmd *cmd;
- u16 dev_id;
u8 scan;
int err;
cp = (void *) data;
- dev_id = get_unaligned_le16(&cp->index);
- BT_DBG("request for hci%u", dev_id);
+ BT_DBG("request for hci%u", index);
- hdev = hci_dev_get(dev_id);
+ hdev = hci_dev_get(index);
if (!hdev)
- return cmd_status(sk, MGMT_OP_SET_CONNECTABLE, ENODEV);
+ return cmd_status(sk, index, MGMT_OP_SET_CONNECTABLE, ENODEV);
hci_dev_lock_bh(hdev);
if (!test_bit(HCI_UP, &hdev->flags)) {
- err = cmd_status(sk, MGMT_OP_SET_CONNECTABLE, ENETDOWN);
+ err = cmd_status(sk, index, MGMT_OP_SET_CONNECTABLE, ENETDOWN);
goto failed;
}
- if (mgmt_pending_find(MGMT_OP_SET_DISCOVERABLE, dev_id) ||
- mgmt_pending_find(MGMT_OP_SET_CONNECTABLE, dev_id)) {
- err = cmd_status(sk, MGMT_OP_SET_CONNECTABLE, EBUSY);
+ if (mgmt_pending_find(MGMT_OP_SET_DISCOVERABLE, index) ||
+ mgmt_pending_find(MGMT_OP_SET_CONNECTABLE, index)) {
+ err = cmd_status(sk, index, MGMT_OP_SET_CONNECTABLE, EBUSY);
goto failed;
}
if (cp->val == test_bit(HCI_PSCAN, &hdev->flags)) {
- err = cmd_status(sk, MGMT_OP_SET_CONNECTABLE, EALREADY);
+ err = cmd_status(sk, index, MGMT_OP_SET_CONNECTABLE, EALREADY);
goto failed;
}
- cmd = mgmt_pending_add(sk, MGMT_OP_SET_CONNECTABLE, dev_id, data, len);
+ cmd = mgmt_pending_add(sk, MGMT_OP_SET_CONNECTABLE, index, data, len);
if (!cmd) {
err = -ENOMEM;
goto failed;
@@ -462,7 +453,8 @@ failed:
return err;
}
-static int mgmt_event(u16 event, void *data, u16 data_len, struct sock *skip_sk)
+static int mgmt_event(u16 event, u16 index, void *data, u16 data_len,
+ struct sock *skip_sk)
{
struct sk_buff *skb;
struct mgmt_hdr *hdr;
@@ -475,9 +467,11 @@ static int mgmt_event(u16 event, void *data, u16 data_len, struct sock *skip_sk)
hdr = (void *) skb_put(skb, sizeof(*hdr));
hdr->opcode = cpu_to_le16(event);
+ hdr->index = cpu_to_le16(index);
hdr->len = cpu_to_le16(data_len);
- memcpy(skb_put(skb, data_len), data, data_len);
+ if (data)
+ memcpy(skb_put(skb, data_len), data, data_len);
hci_send_to_sock(NULL, skb, skip_sk);
kfree_skb(skb);
@@ -489,27 +483,25 @@ static int send_mode_rsp(struct sock *sk, u16 opcode, u16 index, u8 val)
{
struct mgmt_mode rp;
- put_unaligned_le16(index, &rp.index);
rp.val = val;
- return cmd_complete(sk, opcode, &rp, sizeof(rp));
+ return cmd_complete(sk, index, opcode, &rp, sizeof(rp));
}
-static int set_pairable(struct sock *sk, unsigned char *data, u16 len)
+static int set_pairable(struct sock *sk, u16 index, unsigned char *data,
+ u16 len)
{
struct mgmt_mode *cp, ev;
struct hci_dev *hdev;
- u16 dev_id;
int err;
cp = (void *) data;
- dev_id = get_unaligned_le16(&cp->index);
- BT_DBG("request for hci%u", dev_id);
+ BT_DBG("request for hci%u", index);
- hdev = hci_dev_get(dev_id);
+ hdev = hci_dev_get(index);
if (!hdev)
- return cmd_status(sk, MGMT_OP_SET_PAIRABLE, ENODEV);
+ return cmd_status(sk, index, MGMT_OP_SET_PAIRABLE, ENODEV);
hci_dev_lock_bh(hdev);
@@ -518,14 +510,13 @@ static int set_pairable(struct sock *sk, unsigned char *data, u16 len)
else
clear_bit(HCI_PAIRABLE, &hdev->flags);
- err = send_mode_rsp(sk, MGMT_OP_SET_PAIRABLE, dev_id, cp->val);
+ err = send_mode_rsp(sk, MGMT_OP_SET_PAIRABLE, index, cp->val);
if (err < 0)
goto failed;
- put_unaligned_le16(dev_id, &ev.index);
ev.val = cp->val;
- err = mgmt_event(MGMT_EV_PAIRABLE, &ev, sizeof(ev), sk);
+ err = mgmt_event(MGMT_EV_PAIRABLE, index, &ev, sizeof(ev), sk);
failed:
hci_dev_unlock_bh(hdev);
@@ -567,22 +558,20 @@ static int update_class(struct hci_dev *hdev)
return hci_send_cmd(hdev, HCI_OP_WRITE_CLASS_OF_DEV, sizeof(cod), cod);
}
-static int add_uuid(struct sock *sk, unsigned char *data, u16 len)
+static int add_uuid(struct sock *sk, u16 index, unsigned char *data, u16 len)
{
struct mgmt_cp_add_uuid *cp;
struct hci_dev *hdev;
struct bt_uuid *uuid;
- u16 dev_id;
int err;
cp = (void *) data;
- dev_id = get_unaligned_le16(&cp->index);
- BT_DBG("request for hci%u", dev_id);
+ BT_DBG("request for hci%u", index);
- hdev = hci_dev_get(dev_id);
+ hdev = hci_dev_get(index);
if (!hdev)
- return cmd_status(sk, MGMT_OP_ADD_UUID, ENODEV);
+ return cmd_status(sk, index, MGMT_OP_ADD_UUID, ENODEV);
hci_dev_lock_bh(hdev);
@@ -601,7 +590,7 @@ static int add_uuid(struct sock *sk, unsigned char *data, u16 len)
if (err < 0)
goto failed;
- err = cmd_complete(sk, MGMT_OP_ADD_UUID, &dev_id, sizeof(dev_id));
+ err = cmd_complete(sk, index, MGMT_OP_ADD_UUID, NULL, 0);
failed:
hci_dev_unlock_bh(hdev);
@@ -610,23 +599,21 @@ failed:
return err;
}
-static int remove_uuid(struct sock *sk, unsigned char *data, u16 len)
+static int remove_uuid(struct sock *sk, u16 index, unsigned char *data, u16 len)
{
struct list_head *p, *n;
struct mgmt_cp_remove_uuid *cp;
struct hci_dev *hdev;
u8 bt_uuid_any[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
- u16 dev_id;
int err, found;
cp = (void *) data;
- dev_id = get_unaligned_le16(&cp->index);
- BT_DBG("request for hci%u", dev_id);
+ BT_DBG("request for hci%u", index);
- hdev = hci_dev_get(dev_id);
+ hdev = hci_dev_get(index);
if (!hdev)
- return cmd_status(sk, MGMT_OP_REMOVE_UUID, ENODEV);
+ return cmd_status(sk, index, MGMT_OP_REMOVE_UUID, ENODEV);
hci_dev_lock_bh(hdev);
@@ -648,7 +635,7 @@ static int remove_uuid(struct sock *sk, unsigned char *data, u16 len)
}
if (found == 0) {
- err = cmd_status(sk, MGMT_OP_REMOVE_UUID, ENOENT);
+ err = cmd_status(sk, index, MGMT_OP_REMOVE_UUID, ENOENT);
goto unlock;
}
@@ -656,7 +643,7 @@ static int remove_uuid(struct sock *sk, unsigned char *data, u16 len)
if (err < 0)
goto unlock;
- err = cmd_complete(sk, MGMT_OP_REMOVE_UUID, &dev_id, sizeof(dev_id));
+ err = cmd_complete(sk, index, MGMT_OP_REMOVE_UUID, NULL, 0);
unlock:
hci_dev_unlock_bh(hdev);
@@ -665,21 +652,20 @@ unlock:
return err;
}
-static int set_dev_class(struct sock *sk, unsigned char *data, u16 len)
+static int set_dev_class(struct sock *sk, u16 index, unsigned char *data,
+ u16 len)
{
struct hci_dev *hdev;
struct mgmt_cp_set_dev_class *cp;
- u16 dev_id;
int err;
cp = (void *) data;
- dev_id = get_unaligned_le16(&cp->index);
- BT_DBG("request for hci%u", dev_id);
+ BT_DBG("request for hci%u", index);
- hdev = hci_dev_get(dev_id);
+ hdev = hci_dev_get(index);
if (!hdev)
- return cmd_status(sk, MGMT_OP_SET_DEV_CLASS, ENODEV);
+ return cmd_status(sk, index, MGMT_OP_SET_DEV_CLASS, ENODEV);
hci_dev_lock_bh(hdev);
@@ -689,8 +675,7 @@ static int set_dev_class(struct sock *sk, unsigned char *data, u16 len)
err = update_class(hdev);
if (err == 0)
- err = cmd_complete(sk, MGMT_OP_SET_DEV_CLASS, &dev_id,
- sizeof(dev_id));
+ err = cmd_complete(sk, index, MGMT_OP_SET_DEV_CLASS, NULL, 0);
hci_dev_unlock_bh(hdev);
hci_dev_put(hdev);
@@ -698,23 +683,22 @@ static int set_dev_class(struct sock *sk, unsigned char *data, u16 len)
return err;
}
-static int set_service_cache(struct sock *sk, unsigned char *data, u16 len)
+static int set_service_cache(struct sock *sk, u16 index, unsigned char *data,
+ u16 len)
{
struct hci_dev *hdev;
struct mgmt_cp_set_service_cache *cp;
- u16 dev_id;
int err;
cp = (void *) data;
- dev_id = get_unaligned_le16(&cp->index);
- hdev = hci_dev_get(dev_id);
+ hdev = hci_dev_get(index);
if (!hdev)
- return cmd_status(sk, MGMT_OP_SET_SERVICE_CACHE, ENODEV);
+ return cmd_status(sk, index, MGMT_OP_SET_SERVICE_CACHE, ENODEV);
hci_dev_lock_bh(hdev);
- BT_DBG("hci%u enable %d", dev_id, cp->enable);
+ BT_DBG("hci%u enable %d", index, cp->enable);
if (cp->enable) {
set_bit(HCI_SERVICE_CACHE, &hdev->flags);
@@ -725,8 +709,8 @@ static int set_service_cache(struct sock *sk, unsigned char *data, u16 len)
}
if (err == 0)
- err = cmd_complete(sk, MGMT_OP_SET_SERVICE_CACHE, &dev_id,
- sizeof(dev_id));
+ err = cmd_complete(sk, index, MGMT_OP_SET_SERVICE_CACHE, NULL,
+ 0);
hci_dev_unlock_bh(hdev);
hci_dev_put(hdev);
@@ -734,15 +718,14 @@ static int set_service_cache(struct sock *sk, unsigned char *data, u16 len)
return err;
}
-static int load_keys(struct sock *sk, unsigned char *data, u16 len)
+static int load_keys(struct sock *sk, u16 index, unsigned char *data, u16 len)
{
struct hci_dev *hdev;
struct mgmt_cp_load_keys *cp;
- u16 dev_id, key_count, expected_len;
+ u16 key_count, expected_len;
int i;
cp = (void *) data;
- dev_id = get_unaligned_le16(&cp->index);
key_count = get_unaligned_le16(&cp->key_count);
expected_len = sizeof(*cp) + key_count * sizeof(struct mgmt_key_info);
@@ -752,11 +735,11 @@ static int load_keys(struct sock *sk, unsigned char *data, u16 len)
return -EINVAL;
}
- hdev = hci_dev_get(dev_id);
+ hdev = hci_dev_get(index);
if (!hdev)
- return cmd_status(sk, MGMT_OP_LOAD_KEYS, ENODEV);
+ return cmd_status(sk, index, MGMT_OP_LOAD_KEYS, ENODEV);
- BT_DBG("hci%u debug_keys %u key_count %u", dev_id, cp->debug_keys,
+ BT_DBG("hci%u debug_keys %u key_count %u", index, cp->debug_keys,
key_count);
hci_dev_lock_bh(hdev);
@@ -783,26 +766,24 @@ static int load_keys(struct sock *sk, unsigned char *data, u16 len)
return 0;
}
-static int remove_key(struct sock *sk, unsigned char *data, u16 len)
+static int remove_key(struct sock *sk, u16 index, unsigned char *data, u16 len)
{
struct hci_dev *hdev;
struct mgmt_cp_remove_key *cp;
struct hci_conn *conn;
- u16 dev_id;
int err;
cp = (void *) data;
- dev_id = get_unaligned_le16(&cp->index);
- hdev = hci_dev_get(dev_id);
+ hdev = hci_dev_get(index);
if (!hdev)
- return cmd_status(sk, MGMT_OP_REMOVE_KEY, ENODEV);
+ return cmd_status(sk, index, MGMT_OP_REMOVE_KEY, ENODEV);
hci_dev_lock_bh(hdev);
err = hci_remove_link_key(hdev, &cp->bdaddr);
if (err < 0) {
- err = cmd_status(sk, MGMT_OP_REMOVE_KEY, -err);
+ err = cmd_status(sk, index, MGMT_OP_REMOVE_KEY, -err);
goto unlock;
}
@@ -827,44 +808,42 @@ unlock:
return err;
}
-static int disconnect(struct sock *sk, unsigned char *data, u16 len)
+static int disconnect(struct sock *sk, u16 index, unsigned char *data, u16 len)
{
struct hci_dev *hdev;
struct mgmt_cp_disconnect *cp;
struct hci_cp_disconnect dc;
struct pending_cmd *cmd;
struct hci_conn *conn;
- u16 dev_id;
int err;
BT_DBG("");
cp = (void *) data;
- dev_id = get_unaligned_le16(&cp->index);
- hdev = hci_dev_get(dev_id);
+ hdev = hci_dev_get(index);
if (!hdev)
- return cmd_status(sk, MGMT_OP_DISCONNECT, ENODEV);
+ return cmd_status(sk, index, MGMT_OP_DISCONNECT, ENODEV);
hci_dev_lock_bh(hdev);
if (!test_bit(HCI_UP, &hdev->flags)) {
- err = cmd_status(sk, MGMT_OP_DISCONNECT, ENETDOWN);
+ err = cmd_status(sk, index, MGMT_OP_DISCONNECT, ENETDOWN);
goto failed;
}
- if (mgmt_pending_find(MGMT_OP_DISCONNECT, dev_id)) {
- err = cmd_status(sk, MGMT_OP_DISCONNECT, EBUSY);
+ if (mgmt_pending_find(MGMT_OP_DISCONNECT, index)) {
+ err = cmd_status(sk, index, MGMT_OP_DISCONNECT, EBUSY);
goto failed;
}
conn = hci_conn_hash_lookup_ba(hdev, ACL_LINK, &cp->bdaddr);
if (!conn) {
- err = cmd_status(sk, MGMT_OP_DISCONNECT, ENOTCONN);
+ err = cmd_status(sk, index, MGMT_OP_DISCONNECT, ENOTCONN);
goto failed;
}
- cmd = mgmt_pending_add(sk, MGMT_OP_DISCONNECT, dev_id, data, len);
+ cmd = mgmt_pending_add(sk, MGMT_OP_DISCONNECT, index, data, len);
if (!cmd) {
err = -ENOMEM;
goto failed;
@@ -884,24 +863,24 @@ failed:
return err;
}
-static int get_connections(struct sock *sk, unsigned char *data, u16 len)
+static int get_connections(struct sock *sk, u16 index, unsigned char *data,
+ u16 len)
{
struct mgmt_cp_get_connections *cp;
struct mgmt_rp_get_connections *rp;
struct hci_dev *hdev;
struct list_head *p;
size_t rp_len;
- u16 dev_id, count;
+ u16 count;
int i, err;
BT_DBG("");
cp = (void *) data;
- dev_id = get_unaligned_le16(&cp->index);
- hdev = hci_dev_get(dev_id);
+ hdev = hci_dev_get(index);
if (!hdev)
- return cmd_status(sk, MGMT_OP_GET_CONNECTIONS, ENODEV);
+ return cmd_status(sk, index, MGMT_OP_GET_CONNECTIONS, ENODEV);
hci_dev_lock_bh(hdev);
@@ -917,7 +896,6 @@ static int get_connections(struct sock *sk, unsigned char *data, u16 len)
goto unlock;
}
- put_unaligned_le16(dev_id, &rp->index);
put_unaligned_le16(count, &rp->conn_count);
read_lock(&hci_dev_list_lock);
@@ -931,7 +909,7 @@ static int get_connections(struct sock *sk, unsigned char *data, u16 len)
read_unlock(&hci_dev_list_lock);
- err = cmd_complete(sk, MGMT_OP_GET_CONNECTIONS, rp, rp_len);
+ err = cmd_complete(sk, index, MGMT_OP_GET_CONNECTIONS, rp, rp_len);
unlock:
kfree(rp);
@@ -940,32 +918,31 @@ unlock:
return err;
}
-static int pin_code_reply(struct sock *sk, unsigned char *data, u16 len)
+static int pin_code_reply(struct sock *sk, u16 index, unsigned char *data,
+ u16 len)
{
struct hci_dev *hdev;
struct mgmt_cp_pin_code_reply *cp;
struct hci_cp_pin_code_reply reply;
struct pending_cmd *cmd;
- u16 dev_id;
int err;
BT_DBG("");
cp = (void *) data;
- dev_id = get_unaligned_le16(&cp->index);
- hdev = hci_dev_get(dev_id);
+ hdev = hci_dev_get(index);
if (!hdev)
- return cmd_status(sk, MGMT_OP_PIN_CODE_REPLY, ENODEV);
+ return cmd_status(sk, index, MGMT_OP_PIN_CODE_REPLY, ENODEV);
hci_dev_lock_bh(hdev);
if (!test_bit(HCI_UP, &hdev->flags)) {
- err = cmd_status(sk, MGMT_OP_PIN_CODE_REPLY, ENETDOWN);
+ err = cmd_status(sk, index, MGMT_OP_PIN_CODE_REPLY, ENETDOWN);
goto failed;
}
- cmd = mgmt_pending_add(sk, MGMT_OP_PIN_CODE_REPLY, dev_id, data, len);
+ cmd = mgmt_pending_add(sk, MGMT_OP_PIN_CODE_REPLY, index, data, len);
if (!cmd) {
err = -ENOMEM;
goto failed;
@@ -986,31 +963,32 @@ failed:
return err;
}
-static int pin_code_neg_reply(struct sock *sk, unsigned char *data, u16 len)
+static int pin_code_neg_reply(struct sock *sk, u16 index, unsigned char *data,
+ u16 len)
{
struct hci_dev *hdev;
struct mgmt_cp_pin_code_neg_reply *cp;
struct pending_cmd *cmd;
- u16 dev_id;
int err;
BT_DBG("");
cp = (void *) data;
- dev_id = get_unaligned_le16(&cp->index);
- hdev = hci_dev_get(dev_id);
+ hdev = hci_dev_get(index);
if (!hdev)
- return cmd_status(sk, MGMT_OP_PIN_CODE_NEG_REPLY, ENODEV);
+ return cmd_status(sk, index, MGMT_OP_PIN_CODE_NEG_REPLY,
+ ENODEV);
hci_dev_lock_bh(hdev);
if (!test_bit(HCI_UP, &hdev->flags)) {
- err = cmd_status(sk, MGMT_OP_PIN_CODE_NEG_REPLY, ENETDOWN);
+ err = cmd_status(sk, index, MGMT_OP_PIN_CODE_NEG_REPLY,
+ ENETDOWN);
goto failed;
}
- cmd = mgmt_pending_add(sk, MGMT_OP_PIN_CODE_NEG_REPLY, dev_id,
+ cmd = mgmt_pending_add(sk, MGMT_OP_PIN_CODE_NEG_REPLY, index,
data, len);
if (!cmd) {
err = -ENOMEM;
@@ -1029,20 +1007,19 @@ failed:
return err;
}
-static int set_io_capability(struct sock *sk, unsigned char *data, u16 len)
+static int set_io_capability(struct sock *sk, u16 index, unsigned char *data,
+ u16 len)
{
struct hci_dev *hdev;
struct mgmt_cp_set_io_capability *cp;
- u16 dev_id;
BT_DBG("");
cp = (void *) data;
- dev_id = get_unaligned_le16(&cp->index);
- hdev = hci_dev_get(dev_id);
+ hdev = hci_dev_get(index);
if (!hdev)
- return cmd_status(sk, MGMT_OP_SET_IO_CAPABILITY, ENODEV);
+ return cmd_status(sk, index, MGMT_OP_SET_IO_CAPABILITY, ENODEV);
hci_dev_lock_bh(hdev);
@@ -1054,8 +1031,7 @@ static int set_io_capability(struct sock *sk, unsigned char *data, u16 len)
hci_dev_unlock_bh(hdev);
hci_dev_put(hdev);
- return cmd_complete(sk, MGMT_OP_SET_IO_CAPABILITY,
- &dev_id, sizeof(dev_id));
+ return cmd_complete(sk, index, MGMT_OP_SET_IO_CAPABILITY, NULL, 0);
}
static inline struct pending_cmd *find_pairing(struct hci_conn *conn)
@@ -1088,11 +1064,10 @@ static void pairing_complete(struct pending_cmd *cmd, u8 status)
struct mgmt_rp_pair_device rp;
struct hci_conn *conn = cmd->user_data;
- rp.index = cmd->index;
bacpy(&rp.bdaddr, &conn->dst);
rp.status = status;
- cmd_complete(cmd->sk, MGMT_OP_PAIR_DEVICE, &rp, sizeof(rp));
+ cmd_complete(cmd->sk, cmd->index, MGMT_OP_PAIR_DEVICE, &rp, sizeof(rp));
/* So we don't get further callbacks for this connection */
conn->connect_cfm_cb = NULL;
@@ -1119,24 +1094,22 @@ static void pairing_complete_cb(struct hci_conn *conn, u8 status)
pairing_complete(cmd, status);
}
-static int pair_device(struct sock *sk, unsigned char *data, u16 len)
+static int pair_device(struct sock *sk, u16 index, unsigned char *data, u16 len)
{
struct hci_dev *hdev;
struct mgmt_cp_pair_device *cp;
struct pending_cmd *cmd;
u8 sec_level, auth_type;
struct hci_conn *conn;
- u16 dev_id;
int err;
BT_DBG("");
cp = (void *) data;
- dev_id = get_unaligned_le16(&cp->index);
- hdev = hci_dev_get(dev_id);
+ hdev = hci_dev_get(index);
if (!hdev)
- return cmd_status(sk, MGMT_OP_PAIR_DEVICE, ENODEV);
+ return cmd_status(sk, index, MGMT_OP_PAIR_DEVICE, ENODEV);
hci_dev_lock_bh(hdev);
@@ -1156,11 +1129,11 @@ static int pair_device(struct sock *sk, unsigned char *data, u16 len)
if (conn->connect_cfm_cb) {
hci_conn_put(conn);
- err = cmd_status(sk, MGMT_OP_PAIR_DEVICE, EBUSY);
+ err = cmd_status(sk, index, MGMT_OP_PAIR_DEVICE, EBUSY);
goto unlock;
}
- cmd = mgmt_pending_add(sk, MGMT_OP_PAIR_DEVICE, dev_id, data, len);
+ cmd = mgmt_pending_add(sk, MGMT_OP_PAIR_DEVICE, index, data, len);
if (!cmd) {
err = -ENOMEM;
hci_conn_put(conn);
@@ -1186,19 +1159,17 @@ unlock:
return err;
}
-static int user_confirm_reply(struct sock *sk, unsigned char *data, u16 len,
- int success)
+static int user_confirm_reply(struct sock *sk, u16 index, unsigned char *data,
+ u16 len, int success)
{
struct mgmt_cp_user_confirm_reply *cp = (void *) data;
- u16 dev_id, mgmt_op, hci_op;
+ u16 mgmt_op, hci_op;
struct pending_cmd *cmd;
struct hci_dev *hdev;
int err;
BT_DBG("");
- dev_id = get_unaligned_le16(&cp->index);
-
if (success) {
mgmt_op = MGMT_OP_USER_CONFIRM_REPLY;
hci_op = HCI_OP_USER_CONFIRM_REPLY;
@@ -1207,16 +1178,16 @@ static int user_confirm_reply(struct sock *sk, unsigned char *data, u16 len,
hci_op = HCI_OP_USER_CONFIRM_NEG_REPLY;
}
- hdev = hci_dev_get(dev_id);
+ hdev = hci_dev_get(index);
if (!hdev)
- return cmd_status(sk, mgmt_op, ENODEV);
+ return cmd_status(sk, index, mgmt_op, ENODEV);
if (!test_bit(HCI_UP, &hdev->flags)) {
- err = cmd_status(sk, mgmt_op, ENETDOWN);
+ err = cmd_status(sk, index, mgmt_op, ENETDOWN);
goto failed;
}
- cmd = mgmt_pending_add(sk, mgmt_op, dev_id, data, len);
+ cmd = mgmt_pending_add(sk, mgmt_op, index, data, len);
if (!cmd) {
err = -ENOMEM;
goto failed;
@@ -1237,7 +1208,7 @@ int mgmt_control(struct sock *sk, struct msghdr *msg, size_t msglen)
{
unsigned char *buf;
struct mgmt_hdr *hdr;
- u16 opcode, len;
+ u16 opcode, index, len;
int err;
BT_DBG("got %zu bytes", msglen);
@@ -1256,6 +1227,7 @@ int mgmt_control(struct sock *sk, struct msghdr *msg, size_t msglen)
hdr = (struct mgmt_hdr *) buf;
opcode = get_unaligned_le16(&hdr->opcode);
+ index = get_unaligned_le16(&hdr->index);
len = get_unaligned_le16(&hdr->len);
if (len != msglen - sizeof(*hdr)) {
@@ -1271,65 +1243,65 @@ int mgmt_control(struct sock *sk, struct msghdr *msg, size_t msglen)
err = read_index_list(sk);
break;
case MGMT_OP_READ_INFO:
- err = read_controller_info(sk, buf + sizeof(*hdr), len);
+ err = read_controller_info(sk, index);
break;
case MGMT_OP_SET_POWERED:
- err = set_powered(sk, buf + sizeof(*hdr), len);
+ err = set_powered(sk, index, buf + sizeof(*hdr), len);
break;
case MGMT_OP_SET_DISCOVERABLE:
- err = set_discoverable(sk, buf + sizeof(*hdr), len);
+ err = set_discoverable(sk, index, buf + sizeof(*hdr), len);
break;
case MGMT_OP_SET_CONNECTABLE:
- err = set_connectable(sk, buf + sizeof(*hdr), len);
+ err = set_connectable(sk, index, buf + sizeof(*hdr), len);
break;
case MGMT_OP_SET_PAIRABLE:
- err = set_pairable(sk, buf + sizeof(*hdr), len);
+ err = set_pairable(sk, index, buf + sizeof(*hdr), len);
break;
case MGMT_OP_ADD_UUID:
- err = add_uuid(sk, buf + sizeof(*hdr), len);
+ err = add_uuid(sk, index, buf + sizeof(*hdr), len);
break;
case MGMT_OP_REMOVE_UUID:
- err = remove_uuid(sk, buf + sizeof(*hdr), len);
+ err = remove_uuid(sk, index, buf + sizeof(*hdr), len);
break;
case MGMT_OP_SET_DEV_CLASS:
- err = set_dev_class(sk, buf + sizeof(*hdr), len);
+ err = set_dev_class(sk, index, buf + sizeof(*hdr), len);
break;
case MGMT_OP_SET_SERVICE_CACHE:
- err = set_service_cache(sk, buf + sizeof(*hdr), len);
+ err = set_service_cache(sk, index, buf + sizeof(*hdr), len);
break;
case MGMT_OP_LOAD_KEYS:
- err = load_keys(sk, buf + sizeof(*hdr), len);
+ err = load_keys(sk, index, buf + sizeof(*hdr), len);
break;
case MGMT_OP_REMOVE_KEY:
- err = remove_key(sk, buf + sizeof(*hdr), len);
+ err = remove_key(sk, index, buf + sizeof(*hdr), len);
break;
case MGMT_OP_DISCONNECT:
- err = disconnect(sk, buf + sizeof(*hdr), len);
+ err = disconnect(sk, index, buf + sizeof(*hdr), len);
break;
case MGMT_OP_GET_CONNECTIONS:
- err = get_connections(sk, buf + sizeof(*hdr), len);
+ err = get_connections(sk, index, buf + sizeof(*hdr), len);
break;
case MGMT_OP_PIN_CODE_REPLY:
- err = pin_code_reply(sk, buf + sizeof(*hdr), len);
+ err = pin_code_reply(sk, index, buf + sizeof(*hdr), len);
break;
case MGMT_OP_PIN_CODE_NEG_REPLY:
- err = pin_code_neg_reply(sk, buf + sizeof(*hdr), len);
+ err = pin_code_neg_reply(sk, index, buf + sizeof(*hdr), len);
break;
case MGMT_OP_SET_IO_CAPABILITY:
- err = set_io_capability(sk, buf + sizeof(*hdr), len);
+ err = set_io_capability(sk, index, buf + sizeof(*hdr), len);
break;
case MGMT_OP_PAIR_DEVICE:
- err = pair_device(sk, buf + sizeof(*hdr), len);
+ err = pair_device(sk, index, buf + sizeof(*hdr), len);
break;
case MGMT_OP_USER_CONFIRM_REPLY:
- err = user_confirm_reply(sk, buf + sizeof(*hdr), len, 1);
+ err = user_confirm_reply(sk, index, buf + sizeof(*hdr), len, 1);
break;
case MGMT_OP_USER_CONFIRM_NEG_REPLY:
- err = user_confirm_reply(sk, buf + sizeof(*hdr), len, 0);
+ err = user_confirm_reply(sk, index, buf + sizeof(*hdr), len, 0);
break;
default:
BT_DBG("Unknown op %u", opcode);
- err = cmd_status(sk, opcode, 0x01);
+ err = cmd_status(sk, index, opcode, 0x01);
break;
}
@@ -1345,20 +1317,12 @@ done:
int mgmt_index_added(u16 index)
{
- struct mgmt_ev_index_added ev;
-
- put_unaligned_le16(index, &ev.index);
-
- return mgmt_event(MGMT_EV_INDEX_ADDED, &ev, sizeof(ev), NULL);
+ return mgmt_event(MGMT_EV_INDEX_ADDED, index, NULL, 0, NULL);
}
int mgmt_index_removed(u16 index)
{
- struct mgmt_ev_index_added ev;
-
- put_unaligned_le16(index, &ev.index);
-
- return mgmt_event(MGMT_EV_INDEX_REMOVED, &ev, sizeof(ev), NULL);
+ return mgmt_event(MGMT_EV_INDEX_REMOVED, index, NULL, 0, NULL);
}
struct cmd_lookup {
@@ -1394,10 +1358,9 @@ int mgmt_powered(u16 index, u8 powered)
mgmt_pending_foreach(MGMT_OP_SET_POWERED, index, mode_rsp, &match);
- put_unaligned_le16(index, &ev.index);
ev.val = powered;
- ret = mgmt_event(MGMT_EV_POWERED, &ev, sizeof(ev), match.sk);
+ ret = mgmt_event(MGMT_EV_POWERED, index, &ev, sizeof(ev), match.sk);
if (match.sk)
sock_put(match.sk);
@@ -1414,10 +1377,10 @@ int mgmt_discoverable(u16 index, u8 discoverable)
mgmt_pending_foreach(MGMT_OP_SET_DISCOVERABLE, index,
mode_rsp, &match);
- put_unaligned_le16(index, &ev.index);
ev.val = discoverable;
- ret = mgmt_event(MGMT_EV_DISCOVERABLE, &ev, sizeof(ev), match.sk);
+ ret = mgmt_event(MGMT_EV_DISCOVERABLE, index, &ev, sizeof(ev),
+ match.sk);
if (match.sk)
sock_put(match.sk);
@@ -1433,10 +1396,9 @@ int mgmt_connectable(u16 index, u8 connectable)
mgmt_pending_foreach(MGMT_OP_SET_CONNECTABLE, index, mode_rsp, &match);
- put_unaligned_le16(index, &ev.index);
ev.val = connectable;
- ret = mgmt_event(MGMT_EV_CONNECTABLE, &ev, sizeof(ev), match.sk);
+ ret = mgmt_event(MGMT_EV_CONNECTABLE, index, &ev, sizeof(ev), match.sk);
if (match.sk)
sock_put(match.sk);
@@ -1450,25 +1412,22 @@ int mgmt_new_key(u16 index, struct link_key *key, u8 old_key_type)
memset(&ev, 0, sizeof(ev));
- put_unaligned_le16(index, &ev.index);
-
bacpy(&ev.key.bdaddr, &key->bdaddr);
ev.key.type = key->type;
memcpy(ev.key.val, key->val, 16);
ev.key.pin_len = key->pin_len;
ev.old_key_type = old_key_type;
- return mgmt_event(MGMT_EV_NEW_KEY, &ev, sizeof(ev), NULL);
+ return mgmt_event(MGMT_EV_NEW_KEY, index, &ev, sizeof(ev), NULL);
}
int mgmt_connected(u16 index, bdaddr_t *bdaddr)
{
struct mgmt_ev_connected ev;
- put_unaligned_le16(index, &ev.index);
bacpy(&ev.bdaddr, bdaddr);
- return mgmt_event(MGMT_EV_CONNECTED, &ev, sizeof(ev), NULL);
+ return mgmt_event(MGMT_EV_CONNECTED, index, &ev, sizeof(ev), NULL);
}
static void disconnect_rsp(struct pending_cmd *cmd, void *data)
@@ -1477,10 +1436,9 @@ static void disconnect_rsp(struct pending_cmd *cmd, void *data)
struct sock **sk = data;
struct mgmt_rp_disconnect rp;
- put_unaligned_le16(cmd->index, &rp.index);
bacpy(&rp.bdaddr, &cp->bdaddr);
- cmd_complete(cmd->sk, MGMT_OP_DISCONNECT, &rp, sizeof(rp));
+ cmd_complete(cmd->sk, cmd->index, MGMT_OP_DISCONNECT, &rp, sizeof(rp));
*sk = cmd->sk;
sock_hold(*sk);
@@ -1496,10 +1454,9 @@ int mgmt_disconnected(u16 index, bdaddr_t *bdaddr)
mgmt_pending_foreach(MGMT_OP_DISCONNECT, index, disconnect_rsp, &sk);
- put_unaligned_le16(index, &ev.index);
bacpy(&ev.bdaddr, bdaddr);
- err = mgmt_event(MGMT_EV_DISCONNECTED, &ev, sizeof(ev), sk);
+ err = mgmt_event(MGMT_EV_DISCONNECTED, index, &ev, sizeof(ev), sk);
if (sk)
sock_put(sk);
@@ -1516,7 +1473,7 @@ int mgmt_disconnect_failed(u16 index)
if (!cmd)
return -ENOENT;
- err = cmd_status(cmd->sk, MGMT_OP_DISCONNECT, EIO);
+ err = cmd_status(cmd->sk, index, MGMT_OP_DISCONNECT, EIO);
mgmt_pending_remove(cmd);
@@ -1527,21 +1484,20 @@ int mgmt_connect_failed(u16 index, bdaddr_t *bdaddr, u8 status)
{
struct mgmt_ev_connect_failed ev;
- put_unaligned_le16(index, &ev.index);
bacpy(&ev.bdaddr, bdaddr);
ev.status = status;
- return mgmt_event(MGMT_EV_CONNECT_FAILED, &ev, sizeof(ev), NULL);
+ return mgmt_event(MGMT_EV_CONNECT_FAILED, index, &ev, sizeof(ev), NULL);
}
int mgmt_pin_code_request(u16 index, bdaddr_t *bdaddr)
{
struct mgmt_ev_pin_code_request ev;
- put_unaligned_le16(index, &ev.index);
bacpy(&ev.bdaddr, bdaddr);
- return mgmt_event(MGMT_EV_PIN_CODE_REQUEST, &ev, sizeof(ev), NULL);
+ return mgmt_event(MGMT_EV_PIN_CODE_REQUEST, index, &ev, sizeof(ev),
+ NULL);
}
int mgmt_pin_code_reply_complete(u16 index, bdaddr_t *bdaddr, u8 status)
@@ -1554,11 +1510,11 @@ int mgmt_pin_code_reply_complete(u16 index, bdaddr_t *bdaddr, u8 status)
if (!cmd)
return -ENOENT;
- put_unaligned_le16(index, &rp.index);
bacpy(&rp.bdaddr, bdaddr);
rp.status = status;
- err = cmd_complete(cmd->sk, MGMT_OP_PIN_CODE_REPLY, &rp, sizeof(rp));
+ err = cmd_complete(cmd->sk, index, MGMT_OP_PIN_CODE_REPLY, &rp,
+ sizeof(rp));
mgmt_pending_remove(cmd);
@@ -1575,12 +1531,11 @@ int mgmt_pin_code_neg_reply_complete(u16 index, bdaddr_t *bdaddr, u8 status)
if (!cmd)
return -ENOENT;
- put_unaligned_le16(index, &rp.index);
bacpy(&rp.bdaddr, bdaddr);
rp.status = status;
- err = cmd_complete(cmd->sk, MGMT_OP_PIN_CODE_NEG_REPLY,
- &rp, sizeof(rp));
+ err = cmd_complete(cmd->sk, index, MGMT_OP_PIN_CODE_NEG_REPLY, &rp,
+ sizeof(rp));
mgmt_pending_remove(cmd);
@@ -1593,11 +1548,11 @@ int mgmt_user_confirm_request(u16 index, bdaddr_t *bdaddr, __le32 value)
BT_DBG("hci%u", index);
- put_unaligned_le16(index, &ev.index);
bacpy(&ev.bdaddr, bdaddr);
put_unaligned_le32(value, &ev.value);
- return mgmt_event(MGMT_EV_USER_CONFIRM_REQUEST, &ev, sizeof(ev), NULL);
+ return mgmt_event(MGMT_EV_USER_CONFIRM_REQUEST, index, &ev, sizeof(ev),
+ NULL);
}
static int confirm_reply_complete(u16 index, bdaddr_t *bdaddr, u8 status,
@@ -1611,10 +1566,9 @@ static int confirm_reply_complete(u16 index, bdaddr_t *bdaddr, u8 status,
if (!cmd)
return -ENOENT;
- put_unaligned_le16(index, &rp.index);
bacpy(&rp.bdaddr, bdaddr);
rp.status = status;
- err = cmd_complete(cmd->sk, opcode, &rp, sizeof(rp));
+ err = cmd_complete(cmd->sk, index, opcode, &rp, sizeof(rp));
mgmt_pending_remove(cmd);
@@ -1638,9 +1592,8 @@ int mgmt_auth_failed(u16 index, bdaddr_t *bdaddr, u8 status)
{
struct mgmt_ev_auth_failed ev;
- put_unaligned_le16(index, &ev.index);
bacpy(&ev.bdaddr, bdaddr);
ev.status = status;
- return mgmt_event(MGMT_EV_AUTH_FAILED, &ev, sizeof(ev), NULL);
+ return mgmt_event(MGMT_EV_AUTH_FAILED, index, &ev, sizeof(ev), NULL);
}
--
1.7.0.4
on behalf of ST-Ericsson
^ permalink raw reply related
* [PATCH v3 1/3] Bluetooth: Use proper command structure in remove_uuid
From: Szymon Janc @ 2011-02-25 18:05 UTC (permalink / raw)
To: linux-bluetooth; +Cc: par-gunnar.p.hjalmdahl, henrik.possung, Szymon Janc
The structure used for command was wrong (probably copy-paste mistake).
Signed-off-by: Szymon Janc <szymon.janc@tieto.com>
---
net/bluetooth/mgmt.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index 982becd..4543ede 100644
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -613,7 +613,7 @@ failed:
static int remove_uuid(struct sock *sk, unsigned char *data, u16 len)
{
struct list_head *p, *n;
- struct mgmt_cp_add_uuid *cp;
+ struct mgmt_cp_remove_uuid *cp;
struct hci_dev *hdev;
u8 bt_uuid_any[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
u16 dev_id;
--
1.7.0.4
on behalf of ST-Ericsson
^ permalink raw reply related
* Re: [PATCH 00/11] mfd and bluetooth: Add CG2900 suppor
From: Vitaly Wool @ 2011-02-25 17:55 UTC (permalink / raw)
To: Linus Walleij
Cc: Par-Gunnar HJALMDAHL, Samuel Ortiz, Marcel Holtmann, Lee Jones,
Par-Gunnar Hjalmdahl, Alan Cox, Arnd Bergmann,
linux-bluetooth@vger.kernel.org, linux-kernel@vger.kernel.org,
Lukasz Rymanowski, Pavan Savoy
In-Reply-To: <AANLkTi=HvRTfo84L_VwOVtVq5hfb1g+9ueH6SX8FWF2b@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 1312 bytes --]
Hi,
Sorry to say, but I have to disagree. This patchset represents
overcomplicated and unclear model, which may be misleading for developers
implementing similar solution for another platform.
Making hardware work is, if course, a valid point, but porting a windows
driver would do that as well, and it's not the reason to pull windows
drivers' ports into mainline.
Thanks,
Vitaly
Den 25 feb 2011 18:08 skrev "Linus Walleij" <linus.walleij@linaro.org>:
> 2011/2/24 Par-Gunnar HJALMDAHL <par-gunnar.p.hjalmdahl@stericsson.com>:
>
>> I sent the mail below one month ago, but have still not received any
answers or further comments.
>> Has anyone of you who made comments on the CG2900 patches earlier, any
more comments or questions?
>
> I think I have provided
> Acked-by: Linus Walleij <linus.walleij@linaro.org>
> (or the earlier ST-Ericsson address, which is equal) for these patches.
> Else I do so now.
>
> FWIW: I think those who want another architectural solution
> can propose a refactoring patch any day they like, and if it's
> recieved like "ah, that's better" ACK from Pär-Gunnar et al, then
> it's no big deal.
>
> This makes the hardware work with 2.6.39 which is really most
> important IMO, Sam can you merge this as it stands?
>
> Yours,
> Linus Walleij
[-- Attachment #2: Type: text/html, Size: 1715 bytes --]
^ permalink raw reply
* Re: [bluetooth-next 00/15] SMP Just Works Implementation
From: Brian Gix @ 2011-02-25 17:21 UTC (permalink / raw)
To: Vinicius Costa Gomes; +Cc: BlueZ development, Gustavo F. Padovan
In-Reply-To: <cover.1298307667.git.vinicius.gomes@openbossa.org>
Hi Gustavo, Vinicius,
I would like to add my support for promoting these LE Security Manager
patches into the bluetooth-next tip.
On 2/21/2011 9:23 AM, Vinicius Costa Gomes wrote:
> Hi,
>
> This patch series implement the Just Works SMP procedures for LE links.
>
> These patches can also be reached from here[1].
>
>
> Cheers,
> --
> Vinicius
>
> [1] http://git.infradead.org/users/vcgomes/linux-2.6.git (for-next branch)
>
> Anderson Briglia (7):
> Bluetooth: Implement the first SMP commands
> Bluetooth: Start SMP procedure
> Bluetooth: simple SMP pairing negotiation
> Bluetooth: LE SMP Cryptoolbox functions
> Bluetooth: Add SMP confirmation structs
> Bluetooth: Add SMP confirmation checks methods
> Bluetooth: Minor fix in SMP methods
>
> Vinicius Costa Gomes (8):
> Bluetooth: Add support for using the crypto subsystem
> Bluetooth: Add support for LE Start Encryption
> Bluetooth: Add support for resuming socket when SMP is finished
> Bluetooth: Fix initial security level of LE links
> Bluetooth: Update the security level when link is encrypted
> Bluetooth: Add support for Pairing features exchange
> Bluetooth: Add support for SMP timeout
> Bluetooth: Add key size checks for SMP
>
> include/net/bluetooth/hci.h | 34 +++
> include/net/bluetooth/hci_core.h | 10 +
> include/net/bluetooth/l2cap.h | 9 +
> include/net/bluetooth/smp.h | 46 ++++
> net/bluetooth/Kconfig | 6 +
> net/bluetooth/Makefile | 2 +-
> net/bluetooth/hci_conn.c | 47 ++++
> net/bluetooth/hci_core.c | 22 ++
> net/bluetooth/hci_event.c | 69 +++++
> net/bluetooth/l2cap_core.c | 137 ++++++----
> net/bluetooth/l2cap_sock.c | 17 ++
> net/bluetooth/smp.c | 535 ++++++++++++++++++++++++++++++++++++++
> 12 files changed, 876 insertions(+), 58 deletions(-)
> create mode 100644 net/bluetooth/smp.c
>
> --
> 1.7.4.1
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
Brian Gix
bgix@codeaurora.org
Employee of Qualcomm Innovation Center, Inc.
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum
^ permalink raw reply
* Re: [PATCH 00/11] mfd and bluetooth: Add CG2900 suppor
From: Linus Walleij @ 2011-02-25 17:08 UTC (permalink / raw)
To: Par-Gunnar HJALMDAHL, Samuel Ortiz
Cc: Arnd Bergmann, Pavan Savoy, Vitaly Wool, Alan Cox,
Marcel Holtmann, linux-kernel@vger.kernel.org,
linux-bluetooth@vger.kernel.org, Lukasz Rymanowski,
Par-Gunnar Hjalmdahl, Lee Jones
In-Reply-To: <AFCDDB4A3EA003429EEF1E7B211FDBBA334C0FB0E2@EXDCVYMBSTM005.EQ1STM.local>
2011/2/24 Par-Gunnar HJALMDAHL <par-gunnar.p.hjalmdahl@stericsson.com>:
> I sent the mail below one month ago, but have still not received any answ=
ers or further comments.
> Has anyone of you who made comments on the CG2900 patches earlier, any mo=
re comments or questions?
I think I have provided
Acked-by: Linus Walleij <linus.walleij@linaro.org>
(or the earlier ST-Ericsson address, which is equal) for these patches.
Else I do so now.
FWIW: I think those who want another architectural solution
can propose a refactoring patch any day they like, and if it's
recieved like "ah, that's better" ACK from P=E4r-Gunnar et al, then
it's no big deal.
This makes the hardware work with 2.6.39 which is really most
important IMO, Sam can you merge this as it stands?
Yours,
Linus Walleij
^ permalink raw reply
* Re: [PATCH v2 0/3] Another try for the Sixaxis plugin
From: Bastien Nocera @ 2011-02-25 16:02 UTC (permalink / raw)
To: Simon Kenyon; +Cc: linux-bluetooth, linux-input
In-Reply-To: <4D67CF87.50600@koala.ie>
On Fri, 2011-02-25 at 15:49 +0000, Simon Kenyon wrote:
> On 25/02/2011 10:04, Antonio Ospite wrote:
> > FUTURE plans:
> > - Add support for battery status report
> > - Add support for Playstation Move (I don't have the hardware, tho),
> > Pascal?
>
> any chance of including the PS3 BD remote in your plans?
The PS3 BD remote doesn't use cable pairing, and has been supported in
bluetoothd for a couple of years already.
Cheers
^ permalink raw reply
* Re: [PATCH] Move index to common header in management interface
From: Johan Hedberg @ 2011-02-25 15:57 UTC (permalink / raw)
To: Szymon Janc; +Cc: linux-bluetooth, par-gunnar.p.hjalmdahl, henrik.possung
In-Reply-To: <1298554607-2527-1-git-send-email-szymon.janc@tieto.com>
Hi Szymon,
On Thu, Feb 24, 2011, Szymon Janc wrote:
> Match changes introduced in mgmt interface after moving controller
> index to common header.
> ---
> lib/mgmt.h | 43 +---------
> plugins/mgmtops.c | 243 +++++++++++++++++++----------------------------------
> 2 files changed, 90 insertions(+), 196 deletions(-)
Pushed upstream. Thanks.
Now let's try to get the kernel patches to bluetooth-next-2.6 asap. I'll
base all my future work on top of them.
Johan
^ permalink raw reply
* Re: [PATCH] Update mgmt-api.txt with controller index moved to mgmt packet header
From: Johan Hedberg @ 2011-02-25 15:53 UTC (permalink / raw)
To: Szymon Janc; +Cc: linux-bluetooth, par-gunnar.p.hjalmdahl, henrik.possung
In-Reply-To: <1298482761-19986-1-git-send-email-szymon.janc@tieto.com>
Hi Szymon,
On Wed, Feb 23, 2011, Szymon Janc wrote:
> ---
> doc/mgmt-api.txt | 214 ++++++++++++++++++++++++++++--------------------------
> 1 files changed, 110 insertions(+), 104 deletions(-)
Pushed upstream. Thanks.
Johan
^ permalink raw reply
* Re: [PATCH v2 3/3] Bluetooth: Validate data size before accessing mgmt commands
From: Johan Hedberg @ 2011-02-25 15:50 UTC (permalink / raw)
To: Szymon Janc; +Cc: linux-bluetooth, par-gunnar.p.hjalmdahl, henrik.possung
In-Reply-To: <1298476240-18124-3-git-send-email-szymon.janc@tieto.com>
Hi Szymon,
On Wed, Feb 23, 2011, Szymon Janc wrote:
> Crafted (too small) data buffer could result in reading data outside of buffer.
> Validate buffer size and return EINVAL if size is wrong..
>
> Signed-off-by: Szymon Janc <szymon.janc@tieto.com>
The patch looks good, except for this part:
> @@ -1170,6 +1219,10 @@ static int user_confirm_reply(struct sock *sk, u16 index, unsigned char *data,
>
> BT_DBG("");
>
> + if (len != sizeof(*cp))
> + return cmd_status(sk, index, MGMT_OP_USER_CONFIRM_REPLY,
> + EINVAL);
> +
> if (success) {
> mgmt_op = MGMT_OP_USER_CONFIRM_REPLY;
> hci_op = HCI_OP_USER_CONFIRM_REPLY;
Note that this function is also used for the negative reply so you can't
hard-code the MGMT_OP_USER_CONFIRM_REPLY in the cmd_status. Instead move
the if (success) part earlier in the function and then use mgmt_op for
the cmd_status.
When that's fixed:
Acked-by: Johan Hedberg <johan.hedberg@nokia.com>
Johan
^ permalink raw reply
* Re: [PATCH v2 0/3] Another try for the Sixaxis plugin
From: Simon Kenyon @ 2011-02-25 15:49 UTC (permalink / raw)
Cc: linux-bluetooth, linux-input
In-Reply-To: <1298628292-8842-1-git-send-email-ospite@studenti.unina.it>
On 25/02/2011 10:04, Antonio Ospite wrote:
> FUTURE plans:
> - Add support for battery status report
> - Add support for Playstation Move (I don't have the hardware, tho),
> Pascal?
any chance of including the PS3 BD remote in your plans?
--
simon
^ permalink raw reply
* Re: [PATCH v2 2/3] Bluetooth: Move index to common header in management interface
From: Johan Hedberg @ 2011-02-25 15:47 UTC (permalink / raw)
To: Szymon Janc; +Cc: linux-bluetooth, par-gunnar.p.hjalmdahl, henrik.possung
In-Reply-To: <1298476240-18124-2-git-send-email-szymon.janc@tieto.com>
On Wed, Feb 23, 2011, Szymon Janc wrote:
> Most mgmt commands and event are related to hci adapter. Moving index to
> common header allow to easily use it in command status while reporting errors.
> For those not related to adapter use MGMT_INDEX_NONE (0xFFFF) as index.
>
> Signed-off-by: Szymon Janc <szymon.janc@tieto.com>
Acked-by: Johan Hedberg <johan.hedberg@nokia.com>
Johan
^ permalink raw reply
* Re: [PATCH v2 1/3] Bluetooth: Use proper command structure in remove_uuid
From: Johan Hedberg @ 2011-02-25 15:46 UTC (permalink / raw)
To: Szymon Janc; +Cc: linux-bluetooth, par-gunnar.p.hjalmdahl, henrik.possung
In-Reply-To: <1298476240-18124-1-git-send-email-szymon.janc@tieto.com>
Hi Szymon,
On Wed, Feb 23, 2011, Szymon Janc wrote:
> The structure used for command was wrong (probably copy-paste mistake).
>
> Signed-off-by: Szymon Janc <szymon.janc@tieto.com>
Good catch.
Acked-by: Johan Hedberg <johan.hedberg@nokia.com>
Johan
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox