From e5d465b5adb59f2b199819793939d781376b7d75 Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Tue, 15 May 2007 14:15:52 +0000 Subject: Add new file skeletons --- serial/storage.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 serial/storage.c (limited to 'serial/storage.c') diff --git a/serial/storage.c b/serial/storage.c new file mode 100644 index 00000000..bf885407 --- /dev/null +++ b/serial/storage.c @@ -0,0 +1,28 @@ +/* + * + * 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 "storage.h" -- cgit From 2180c8458b3347f5c83fb483bcc70ec8dd5fe924 Mon Sep 17 00:00:00 2001 From: Claudio Takahasi Date: Fri, 18 May 2007 12:20:15 +0000 Subject: serial: added port persistent storage --- serial/storage.c | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) (limited to 'serial/storage.c') diff --git a/serial/storage.c b/serial/storage.c index bf885407..0b599247 100644 --- a/serial/storage.c +++ b/serial/storage.c @@ -25,4 +25,44 @@ #include #endif +#include +#include + +#include + +#include + +#include "logging.h" +#include "textfile.h" + #include "storage.h" + +int port_store(bdaddr_t *src, bdaddr_t *dst, int id, + uint8_t ch, const char *svcname) +{ + char filename[PATH_MAX + 1]; + char src_addr[18], dst_addr[18]; + char key[32]; + char *value; + int size, err; + + if (!svcname) + svcname = "Bluetooth RFCOMM port"; + + ba2str(src, src_addr); + ba2str(dst, dst_addr); + + create_name(filename, PATH_MAX, STORAGEDIR, src_addr, "serial"); + create_file(filename, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH); + + size = strlen(svcname) + 3; + value = g_malloc0(size); + + snprintf(key, 32, "%s#%d", dst_addr, id); + snprintf(value, size, "%d:%s", ch, svcname); + + err = textfile_put(filename, key, value); + g_free(value); + + return err; +} -- cgit From d421185c6b67a294980425dd24d8142956bb7124 Mon Sep 17 00:00:00 2001 From: Claudio Takahasi Date: Fri, 18 May 2007 16:00:34 +0000 Subject: serial: eglib build was broken --- serial/storage.c | 1 + 1 file changed, 1 insertion(+) (limited to 'serial/storage.c') diff --git a/serial/storage.c b/serial/storage.c index 0b599247..89d156e5 100644 --- a/serial/storage.c +++ b/serial/storage.c @@ -27,6 +27,7 @@ #include #include +#include #include -- cgit From aab0210d3c33296381cff7f988a30f75f058ae8c Mon Sep 17 00:00:00 2001 From: Claudio Takahasi Date: Fri, 18 May 2007 19:19:49 +0000 Subject: serial: remove the entry from the persistent storage when RemovePort is called --- serial/storage.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'serial/storage.c') diff --git a/serial/storage.c b/serial/storage.c index 89d156e5..e6d73827 100644 --- a/serial/storage.c +++ b/serial/storage.c @@ -38,6 +38,21 @@ #include "storage.h" +int port_delete(bdaddr_t *src, bdaddr_t *dst, int id) +{ + char filename[PATH_MAX + 1]; + char src_addr[18], dst_addr[18]; + char key[32]; + + ba2str(src, src_addr); + ba2str(dst, dst_addr); + + create_name(filename, PATH_MAX, STORAGEDIR, src_addr, "serial"); + snprintf(key, sizeof(key), "%s#%d", dst_addr, id); + + return textfile_del(filename, key); +} + int port_store(bdaddr_t *src, bdaddr_t *dst, int id, uint8_t ch, const char *svcname) { -- cgit From 68f208cc3b17f8e26318ba411a0974d9489249c9 Mon Sep 17 00:00:00 2001 From: Claudio Takahasi Date: Fri, 18 May 2007 20:39:10 +0000 Subject: serial: code standard - use int16_t for dev_id --- serial/storage.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'serial/storage.c') diff --git a/serial/storage.c b/serial/storage.c index e6d73827..46e63f5d 100644 --- a/serial/storage.c +++ b/serial/storage.c @@ -38,7 +38,7 @@ #include "storage.h" -int port_delete(bdaddr_t *src, bdaddr_t *dst, int id) +int port_delete(bdaddr_t *src, bdaddr_t *dst, int16_t id) { char filename[PATH_MAX + 1]; char src_addr[18], dst_addr[18]; @@ -48,12 +48,12 @@ int port_delete(bdaddr_t *src, bdaddr_t *dst, int id) ba2str(dst, dst_addr); create_name(filename, PATH_MAX, STORAGEDIR, src_addr, "serial"); - snprintf(key, sizeof(key), "%s#%d", dst_addr, id); + snprintf(key, sizeof(key), "%s#%hd", dst_addr, id); return textfile_del(filename, key); } -int port_store(bdaddr_t *src, bdaddr_t *dst, int id, +int port_store(bdaddr_t *src, bdaddr_t *dst, int16_t id, uint8_t ch, const char *svcname) { char filename[PATH_MAX + 1]; @@ -74,7 +74,7 @@ int port_store(bdaddr_t *src, bdaddr_t *dst, int id, size = strlen(svcname) + 3; value = g_malloc0(size); - snprintf(key, 32, "%s#%d", dst_addr, id); + snprintf(key, 32, "%s#%hd", dst_addr, id); snprintf(value, size, "%d:%s", ch, svcname); err = textfile_put(filename, key, value); -- cgit From b8769c4814ad301b9ee409847b9df12085e69f59 Mon Sep 17 00:00:00 2001 From: Claudio Takahasi Date: Wed, 15 Aug 2007 13:16:41 +0000 Subject: serial: initial proxy storage implementation --- serial/storage.c | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) (limited to 'serial/storage.c') diff --git a/serial/storage.c b/serial/storage.c index 46e63f5d..1a867307 100644 --- a/serial/storage.c +++ b/serial/storage.c @@ -25,11 +25,15 @@ #include #endif +#include +#include #include #include #include #include +#include +#include #include @@ -82,3 +86,35 @@ int port_store(bdaddr_t *src, bdaddr_t *dst, int16_t id, return err; } + +int proxy_store(bdaddr_t *src, const char *uuid, const char *tty, + const char *name, uint8_t ch, int opts, struct termios *ti) +{ + char filename[PATH_MAX + 1], key[32], src_addr[18], *value; + int i, pos, size, err; + uint8_t *pti; + + ba2str(src, src_addr); + + create_name(filename, PATH_MAX, STORAGEDIR, src_addr, "proxy"); + create_file(filename, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH); + + if (!name) + name = "Port Proxy Entity"; + + size = MAX_LEN_UUID_STR + 16 + strlen(name) + sizeof(struct termios) * 2; + value = g_malloc0(size); + + snprintf(key, 32, "%s", tty); + + /* tty uuid 00 0x0000 name:termios */ + pos = snprintf(value, size, "%s %d 0x%04X %s:", tty, ch, opts, name); + + for (i = 0, pti = (uint8_t *) ti; i < sizeof(struct termios); i++, pti++) + sprintf(value + pos + (i * 2), "%2.2X", *pti); + + err = textfile_put(filename, key, value); + g_free(value); + + return err; +} -- cgit From 773651ca6b577e822c2bc096c4a5dec4f9645054 Mon Sep 17 00:00:00 2001 From: Claudio Takahasi Date: Wed, 15 Aug 2007 20:23:01 +0000 Subject: serial: proxy_store - replaced tty by uuid --- serial/storage.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'serial/storage.c') diff --git a/serial/storage.c b/serial/storage.c index 1a867307..f3c070d3 100644 --- a/serial/storage.c +++ b/serial/storage.c @@ -108,7 +108,7 @@ int proxy_store(bdaddr_t *src, const char *uuid, const char *tty, snprintf(key, 32, "%s", tty); /* tty uuid 00 0x0000 name:termios */ - pos = snprintf(value, size, "%s %d 0x%04X %s:", tty, ch, opts, name); + pos = snprintf(value, size, "%s %d 0x%04X %s:", uuid, ch, opts, name); for (i = 0, pti = (uint8_t *) ti; i < sizeof(struct termios); i++, pti++) sprintf(value + pos + (i * 2), "%2.2X", *pti); -- cgit From 7f0afa058ede87359b3104ffa72874ed59f68432 Mon Sep 17 00:00:00 2001 From: Claudio Takahasi Date: Thu, 16 Aug 2007 13:15:46 +0000 Subject: serial: RemoveProxy - remove the entry from the storage --- serial/storage.c | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'serial/storage.c') diff --git a/serial/storage.c b/serial/storage.c index f3c070d3..641ca1e8 100644 --- a/serial/storage.c +++ b/serial/storage.c @@ -87,6 +87,17 @@ int port_store(bdaddr_t *src, bdaddr_t *dst, int16_t id, return err; } +int proxy_delete(bdaddr_t *src, const char *tty) +{ + char filename[PATH_MAX + 1], src_addr[18]; + + ba2str(src, src_addr); + + create_name(filename, PATH_MAX, STORAGEDIR, src_addr, "proxy"); + + return textfile_del(filename, tty); +} + int proxy_store(bdaddr_t *src, const char *uuid, const char *tty, const char *name, uint8_t ch, int opts, struct termios *ti) { -- cgit From 26c787542c3949e2b64564ce84c3f52761b275d1 Mon Sep 17 00:00:00 2001 From: Claudio Takahasi Date: Wed, 22 Aug 2007 15:01:52 +0000 Subject: serial: added proxy for unix sockets --- serial/storage.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'serial/storage.c') diff --git a/serial/storage.c b/serial/storage.c index 641ca1e8..8b66354f 100644 --- a/serial/storage.c +++ b/serial/storage.c @@ -121,9 +121,13 @@ int proxy_store(bdaddr_t *src, const char *uuid, const char *tty, /* tty uuid 00 0x0000 name:termios */ pos = snprintf(value, size, "%s %d 0x%04X %s:", uuid, ch, opts, name); + if (!ti) + goto done; + for (i = 0, pti = (uint8_t *) ti; i < sizeof(struct termios); i++, pti++) sprintf(value + pos + (i * 2), "%2.2X", *pti); +done: err = textfile_put(filename, key, value); g_free(value); -- cgit From 09200aea99bdd29fb0f75b67162fbd958ef5df99 Mon Sep 17 00:00:00 2001 From: Claudio Takahasi Date: Mon, 24 Sep 2007 23:43:32 +0000 Subject: serial - allow up to 3 digits channel number --- serial/storage.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'serial/storage.c') diff --git a/serial/storage.c b/serial/storage.c index 8b66354f..110d8de7 100644 --- a/serial/storage.c +++ b/serial/storage.c @@ -75,7 +75,7 @@ int port_store(bdaddr_t *src, bdaddr_t *dst, int16_t id, create_name(filename, PATH_MAX, STORAGEDIR, src_addr, "serial"); create_file(filename, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH); - size = strlen(svcname) + 3; + size = strlen(svcname) + 5; value = g_malloc0(size); snprintf(key, 32, "%s#%hd", dst_addr, id); -- cgit From 4c18c3e4ffbd0bb6eeb7d0933acadc2f8200587b Mon Sep 17 00:00:00 2001 From: Claudio Takahasi Date: Wed, 26 Sep 2007 13:58:19 +0000 Subject: serial: Added GetName and GetAdapter --- serial/storage.c | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) (limited to 'serial/storage.c') diff --git a/serial/storage.c b/serial/storage.c index 110d8de7..6ea3eb41 100644 --- a/serial/storage.c +++ b/serial/storage.c @@ -25,6 +25,7 @@ #include #endif +#include #include #include #include @@ -133,3 +134,37 @@ done: return err; } + +int read_device_name(bdaddr_t *src, bdaddr_t *dst, char **name) +{ + char filename[PATH_MAX + 1], *str; + char src_addr[18], dst_addr[18]; + int len; + + ba2str(src, src_addr); + ba2str(dst, dst_addr); + + create_name(filename, PATH_MAX, STORAGEDIR, src_addr, "names"); + + str = textfile_get(filename, dst_addr); + if (!str) + return -ENOENT; + + len = strlen(str); + + /* Max remote device name */ + if (len < 248) { + *name = str; + return 0; + } + + *name = g_try_malloc0(248); + if (!*name) + return -ENOMEM; + + snprintf(*name, 248, "%s", str); + + free(str); + + return 0; +} -- 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 --- serial/storage.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'serial/storage.c') diff --git a/serial/storage.c b/serial/storage.c index 6ea3eb41..98cd5b84 100644 --- a/serial/storage.c +++ b/serial/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