Refactor bnep code and implement pan methods
Subsystems (2)
cover Refactor bnep code and implement pan methods
v3: Fixed Anderson and Luiz comments and solved rebased conflicts.
v2: Refactored profiles/network/common.* as per Johan's comments
(renaming common.c|h to bnep.c|h and moving bnep related code to
bnep.c ro reduce redundancy in profiles/netowrk/connection.c and android/pan.c)
v1: This patch set supports PANU role with a minor fix in android. Added
CAP_NET_RAW capability for bnep services. Creates bnep connection and up the inreface on connect call and free the device on disconnect call. Interface name(bnepX) will be notified on control state cb. Android environment will create IP address with dhcp calls.
Ravi kumar Veeramally (7):
profiles/network: Remove redundant code for bnep interface name profiles/network: Refactor bnep connection setup functionality profiles/network: Rename common.c|h to bnep.c|h android/pan: Implement pan connect method in daemon android/pan: Implement pan disconnect method in daemon android/pan: Implement the get local role method in daemon
android: Add reasons for adding capabilites to process
Makefile.plugins | 2 +-
android/Android.mk | 2 +
android/Makefile.am | 3 +-
android/main.c | 3 +
android/pan.c | 252 ++++++++++++++++++++++++++++++++--
profiles/network/{common.c => bnep.c} | 184 ++++++++++++++++++++++++-
profiles/network/{common.h => bnep.h} | 5 +
profiles/network/connection.c | 171 ++---------------------
profiles/network/manager.c | 2 +-
profiles/network/server.c | 5 +-
10 files changed, 452 insertions(+), 177 deletions(-)
rename profiles/network/{common.c => bnep.c} (59%)
rename profiles/network/{common.h => bnep.h} (87%)Signature · 1 line
1.8.3.2
PATCH 1/7 profiles/network: Remove redundant code for bnep interface name
Remove redundant code for copying bnepX interface name from connection and server files. It is better to place on actual function call.
--- profiles/network/common.c | 4 ++-- profiles/network/connection.c | 2 -- profiles/network/server.c | 3 --- 3 files changed, 2 insertions(+), 7 deletions(-)
profiles/network/common.c +2 -2
@@ -149,9 +149,9 @@ int bnep_connadd(int sk, uint16_t role, char *dev) {struct bnep_connadd_req req; +memset (dev,0 ,16 );memset (&req,0 ,sizeof (req)); -strncpy (req.device, dev,16 ); - req.device[15 ] ='\0' ; +strcpy (req.device,"bnep%d" ); req.sock = sk; req.role = role;if (ioctl (ctl,BNEPCONNADD , &req) <0 ) {
profiles/network/connection.c +0 -2
@@ -692,8 +692,6 @@ int connection_register(struct btd_service *service) nc = g_new0(struct network_conn, 1); nc->id = id; -memset (nc->dev,0 ,sizeof (nc->dev)); -strcpy (nc->dev,"bnep%d" ); nc->service =btd_service_ref (service); nc->state =DISCONNECTED ; nc->peer = peer;
profiles/network/server.c +0 -3
@@ -269,9 +269,6 @@ static int server_connadd(struct network_server *ns,char devname[16 ];int err, nsk; -memset (devname,0 ,sizeof (devname)); -strcpy (devname,"bnep%d" ); - nsk =g_io_channel_unix_get_fd (session->io); err =bnep_connadd (nsk, dst_role, devname);if (err <0 )
Signature · 1 line
1.8.3.2
PATCH 2/7 profiles/network: Refactor bnep connection setup functionality
In reply to Ravi kumar VeeramallyMoving bnep connection setup related functionality to common.c. Provided bnep_connect call with bnep_connect_cb for status and bnep interface name. It will be simple if someone want to utilize this call otherwise they have to reimplement similar functionality with minimal changes (e.g. android/pan).
--- profiles/network/common.c | 178 ++++++++++++++++++++++++++++++++++++++++++ profiles/network/common.h | 5 ++ profiles/network/connection.c | 167 +++------------------------------------ 3 files changed, 194 insertions(+), 156 deletions(-)
profiles/network/common.c +178 -0
@@ -46,6 +46,9 @@#include "common.h" #include "lib/uuid.h" +#define CON_SETUP_RETRIES 3 +#define CON_SETUP_TO 9 +static int ctl; static struct {
@@ -59,6 +62,21 @@ static struct { { NULL } }; +struct __service_16 { +uint16_t dst; +uint16_t src; +} __attribute__ ((packed)); + +struct bnep_conn { +GIOChannel *io; +uint16_t src; +uint16_t dst; +guint attempts; +guint setup_to; +void *data; +bnep_connect_cb conn_cb; +}; +uint16_t bnep_service_id (const char *svc) {int i;
@@ -215,6 +233,166 @@ int bnep_if_down(const char *devname)return 0 ; } +static gboolean bnep_setup_cb (GIOChannel *chan,GIOCondition cond, +gpointer data) +{ +struct bnep_conn *bc = data; +struct bnep_control_rsp *rsp; +struct timeval timeo; +char pkt[BNEP_MTU ]; +char iface[16 ]; +ssize_t r; +int sk; + +if (cond &G_IO_NVAL ) + goto failed; + +if (bc->setup_to >0 ) { +g_source_remove (bc->setup_to); + bc->setup_to =0 ; + } + +if (cond & (G_IO_HUP |G_IO_ERR )) { +error ("Hangup or error on l2cap server socket" ); + goto failed; + } + + sk =g_io_channel_unix_get_fd (chan); +memset (pkt,0 ,BNEP_MTU ); + r =read (sk, pkt,sizeof (pkt) -1 ); +if (r <0 ) { +error ("IO Channel read error" ); + goto failed; + } + +if (r ==0 ) { +error ("No packet received on l2cap socket" ); + goto failed; + } + + errno =EPROTO ; + +if ((size_t ) r <sizeof (*rsp)) { +error ("Packet received is not bnep type" ); + goto failed; + } + + rsp = (void *) pkt; +if (rsp->type !=BNEP_CONTROL ) { +error ("Packet received is not bnep type" ); + goto failed; + } + +if (rsp->ctrl !=BNEP_SETUP_CONN_RSP ) +return TRUE; + + r =ntohs (rsp->resp); +if (r !=BNEP_SUCCESS ) { +error ("bnep failed" ); + goto failed; + } + +memset (&timeo,0 ,sizeof (timeo)); + timeo.tv_sec =0 ; +setsockopt (sk,SOL_SOCKET ,SO_RCVTIMEO , &timeo,sizeof (timeo)); + + sk =g_io_channel_unix_get_fd (bc->io); +if (bnep_connadd (sk, bc->src, iface)) { +error ("bnep conn could not be added" ); + goto failed; + } + +if (bnep_if_up (iface)) { +error ("could not up %s" , iface); + goto failed; + } + + bc->conn_cb (chan, iface,0 , bc->data); +g_free (bc); + +return FALSE; + +failed: + bc->conn_cb (NULL ,NULL , -EIO , bc->data); +g_free (bc); + +return FALSE; +} + + +static int bnep_setup_conn_req (struct bnep_conn *bc) +{ +struct bnep_setup_conn_req *req; +struct __service_16 *s; +unsigned char pkt[BNEP_MTU ]; +int fd; + +/* Send request */ + req = (void *) pkt; + req->type =BNEP_CONTROL ; + req->ctrl =BNEP_SETUP_CONN_REQ ; + req->uuid_size =2 ;/* 16bit UUID */ + s = (void *) req->service; + s->src =htons (bc->src); + s->dst =htons (bc->dst); + + fd =g_io_channel_unix_get_fd (bc->io); +if (write (fd, pkt,sizeof (*req) +sizeof (*s)) <0 ) { +error ("bnep connection req send failed: %s" ,strerror (errno)); +return -errno; + } + + bc->attempts++; + +return 0 ; +} + +static gboolean bnep_conn_req_to (gpointer user_data) +{ +struct bnep_conn *bc = user_data; + +if (bc->attempts ==CON_SETUP_RETRIES ) { +error ("Too many bnep connection attempts" ); + }else { +error ("bnep connection setup TO, retrying..." ); +if (bnep_setup_conn_req (bc) ==0 ) +return TRUE; + } + + bc->conn_cb (NULL ,NULL , -ETIMEDOUT , bc->data); +g_free (bc); + +return FALSE; +} + +int bnep_connect (GIOChannel *io,uint16_t src,uint16_t dst, +bnep_connect_cb conn_cb,void *data) +{ +struct bnep_conn *bc; +int err; + +if (!io || !conn_cb) +return -EINVAL ; + + bc = g_new0(struct bnep_conn, 1); + bc->io = io; + bc->attempts =0 ; + bc->src = src; + bc->dst = dst; + bc->conn_cb = conn_cb; + bc->data = data; + + err =bnep_setup_conn_req (bc); +if (err <0 ) +return err; + + bc->setup_to =g_timeout_add_seconds (CON_SETUP_TO , + bnep_conn_req_to, bc); +g_io_add_watch (bc->io,G_IO_IN |G_IO_ERR |G_IO_HUP |G_IO_NVAL , + bnep_setup_cb, bc); +return 0 ; +} +int bnep_add_to_bridge (const char *devname,const char *bridge) {int ifindex;
profiles/network/common.h +5 -0
@@ -35,3 +35,8 @@ int bnep_if_up(const char *devname);int bnep_if_down (const char *devname);int bnep_add_to_bridge (const char *devname,const char *bridge);int bnep_del_from_bridge (const char *devname,const char *bridge); + +typedef void (*bnep_connect_cb ) (GIOChannel *chan,char *iface,int err, +void *data); +int bnep_connect (GIOChannel *io,uint16_t src,uint16_t dst, +bnep_connect_cb conn_cb,void *data);
profiles/network/connection.c +11 -156
224 lines not on this page · raw message
Signature · 1 line
1.8.3.2
PATCH 3/7 profiles/network: Rename common.c|h to bnep.c|h
In reply to Ravi kumar VeeramallyFiles common.c|h contains only bnep related code, it makes more sence with bnep.c|h.
---
Makefile.plugins | 2 +-
profiles/network/{common.c => bnep.c} | 2 +-
profiles/network/{common.h => bnep.h} | 0
profiles/network/connection.c | 2 +-
profiles/network/manager.c | 2 +-
profiles/network/server.c | 2 +-
6 files changed, 5 insertions(+), 5 deletions(-)
rename profiles/network/{common.c => bnep.c} (99%)
rename profiles/network/{common.h => bnep.h} (100%)Makefile.plugins +1 -1
@@ -47,7 +47,7 @@ builtin_sources += profiles/audio/control.h profiles/audio/control.c \ builtin_modules += network builtin_sources += profiles/network/manager.c \ - profiles/network/common.h profiles/network/common.c \ + profiles/network/bnep.h profiles/network/bnep.c \ profiles/network/server.h profiles/network/server.c \ profiles/network/connection.h \ profiles/network/connection.c
profiles/network/bnep.c renamed from profiles/network/common.c +1 -1
@@ -43,7 +43,7 @@#include <glib.h> #include "log.h" -#include "common.h" +#include "bnep.h" #include "lib/uuid.h" #define CON_SETUP_RETRIES 3
profiles/network/bnep.h renamed from profiles/network/common.h +0 -0
profiles/network/connection.c +1 -1
@@ -47,7 +47,7 @@#include "service.h" #include "error.h" -#include "common.h" +#include "bnep.h" #include "connection.h" #define NETWORK_PEER_INTERFACE "org.bluez.Network1"
profiles/network/manager.c +1 -1
@@ -43,7 +43,7 @@#include "device.h" #include "profile.h" #include "service.h" -#include "common.h" +#include "bnep.h" #include "connection.h" #include "server.h"
profiles/network/server.c +1 -1
@@ -48,7 +48,7 @@#include "error.h" #include "sdpd.h" -#include "common.h" +#include "bnep.h" #include "server.h" #define NETWORK_SERVER_INTERFACE "org.bluez.NetworkServer1"
Signature · 1 line
1.8.3.2
PATCH 4/7 android/pan: Implement pan connect method in daemon
In reply to Ravi kumar VeeramallyImplements the PAN connect method in android daemon with PANU role only. Setting up the bnep environment, adds connection and makes bnep interface up are part of bnep_connect call. Notifies bnep interface on control state call back and connection status on connection state call back.
--- android/Android.mk | 2 + android/Makefile.am | 3 +- android/pan.c | 218 ++++++++++++++++++++++++++++++++++++++++++++++++++-- 3 files changed, 215 insertions(+), 8 deletions(-)
android/Android.mk +2 -0
@@ -42,6 +42,7 @@ LOCAL_SRC_FILES := \ ../lib/hci.c \ ../btio/btio.c \ ../src/sdp-client.c \ + ../profiles/network/bnep.c \ LOCAL_C_INCLUDES := \ $(call include-path-for, glib) \
@@ -66,6 +67,7 @@ lib_headers := \ sdp.h \ rfcomm.h \ sco.h \ + bnep.h \ $(shell mkdir -p $(LOCAL_PATH)/../lib/bluetooth)
android/Makefile.am +2 -1
@@ -24,7 +24,8 @@ android_bluetoothd_SOURCES = android/main.c \ android/socket.h android/socket.c \ android/pan.h android/pan.c \ btio/btio.h btio/btio.c \ - src/sdp-client.h src/sdp-client.c + src/sdp-client.h src/sdp-client.c \ + profiles/network/bnep.h profiles/network/bnep.c android_bluetoothd_LDADD = lib/libbluetooth-internal.la @GLIB_LIBS@
android/pan.c +211 -7
258 lines not on this page · raw message
Signature · 1 line
1.8.3.2
PATCH 5/7 android/pan: Implement pan disconnect method in daemon
In reply to Ravi kumar VeeramallyDisconnect ongoing PANU role connection betweek devices, free the device and notify the connection state.
--- android/pan.c | 30 ++++++++++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-)
android/pan.c +28 -2
@@ -237,9 +237,35 @@ static uint8_t bt_pan_connect(struct hal_cmd_pan_connect *cmd, uint16_t len)static uint8_t bt_pan_disconnect (struct hal_cmd_pan_disconnect *cmd,uint16_t len) { -DBG ("Not Implemented" ); +struct network_peer *np; +GSList *l; +bdaddr_t dst; -return HAL_STATUS_FAILED ; +DBG ("" ); + +if (len <sizeof (*cmd)) +return HAL_STATUS_INVALID ; + +android2bdaddr (&cmd->bdaddr, &dst); + + l =g_slist_find_custom (peers, &dst, peer_cmp); +if (!l) +return HAL_STATUS_FAILED ; + + np = l->data; + +if (np->watch) { +g_source_remove (np->watch); + np->watch =0 ; + } + +bnep_if_down (np->dev); +bnep_kill_connection (&dst); + +bt_pan_notify_conn_state (np,HAL_PAN_STATE_DISCONNECTED ); +network_peer_free (np); + +return HAL_STATUS_SUCCESS ; }static uint8_t bt_pan_enable (struct hal_cmd_pan_enable *cmd,uint16_t len)
Signature · 1 line
1.8.3.2
PATCH 6/7 android/pan: Implement the get local role method in daemon
In reply to Ravi kumar VeeramallyReturns local role of the device (NONE, PANU or NAP).
--- android/pan.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
android/pan.c +8 -2
@@ -277,9 +277,15 @@ static uint8_t bt_pan_enable(struct hal_cmd_pan_enable *cmd, uint16_t len)static uint8_t bt_pan_get_role (void *cmd,uint16_t len) { -DBG ("Not Implemented" ); +struct hal_rsp_pan_get_role rsp; -return HAL_STATUS_FAILED ; +DBG ("" ); + + rsp.local_role = local_role; +ipc_send_rsp_full (HAL_SERVICE_ID_PAN ,HAL_OP_PAN_GET_ROLE ,sizeof (rsp), + &rsp,-1 ); + +return HAL_STATUS_SUCCESS ; }void bt_pan_handle_cmd (int sk,uint8_t opcode,void *buf,uint16_t len)
Signature · 1 line
1.8.3.2
PATCH 7/7 android: Add reasons for adding capabilites to process
In reply to Ravi kumar VeeramallyCAP_NET_ADMIN: Allow use of MGMT interfaceCAP_NET_BIND_SERVICE: Allow use of privileged PSMCAP_NET_RAW: Allow use of bnep ioctl calls
--- android/main.c | 3 +++ 1 file changed, 3 insertions(+)
android/main.c +3 -0
@@ -534,6 +534,9 @@ static bool set_capabilities(void) header.version = _LINUX_CAPABILITY_VERSION; header.pid =0 ; +/* CAP_NET_ADMIN: Allow use of MGMT interface +* CAP_NET_BIND_SERVICE: Allow use of privileged PSM +* CAP_NET_RAW: Allow use of bnep ioctl calls */ cap.effective = cap.permitted =CAP_TO_MASK (CAP_NET_RAW ) | CAP_TO_MASK(CAP_NET_ADMIN) |
Signature · 1 line
1.8.3.2