From d0dc2769f9f1e9cd3ef3b430d7eff0d5d90a7e6b Mon Sep 17 00:00:00 2001 From: Claudio Takahasi Date: Thu, 25 Jan 2007 14:25:07 +0000 Subject: Moved HID store related functions to a new file --- input/storage.c | 171 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 171 insertions(+) create mode 100644 input/storage.c (limited to 'input/storage.c') diff --git a/input/storage.c b/input/storage.c new file mode 100644 index 00000000..cc9f22db --- /dev/null +++ b/input/storage.c @@ -0,0 +1,171 @@ +/* + * + * BlueZ - Bluetooth protocol stack for Linux + * + * Copyright (C) 2004-2007 Marcel Holtmann + * + * + * 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 +#endif + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include + +#include "textfile.h" + +#include "storage.h" + +static inline int create_filename(char *buf, size_t size, + bdaddr_t *bdaddr, const char *name) +{ + char addr[18]; + + ba2str(bdaddr, addr); + + return create_name(buf, size, STORAGEDIR, addr, name); +} + +int parse_stored_device_info(const char *str, struct hidp_connadd_req *req) +{ + char tmp[3], *desc; + unsigned int vendor, product, version, subclass, country, parser, pos; + int i; + + desc = malloc(4096); + if (!desc) + return -ENOMEM; + + memset(desc, 0, 4096); + + + sscanf(str, "%04X:%04X:%04X %02X %02X %04X %4095s %08X %n", + &vendor, &product, &version, &subclass, &country, + &parser, desc, &req->flags, &pos); + + req->vendor = vendor; + req->product = product; + req->version = version; + req->subclass = subclass; + req->country = country; + req->parser = parser; + + snprintf(req->name, 128, str + pos); + + req->rd_size = strlen(desc) / 2; + req->rd_data = malloc(req->rd_size); + if (!req->rd_data) { + free(desc); + return -ENOMEM; + } + + memset(tmp, 0, sizeof(tmp)); + for (i = 0; i < req->rd_size; i++) { + memcpy(tmp, desc + (i * 2), 2); + req->rd_data[i] = (uint8_t) strtol(tmp, NULL, 16); + } + + free(desc); + + return 0; +} + +int get_stored_device_info(bdaddr_t *sba, bdaddr_t *dba, + struct hidp_connadd_req *req) +{ + char filename[PATH_MAX + 1], *str; + char peer[18]; + int ret; + + create_filename(filename, PATH_MAX, sba, "hidd"); + + ba2str(dba, peer); + str = textfile_get(filename, peer); + if (!str) + return -ENOENT; + + ret = parse_stored_device_info(str, req); + + free(str); + + return ret; +} + +int del_stored_device_info(bdaddr_t *sba, bdaddr_t *dba) +{ + char filename[PATH_MAX + 1]; + char addr[18]; + + create_filename(filename, PATH_MAX, sba, "hidd"); + + ba2str(dba, addr); + + return textfile_del(filename, addr); +} + +int store_device_info(bdaddr_t *sba, bdaddr_t *dba, struct hidp_connadd_req *req) +{ + char filename[PATH_MAX + 1], *str, *desc; + int i, size, ret; + char addr[18]; + + create_filename(filename, PATH_MAX, sba, "hidd"); + + size = 15 + 3 + 3 + 5 + (req->rd_size * 2) + 1 + 9 + strlen(req->name) + 2; + str = malloc(size); + if (!str) + return -ENOMEM; + + desc = malloc((req->rd_size * 2) + 1); + if (!desc) { + free(str); + return -ENOMEM; + } + + memset(desc, 0, (req->rd_size * 2) + 1); + for (i = 0; i < req->rd_size; i++) + sprintf(desc + (i * 2), "%2.2X", req->rd_data[i]); + + snprintf(str, size - 1, "%04X:%04X:%04X %02X %02X %04X %s %08X %s", + req->vendor, req->product, req->version, + req->subclass, req->country, req->parser, desc, + req->flags, req->name); + free(desc); + + create_file(filename, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH); + + ba2str(dba, addr); + + ret = textfile_put(filename, addr, str); + free(str); + + return ret; +} -- cgit From 24aaa3c3825fd26e34730fe64f5e375f7e94bb7d Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Thu, 25 Jan 2007 15:06:06 +0000 Subject: Small cleanup --- input/storage.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'input/storage.c') diff --git a/input/storage.c b/input/storage.c index cc9f22db..0452a1e9 100644 --- a/input/storage.c +++ b/input/storage.c @@ -45,7 +45,7 @@ #include "storage.h" static inline int create_filename(char *buf, size_t size, - bdaddr_t *bdaddr, const char *name) + bdaddr_t *bdaddr, const char *name) { char addr[18]; @@ -66,7 +66,6 @@ int parse_stored_device_info(const char *str, struct hidp_connadd_req *req) memset(desc, 0, 4096); - sscanf(str, "%04X:%04X:%04X %02X %02X %04X %4095s %08X %n", &vendor, &product, &version, &subclass, &country, &parser, desc, &req->flags, &pos); @@ -99,11 +98,11 @@ int parse_stored_device_info(const char *str, struct hidp_connadd_req *req) } int get_stored_device_info(bdaddr_t *sba, bdaddr_t *dba, - struct hidp_connadd_req *req) + struct hidp_connadd_req *req) { char filename[PATH_MAX + 1], *str; char peer[18]; - int ret; + int err; create_filename(filename, PATH_MAX, sba, "hidd"); @@ -112,11 +111,11 @@ int get_stored_device_info(bdaddr_t *sba, bdaddr_t *dba, if (!str) return -ENOENT; - ret = parse_stored_device_info(str, req); + err = parse_stored_device_info(str, req); free(str); - return ret; + return err; } int del_stored_device_info(bdaddr_t *sba, bdaddr_t *dba) @@ -134,7 +133,7 @@ int del_stored_device_info(bdaddr_t *sba, bdaddr_t *dba) int store_device_info(bdaddr_t *sba, bdaddr_t *dba, struct hidp_connadd_req *req) { char filename[PATH_MAX + 1], *str, *desc; - int i, size, ret; + int i, err, size; char addr[18]; create_filename(filename, PATH_MAX, sba, "hidd"); @@ -158,14 +157,16 @@ int store_device_info(bdaddr_t *sba, bdaddr_t *dba, struct hidp_connadd_req *req req->vendor, req->product, req->version, req->subclass, req->country, req->parser, desc, req->flags, req->name); + free(desc); create_file(filename, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH); ba2str(dba, addr); - ret = textfile_put(filename, addr, str); + err = textfile_put(filename, addr, str); + free(str); - return ret; + return err; } -- cgit From 5753e415a5ef3308f1408ad07623ae07047faaf5 Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Fri, 26 Jan 2007 09:53:30 +0000 Subject: Add encryption support --- input/storage.c | 75 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 75 insertions(+) (limited to 'input/storage.c') diff --git a/input/storage.c b/input/storage.c index 0452a1e9..c46b8d82 100644 --- a/input/storage.c +++ b/input/storage.c @@ -35,12 +35,16 @@ #include #include #include +#include #include #include #include +#include +#include #include "textfile.h" +#include "logging.h" #include "storage.h" @@ -170,3 +174,74 @@ int store_device_info(bdaddr_t *sba, bdaddr_t *dba, struct hidp_connadd_req *req return err; } + +int encrypt_link(bdaddr_t *src, bdaddr_t *dst) +{ + char filename[PATH_MAX + 1]; + struct hci_conn_info_req *cr; + int dd, err, dev_id; + char addr[18], *str; + + create_filename(filename, PATH_MAX, src, "linkkeys"); + + ba2str(dst, addr); + + str = textfile_get(filename, addr); + if (!str) { + error("Encryption link key not found"); + return -ENOKEY; + } + + free(str); + + cr = malloc(sizeof(*cr) + sizeof(struct hci_conn_info)); + if (!cr) + return -ENOMEM; + + ba2str(src, addr); + + dev_id = hci_devid(addr); + if (dev_id < 0) { + free(cr); + return -errno; + } + + dd = hci_open_dev(dev_id); + if (dd < 0) { + free(cr); + return -errno; + } + + memset(cr, 0, sizeof(*cr) + sizeof(struct hci_conn_info)); + bacpy(&cr->bdaddr, dst); + cr->type = ACL_LINK; + + if (ioctl(dd, HCIGETCONNINFO, (unsigned long) cr) < 0) + goto fail; + + if (hci_authenticate_link(dd, htobs(cr->conn_info->handle), 1000) < 0) { + error("Link authentication failed: %s (%d)", + strerror(errno), errno); + goto fail; + } + + if (hci_encrypt_link(dd, htobs(cr->conn_info->handle), 1, 1000) < 0) { + error("Link encryption failed: %s (%d)", + strerror(errno), errno); + goto fail; + } + + free(cr); + + hci_close_dev(dd); + + return 0; + +fail: + free(cr); + + err = errno; + hci_close_dev(dd); + + return -err; +} -- cgit From 5d6c22d60f55e477d42a546da9c04339c735789b Mon Sep 17 00:00:00 2001 From: Claudio Takahasi Date: Fri, 26 Jan 2007 14:19:07 +0000 Subject: Code standard(variables names): replaced sba to src and dba to dst --- input/storage.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'input/storage.c') diff --git a/input/storage.c b/input/storage.c index c46b8d82..fab7d6c2 100644 --- a/input/storage.c +++ b/input/storage.c @@ -101,16 +101,16 @@ int parse_stored_device_info(const char *str, struct hidp_connadd_req *req) return 0; } -int get_stored_device_info(bdaddr_t *sba, bdaddr_t *dba, +int get_stored_device_info(bdaddr_t *src, bdaddr_t *dst, struct hidp_connadd_req *req) { char filename[PATH_MAX + 1], *str; char peer[18]; int err; - create_filename(filename, PATH_MAX, sba, "hidd"); + create_filename(filename, PATH_MAX, src, "hidd"); - ba2str(dba, peer); + ba2str(dst, peer); str = textfile_get(filename, peer); if (!str) return -ENOENT; @@ -122,25 +122,25 @@ int get_stored_device_info(bdaddr_t *sba, bdaddr_t *dba, return err; } -int del_stored_device_info(bdaddr_t *sba, bdaddr_t *dba) +int del_stored_device_info(bdaddr_t *src, bdaddr_t *dst) { char filename[PATH_MAX + 1]; char addr[18]; - create_filename(filename, PATH_MAX, sba, "hidd"); + create_filename(filename, PATH_MAX, src, "hidd"); - ba2str(dba, addr); + ba2str(dst, addr); return textfile_del(filename, addr); } -int store_device_info(bdaddr_t *sba, bdaddr_t *dba, struct hidp_connadd_req *req) +int store_device_info(bdaddr_t *src, bdaddr_t *dst, struct hidp_connadd_req *req) { char filename[PATH_MAX + 1], *str, *desc; int i, err, size; char addr[18]; - create_filename(filename, PATH_MAX, sba, "hidd"); + create_filename(filename, PATH_MAX, src, "hidd"); size = 15 + 3 + 3 + 5 + (req->rd_size * 2) + 1 + 9 + strlen(req->name) + 2; str = malloc(size); @@ -166,7 +166,7 @@ int store_device_info(bdaddr_t *sba, bdaddr_t *dba, struct hidp_connadd_req *req create_file(filename, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH); - ba2str(dba, addr); + ba2str(dst, addr); err = textfile_put(filename, addr, str); -- cgit From 10cdcaa9bc6a49d98dcd3b3c1bf3c807ff82a578 Mon Sep 17 00:00:00 2001 From: Claudio Takahasi Date: Fri, 26 Jan 2007 15:02:48 +0000 Subject: Check if the HCI_LM_ENCRYPT is already active --- input/storage.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'input/storage.c') diff --git a/input/storage.c b/input/storage.c index fab7d6c2..5f467efb 100644 --- a/input/storage.c +++ b/input/storage.c @@ -219,6 +219,11 @@ int encrypt_link(bdaddr_t *src, bdaddr_t *dst) if (ioctl(dd, HCIGETCONNINFO, (unsigned long) cr) < 0) goto fail; + if (cr->conn_info->link_mode & HCI_LM_ENCRYPT) { + /* Already encrypted */ + goto done; + } + if (hci_authenticate_link(dd, htobs(cr->conn_info->handle), 1000) < 0) { error("Link authentication failed: %s (%d)", strerror(errno), errno); @@ -231,6 +236,7 @@ int encrypt_link(bdaddr_t *src, bdaddr_t *dst) goto fail; } +done: free(cr); hci_close_dev(dd); -- cgit From acfdab3a74249dc4e04078523a7fd10fd6fe4d5d Mon Sep 17 00:00:00 2001 From: Claudio Takahasi Date: Wed, 28 Feb 2007 12:31:25 +0000 Subject: Input: Using glib memory alloc functions --- input/storage.c | 35 ++++++++++++++++------------------- 1 file changed, 16 insertions(+), 19 deletions(-) (limited to 'input/storage.c') diff --git a/input/storage.c b/input/storage.c index 5f467efb..ca96da0b 100644 --- a/input/storage.c +++ b/input/storage.c @@ -31,7 +31,6 @@ #include #include #include -#include #include #include #include @@ -43,6 +42,8 @@ #include #include +#include + #include "textfile.h" #include "logging.h" @@ -64,12 +65,10 @@ int parse_stored_device_info(const char *str, struct hidp_connadd_req *req) unsigned int vendor, product, version, subclass, country, parser, pos; int i; - desc = malloc(4096); + desc = g_try_malloc0(4096); if (!desc) return -ENOMEM; - memset(desc, 0, 4096); - sscanf(str, "%04X:%04X:%04X %02X %02X %04X %4095s %08X %n", &vendor, &product, &version, &subclass, &country, &parser, desc, &req->flags, &pos); @@ -84,9 +83,9 @@ int parse_stored_device_info(const char *str, struct hidp_connadd_req *req) snprintf(req->name, 128, str + pos); req->rd_size = strlen(desc) / 2; - req->rd_data = malloc(req->rd_size); + req->rd_data = g_try_malloc0(req->rd_size); if (!req->rd_data) { - free(desc); + g_free(desc); return -ENOMEM; } @@ -96,7 +95,7 @@ int parse_stored_device_info(const char *str, struct hidp_connadd_req *req) req->rd_data[i] = (uint8_t) strtol(tmp, NULL, 16); } - free(desc); + g_free(desc); return 0; } @@ -143,17 +142,16 @@ int store_device_info(bdaddr_t *src, bdaddr_t *dst, struct hidp_connadd_req *req create_filename(filename, PATH_MAX, src, "hidd"); size = 15 + 3 + 3 + 5 + (req->rd_size * 2) + 1 + 9 + strlen(req->name) + 2; - str = malloc(size); + str = g_try_malloc0(size); if (!str) return -ENOMEM; - desc = malloc((req->rd_size * 2) + 1); + desc = g_try_malloc0((req->rd_size * 2) + 1); if (!desc) { - free(str); + g_free(str); return -ENOMEM; } - memset(desc, 0, (req->rd_size * 2) + 1); for (i = 0; i < req->rd_size; i++) sprintf(desc + (i * 2), "%2.2X", req->rd_data[i]); @@ -162,7 +160,7 @@ int store_device_info(bdaddr_t *src, bdaddr_t *dst, struct hidp_connadd_req *req req->subclass, req->country, req->parser, desc, req->flags, req->name); - free(desc); + g_free(desc); create_file(filename, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH); @@ -170,7 +168,7 @@ int store_device_info(bdaddr_t *src, bdaddr_t *dst, struct hidp_connadd_req *req err = textfile_put(filename, addr, str); - free(str); + g_free(str); return err; } @@ -194,7 +192,7 @@ int encrypt_link(bdaddr_t *src, bdaddr_t *dst) free(str); - cr = malloc(sizeof(*cr) + sizeof(struct hci_conn_info)); + cr = g_try_malloc0(sizeof(*cr) + sizeof(struct hci_conn_info)); if (!cr) return -ENOMEM; @@ -202,17 +200,16 @@ int encrypt_link(bdaddr_t *src, bdaddr_t *dst) dev_id = hci_devid(addr); if (dev_id < 0) { - free(cr); + g_free(cr); return -errno; } dd = hci_open_dev(dev_id); if (dd < 0) { - free(cr); + g_free(cr); return -errno; } - memset(cr, 0, sizeof(*cr) + sizeof(struct hci_conn_info)); bacpy(&cr->bdaddr, dst); cr->type = ACL_LINK; @@ -237,14 +234,14 @@ int encrypt_link(bdaddr_t *src, bdaddr_t *dst) } done: - free(cr); + g_free(cr); hci_close_dev(dd); return 0; fail: - free(cr); + g_free(cr); err = errno; hci_close_dev(dd); -- cgit From fd660e28020d6b26f8fe49c0a87545f04e981fa9 Mon Sep 17 00:00:00 2001 From: Claudio Takahasi Date: Thu, 1 Mar 2007 11:40:20 +0000 Subject: Input: renamed input storage file to "input" --- input/storage.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'input/storage.c') diff --git a/input/storage.c b/input/storage.c index ca96da0b..3833d09e 100644 --- a/input/storage.c +++ b/input/storage.c @@ -107,7 +107,7 @@ int get_stored_device_info(bdaddr_t *src, bdaddr_t *dst, char peer[18]; int err; - create_filename(filename, PATH_MAX, src, "hidd"); + create_filename(filename, PATH_MAX, src, "input"); ba2str(dst, peer); str = textfile_get(filename, peer); @@ -126,7 +126,7 @@ int del_stored_device_info(bdaddr_t *src, bdaddr_t *dst) char filename[PATH_MAX + 1]; char addr[18]; - create_filename(filename, PATH_MAX, src, "hidd"); + create_filename(filename, PATH_MAX, src, "input"); ba2str(dst, addr); @@ -139,8 +139,9 @@ int store_device_info(bdaddr_t *src, bdaddr_t *dst, struct hidp_connadd_req *req int i, err, size; char addr[18]; - create_filename(filename, PATH_MAX, src, "hidd"); + create_filename(filename, PATH_MAX, src, "input"); + /* FIXME: name is not required */ size = 15 + 3 + 3 + 5 + (req->rd_size * 2) + 1 + 9 + strlen(req->name) + 2; str = g_try_malloc0(size); if (!str) -- cgit From 553db8d4150c59628105bf8df4ddb68311b2fb58 Mon Sep 17 00:00:00 2001 From: Claudio Takahasi Date: Thu, 1 Mar 2007 13:02:21 +0000 Subject: Input: don't store the HID name in the "input" file && removed magic number in the memory alloc --- input/storage.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) (limited to 'input/storage.c') diff --git a/input/storage.c b/input/storage.c index 3833d09e..be5ab3e3 100644 --- a/input/storage.c +++ b/input/storage.c @@ -61,17 +61,21 @@ static inline int create_filename(char *buf, size_t size, int parse_stored_device_info(const char *str, struct hidp_connadd_req *req) { - char tmp[3], *desc; + char tmp[3]; + const char *desc; unsigned int vendor, product, version, subclass, country, parser, pos; + size_t len; int i; - desc = g_try_malloc0(4096); - if (!desc) - return -ENOMEM; - - sscanf(str, "%04X:%04X:%04X %02X %02X %04X %4095s %08X %n", + sscanf(str, "%04X:%04X:%04X %02X %02X %04X %08X %n", &vendor, &product, &version, &subclass, &country, - &parser, desc, &req->flags, &pos); + &parser, &req->flags, &pos); + + + desc = &str[pos]; + len = strlen(desc); + if (len <= 0) + return -ENOENT; req->vendor = vendor; req->product = product; @@ -80,12 +84,11 @@ int parse_stored_device_info(const char *str, struct hidp_connadd_req *req) req->country = country; req->parser = parser; - snprintf(req->name, 128, str + pos); + /* FIXME: Retrieve the name from the filesystem file "names" */ - req->rd_size = strlen(desc) / 2; + req->rd_size = len / 2; req->rd_data = g_try_malloc0(req->rd_size); if (!req->rd_data) { - g_free(desc); return -ENOMEM; } @@ -95,8 +98,6 @@ int parse_stored_device_info(const char *str, struct hidp_connadd_req *req) req->rd_data[i] = (uint8_t) strtol(tmp, NULL, 16); } - g_free(desc); - return 0; } @@ -141,8 +142,7 @@ int store_device_info(bdaddr_t *src, bdaddr_t *dst, struct hidp_connadd_req *req create_filename(filename, PATH_MAX, src, "input"); - /* FIXME: name is not required */ - size = 15 + 3 + 3 + 5 + (req->rd_size * 2) + 1 + 9 + strlen(req->name) + 2; + size = 15 + 3 + 3 + 5 + (req->rd_size * 2) + 1 + 9; str = g_try_malloc0(size); if (!str) return -ENOMEM; @@ -156,10 +156,10 @@ int store_device_info(bdaddr_t *src, bdaddr_t *dst, struct hidp_connadd_req *req for (i = 0; i < req->rd_size; i++) sprintf(desc + (i * 2), "%2.2X", req->rd_data[i]); - snprintf(str, size - 1, "%04X:%04X:%04X %02X %02X %04X %s %08X %s", + snprintf(str, size - 1, "%04X:%04X:%04X %02X %02X %04X %08X %s", req->vendor, req->product, req->version, - req->subclass, req->country, req->parser, desc, - req->flags, req->name); + req->subclass, req->country, req->parser, + req->flags, desc); g_free(desc); -- cgit From 3f27f7f7a01ad43532b65504e6204194e3e259df Mon Sep 17 00:00:00 2001 From: Claudio Takahasi Date: Thu, 1 Mar 2007 14:10:10 +0000 Subject: Input: Use stored device name instead of the service name attribute --- input/storage.c | 34 +++++++++++++++++++++++++++++++--- 1 file changed, 31 insertions(+), 3 deletions(-) (limited to 'input/storage.c') diff --git a/input/storage.c b/input/storage.c index be5ab3e3..fd8d4bcb 100644 --- a/input/storage.c +++ b/input/storage.c @@ -71,7 +71,6 @@ int parse_stored_device_info(const char *str, struct hidp_connadd_req *req) &vendor, &product, &version, &subclass, &country, &parser, &req->flags, &pos); - desc = &str[pos]; len = strlen(desc); if (len <= 0) @@ -84,8 +83,6 @@ int parse_stored_device_info(const char *str, struct hidp_connadd_req *req) req->country = country; req->parser = parser; - /* FIXME: Retrieve the name from the filesystem file "names" */ - req->rd_size = len / 2; req->rd_data = g_try_malloc0(req->rd_size); if (!req->rd_data) { @@ -174,6 +171,37 @@ int store_device_info(bdaddr_t *src, bdaddr_t *dst, struct hidp_connadd_req *req return err; } +int read_device_name(bdaddr_t *local, bdaddr_t *peer, char **name) +{ + char filename[PATH_MAX + 1], addr[18], *str; + int len; + + create_filename(filename, PATH_MAX, local, "names"); + + ba2str(peer, addr); + str = textfile_get(filename, addr); + if (!str) + return -ENOENT; + + len = strlen(str); + + /* HID max name size is 128 chars */ + if (len < 128) { + *name = str; + return 0; + } + + *name = g_try_malloc0(128); + if (!*name) + return -ENOMEM; + + snprintf(*name, 128, "%s", str); + + free(str); + + return 0; +} + int encrypt_link(bdaddr_t *src, bdaddr_t *dst) { char filename[PATH_MAX + 1]; -- cgit From f2c6a6f2debcccfb51d239834c3cf91a2c3a6c40 Mon Sep 17 00:00:00 2001 From: Claudio Takahasi Date: Mon, 19 Mar 2007 14:58:44 +0000 Subject: Moving input functions to the right files --- input/storage.c | 31 +++++++++++++++++++++++++++---- 1 file changed, 27 insertions(+), 4 deletions(-) (limited to 'input/storage.c') diff --git a/input/storage.c b/input/storage.c index fd8d4bcb..3793a275 100644 --- a/input/storage.c +++ b/input/storage.c @@ -44,8 +44,8 @@ #include -#include "textfile.h" #include "logging.h" +#include "textfile.h" #include "storage.h" @@ -171,14 +171,14 @@ int store_device_info(bdaddr_t *src, bdaddr_t *dst, struct hidp_connadd_req *req return err; } -int read_device_name(bdaddr_t *local, bdaddr_t *peer, char **name) +int read_device_name(bdaddr_t *src, bdaddr_t *dst, char **name) { char filename[PATH_MAX + 1], addr[18], *str; int len; - create_filename(filename, PATH_MAX, local, "names"); + create_filename(filename, PATH_MAX, src, "names"); - ba2str(peer, addr); + ba2str(dst, addr); str = textfile_get(filename, addr); if (!str) return -ENOENT; @@ -202,6 +202,29 @@ int read_device_name(bdaddr_t *local, bdaddr_t *peer, char **name) return 0; } +int read_device_class(bdaddr_t *src, bdaddr_t *dst, uint32_t *cls) +{ + char filename[PATH_MAX + 1], *str; + char addr[18]; + + ba2str(src, addr); + create_name(filename, PATH_MAX, STORAGEDIR, addr, "classes"); + + ba2str(dst, addr); + str = textfile_get(filename, addr); + if (!str) + return -ENOENT; + + if (sscanf(str, "%x", cls) != 1) { + g_free(str); + return -ENOENT; + } + + g_free(str); + + return 0; +} + int encrypt_link(bdaddr_t *src, bdaddr_t *dst) { char filename[PATH_MAX + 1]; -- cgit From 0762886602369f99a473dc95cc288def7b6e363c Mon Sep 17 00:00:00 2001 From: Claudio Takahasi Date: Fri, 22 Jun 2007 17:11:10 +0000 Subject: input: convert hidd to input --- input/storage.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) (limited to 'input/storage.c') diff --git a/input/storage.c b/input/storage.c index 3793a275..7da536b3 100644 --- a/input/storage.c +++ b/input/storage.c @@ -59,6 +59,48 @@ static inline int create_filename(char *buf, size_t size, return create_name(buf, size, STORAGEDIR, addr, name); } +int parse_stored_hidd(const char *str, struct hidp_connadd_req *req) +{ + char tmp[3]; + char *desc; + unsigned int vendor, product, version, subclass, country, parser, pos; + int i; + + desc = malloc(4096); + if (!desc) + return -ENOMEM; + + memset(desc, 0, 4096); + + sscanf(str, "%04X:%04X:%04X %02X %02X %04X %4095s %08X %n", + &vendor, &product, &version, &subclass, &country, + &parser, desc, &req->flags, &pos); + + req->vendor = vendor; + req->product = product; + req->version = version; + req->subclass = subclass; + req->country = country; + req->parser = parser; + + req->rd_size = strlen(desc) / 2; + req->rd_data = g_try_malloc0(req->rd_size); + if (!req->rd_data) { + g_free(desc); + return -ENOMEM; + } + + memset(tmp, 0, sizeof(tmp)); + for (i = 0; i < req->rd_size; i++) { + memcpy(tmp, desc + (i * 2), 2); + req->rd_data[i] = (uint8_t) strtol(tmp, NULL, 16); + } + + g_free(desc); + + return 0; +} + int parse_stored_device_info(const char *str, struct hidp_connadd_req *req) { char tmp[3]; -- cgit From 79a65bbbe4d711bb7eb78ff9744fe33ef46082aa Mon Sep 17 00:00:00 2001 From: Claudio Takahasi Date: Fri, 22 Jun 2007 19:55:06 +0000 Subject: input: remove the device entry from the hidd file when RemoveDevice is called --- input/storage.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'input/storage.c') diff --git a/input/storage.c b/input/storage.c index 7da536b3..0ba49027 100644 --- a/input/storage.c +++ b/input/storage.c @@ -166,10 +166,12 @@ int del_stored_device_info(bdaddr_t *src, bdaddr_t *dst) char filename[PATH_MAX + 1]; char addr[18]; - create_filename(filename, PATH_MAX, src, "input"); - ba2str(dst, addr); + create_filename(filename, PATH_MAX, src, "hidd"); + textfile_del(filename, addr); + + create_filename(filename, PATH_MAX, src, "input"); return textfile_del(filename, addr); } -- cgit From 0ffdac3e37977d4db9fb42832b95a6fd1f3a4100 Mon Sep 17 00:00:00 2001 From: Claudio Takahasi Date: Fri, 3 Aug 2007 13:03:53 +0000 Subject: input: fixed missing byte(HID descriptor field) in the input file --- input/storage.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'input/storage.c') diff --git a/input/storage.c b/input/storage.c index 0ba49027..b20524d9 100644 --- a/input/storage.c +++ b/input/storage.c @@ -183,7 +183,7 @@ int store_device_info(bdaddr_t *src, bdaddr_t *dst, struct hidp_connadd_req *req create_filename(filename, PATH_MAX, src, "input"); - size = 15 + 3 + 3 + 5 + (req->rd_size * 2) + 1 + 9; + size = 15 + 3 + 3 + 5 + (req->rd_size * 2) + 2 + 9; str = g_try_malloc0(size); if (!str) return -ENOMEM; -- cgit From 07ebeadd853277fa7b7fae80abb84c17bf1d303b Mon Sep 17 00:00:00 2001 From: Claudio Takahasi Date: Thu, 4 Oct 2007 15:48:32 +0000 Subject: input: added CreateSecureDevice --- input/storage.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'input/storage.c') diff --git a/input/storage.c b/input/storage.c index b20524d9..fe0469e6 100644 --- a/input/storage.c +++ b/input/storage.c @@ -344,3 +344,21 @@ fail: return -err; } + +gboolean has_bonding(bdaddr_t *src, bdaddr_t *dst) +{ + char filename[PATH_MAX + 1]; + char addr[18], *str; + + create_filename(filename, PATH_MAX, src, "linkkeys"); + + ba2str(dst, addr); + + str = textfile_get(filename, addr); + if (!str) + return FALSE; + + free(str); + + return TRUE; +} -- cgit From e823c15e43a6f924779e466d434c51157002d9ee Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Sat, 2 Feb 2008 03:37:05 +0000 Subject: Update copyright information --- input/storage.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'input/storage.c') diff --git a/input/storage.c b/input/storage.c index fe0469e6..25894a5b 100644 --- a/input/storage.c +++ b/input/storage.c @@ -2,7 +2,7 @@ * * BlueZ - Bluetooth protocol stack for Linux * - * Copyright (C) 2004-2007 Marcel Holtmann + * Copyright (C) 2004-2008 Marcel Holtmann * * * This program is free software; you can redistribute it and/or modify -- cgit