bnep: Refactored bnep connect and disconnect calls
PATCH 1/2 bnep: Refactored bnep connect and disconnect calls
Refactored bnep connect and disconnect calls to simply and keeping bnep related functionality behind curtains. Provided bnep_struct, bnep_new and bnep_free to intialize and free the bnep_stuct with basic parameters. bnep_connect calls takes care of bnep_setup until interface up then connect callback will be called, disconnect_cb is registered as watchdog and it will triggered by remote device on disconnect or any other I/O error. bnep_disconnect should be called only when iface is up/connected.
--- android/pan.c | 97 ++++++++++++------------------- profiles/network/bnep.c | 131 ++++++++++++++++++++++++++++++------------ profiles/network/bnep.h | 14 +++-- profiles/network/connection.c | 50 ++++++++++------ 4 files changed, 173 insertions(+), 119 deletions(-)
android/pan.c +37 -60
@@ -54,7 +54,7 @@ struct pan_device {uint8_t conn_state;uint8_t role;GIOChannel *io; -guint watch; +struct bnep_conn *bnep; };static int device_cmp (gconstpointer s,gconstpointer user_data)
@@ -65,24 +65,6 @@ static int device_cmp(gconstpointer s, gconstpointer user_data)return bacmp (&dev->dst, dst); } -static void pan_device_free (struct pan_device *dev) -{ - local_role =HAL_PAN_ROLE_NONE ; - -if (dev->watch >0 ) { -g_source_remove (dev->watch); - dev->watch =0 ; - } - -if (dev->io) { -g_io_channel_unref (dev->io); - dev->io =NULL ; - } - - devices =g_slist_remove (devices, dev); -g_free (dev); -} -static void bt_pan_notify_conn_state (struct pan_device *dev,uint8_t state) {struct hal_ev_pan_conn_state ev;
@@ -121,22 +103,33 @@ static void bt_pan_notify_ctrl_state(struct pan_device *dev, uint8_t state) &ev); } -static gboolean bnep_watchdog_cb (GIOChannel *chan,GIOCondition cond, -gpointer data) +static void destroy_pan_device (struct pan_device *dev) { -struct pan_device *dev = data; +if (dev->io) { +g_io_channel_shutdown (dev->io, TRUE,NULL ); +g_io_channel_unref (dev->io); + dev->io =NULL ; + } -DBG ("%s disconnected" , dev->iface); +if (dev->conn_state ==HAL_PAN_STATE_CONNECTED ) +bnep_disconnect (dev->bnep); -bnep_if_down (dev->iface); -bnep_conndel (&dev->dst);bt_pan_notify_conn_state (dev,HAL_PAN_STATE_DISCONNECTED ); -pan_device_free (dev); +bnep_free (dev->bnep); + devices =g_slist_remove (devices, dev); +g_free (dev); +} -return FALSE; +static void bnep_disconn_cb (void *data) +{ +struct pan_device *dev = data; + +DBG ("%s disconnected" , dev->iface); + +destroy_pan_device (dev); } -static void bnep_conn_cb (GIOChannel *chan,char *iface,int err,void *data) +static void bnep_conn_cb (char *iface,int err,void *data) {struct pan_device *dev = data;
@@ -144,26 +137,18 @@ static void bnep_conn_cb(GIOChannel *chan, char *iface, int err, void *data)if (err <0 ) {error ("bnep connect req failed: %s" ,strerror (-err)); -bnep_conndel (&dev->dst); -bt_pan_notify_conn_state (dev,HAL_PAN_STATE_DISCONNECTED ); -pan_device_free (dev); +destroy_pan_device (dev);return ; } -memcpy (dev->iface, iface,sizeof (dev->iface)); - -DBG ("%s connected" , dev->iface); +DBG ("%s connected" , iface); +memcpy (dev->iface, iface,sizeof (dev->iface));bt_pan_notify_ctrl_state (dev,HAL_PAN_CTRL_ENABLED );bt_pan_notify_conn_state (dev,HAL_PAN_STATE_CONNECTED ); - - dev->watch =g_io_add_watch (chan,G_IO_ERR |G_IO_HUP |G_IO_NVAL , - bnep_watchdog_cb, dev); -g_io_channel_unref (dev->io); - dev->io =NULL ; } -static void connect_cb (GIOChannel *chan,GError *err,gpointer data) +static void bt_io_connect_cb (GIOChannel *chan,GError *err,gpointer data) {struct pan_device *dev = data;uint16_t src, dst;
@@ -180,7 +165,13 @@ static void connect_cb(GIOChannel *chan, GError *err, gpointer data) dst = (dev->role ==HAL_PAN_ROLE_NAP ) ?BNEP_SVC_NAP :BNEP_SVC_PANU ; sk =g_io_channel_unix_get_fd (dev->io); - perr =bnep_connect (sk, src, dst, bnep_conn_cb, dev); + dev->bnep =bnep_new (src, dst, &dev->dst); +if (!dev->bnep) { +error ("unable to allocate memory for dev->bnep" ); + goto fail; + } + + perr =bnep_connect (dev->bnep, sk, bnep_conn_cb, bnep_disconn_cb, dev);if (perr <0 ) {error ("bnep connect req failed: %s" ,strerror (-perr)); goto fail;
@@ -189,8 +180,7 @@ static void connect_cb(GIOChannel *chan, GError *err, gpointer data)return ; fail: -bt_pan_notify_conn_state (dev,HAL_PAN_STATE_DISCONNECTED ); -pan_device_free (dev); +destroy_pan_device (dev); }static void bt_pan_connect (const void *buf,uint16_t len)
@@ -240,7 +230,7 @@ static void bt_pan_connect(const void *buf, uint16_t len)ba2str (&dev->dst, addr);DBG ("connecting to %s %s" , addr, dev->iface); - dev->io = bt_io_connect(connect_cb, dev, NULL, &gerr, + dev->io = bt_io_connect(bt_io_connect_cb, dev, NULL, &gerr, BT_IO_OPT_SOURCE_BDADDR, &adapter_addr, BT_IO_OPT_DEST_BDADDR, &dev->dst, BT_IO_OPT_PSM, BNEP_PSM,
@@ -269,7 +259,7 @@ static void bt_pan_disconnect(const void *buf, uint16_t len) {const struct hal_cmd_pan_disconnect *cmd = buf;struct pan_device *dev; -uint8_t status; +uint8_t status =HAL_STATUS_FAILED ;GSList *l;bdaddr_t dst;
@@ -278,24 +268,11 @@ static void bt_pan_disconnect(const void *buf, uint16_t len)android2bdaddr (&cmd->bdaddr, &dst); l =g_slist_find_custom (devices, &dst, device_cmp); -if (!l) { - status =HAL_STATUS_FAILED ; +if (!l) goto failed; - } dev = l->data; - -if (dev->watch) { -g_source_remove (dev->watch); - dev->watch =0 ; - } - -bnep_if_down (dev->iface); -bnep_conndel (&dst); - -bt_pan_notify_conn_state (dev,HAL_PAN_STATE_DISCONNECTED ); -pan_device_free (dev); - +destroy_pan_device (dev); status =HAL_STATUS_SUCCESS ; failed:
profiles/network/bnep.c +95 -36
202 lines not on this page · raw message
profiles/network/bnep.h +10 -4
@@ -21,6 +21,8 @@* */ +struct bnep_conn ; +int bnep_init (void );int bnep_cleanup (void );
@@ -35,10 +37,14 @@ 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 (int sk,uint16_t src,uint16_t dst,bnep_connect_cb conn_cb, -void *data); +struct bnep_conn *bnep_new (uint16_t src,uint16_t dst, +const bdaddr_t *dst_addr); +void bnep_free (struct bnep_conn *bnep); +typedef void (*bnep_connect_cb ) (char *iface,int err,void *data); +typedef void (*bnep_disconnect_cb ) (void *data); +int bnep_connect (struct bnep_conn *bnep,int sk,bnep_connect_cb conn_cb, +bnep_disconnect_cb disconn_cb,void *data); +void bnep_disconnect (struct bnep_conn *bnep);ssize_t bnep_send_ctrl_rsp (int sk,uint8_t type,uint8_t ctrl,uint16_t resp);uint16_t bnep_setup_chk (uint16_t dst_role,uint16_t src_role);
profiles/network/connection.c +31 -19
102 lines not on this page · raw message
Signature · 1 line
1.8.3.2
PATCH 2/2 bnep: Refactored bnep server apis for bridge addition and deletion
To simplify bnep server realted bridge creation and deletion calls provided extra apis and moved related apis to static.
--- profiles/network/bnep.c | 99 +++++++++++++++++++++++++++++++++++++++++------ profiles/network/bnep.h | 15 +++---- profiles/network/server.c | 81 ++++++-------------------------------- 3 files changed, 104 insertions(+), 91 deletions(-)
profiles/network/bnep.c +88 -11
@@ -151,7 +151,7 @@ int bnep_cleanup(void)return 0 ; } -int bnep_conndel (const bdaddr_t *dst) +static int bnep_conndel (const bdaddr_t *dst) {struct bnep_conndel_req req;
@@ -167,7 +167,7 @@ int bnep_conndel(const bdaddr_t *dst)return 0 ; } -int bnep_connadd (int sk,uint16_t role,char *dev) +static int bnep_connadd (int sk,uint16_t role,char *dev) {struct bnep_connadd_req req;
@@ -187,7 +187,7 @@ int bnep_connadd(int sk, uint16_t role, char *dev)return 0 ; } -int bnep_if_up (const char *devname) +static int bnep_if_up (const char *devname) {struct ifreq ifr;int sk, err;
@@ -212,7 +212,7 @@ int bnep_if_up(const char *devname)return 0 ; } -int bnep_if_down (const char *devname) +static int bnep_if_down (const char *devname) {struct ifreq ifr;int sk, err;
@@ -464,7 +464,7 @@ void bnep_free(struct bnep_conn *bc)g_free (bc); } -int bnep_add_to_bridge (const char *devname,const char *bridge) +static int bnep_add_to_bridge (const char *devname,const char *bridge) {int ifindex;struct ifreq ifr;
@@ -495,7 +495,7 @@ int bnep_add_to_bridge(const char *devname, const char *bridge)return 0 ; } -int bnep_del_from_bridge (const char *devname,const char *bridge) +static int bnep_del_from_bridge (const char *devname,const char *bridge) {int ifindex =if_nametoindex (devname);struct ifreq ifr;
@@ -535,19 +535,19 @@ ssize_t bnep_send_ctrl_rsp(int sk, uint8_t type, uint8_t ctrl, uint16_t resp)return send (sk, &rsp,sizeof (rsp),0 ); } -uint16_t bnep_setup_chk (uint16_t dst,uint16_t src) +static uint16_t bnep_setup_chk (uint16_t dst,uint16_t src) {/* Allowed PAN Profile scenarios */ switch (dst) {case BNEP_SVC_NAP :case BNEP_SVC_GN :if (src ==BNEP_SVC_PANU ) -return 0 ; +return BNEP_SUCCESS ;return BNEP_CONN_INVALID_SRC ;case BNEP_SVC_PANU :if (src ==BNEP_SVC_PANU || src ==BNEP_SVC_GN || src ==BNEP_SVC_NAP ) -return 0 ; +return BNEP_SUCCESS ;return BNEP_CONN_INVALID_SRC ; }
@@ -555,8 +555,8 @@ uint16_t bnep_setup_chk(uint16_t dst, uint16_t src)return BNEP_CONN_INVALID_DST ; } -uint16_t bnep_setup_decode (struct bnep_setup_conn_req *req,uint16_t *dst, -uint16_t *src) +static uint16_t bnep_setup_decode (struct bnep_setup_conn_req *req, +uint16_t *dst,uint16_t *src) {const uint8_t bt_base[] = {0x00 ,0x00 ,0x10 ,0x00 ,0x80 ,0x00 ,0x00 ,0x80 ,0x5F ,0x9B ,0x34 ,0xFB };
@@ -601,3 +601,80 @@ uint16_t bnep_setup_decode(struct bnep_setup_conn_req *req, uint16_t *dst,return BNEP_SUCCESS ; } + +int bnep_validate_setup_rsp (int sk,uint16_t *dst) +{ +uint8_t packet[BNEP_MTU ]; +struct bnep_setup_conn_req *req = (void *) packet; +uint16_t src; +uint8_t pkt[3 ]; +int n, rsp =BNEP_CONN_NOT_ALLOWED ; + +/* Reading BNEP_SETUP_CONNECTION_REQUEST_MSG */ + n =read (sk, packet,sizeof (packet)); +if (n <0 ) { +error ("read(): %s(%d)" ,strerror (errno), errno); +return n; + } + +/* Highest known Control command ID +* is BNEP_FILTER_MULT_ADDR_RSP = 0x06 */ +if (req->type ==BNEP_CONTROL && + req->ctrl >BNEP_FILTER_MULT_ADDR_RSP ) { + pkt[0 ] =BNEP_CONTROL ; + pkt[1 ] =BNEP_CMD_NOT_UNDERSTOOD ; + pkt[2 ] = req->ctrl; + +send (sk, pkt,sizeof (pkt),0 ); +return -EINVAL ; + } + +if (req->type !=BNEP_CONTROL || req->ctrl !=BNEP_SETUP_CONN_REQ ) +return -EINVAL ; + + rsp =bnep_setup_decode (req, dst, &src); +if (rsp) +return rsp; + + rsp =bnep_setup_chk (*dst, src); + +return rsp; +} + +int bnep_server_add (int sk,uint16_t dst,char *bridge,char *iface, +const bdaddr_t *addr) +{ +if (!bridge || !bridge || !iface || !addr) +return -EINVAL ; + +if (bnep_connadd (sk, dst, iface) <0 ) { +error ("Can't add connection to the bridge %s: %s(%d)" , + bridge,strerror (errno), errno); +return -errno; + } + +if (bnep_add_to_bridge (iface, bridge) <0 ) { +error ("Can't add %s to the bridge %s: %s(%d)" , + iface, bridge,strerror (errno), errno); +bnep_conndel (addr); +return -errno; + } + +if (bnep_if_up (iface) <0 ) { +error ("Can't up the interface %s: %s(%d)" , + iface,strerror (errno), errno); +return -errno; + } + +return 0 ; +} + +void bnep_server_delete (char *bridge,char *iface,const bdaddr_t *addr) +{ +if (!bridge || !iface || !addr) +return ; + +bnep_del_from_bridge (iface, bridge); +bnep_if_down (iface); +bnep_conndel (addr); +}
profiles/network/bnep.h +5 -10
@@ -30,13 +30,6 @@ uint16_t bnep_service_id(const char *svc);const char *bnep_uuid (uint16_t id);const char *bnep_name (uint16_t id); -int bnep_connadd (int sk,uint16_t role,char *dev); -int bnep_conndel (const bdaddr_t *dst); -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); -struct bnep_conn *bnep_new (uint16_t src,uint16_t dst,const bdaddr_t *dst_addr);void bnep_free (struct bnep_conn *bnep);
@@ -46,7 +39,9 @@ int bnep_connect(struct bnep_conn *bnep, int sk, bnep_connect_cb conn_cb, bnep_disconnect_cb disconn_cb, void *data);void bnep_disconnect (struct bnep_conn *bnep); +int bnep_server_add (int sk,uint16_t dst,char *bridge,char *iface, +const bdaddr_t *addr); +void bnep_server_delete (char *bridge,char *iface,const bdaddr_t *addr); + +int bnep_validate_setup_rsp (int sk,uint16_t *dst);ssize_t bnep_send_ctrl_rsp (int sk,uint8_t type,uint8_t ctrl,uint16_t resp); -uint16_t bnep_setup_chk (uint16_t dst_role,uint16_t src_role); -uint16_t bnep_setup_decode (struct bnep_setup_conn_req *req,uint16_t *dst, -uint16_t *src);
profiles/network/server.c +11 -70
120 lines not on this page · raw message
Signature · 1 line
1.8.3.2
Hi Ravi,
Quoted 9 lines · Ravi kumar Veeramally
Refactored bnep connect and disconnect calls to simply and keeping bnep related functionality behind curtains. Provided
bnep_struct,bnep_newandbnep_freeto intialize and free thebnep_stuctwith basic parameters.bnep_connectcalls takes care ofbnep_setupuntil interface up then connect callback will be called,disconnect_cbis registered as watchdog and it will triggered by remote device on disconnect or any other I/O error.bnep_disconnectshould be called only when iface is up/connected.
Quoted 6 lines
--- android/pan.c | 97 ++++++++++++------------------- profiles/network/bnep.c | 131 ++++++++++++++++++++++++++++++------------ profiles/network/bnep.h | 14 +++-- profiles/network/connection.c | 50 ++++++++++------ 4 files changed, 173 insertions(+), 119 deletions(-)
This is a bit too much stuff in a single patch which makes it hard to follow exactly what the patch is doing. Could you please try to split this up into multiple patches? Thanks.
Johan