From: Andreas Langer <an.langer@gmx.de>
To: b.a.t.m.a.n@lists.open-mesh.org
Subject: [B.A.T.M.A.N.] [PATCH 3/6] batman-adv: move skb reassembly of fragmented packets into dedicated function
Date: Fri, 17 Sep 2010 00:00:07 +0200 [thread overview]
Message-ID: <1284674410-15477-3-git-send-email-an.langer@gmx.de> (raw)
In-Reply-To: <20100916235908.51ab3bfc@rechenknecht>
Signed-off-by: Andreas Langer <an.langer at gmx.de>
---
batman-adv/routing.c | 43 +++++------------------------------
batman-adv/unicast.c | 60 +++++++++++++++++++++++++++++++++++++++++++++++--
batman-adv/unicast.h | 10 +------
3 files changed, 66 insertions(+), 47 deletions(-)
diff --git a/batman-adv/routing.c b/batman-adv/routing.c
index a0936ca..c1e32e6 100644
--- a/batman-adv/routing.c
+++ b/batman-adv/routing.c
@@ -1218,10 +1218,9 @@ int recv_ucast_frag_packet(struct sk_buff *skb, struct batman_if *recv_if)
{
struct bat_priv *bat_priv = netdev_priv(recv_if->soft_iface);
struct unicast_frag_packet *unicast_packet;
- struct orig_node *orig_node;
- struct frag_packet_list_entry *tmp_frag_entry;
int hdr_size = sizeof(struct unicast_frag_packet);
- unsigned long flags;
+ struct sk_buff *new_skb = NULL;
+ int ret;
if (check_unicast_packet(skb, hdr_size) < 0)
return NET_RX_DROP;
@@ -1231,44 +1230,16 @@ int recv_ucast_frag_packet(struct sk_buff *skb, struct batman_if *recv_if)
/* packet for me */
if (is_my_mac(unicast_packet->dest)) {
- spin_lock_irqsave(&bat_priv->orig_hash_lock, flags);
- orig_node = ((struct orig_node *)
- hash_find(bat_priv->orig_hash, unicast_packet->orig));
-
- if (!orig_node) {
- pr_debug("couldn't find orig node for fragmentation\n");
- spin_unlock_irqrestore(&bat_priv->orig_hash_lock,
- flags);
- return NET_RX_DROP;
- }
-
- orig_node->last_frag_packet = jiffies;
+ ret = frag_reassemble_skb(skb, bat_priv, &new_skb);
- if (list_empty(&orig_node->frag_list) &&
- frag_create_buffer(&orig_node->frag_list)) {
- spin_unlock_irqrestore(&bat_priv->orig_hash_lock,
- flags);
+ if (ret == NET_RX_DROP)
return NET_RX_DROP;
- }
-
- tmp_frag_entry =
- frag_search_packet(&orig_node->frag_list,
- unicast_packet);
- if (!tmp_frag_entry) {
- frag_create_entry(&orig_node->frag_list, skb);
- spin_unlock_irqrestore(&bat_priv->orig_hash_lock,
- flags);
+ /* packet was buffered for late merge */
+ if (!new_skb)
return NET_RX_SUCCESS;
- }
- skb = frag_merge_packet(&orig_node->frag_list,
- tmp_frag_entry, skb);
- spin_unlock_irqrestore(&bat_priv->orig_hash_lock, flags);
- if (!skb)
- return NET_RX_DROP;
-
- interface_rx(recv_if->soft_iface, skb, hdr_size);
+ interface_rx(recv_if->soft_iface, new_skb, hdr_size);
return NET_RX_SUCCESS;
}
diff --git a/batman-adv/unicast.c b/batman-adv/unicast.c
index 23a9373..25284d8 100644
--- a/batman-adv/unicast.c
+++ b/batman-adv/unicast.c
@@ -63,7 +63,7 @@ static struct sk_buff *frag_merge_packet(struct list_head *head,
return skb;
}
-void frag_create_entry(struct list_head *head, struct sk_buff *skb)
+static void frag_create_entry(struct list_head *head, struct sk_buff *skb)
{
struct frag_packet_list_entry *tfp;
struct unicast_frag_packet *up =
@@ -79,7 +79,7 @@ void frag_create_entry(struct list_head *head, struct sk_buff *skb)
return;
}
-int frag_create_buffer(struct list_head *head)
+static int frag_create_buffer(struct list_head *head)
{
int i;
struct frag_packet_list_entry *tfp;
@@ -100,7 +100,7 @@ int frag_create_buffer(struct list_head *head)
return 0;
}
-struct frag_packet_list_entry *frag_search_packet(struct list_head *head,
+static struct frag_packet_list_entry *frag_search_packet(struct list_head *head,
struct unicast_frag_packet *up)
{
struct frag_packet_list_entry *tfp;
@@ -153,6 +153,60 @@ void frag_list_free(struct list_head *head)
return;
}
+/* frag_reassemble_skb():
+ * returns NET_RX_DROP if the operation failed - skb is left intact
+ * returns NET_RX_SUCCESS if the fragment was buffered (skb_new will be NULL)
+ * or the skb could be reassembled (skb_new will point to the new packet and
+ * skb was freed)
+ */
+int frag_reassemble_skb(struct sk_buff *skb, struct bat_priv *bat_priv,
+ struct sk_buff **new_skb)
+{
+ unsigned long flags;
+ struct orig_node *orig_node;
+ struct frag_packet_list_entry *tmp_frag_entry;
+ int ret = NET_RX_DROP;
+ struct unicast_frag_packet *unicast_packet =
+ (struct unicast_frag_packet *)skb->data;
+
+ *new_skb = NULL;
+ spin_lock_irqsave(&bat_priv->orig_hash_lock, flags);
+ orig_node = ((struct orig_node *)
+ hash_find(bat_priv->orig_hash, unicast_packet->orig));
+
+ if (!orig_node) {
+ pr_debug("couldn't find originator in orig_hash\n");
+ goto out;
+ }
+
+ orig_node->last_frag_packet = jiffies;
+
+ if (list_empty(&orig_node->frag_list) &&
+ frag_create_buffer(&orig_node->frag_list)) {
+ pr_debug("couldn't create frag buffer\n");
+ goto out;
+ }
+
+ tmp_frag_entry = frag_search_packet(&orig_node->frag_list,
+ unicast_packet);
+
+ if (!tmp_frag_entry) {
+ frag_create_entry(&orig_node->frag_list, skb);
+ ret = NET_RX_SUCCESS;
+ goto out;
+ }
+
+ *new_skb = frag_merge_packet(&orig_node->frag_list, tmp_frag_entry,
+ skb);
+ /* if not, merge failed */
+ if (*new_skb)
+ ret = NET_RX_SUCCESS;
+out:
+ spin_unlock_irqrestore(&bat_priv->orig_hash_lock, flags);
+
+ return ret;
+}
+
int frag_send_skb(struct sk_buff *skb, struct bat_priv *bat_priv,
struct batman_if *batman_if, uint8_t dstaddr[])
{
diff --git a/batman-adv/unicast.h b/batman-adv/unicast.h
index b50d61b..5908b01 100644
--- a/batman-adv/unicast.h
+++ b/batman-adv/unicast.h
@@ -25,14 +25,8 @@
#define FRAG_TIMEOUT 10000 /* purge frag list entrys after time in ms */
#define FRAG_BUFFER_SIZE 6 /* number of list elements in buffer */
-struct sk_buff *frag_merge_packet(struct list_head *head,
- struct frag_packet_list_entry *tfp,
- struct sk_buff *skb);
-
-void frag_create_entry(struct list_head *head, struct sk_buff *skb);
-int frag_create_buffer(struct list_head *head);
-struct frag_packet_list_entry *frag_search_packet(struct list_head *head,
- struct unicast_frag_packet *up);
+int frag_reassemble_skb(struct sk_buff *skb, struct bat_priv *bat_priv,
+ struct sk_buff **new_skb);
void frag_list_free(struct list_head *head);
int unicast_send_skb(struct sk_buff *skb, struct bat_priv *bat_priv);
--
1.7.0.4
next prev parent reply other threads:[~2010-09-16 22:00 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-16 21:59 [B.A.T.M.A.N.] batman-adv: unicast fragmentation enhancements Andreas Langer
2010-09-16 22:00 ` [B.A.T.M.A.N.] [PATCH 1/6] batman-adv: restructure fragmentation to handle batman unicast packets Andreas Langer
2010-09-16 22:00 ` [B.A.T.M.A.N.] [PATCH 2/6] batman-adv: add frag_ prefix to all fragmentation related functions Andreas Langer
2010-09-16 22:00 ` Andreas Langer [this message]
2010-09-16 22:00 ` [B.A.T.M.A.N.] [PATCH 4/6] batman-adv:remove redundant is_my_mac() check in route_unicast_packet - callers deal with it Andreas Langer
2010-09-16 22:00 ` [B.A.T.M.A.N.] [PATCH 5/6] batman-adv: fragment forwarded packets Andreas Langer
2010-09-16 22:00 ` [B.A.T.M.A.N.] [PATCH 6/6] batman-adv: reassemble fragmented skb if mtu allows it Andreas Langer
2010-09-16 22:43 ` Andreas Langer
2010-09-16 22:27 ` [B.A.T.M.A.N.] batman-adv: unicast fragmentation enhancements Sven Eckelmann
2010-09-17 14:48 ` Andy Whitcroft
2010-09-17 14:54 ` Sven Eckelmann
2010-09-25 10:13 ` Marek Lindner
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=1284674410-15477-3-git-send-email-an.langer@gmx.de \
--to=an.langer@gmx.de \
--cc=b.a.t.m.a.n@lists.open-mesh.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;
as well as URLs for NNTP newsgroup(s).