From: Alexander Aring <aar@pengutronix.de>
To: linux-wpan@vger.kernel.org
Cc: kernel@pengutronix.de, luiz.dentz@gmail.com, kaspar@schleiser.de,
jukka.rissanen@linux.intel.com, linux-bluetooth@vger.kernel.org,
Patrik.Flykt@linux.intel.com,
Alexander Aring <aar@pengutronix.de>
Subject: [RFC bluetooth-next 17/20] 6lowpan: iphc: add handling for btle
Date: Mon, 11 Jul 2016 21:50:41 +0200 [thread overview]
Message-ID: <20160711195044.25343-18-aar@pengutronix.de> (raw)
In-Reply-To: <20160711195044.25343-1-aar@pengutronix.de>
This patch adds right handling for uncompress/compress L3 addresses
which are compressed by BTLE L2 address.
Signed-off-by: Alexander Aring <aar@pengutronix.de>
---
net/6lowpan/iphc.c | 103 +++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 103 insertions(+)
diff --git a/net/6lowpan/iphc.c b/net/6lowpan/iphc.c
index fb5f6fa..e93f656 100644
--- a/net/6lowpan/iphc.c
+++ b/net/6lowpan/iphc.c
@@ -50,6 +50,7 @@
#include <linux/if_arp.h>
#include <linux/netdevice.h>
+#include <net/bluetooth/bluetooth.h>
#include <net/6lowpan.h>
#include <net/ipv6.h>
@@ -186,6 +187,27 @@ lowpan_iphc_uncompress_802154_lladdr(struct in6_addr *ipaddr,
}
}
+static inline void
+lowpan_iphc_uncompress_btle_lladdr(struct in6_addr *ipaddr, const void *lladdr)
+{
+ bdaddr_t be_bdaddr;
+
+ /* ipv6 addr needs big endian form here
+ * TODO make src in baswap const?
+ */
+ baswap(&be_bdaddr, (bdaddr_t *)lladdr);
+
+ ipaddr->s6_addr[0] = 0xFE;
+ ipaddr->s6_addr[1] = 0x80;
+
+ memcpy(&ipaddr->s6_addr[8], be_bdaddr.b, 3);
+ memcpy(&ipaddr->s6_addr[13], be_bdaddr.b + 3, 3);
+
+ ipaddr->s6_addr[11] = 0xFF;
+ ipaddr->s6_addr[12] = 0xFE;
+ ipaddr->s6_addr[8] ^= 2;
+}
+
static struct lowpan_iphc_ctx *
lowpan_iphc_ctx_get_by_id(const struct net_device *dev, u8 id)
{
@@ -315,11 +337,19 @@ static int lowpan_iphc_uncompress_addr(struct sk_buff *skb,
case LOWPAN_IPHC_SAM_11:
case LOWPAN_IPHC_DAM_11:
fail = false;
+ /* TODO this can work to work as length here, ipv6 addrconf
+ * has similar functionality to generate autoconfigured
+ * addresses - use shared code here.
+ */
switch (lowpan_dev(dev)->lltype) {
case LOWPAN_LLTYPE_IEEE802154:
lowpan_iphc_uncompress_802154_lladdr(ipaddr, lladdr);
break;
+ case LOWPAN_LLTYPE_BTLE:
+ lowpan_iphc_uncompress_btle_lladdr(ipaddr, lladdr);
+ break;
default:
+ /* TODO remove? */
lowpan_iphc_uncompress_eui64_lladdr(ipaddr, lladdr);
break;
}
@@ -380,6 +410,9 @@ static int lowpan_iphc_uncompress_ctx_addr(struct sk_buff *skb,
case LOWPAN_LLTYPE_IEEE802154:
lowpan_iphc_uncompress_802154_lladdr(ipaddr, lladdr);
break;
+ case LOWPAN_LLTYPE_BTLE:
+ lowpan_iphc_uncompress_btle_lladdr(ipaddr, lladdr);
+ break;
default:
lowpan_iphc_uncompress_eui64_lladdr(ipaddr, lladdr);
break;
@@ -810,6 +843,29 @@ lowpan_iphc_compress_ctx_802154_lladdr(const struct in6_addr *ipaddr,
return lladdr_compress;
}
+static inline bool
+lowpan_iphc_compress_ctx_btle_lladdr(const struct in6_addr *ipaddr,
+ const struct lowpan_iphc_ctx *ctx,
+ const void *lladdr)
+{
+ struct in6_addr tmp = {};
+ bdaddr_t be_bdaddr;
+
+ /* ipv6 addr needs big endian form here */
+ baswap(&be_bdaddr, (bdaddr_t *)lladdr);
+
+ memcpy(&tmp.s6_addr[8], be_bdaddr.b, 3);
+ memcpy(&tmp.s6_addr[13], be_bdaddr.b + 3, 3);
+
+ tmp.s6_addr[11] = 0xFF;
+ tmp.s6_addr[12] = 0xFE;
+ tmp.s6_addr[8] ^= 2;
+
+ /* context information are always used */
+ ipv6_addr_prefix_copy(&tmp, &ctx->pfx, ctx->plen);
+ return ipv6_addr_equal(&tmp, ipaddr);
+}
+
static u8 lowpan_compress_ctx_addr(u8 **hc_ptr, const struct net_device *dev,
const struct in6_addr *ipaddr,
const struct lowpan_iphc_ctx *ctx,
@@ -826,6 +882,13 @@ static u8 lowpan_compress_ctx_addr(u8 **hc_ptr, const struct net_device *dev,
goto out;
}
break;
+ case LOWPAN_LLTYPE_BTLE:
+ if (lowpan_iphc_compress_ctx_btle_lladdr(ipaddr, ctx,
+ lladdr)) {
+ dam = LOWPAN_IPHC_DAM_11;
+ goto out;
+ }
+ break;
default:
/* check for SAM/DAM = 11 */
memcpy(&tmp.s6_addr[8], lladdr, EUI64_ADDR_LEN);
@@ -886,6 +949,7 @@ lowpan_iphc_compress_802154_lladdr(const struct in6_addr *ipaddr,
switch (addr->mode) {
case IEEE802154_ADDR_LONG:
ieee802154_le64_to_be64(&extended_addr, &addr->extended_addr);
+ /* TODO remove this macro and use ipv6_addr_equal */
if (is_addr_mac_addr_based(ipaddr, extended_addr))
lladdr_compress = true;
break;
@@ -914,12 +978,38 @@ lowpan_iphc_compress_802154_lladdr(const struct in6_addr *ipaddr,
return lladdr_compress;
}
+static inline bool
+lowpan_iphc_compress_btle_lladdr(const struct in6_addr *ipaddr,
+ const void *lladdr)
+{
+ struct in6_addr tmp = {};
+ bdaddr_t be_bdaddr;
+
+ /* ipv6 addr needs big endian form here */
+ baswap(&be_bdaddr, (bdaddr_t *)lladdr);
+
+ tmp.s6_addr[0] = 0xFE;
+ tmp.s6_addr[1] = 0x80;
+
+ memcpy(&tmp.s6_addr[8], be_bdaddr.b, 3);
+ memcpy(&tmp.s6_addr[13], be_bdaddr.b + 3, 3);
+
+ tmp.s6_addr[11] = 0xFF;
+ tmp.s6_addr[12] = 0xFE;
+ tmp.s6_addr[8] ^= 2;
+
+ return ipv6_addr_equal(&tmp, ipaddr);
+}
+
static u8 lowpan_compress_addr_64(u8 **hc_ptr, const struct net_device *dev,
const struct in6_addr *ipaddr,
const unsigned char *lladdr, bool sam)
{
u8 dam = LOWPAN_IPHC_DAM_01;
+ /* TODO share code with compress ctx stuff here, stateless compress
+ * is the same like stateful except the prefix must be fe80::/64
+ */
switch (lowpan_dev(dev)->lltype) {
case LOWPAN_LLTYPE_IEEE802154:
if (lowpan_iphc_compress_802154_lladdr(ipaddr, lladdr)) {
@@ -928,7 +1018,15 @@ static u8 lowpan_compress_addr_64(u8 **hc_ptr, const struct net_device *dev,
goto out;
}
break;
+ case LOWPAN_LLTYPE_BTLE:
+ if (lowpan_iphc_compress_btle_lladdr(ipaddr, lladdr)) {
+ dam = LOWPAN_IPHC_DAM_11; /* 0-bits */
+ pr_debug("address compression 0 bits\n");
+ goto out;
+ }
+ break;
default:
+ /* TODO remove? */
if (is_addr_mac_addr_based(ipaddr, lladdr)) {
dam = LOWPAN_IPHC_DAM_11; /* 0-bits */
pr_debug("address compression 0 bits\n");
@@ -1100,6 +1198,11 @@ static u8 lowpan_iphc_mcast_addr_compress(u8 **hc_ptr,
return val;
}
+/* TODO maybe handle directly saddr, daddr as big endian? unnecessary byteswaps.
+ * Neighbour cachane and dev->dev_addr is big endian saved, don't use l2 format
+ * here maybe? Cons: Will confuse everything, because lladdr are saved always
+ * in format as mac header format. Same for lowpan_header_decompress.
+ */
int lowpan_header_compress(struct sk_buff *skb, const struct net_device *dev,
const void *daddr, const void *saddr)
{
--
2.9.0
next prev parent reply other threads:[~2016-07-11 19:50 UTC|newest]
Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-11 19:50 [RFC bluetooth-next 00/20] bluetooth: rework 6lowpan implementation Alexander Aring
2016-07-11 19:50 ` [RFC bluetooth-next 01/20] 6lowpan: ndisc: don't remove short address Alexander Aring
2016-07-11 19:50 ` [RFC bluetooth-next 02/20] nhc: add TODO for nhc work Alexander Aring
2016-07-11 19:50 ` [RFC bluetooth-next 03/20] ieee802154: 6lowpan: remove headroom check Alexander Aring
2016-07-11 19:50 ` [RFC bluetooth-next 04/20] ieee802154: 6lowpan: move skb cb BUILD_BUG_ON check Alexander Aring
2016-07-11 19:50 ` [RFC bluetooth-next 05/20] 6lowpan: remove LOWPAN_IPHC_MAX_HEADER_LEN Alexander Aring
2016-07-11 19:50 ` [RFC bluetooth-next 06/20] 6lowpan: hold netdev while unregister Alexander Aring
2016-07-11 19:50 ` [RFC bluetooth-next 07/20] 6lowpan: introduce generic default naming Alexander Aring
2016-07-11 19:50 ` [RFC bluetooth-next 08/20] 6lowpan: move rx defines to generic Alexander Aring
2016-07-11 19:50 ` [RFC bluetooth-next 09/20] bluetooth: introduce l2cap_hdev_chan_connect Alexander Aring
2016-07-11 19:50 ` [RFC bluetooth-next 10/20] bluetooth: add hci dev notifier Alexander Aring
2016-07-11 19:50 ` [RFC bluetooth-next 11/20] bluetooth: export functions and variables Alexander Aring
2016-07-11 19:50 ` [RFC bluetooth-next 12/20] 6lowpan: bluetooth: remove implementation Alexander Aring
2016-07-11 19:50 ` [RFC bluetooth-next 13/20] ieee802154: 6lowpan: move header create to 6lowpan Alexander Aring
2016-07-11 19:50 ` [RFC bluetooth-next 14/20] 6lowpan: move dev_init to generic Alexander Aring
2016-07-11 19:50 ` [RFC bluetooth-next 15/20] 6lowpan: iphc: override l2 packet information Alexander Aring
2016-07-11 19:50 ` [RFC bluetooth-next 16/20] ipv6: addrconf: fix 48 bit 6lowpan autoconfiguration Alexander Aring
2016-07-12 20:16 ` Alexander Aring
2016-07-11 19:50 ` Alexander Aring [this message]
2016-07-11 19:50 ` [RFC bluetooth-next 18/20] 6lowpan: move multicast flags to generic Alexander Aring
2016-07-12 20:34 ` Alexander Aring
2016-07-13 11:15 ` Jukka Rissanen
2016-07-14 8:21 ` Alexander Aring
2016-07-14 8:36 ` Alexander Aring
2016-07-19 14:51 ` Michael Richardson
2016-07-19 18:20 ` Alexander Aring
2016-07-11 19:50 ` [RFC bluetooth-next 19/20] 6lowpan: delete addr_len handling " Alexander Aring
2016-07-11 19:50 ` [RFC bluetooth-next 20/20] 6lowpan: bluetooth: add new implementation Alexander Aring
2016-07-12 21:19 ` Alexander Aring
2016-07-14 11:40 ` Luiz Augusto von Dentz
2016-07-17 15:52 ` Alexander Aring
2016-07-18 8:59 ` Luiz Augusto von Dentz
2016-07-18 21:52 ` Alexander Aring
2016-07-19 5:45 ` Johan Hedberg
2016-07-19 8:23 ` Luiz Augusto von Dentz
2016-07-19 21:05 ` Alexander Aring
2016-07-20 7:39 ` Johan Hedberg
2016-07-20 8:14 ` Luiz Augusto von Dentz
2016-07-20 10:22 ` Marcel Holtmann
2016-07-19 8:49 ` Luiz Augusto von Dentz
2016-07-19 14:48 ` Michael Richardson
2016-07-19 21:24 ` Alexander Aring
2016-07-12 14:51 ` [RFC bluetooth-next 00/20] bluetooth: rework 6lowpan implementation Luiz Augusto von Dentz
2016-07-12 18:35 ` Alexander Aring
2016-07-13 9:12 ` Alexander Aring
2016-07-13 10:13 ` Luiz Augusto von Dentz
2016-07-13 10:56 ` Alexander Aring
2016-07-14 12:02 ` Luiz Augusto von Dentz
2016-07-19 12:58 ` Michael Richardson
2016-08-05 7:15 ` Bakke, Glenn Ruben
2016-08-05 9:18 ` Alexander Aring
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160711195044.25343-18-aar@pengutronix.de \
--to=aar@pengutronix.de \
--cc=Patrik.Flykt@linux.intel.com \
--cc=jukka.rissanen@linux.intel.com \
--cc=kaspar@schleiser.de \
--cc=kernel@pengutronix.de \
--cc=linux-bluetooth@vger.kernel.org \
--cc=linux-wpan@vger.kernel.org \
--cc=luiz.dentz@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).