BNEP/PAN Qualification issues

index e69244d..8190c3a 100644
@@ -170,6 +170,8 @@ struct bnep_session {
 	struct socket    *sock;
 	struct net_device *dev;
 	struct net_device_stats stats;
+
+	int setup;
 };
 
 void bnep_net_setup(struct net_device *dev);

322 lines not on this page · raw message

index 604ed55..88c1184 100644
@@ -259,6 +259,7 @@ int bnep_create_connection(int sk, uint16_t role, uint16_t svc, char *dev)
 	struct __service_16 *s;
 	unsigned char pkt[BNEP_MTU];
 	int r;
+	struct timeval t = { 30, 0 };
 
 	/* Send request */
 	req = (void *) pkt;

@@ -269,6 +270,8 @@ int bnep_create_connection(int sk, uint16_t role, uint16_t svc, char *dev)
 	s->dst = htons(svc);
 	s->src = htons(role);
 
+	setsockopt(sk, SOL_SOCKET, SO_RCVTIMEO, &t, sizeof(t));
+
 	if (send(sk, pkt, sizeof(*req) + sizeof(*s), 0) < 0)
 		return -1;
 

@@ -278,6 +281,9 @@ receive:
 	if (r <= 0)
 		return -1;
 
+	t.tv_sec = 0;
+	setsockopt(sk, SOL_SOCKET, SO_RCVTIMEO, &t, sizeof(t));
+
 	errno = EPROTO;
 
 	if (r < sizeof(*rsp))

index 057fbba..9d09e83 100644
@@ -109,6 +109,7 @@ static gboolean bnep_connect_cb(GIOChannel *chan, GIOCondition cond,
 	int sk;
 	DBusMessage *reply;
 	const char *pdev;
+	struct timeval t = { 0, 0 };
 
 	if (cond & G_IO_NVAL)
 		return FALSE;

@@ -155,6 +156,8 @@ static gboolean bnep_connect_cb(GIOChannel *chan, GIOCondition cond,
 
 	sk = g_io_channel_unix_get_fd(chan);
 
+	setsockopt(sk, SOL_SOCKET, SO_RCVTIMEO, &t, sizeof(t));
+
 	if (bnep_connadd(sk, BNEP_SVC_PANU, nc->dev)) {
 		error("%s could not be added", nc->dev);
 		goto failed;

@@ -196,6 +199,7 @@ static int bnep_connect(struct network_conn *nc)
 	unsigned char pkt[BNEP_MTU];
 	GIOChannel *io;
 	int err = 0;
+	struct timeval t = { 30, 0 };
 
 	/* Send request */
 	req = (void *) pkt;

@@ -206,6 +210,8 @@ static int bnep_connect(struct network_conn *nc)
 	s->dst = htons(nc->id);
 	s->src = htons(BNEP_SVC_PANU);
 
+	setsockopt(nc->sk, SOL_SOCKET, SO_RCVTIMEO, &t, sizeof(t));
+
 	io = g_io_channel_unix_new(nc->sk);
 	g_io_channel_set_close_on_unref(io, FALSE);
 

index d494b0b..84b00d3 100644
@@ -62,6 +62,7 @@
 #endif
 
 #define VERSION "1.3"
+static unsigned int compress = 0x03;
 
 static LIST_HEAD(bnep_session_list);
 static DECLARE_RWSEM(bnep_session_sem);

@@ -593,10 +594,10 @@ static inline int bnep_tx_frame(struct bnep_session *s, struct sk_buff *skb)
 	iv[il++] = (struct kvec) { &type, 1 };
 	len++;
 
-	if (!compare_ether_addr(eh->h_dest, s->eh.h_source))
+	if ((compress & 0x01) && !compare_ether_addr(eh->h_dest, s->eh.h_source))
 		type |= 0x01;
 
-	if (!compare_ether_addr(eh->h_source, s->eh.h_dest))
+	if ((compress & 0x02) && !compare_ether_addr(eh->h_source, s->eh.h_dest))
 		type |= 0x02;
 
 	if (type)

@@ -898,6 +899,9 @@ static void __exit bnep_exit(void)
 module_init(bnep_init);
 module_exit(bnep_exit);
 
+module_param(compress, uint, 0644);
+MODULE_PARM_DESC(compress, "Compress BNEP headers before sending (0x01 src, 0x02 dst, 0x03 both)");
+
 MODULE_AUTHOR("David Libault <[email protected]>, Maxim Krasnyansky <[email protected]>");
 MODULE_DESCRIPTION("Bluetooth BNEP ver " VERSION);
 MODULE_VERSION(VERSION);

index d2fd85c..5b9c293 100644
@@ -152,6 +152,7 @@ static gboolean bnep_connect_cb(GIOChannel *chan, GIOCondition cond,
 	int sk;
 	DBusMessage *reply;
 	const char *pdev;
+	struct timeval t = { 0, 0 };
 
 	if (cond & G_IO_NVAL)
 		return FALSE;

@@ -198,6 +199,8 @@ static gboolean bnep_connect_cb(GIOChannel *chan, GIOCondition cond,
 
 	sk = g_io_channel_unix_get_fd(chan);
 
+	setsockopt(sk, SOL_SOCKET, SO_RCVTIMEO, &t, sizeof(t));
+
 	if (bnep_connadd(sk, BNEP_SVC_PANU, nc->dev)) {
 		error("%s could not be added", nc->dev);
 		goto failed;

@@ -241,6 +244,7 @@ static int bnep_connect(struct network_conn *nc)
 	unsigned char pkt[BNEP_MTU];
 	GIOChannel *io;
 	int err = 0;
+	struct timeval t = { 30, 0 };
 
 	/* Send request */
 	req = (void *) pkt;

@@ -251,6 +255,8 @@ static int bnep_connect(struct network_conn *nc)
 	s->dst = htons(nc->id);
 	s->src = htons(BNEP_SVC_PANU);
 
+	setsockopt(nc->sk, SOL_SOCKET, SO_RCVTIMEO, &t, sizeof(t));
+
 	io = g_io_channel_unix_new(nc->sk);
 	g_io_channel_set_close_on_unref(io, FALSE);
 

index 604ed55..88c1184 100644
@@ -259,6 +259,7 @@ int bnep_create_connection(int sk, uint16_t role, uint16_t svc, char *dev)
 	struct __service_16 *s;
 	unsigned char pkt[BNEP_MTU];
 	int r;
+	struct timeval t = { 30, 0 };
 
 	/* Send request */
 	req = (void *) pkt;

@@ -269,6 +270,8 @@ int bnep_create_connection(int sk, uint16_t role, uint16_t svc, char *dev)
 	s->dst = htons(svc);
 	s->src = htons(role);
 
+	setsockopt(sk, SOL_SOCKET, SO_RCVTIMEO, &t, sizeof(t));
+
 	if (send(sk, pkt, sizeof(*req) + sizeof(*s), 0) < 0)
 		return -1;
 

@@ -278,6 +281,9 @@ receive:
 	if (r <= 0)
 		return -1;
 
+	t.tv_sec = 0;
+	setsockopt(sk, SOL_SOCKET, SO_RCVTIMEO, &t, sizeof(t));
+
 	errno = EPROTO;
 
 	if (r < sizeof(*rsp))

index b69bf4e..7220b05 100644
@@ -166,6 +166,7 @@ struct bnep_session {
 	struct socket    *sock;
 	struct net_device *dev;
 	struct net_device_stats stats;
+	int setup;
 };
 
 void bnep_net_setup(struct net_device *dev);

index 80ba30c..1e63938 100644
@@ -112,6 +112,16 @@ static int bnep_send_rsp(struct bnep_session *s, u8 ctrl, u16 resp)
 	return bnep_send(s, &rsp, sizeof(rsp));
 }
 
+int bnep_not_understood(struct bnep_session *s, u8 cmd)
+{
+	u8 pkt[3];
+	pkt[0] = BNEP_CONTROL;
+	pkt[1] = BNEP_CMD_NOT_UNDERSTOOD;
+	pkt[2] = cmd;
+	bnep_send(s, pkt, sizeof(pkt));
+	return sizeof(pkt);
+}
+
 #ifdef CONFIG_BT_BNEP_PROTO_FILTER
 static inline void bnep_set_default_proto_filter(struct bnep_session *s)
 {

@@ -251,11 +261,7 @@ static int bnep_rx_control(struct bnep_session *s, void *data, int len)
 		break;
 
 	default: {
-			u8 pkt[3];
-			pkt[0] = BNEP_CONTROL;
-			pkt[1] = BNEP_CMD_NOT_UNDERSTOOD;
-			pkt[2] = cmd;
-			bnep_send(s, pkt, sizeof(pkt));
+			bnep_not_understood(s, cmd);
 		}
 		break;
 	}

120 lines not on this page · raw message

index 8764930..a3c4372 100644
@@ -139,6 +139,7 @@ static inline void bnep_set_default_proto_filter(struct bnep_session *s)
 
 static int bnep_ctrl_set_netfilter(struct bnep_session *s, __be16 *data, int len)
 {
+	int l = len;
 	int n;
 
 	if (len < 2)

@@ -179,11 +180,12 @@ static int bnep_ctrl_set_netfilter(struct bnep_session *s, __be16 *data, int len
 #else
 	bnep_send_rsp(s, BNEP_FILTER_NET_TYPE_RSP, BNEP_FILTER_UNSUPPORTED_REQ);
 #endif
-	return 0;
+	return l - len;
 }
 
 static int bnep_ctrl_set_mcfilter(struct bnep_session *s, u8 *data, int len)
 {
+	int l = len;
 	int n;
 
 	if (len < 2)

@@ -233,7 +235,7 @@ static int bnep_ctrl_set_mcfilter(struct bnep_session *s, u8 *data, int len)
 #else
 	bnep_send_rsp(s, BNEP_FILTER_MULTI_ADDR_RSP, BNEP_FILTER_UNSUPPORTED_REQ);
 #endif
-	return 0;
+	return l - len;
 }
 
 static struct {

@@ -326,12 +328,14 @@ static int bnep_rx_control(struct bnep_session *s, void *data, int len)
 			err = bnep_ctrl_setup_conn_req(s, data, len);
 		} else {
 			bnep_send_rsp(s, BNEP_SETUP_CONN_RSP, BNEP_CONN_NOT_ALLOWED);
+			err = len;
 		}
 		break;
 
 	case BNEP_FILTER_NET_TYPE_SET:
 		if (!s->setup) {
 			bnep_not_understood(s, cmd);
+			err = len;
 		} else {
 			err = bnep_ctrl_set_netfilter(s, data, len);
 		}

@@ -340,17 +344,20 @@ static int bnep_rx_control(struct bnep_session *s, void *data, int len)
 	case BNEP_FILTER_MULTI_ADDR_SET:
 		if (!s->setup) {
 			bnep_not_understood(s, cmd);
+			err = len;
 		} else {
 			err = bnep_ctrl_set_mcfilter(s, data, len);
 		}
 		break;
 
-	default: {
-			bnep_not_understood(s, cmd);
-		}
+	default:
+		bnep_not_understood(s, cmd);
+		err = len;
 		break;
 	}
 
+	if (err >= 0)
+		err++;
 	return err;
 }
 

@@ -370,11 +377,13 @@ static int bnep_rx_extension(struct bnep_session *s, struct sk_buff *skb)
 
 		switch (h->type & BNEP_TYPE_MASK) {
 		case BNEP_EXT_CONTROL:
-			bnep_rx_control(s, skb->data, skb->len);
+			if (bnep_rx_control(s, skb->data, h->len) != h->len)
+				return -EILSEQ;
 			break;
 
 		default:
 			/* Unknown extension, skip it. */
+			err += sizeof(*h) + h->len;
 			break;
 		}
 

@@ -382,7 +391,7 @@ static int bnep_rx_extension(struct bnep_session *s, struct sk_buff *skb)
 			err = -EILSEQ;
 			break;
 		}
-	} while (!err && (h->type & BNEP_EXT_HEADER));
+	} while (h->type & BNEP_EXT_HEADER);
 
 	return err;
 }

@@ -401,6 +410,7 @@ static inline int bnep_rx_frame(struct bnep_session *s, struct sk_buff *skb)
 	struct net_device *dev = s->dev;
 	struct sk_buff *nskb;
 	u8 type;
+	int ext;
 
 	dev->last_rx = jiffies;
 	s->stats.rx_bytes += skb->len;

@@ -411,7 +421,15 @@ static inline int bnep_rx_frame(struct bnep_session *s, struct sk_buff *skb)
 		goto badframe;
 
 	if ((type & BNEP_TYPE_MASK) == BNEP_CONTROL) {
-		bnep_rx_control(s, skb->data, skb->len);
+		if ((ext = bnep_rx_control(s, skb->data, skb->len)) < 0)
+			goto badframe;
+
+		skb_pull(skb, ext);
+
+		if (type & BNEP_EXT_HEADER) {
+			if ((ext = bnep_rx_extension(s, skb)) < 0)
+				goto badframe;
+		}
 		kfree_skb(skb);
 		return 0;
 	}

@@ -425,9 +443,10 @@ static inline int bnep_rx_frame(struct bnep_session *s, struct sk_buff *skb)
 	s->eh.h_proto = get_unaligned((__be16 *) (skb->data - 2));
 
 	if (type & BNEP_EXT_HEADER) {
-		if (bnep_rx_extension(s, skb) < 0)
+		if ((ext = bnep_rx_extension(s, skb)) < 0)
 			goto badframe;
-	}
+	} else
+		ext = 0;
 
 	/* Strip 802.1p header */
 	if (ntohs(s->eh.h_proto) == 0x8100) {

72 lines not on this page · raw message

index c5042d9..3395b16 100644
@@ -61,6 +61,7 @@
 
 static int compress_src = 1;
 static int compress_dst = 1;
+static unsigned int ksetup = 1;
 
 static LIST_HEAD(bnep_session_list);
 static DECLARE_RWSEM(bnep_session_sem);

@@ -908,6 +909,9 @@ MODULE_PARM_DESC(compress_src, "Compress sources headers");
 module_param(compress_dst, bool, 0644);
 MODULE_PARM_DESC(compress_dst, "Compress destination headers");
 
+module_param(ksetup, uint, 0644);
+MODULE_PARM_DESC(ksetup, "Present if kernel can handle BNEP_SETUP_CONN_REQ");
+
 MODULE_AUTHOR("Marcel Holtmann <[email protected]>");
 MODULE_DESCRIPTION("Bluetooth BNEP ver " VERSION);
 MODULE_VERSION(VERSION);

index 841e5fa..c47769f 100644
@@ -32,6 +32,8 @@
 #include <stdlib.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
+#include <sys/types.h>
+#include <sys/stat.h>
 
 #include <bluetooth/bluetooth.h>
 #include <bluetooth/l2cap.h>

@@ -180,13 +182,14 @@ int bnep_kill_all_connections(void)
 	return 0;
 }
 
-static int bnep_connadd(int sk, uint16_t role, char *dev)
+static int bnep_connadd(int sk, uint16_t role, char *dev, int setup_done)
 {
 	struct bnep_connadd_req req;
 
 	strncpy(req.device, dev, 16);
 	req.device[15] = '\0';
 	req.sock = sk;
+	req.flags = setup_done;
 	req.role = role;
 	if (ioctl(ctl, bnepconnadd, &req))
 		return -1;

@@ -220,6 +223,20 @@ int bnep_accept_connection(int sk, uint16_t role, char *dev)
 	struct bnep_control_rsp *rsp;
 	unsigned char pkt[BNEP_MTU];
 	int r;
+	FILE *f;
+	int ksetup = 0;
+
+	/* Read BNEP kernel module version number */
+
+	f = fopen("/sys/module/bnep/parameters/ksetup", "rt");
+	if(f) {
+		if(fscanf(f, "%d", &ksetup) != 1)
+			ksetup = 0;
+		fclose(f);
+	}
+
+	if(ksetup)
+		return bnep_connadd(sk, role, dev, 0);
 
 	r = recv(sk, pkt, BNEP_MTU, 0);
 	if (r <= 0)

@@ -243,7 +260,7 @@ int bnep_accept_connection(int sk, uint16_t role, char *dev)
 	if (send(sk, rsp, sizeof(*rsp), 0) < 0)
 		return -1;
 
-	return bnep_connadd(sk, role, dev);
+	return bnep_connadd(sk, role, dev, 1);
 }
 
 /* Create BNEP connection 

@@ -319,5 +336,5 @@ receive:
 		return -1;
 	}
 
-	return bnep_connadd(sk, role, dev);
+	return bnep_connadd(sk, role, dev, 1);
 }

index 980486f..f7ab8d1 100644
@@ -198,7 +198,7 @@ int bnep_kill_all_connections(void)
 	return 0;
 }
 
-int bnep_connadd(int sk, uint16_t role, char *dev)
+int bnep_connadd(int sk, uint16_t role, char *dev, int setup_done)
 {
 	struct bnep_connadd_req req;
 

@@ -206,6 +206,7 @@ int bnep_connadd(int sk, uint16_t role, char *dev)
 	strncpy(req.device, dev, 16);
 	req.device[15] = '\0';
 	req.sock = sk;
+	req.flags = setup_done;
 	req.role = role;
 	if (ioctl(ctl, BNEPCONNADD, &req) < 0) {
 		int err = errno;

index 78d0d76..3e421fb 100644
@@ -36,6 +36,6 @@ const char *bnep_name(uint16_t id);
 int bnep_kill_connection(bdaddr_t *dst);
 int bnep_kill_all_connections(void);
 
-int bnep_connadd(int sk, uint16_t role, char *dev);
+int bnep_connadd(int sk, uint16_t role, char *dev, int setup_done);
 int bnep_if_up(const char *devname, uint16_t id);
 int bnep_if_down(const char *devname);

index c17950b..3f574ec 100644
@@ -215,7 +215,7 @@ static gboolean bnep_connect_cb(GIOChannel *chan, GIOCondition cond,
 
 	setsockopt(sk, SOL_SOCKET, SO_RCVTIMEO, &timeo, sizeof(timeo));
 
-	if (bnep_connadd(sk, BNEP_SVC_PANU, nc->dev)) {
+	if (bnep_connadd(sk, BNEP_SVC_PANU, nc->dev, 1)) {
 		error("%s could not be added", nc->dev);
 		goto failed;
 	}

index e283a99..67d18d7 100644
@@ -64,6 +64,7 @@ struct setup_session {
 	uint16_t	src_role;	/* Source role */
 	int		nsk;		/* L2CAP socket */
 	guint		watch;		/* BNEP socket watch */
+	int		ksetup;		/* Kernel does BNEP_SETUP_CONN_REQ */
 };
 
 struct timeout {

@@ -126,7 +127,8 @@ static struct network_server *find_server(GSList *list, uint16_t id)
 }
 
 static struct setup_session *setup_session_new(gchar *address,
-		uint16_t dst_role, uint16_t src_role, int nsk, guint watch)
+		uint16_t dst_role, uint16_t src_role, int nsk,
+		guint watch, int ksetup)
 {
 	struct setup_session *setup;
 

@@ -136,6 +138,7 @@ static struct setup_session *setup_session_new(gchar *address,
 	setup->src_role = src_role;
 	setup->nsk = nsk;
 	setup->watch = watch;
+	setup->ksetup = ksetup;
 
 	return setup;
 }

@@ -298,7 +301,7 @@ static ssize_t send_bnep_ctrl_rsp(int sk, uint16_t val)
 }
 
 static int server_connadd(struct network_server *ns, int nsk,
-			const gchar *address, uint16_t dst_role)
+			const gchar *address, uint16_t dst_role, int ksetup)
 {
 	char devname[16];
 	const char *bridge;

@@ -311,7 +314,7 @@ static int server_connadd(struct network_server *ns, int nsk,
 	memset(devname, 0, 16);
 	strncpy(devname, prefix, strlen(prefix));
 
-	err = bnep_connadd(nsk, dst_role, devname);
+	err = bnep_connadd(nsk, dst_role, devname, !ksetup);
 	if (err < 0)
 		return err;
 

@@ -358,7 +361,7 @@ static void req_auth_cb(DBusError *derr, void *user_data)
 	}
 
 	if (server_connadd(ns, setup->nsk,
-			setup->address, setup->dst_role) < 0)
+			setup->address, setup->dst_role, setup->ksetup) < 0)
 		val = BNEP_CONN_NOT_ALLOWED;
 	else
 		val = BNEP_SUCCESS;

@@ -444,6 +447,8 @@ static gboolean bnep_setup(GIOChannel *chan,
 	char address[18];
 	uint16_t rsp, src_role, dst_role;
 	int n, sk;
+	FILE *f;
+	int ksetup = 0;
 
 	if (cond & G_IO_NVAL)
 		return FALSE;

@@ -455,6 +460,20 @@ static gboolean bnep_setup(GIOChannel *chan,
 
 	sk = g_io_channel_unix_get_fd(chan);
 
+	/* Read BNEP kernel module version number */
+
+	f = fopen("/sys/module/bnep/parameters/ksetup", "rt");
+	if(f) {
+		if(fscanf(f, "%d", &ksetup) != 1)
+			ksetup = 0;
+		fclose(f);
+	}
+
+	if(ksetup) {
+		src_role = dst_role = BNEP_SVC_NAP;
+		goto end_read;
+	}
+
 	/* Reading BNEP_SETUP_CONNECTION_REQUEST_MSG */
 	n = read(sk, packet, sizeof(packet));
 	if (n < 0) {

@@ -473,6 +492,7 @@ static gboolean bnep_setup(GIOChannel *chan,
 	if (rsp)
 		goto reply;
 
+end_read:
 	size = sizeof(sa);
 	if (getsockname(sk, (struct sockaddr *) &sa, &size) < 0) {
 		rsp = BNEP_CONN_NOT_ALLOWED;

@@ -500,7 +520,8 @@ static gboolean bnep_setup(GIOChannel *chan,
 		goto reply;
 	}
 
-	setup = setup_session_new(address, dst_role, src_role, sk, to->watch);
+	setup = setup_session_new(address, dst_role, src_role, sk,
+		to->watch, ksetup);
 
 	/* Wait authorization before reply success */
 	if (authorize_connection(ns, address) < 0) {

index a3c4372..a3491ae 100644
@@ -455,6 +455,25 @@ static inline int bnep_rx_frame(struct bnep_session *s, struct sk_buff *skb)
 		s->eh.h_proto = get_unaligned((__be16 *) (skb->data - 2));
 	}
 
+	/* Strip extensions if they are not to be forwarded */
+	if (ext > 0) {
+		switch (type & BNEP_TYPE_MASK) {
+		case BNEP_COMPRESSED:
+		case BNEP_COMPRESSED_SRC_ONLY:
+			/* Specified destination is this session */
+			ext = 0;
+			break;
+
+		case BNEP_COMPRESSED_DST_ONLY:
+		case BNEP_GENERAL:
+			/* Check if specified destination is this session */
+			if (!compare_ether_addr(skb_mac_header(skb), s->eh.h_dest)) {
+				ext = 0;
+			}
+			break;
+		}
+	}
+
 	/* We have to alloc new skb and copy data here :(. Because original skb
 	 * may not be modified and because of the alignment requirements. */
 	nskb = alloc_skb(2 + ETH_HLEN + skb->len, GFP_KERNEL);