From 3406c27e758f3dfa182f6fdfcc878bc3a53e3c98 Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Fri, 9 Mar 2007 15:33:38 +0000 Subject: Add skeleton for network service --- network/server.h | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 network/server.h (limited to 'network/server.h') diff --git a/network/server.h b/network/server.h new file mode 100644 index 00000000..e87dd676 --- /dev/null +++ b/network/server.h @@ -0,0 +1,22 @@ +/* + * + * 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 + * + */ -- cgit From 0ac929228aa1eb823f37776e2bbb84855417c66e Mon Sep 17 00:00:00 2001 From: Luiz Augusto von Dentz Date: Mon, 19 Mar 2007 13:57:52 +0000 Subject: Fix build, move errors to error file and add server registration. --- network/server.h | 1 + 1 file changed, 1 insertion(+) (limited to 'network/server.h') diff --git a/network/server.h b/network/server.h index e87dd676..33f997a9 100644 --- a/network/server.h +++ b/network/server.h @@ -20,3 +20,4 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * */ +int server_register(DBusConnection *conn, const char *path); -- cgit From d1e15b83b04cf2cfe3f154678b1d72ebaf783512 Mon Sep 17 00:00:00 2001 From: Claudio Takahasi Date: Thu, 22 Mar 2007 14:21:01 +0000 Subject: network: Added Server.GetUUID() --- network/server.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'network/server.h') diff --git a/network/server.h b/network/server.h index 33f997a9..a3fba6d1 100644 --- a/network/server.h +++ b/network/server.h @@ -20,4 +20,4 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * */ -int server_register(DBusConnection *conn, const char *path); +int server_register(DBusConnection *conn, const char *path, const char *uuid); -- cgit From ef3649fd9e62bd989ff67a125a05c962d5640fd3 Mon Sep 17 00:00:00 2001 From: Claudio Takahasi Date: Fri, 23 Mar 2007 21:04:08 +0000 Subject: network: using service class identifier instead of the uuid 128 string for server registration --- network/server.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'network/server.h') diff --git a/network/server.h b/network/server.h index a3fba6d1..bb15e4d7 100644 --- a/network/server.h +++ b/network/server.h @@ -20,4 +20,4 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * */ -int server_register(DBusConnection *conn, const char *path, const char *uuid); +int server_register(DBusConnection *conn, const char *path, uint16_t id); -- cgit From 3ee5b90642bb7c8d2e88904600edac9d0d33efb4 Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Tue, 27 Mar 2007 10:21:45 +0000 Subject: Improve D-Bus system bus integration --- network/server.h | 1 + 1 file changed, 1 insertion(+) (limited to 'network/server.h') diff --git a/network/server.h b/network/server.h index bb15e4d7..27b38ba6 100644 --- a/network/server.h +++ b/network/server.h @@ -20,4 +20,5 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * */ + int server_register(DBusConnection *conn, const char *path, uint16_t id); -- cgit From 0f09acbace55a146315d240d45132faf62ad45cf Mon Sep 17 00:00:00 2001 From: Luiz Augusto von Dentz Date: Mon, 2 Apr 2007 18:23:50 +0000 Subject: Add storage code. --- network/server.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'network/server.h') diff --git a/network/server.h b/network/server.h index 27b38ba6..7db4ad18 100644 --- a/network/server.h +++ b/network/server.h @@ -21,4 +21,6 @@ * */ -int server_register(DBusConnection *conn, const char *path, uint16_t id); +int server_register(DBusConnection *conn, const char *addr, const char *path, + uint16_t id); +int read_server_uuid(bdaddr_t *src, uint16_t uuid, gboolean *enable); -- cgit From 2cd680bf44197f4fdba3fdfe6d042dcc373c1c52 Mon Sep 17 00:00:00 2001 From: Claudio Takahasi Date: Fri, 13 Apr 2007 16:42:57 +0000 Subject: network: added functions prototypes for nap/gn registration --- network/server.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'network/server.h') diff --git a/network/server.h b/network/server.h index 7db4ad18..23ebe772 100644 --- a/network/server.h +++ b/network/server.h @@ -21,6 +21,8 @@ * */ -int server_register(DBusConnection *conn, const char *addr, const char *path, - uint16_t id); +int server_register(DBusConnection *conn, const char *addr, + const char *path, uint16_t id); +int register_nap_from_file(const bdaddr_t *src, const char *filename); +int register_gn_from_file(const bdaddr_t *src, const char *filename); int read_server_uuid(bdaddr_t *src, uint16_t uuid, gboolean *enable); -- cgit From 235f0862a242772d8e3e51cd4f4dd8277939bbe5 Mon Sep 17 00:00:00 2001 From: Claudio Takahasi Date: Fri, 13 Apr 2007 20:21:11 +0000 Subject: network: added register_nap_from_file --- network/server.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'network/server.h') diff --git a/network/server.h b/network/server.h index 23ebe772..d96873b3 100644 --- a/network/server.h +++ b/network/server.h @@ -23,6 +23,8 @@ int server_register(DBusConnection *conn, const char *addr, const char *path, uint16_t id); -int register_nap_from_file(const bdaddr_t *src, const char *filename); -int register_gn_from_file(const bdaddr_t *src, const char *filename); +int register_nap_from_file(DBusConnection *conn, const char *path, + const bdaddr_t *src, const char *filename); +int register_gn_from_file(DBusConnection *conn, const char *path, + const bdaddr_t *src, const char *filename); int read_server_uuid(bdaddr_t *src, uint16_t uuid, gboolean *enable); -- cgit From a4bc8363b53f68c20bed8dcf5bf436c8609be199 Mon Sep 17 00:00:00 2001 From: Claudio Takahasi Date: Fri, 13 Apr 2007 20:38:37 +0000 Subject: network: moved register_nap_from_file to server_register_from file to support gn and nap registration --- network/server.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'network/server.h') diff --git a/network/server.h b/network/server.h index d96873b3..c4dd51e6 100644 --- a/network/server.h +++ b/network/server.h @@ -23,8 +23,6 @@ int server_register(DBusConnection *conn, const char *addr, const char *path, uint16_t id); -int register_nap_from_file(DBusConnection *conn, const char *path, - const bdaddr_t *src, const char *filename); -int register_gn_from_file(DBusConnection *conn, const char *path, - const bdaddr_t *src, const char *filename); +int server_register_from_file(DBusConnection *conn, const char *path, + const bdaddr_t *src, uint16_t id, const char *filename); int read_server_uuid(bdaddr_t *src, uint16_t uuid, gboolean *enable); -- cgit From af49fed2e0f5b71203c67fc163d29464ed534399 Mon Sep 17 00:00:00 2001 From: Claudio Takahasi Date: Fri, 13 Apr 2007 20:58:03 +0000 Subject: network: changed server_register signature and code cleanup --- network/server.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'network/server.h') diff --git a/network/server.h b/network/server.h index c4dd51e6..613b628d 100644 --- a/network/server.h +++ b/network/server.h @@ -21,8 +21,8 @@ * */ -int server_register(DBusConnection *conn, const char *addr, - const char *path, uint16_t id); +int server_register(DBusConnection *conn, const char *path, + bdaddr_t *src, uint16_t id); int server_register_from_file(DBusConnection *conn, const char *path, const bdaddr_t *src, uint16_t id, const char *filename); int read_server_uuid(bdaddr_t *src, uint16_t uuid, gboolean *enable); -- cgit From 476855d7cdf0fc2259f1aab3946b9719e567a808 Mon Sep 17 00:00:00 2001 From: Claudio Takahasi Date: Fri, 13 Apr 2007 21:18:19 +0000 Subject: network: removed not defined function(read_server_uuid) --- network/server.h | 1 - 1 file changed, 1 deletion(-) (limited to 'network/server.h') diff --git a/network/server.h b/network/server.h index 613b628d..92d82f2f 100644 --- a/network/server.h +++ b/network/server.h @@ -25,4 +25,3 @@ int server_register(DBusConnection *conn, const char *path, bdaddr_t *src, uint16_t id); int server_register_from_file(DBusConnection *conn, const char *path, const bdaddr_t *src, uint16_t id, const char *filename); -int read_server_uuid(bdaddr_t *src, uint16_t uuid, gboolean *enable); -- cgit From 47895f4ab3f4de2682088dfba156106c772a92da Mon Sep 17 00:00:00 2001 From: Claudio Takahasi Date: Sat, 14 Apr 2007 00:19:59 +0000 Subject: network: addded server_store --- network/server.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'network/server.h') diff --git a/network/server.h b/network/server.h index 92d82f2f..e762da9d 100644 --- a/network/server.h +++ b/network/server.h @@ -25,3 +25,5 @@ int server_register(DBusConnection *conn, const char *path, bdaddr_t *src, uint16_t id); int server_register_from_file(DBusConnection *conn, const char *path, const bdaddr_t *src, uint16_t id, const char *filename); + +int server_store(DBusConnection *conn, const char *path); -- cgit From e968bf544679fbf8565b2354cb4beac3641538e4 Mon Sep 17 00:00:00 2001 From: Claudio Takahasi Date: Mon, 16 Apr 2007 13:14:07 +0000 Subject: network: added server_remove_stored function --- network/server.h | 1 + 1 file changed, 1 insertion(+) (limited to 'network/server.h') diff --git a/network/server.h b/network/server.h index e762da9d..30016f3e 100644 --- a/network/server.h +++ b/network/server.h @@ -27,3 +27,4 @@ int server_register_from_file(DBusConnection *conn, const char *path, const bdaddr_t *src, uint16_t id, const char *filename); int server_store(DBusConnection *conn, const char *path); +int server_remove_stored(DBusConnection *conn, const char *path); -- cgit From de900f387d63bc74bebedbe52f158e7ec64129d5 Mon Sep 17 00:00:00 2001 From: Luiz Augusto von Dentz Date: Tue, 8 May 2007 14:42:02 +0000 Subject: Fix bug on FindServer and add missing headers. --- network/server.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'network/server.h') diff --git a/network/server.h b/network/server.h index 30016f3e..ff754711 100644 --- a/network/server.h +++ b/network/server.h @@ -28,3 +28,5 @@ int server_register_from_file(DBusConnection *conn, const char *path, int server_store(DBusConnection *conn, const char *path); int server_remove_stored(DBusConnection *conn, const char *path); +int server_find_data(DBusConnection *conn, const char *path, + const char *pattern); -- cgit From 3a653f915b0e7de28e111665ba40b69ae6d6a235 Mon Sep 17 00:00:00 2001 From: Luiz Augusto von Dentz Date: Wed, 20 Jun 2007 20:23:35 +0000 Subject: Remove CreateServer and RemoveServer, servers are always create. --- network/server.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'network/server.h') diff --git a/network/server.h b/network/server.h index ff754711..fb6debdf 100644 --- a/network/server.h +++ b/network/server.h @@ -21,12 +21,13 @@ * */ + int server_register(DBusConnection *conn, const char *path, bdaddr_t *src, uint16_t id); int server_register_from_file(DBusConnection *conn, const char *path, const bdaddr_t *src, uint16_t id, const char *filename); int server_store(DBusConnection *conn, const char *path); -int server_remove_stored(DBusConnection *conn, const char *path); + int server_find_data(DBusConnection *conn, const char *path, const char *pattern); -- cgit From 5162283fd17b02c1ea0635b12a72f3bdc17891b8 Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Thu, 16 Aug 2007 18:03:01 +0000 Subject: Small header cleanups --- network/server.h | 1 - 1 file changed, 1 deletion(-) (limited to 'network/server.h') diff --git a/network/server.h b/network/server.h index fb6debdf..5765e42e 100644 --- a/network/server.h +++ b/network/server.h @@ -21,7 +21,6 @@ * */ - int server_register(DBusConnection *conn, const char *path, bdaddr_t *src, uint16_t id); int server_register_from_file(DBusConnection *conn, const char *path, -- cgit From 176b646a7829d683055d95b5d637a3a5dfdd36c0 Mon Sep 17 00:00:00 2001 From: Claudio Takahasi Date: Wed, 29 Aug 2007 20:32:05 +0000 Subject: network: server cleanup - added static DBusConnection and server init/exit --- network/server.h | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'network/server.h') diff --git a/network/server.h b/network/server.h index 5765e42e..d96b7ecb 100644 --- a/network/server.h +++ b/network/server.h @@ -20,13 +20,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * */ +int server_init(DBusConnection *conn); +void server_exit(); +int server_register(const char *path, bdaddr_t *src, uint16_t id); +int server_register_from_file(const char *path, const bdaddr_t *src, + uint16_t id, const char *filename); -int server_register(DBusConnection *conn, const char *path, - bdaddr_t *src, uint16_t id); -int server_register_from_file(DBusConnection *conn, const char *path, - const bdaddr_t *src, uint16_t id, const char *filename); +int server_store(const char *path); -int server_store(DBusConnection *conn, const char *path); - -int server_find_data(DBusConnection *conn, const char *path, - const char *pattern); +int server_find_data(const char *path, const char *pattern); -- cgit From 2033d8e42102bb6513e5ea71e147a8a7dcce1420 Mon Sep 17 00:00:00 2001 From: Luiz Augusto von Dentz Date: Fri, 28 Sep 2007 13:15:53 +0000 Subject: Add support for config file. --- network/server.h | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'network/server.h') diff --git a/network/server.h b/network/server.h index d96b7ecb..2b148081 100644 --- a/network/server.h +++ b/network/server.h @@ -20,6 +20,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * */ + +struct server_conf { + char *panu_iface; + char *gn_iface; + char *nap_iface; + gboolean disable_security; +}; + int server_init(DBusConnection *conn); void server_exit(); int server_register(const char *path, bdaddr_t *src, uint16_t id); -- cgit From b94d1033b7c6919ca4705cf11139fb8224c3ecde Mon Sep 17 00:00:00 2001 From: Luiz Augusto von Dentz Date: Fri, 28 Sep 2007 13:19:21 +0000 Subject: Add bridge name support. --- network/server.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'network/server.h') diff --git a/network/server.h b/network/server.h index 2b148081..233c7837 100644 --- a/network/server.h +++ b/network/server.h @@ -28,7 +28,8 @@ struct server_conf { gboolean disable_security; }; -int server_init(DBusConnection *conn); +int server_init(DBusConnection *conn, const char *iface_prefix, + struct server_conf *server_conf); void server_exit(); int server_register(const char *path, bdaddr_t *src, uint16_t id); int server_register_from_file(const char *path, const bdaddr_t *src, -- cgit From 6113615ecfb8026a6a3ce0af38fc79ec8abec748 Mon Sep 17 00:00:00 2001 From: Luiz Augusto von Dentz Date: Fri, 28 Sep 2007 13:23:51 +0000 Subject: Rework configuration file to use roles. --- network/server.h | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'network/server.h') diff --git a/network/server.h b/network/server.h index 233c7837..9f49cad7 100644 --- a/network/server.h +++ b/network/server.h @@ -21,15 +21,7 @@ * */ -struct server_conf { - char *panu_iface; - char *gn_iface; - char *nap_iface; - gboolean disable_security; -}; - -int server_init(DBusConnection *conn, const char *iface_prefix, - struct server_conf *server_conf); +int server_init(DBusConnection *conn, const char *iface_prefix); void server_exit(); int server_register(const char *path, bdaddr_t *src, uint16_t id); int server_register_from_file(const char *path, const bdaddr_t *src, -- cgit From 54943abd65058d7c24fbf9384759181c16913a96 Mon Sep 17 00:00:00 2001 From: Luiz Augusto von Dentz Date: Fri, 28 Sep 2007 13:30:48 +0000 Subject: Add secure link mode. --- network/server.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'network/server.h') diff --git a/network/server.h b/network/server.h index 9f49cad7..839aea4b 100644 --- a/network/server.h +++ b/network/server.h @@ -21,7 +21,8 @@ * */ -int server_init(DBusConnection *conn, const char *iface_prefix); +int server_init(DBusConnection *conn, const char *iface_prefix, + gboolean secure); void server_exit(); int server_register(const char *path, bdaddr_t *src, uint16_t id); int server_register_from_file(const char *path, const bdaddr_t *src, -- 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 --- network/server.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'network/server.h') diff --git a/network/server.h b/network/server.h index 839aea4b..6fb06b58 100644 --- a/network/server.h +++ b/network/server.h @@ -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