From: Alexander Aring <alex.aring@gmail.com>
To: linux-wpan@vger.kernel.org
Cc: linux-bluetooth@vger.kernel.org, jukka.rissanen@linux.intel.com,
Alexander Aring <alex.aring@gmail.com>
Subject: [RFC bluetooth-next 3/8] 6lowpan: add hop-by-hop options skeleton
Date: Sat, 9 Aug 2014 21:02:18 +0200 [thread overview]
Message-ID: <1407610943-27701-4-git-send-email-alex.aring@gmail.com> (raw)
In-Reply-To: <1407610943-27701-1-git-send-email-alex.aring@gmail.com>
Currenlty not support. Received packets with this nhc id should be
dropped.
Signed-off-by: Alexander Aring <alex.aring@gmail.com>
---
net/6lowpan/nhc/Makefile | 3 ++-
net/6lowpan/nhc/core.c | 18 +++++++++++++++++-
net/6lowpan/nhc/hop.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
net/6lowpan/nhc/hop.h | 11 +++++++++++
4 files changed, 78 insertions(+), 2 deletions(-)
create mode 100644 net/6lowpan/nhc/hop.c
create mode 100644 net/6lowpan/nhc/hop.h
diff --git a/net/6lowpan/nhc/Makefile b/net/6lowpan/nhc/Makefile
index 07431c2..b82135a 100644
--- a/net/6lowpan/nhc/Makefile
+++ b/net/6lowpan/nhc/Makefile
@@ -1,4 +1,5 @@
obj-$(CONFIG_6LOWPAN) += nhc.o
nhc-y := core.o \
- udp.o
+ udp.o \
+ hop.o
diff --git a/net/6lowpan/nhc/core.c b/net/6lowpan/nhc/core.c
index 0f98132..80ed357 100644
--- a/net/6lowpan/nhc/core.c
+++ b/net/6lowpan/nhc/core.c
@@ -16,6 +16,7 @@
#include "core.h"
#include "udp.h"
+#include "hop.h"
static struct rb_root rb_root = RB_ROOT;
static struct lowpan_nhc *lowpan_nexthdr_nhcs[NEXTHDR_MAX];
@@ -173,10 +174,25 @@ EXPORT_SYMBOL(lowpan_del_nhc);
int lowpan_init_nhc(void)
{
- return lowpan_init_nhc_udp();
+ int ret;
+
+ ret = lowpan_init_nhc_udp();
+ if (ret < 0)
+ goto out;
+
+ ret = lowpan_init_nhc_hop();
+ if (ret < 0)
+ goto hop_fail;
+out:
+ return ret;
+
+hop_fail:
+ lowpan_cleanup_nhc_udp();
+ goto out;
}
void lowpan_cleanup_nhc(void)
{
lowpan_cleanup_nhc_udp();
+ lowpan_cleanup_nhc_hop();
}
diff --git a/net/6lowpan/nhc/hop.c b/net/6lowpan/nhc/hop.c
new file mode 100644
index 0000000..f74ac72
--- /dev/null
+++ b/net/6lowpan/nhc/hop.c
@@ -0,0 +1,48 @@
+/* 6LoWPAN IPv6 Hop-by-Hop Options Header compression
+ *
+ *
+ * Authors:
+ * Alexander Aring <aar@pengutronix.de>
+ *
+ * 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.
+ */
+
+#include <net/6lowpan.h>
+#include <linux/skbuff.h>
+
+#include "core.h"
+#include "hop.h"
+
+static int hop_uncompress(struct sk_buff **skb)
+{
+ return -ENOTSUPP;
+}
+
+static int hop_compress(struct sk_buff *skb, u8 **hc_ptr)
+{
+ return -ENOTSUPP;
+}
+
+static void hop_nhid_setup(struct lowpan_nhc *nhc)
+{
+ nhc->id[0] = LOWPAN_NHC_HOP_ID_0;
+ nhc->idmask[0] = LOWPAN_NHC_HOP_MASK_0;
+}
+
+LOWPAN_NHC(hop_nhc, "IPv6 Hop-by-Hop Options Header", NEXTHDR_HOP,
+ hop_nhid_setup, LOWPAN_NHC_HOP_LEN, hop_uncompress, hop_compress);
+
+int lowpan_init_nhc_hop(void)
+{
+ return lowpan_add_nhc(&hop_nhc);
+}
+EXPORT_SYMBOL(lowpan_init_nhc_hop);
+
+void lowpan_cleanup_nhc_hop(void)
+{
+ lowpan_del_nhc(&hop_nhc);
+}
+EXPORT_SYMBOL(lowpan_cleanup_nhc_hop);
diff --git a/net/6lowpan/nhc/hop.h b/net/6lowpan/nhc/hop.h
new file mode 100644
index 0000000..c03fc58
--- /dev/null
+++ b/net/6lowpan/nhc/hop.h
@@ -0,0 +1,11 @@
+#ifndef __6LOWPAN_NHC_HOP_H
+#define __6LOWPAN_NHC_HOP_H
+
+#define LOWPAN_NHC_HOP_LEN 1
+#define LOWPAN_NHC_HOP_ID_0 0xe0
+#define LOWPAN_NHC_HOP_MASK_0 0xfe
+
+int lowpan_init_nhc_hop(void);
+void lowpan_cleanup_nhc_hop(void);
+
+#endif /* __6LOWPAN_NHC_HOP_H */
--
2.0.3
next prev parent reply other threads:[~2014-08-09 19:02 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-08-09 19:02 [RFC bluetooth-next 0/8] 6lowpan: introduce generic next header compression layer Alexander Aring
2014-08-09 19:02 ` [RFC bluetooth-next 1/8] 6lowpan: add generic nhc layer interface Alexander Aring
2014-08-10 15:02 ` Alexander Aring
2014-08-10 15:14 ` Alexander Aring
2014-08-09 19:02 ` [RFC bluetooth-next 2/8] 6lowpan: nhc layer udp compression Alexander Aring
2014-08-09 19:02 ` Alexander Aring [this message]
2014-08-09 19:02 ` [RFC bluetooth-next 4/8] 6lowpan: add routing skeleton Alexander Aring
2014-08-09 19:02 ` [RFC bluetooth-next 5/8] 6lowpan: add fragment skeleton Alexander Aring
2014-08-09 19:02 ` [RFC bluetooth-next 6/8] 6lowpan: add destination options skeleton Alexander Aring
2014-08-09 19:02 ` [RFC bluetooth-next 7/8] 6lowpan: add mobility skeleton Alexander Aring
2014-08-09 19:02 ` [RFC bluetooth-next 8/8] 6lowpan: add ipv6 skeleton 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=1407610943-27701-4-git-send-email-alex.aring@gmail.com \
--to=alex.aring@gmail.com \
--cc=jukka.rissanen@linux.intel.com \
--cc=linux-bluetooth@vger.kernel.org \
--cc=linux-wpan@vger.kernel.org \
/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