From patchwork Thu Nov 24 22:21:13 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antonio Quartulli X-Patchwork-Id: 1386 Return-Path: Received: from confino.investici.org (investici.nine.ch [217.150.252.179]) by open-mesh.org (Postfix) with ESMTPS id 297406007E4 for ; Thu, 24 Nov 2011 23:21:44 +0100 (CET) Authentication-Results: open-mesh.org; dkim=pass (1024-bit key) header.i=@autistici.org; dkim-adsp=pass Received: from [217.150.252.179] (confino [217.150.252.179]) (Authenticated sender: ordex@autistici.org) by localhost (Postfix) with ESMTPSA id A53B68444B; Thu, 24 Nov 2011 22:21:42 +0000 (UTC) X-DKIM: Sendmail DKIM Filter v2.8.2 confino.investici.org A53B68444B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=autistici.org; s=stigmate; t=1322173303; bh=fCNlFnwsSSTKFOT3pDqc6VkVpoMghy51AVaxfw6VlVA=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References; b=lpvCIQrn2kgaFpmmZ66zjrFwL2+dQovxFPgsCLJhZnel451MXLhZXSu0GBsLv4sGx 5IjszNslm3ZklRcc4exoyWyVGh8wnfLPoOT/c0+Kct1c+QI4cqZ4LnzP0FwiOXTlWs T57Q+7AafSlhT8EctXtVqJ8zYzJiiYafOOgpjP10= From: Antonio Quartulli To: b.a.t.m.a.n@lists.open-mesh.org Date: Thu, 24 Nov 2011 23:21:13 +0100 Message-Id: <1322173279-18338-2-git-send-email-ordex@autistici.org> X-Mailer: git-send-email 1.7.3.4 In-Reply-To: <1322173279-18338-1-git-send-email-ordex@autistici.org> References: <1322173279-18338-1-git-send-email-ordex@autistici.org> Subject: [B.A.T.M.A.N.] [PATCHv4 1/7] batman-adv: implement an helper function to forge unicast packets X-BeenThere: b.a.t.m.a.n@lists.open-mesh.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: The list for a Better Approach To Mobile Ad-hoc Networking List-Id: The list for a Better Approach To Mobile Ad-hoc Networking List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Nov 2011 22:21:44 -0000 A new function named prepare_unicast_packet() has been implemented so that it can do all the needed operations to set up a skb for unicast sending. It is general enough to be used in every context. Helpful for later developments Signed-off-by: Antonio Quartulli --- unicast.c | 36 ++++++++++++++++++++++++------------ unicast.h | 1 + 2 files changed, 25 insertions(+), 12 deletions(-) diff --git a/unicast.c b/unicast.c index 6f3c659..d49f2cc 100644 --- a/unicast.c +++ b/unicast.c @@ -283,6 +283,29 @@ out: return ret; } +bool prepare_unicast_packet(struct sk_buff *skb, struct orig_node *orig_node) +{ + struct unicast_packet *unicast_packet; + + if (my_skb_head_push(skb, sizeof(*unicast_packet)) < 0) + return false; + + unicast_packet = (struct unicast_packet *)skb->data; + + unicast_packet->header.version = COMPAT_VERSION; + /* batman packet type: unicast */ + unicast_packet->header.packet_type = BAT_UNICAST; + /* set unicast ttl */ + unicast_packet->header.ttl = TTL; + /* copy the destination for faster routing */ + memcpy(unicast_packet->dest, orig_node->orig, ETH_ALEN); + /* set the destination tt version number */ + unicast_packet->ttvn = + (uint8_t)atomic_read(&orig_node->last_ttvn); + + return true; +} + int unicast_send_skb(struct sk_buff *skb, struct bat_priv *bat_priv) { struct ethhdr *ethhdr = (struct ethhdr *)skb->data; @@ -315,22 +338,11 @@ find_router: if (!neigh_node) goto out; - if (my_skb_head_push(skb, sizeof(*unicast_packet)) < 0) + if (!prepare_unicast_packet(skb, orig_node)) goto out; unicast_packet = (struct unicast_packet *)skb->data; - unicast_packet->header.version = COMPAT_VERSION; - /* batman packet type: unicast */ - unicast_packet->header.packet_type = BAT_UNICAST; - /* set unicast ttl */ - unicast_packet->header.ttl = TTL; - /* copy the destination for faster routing */ - memcpy(unicast_packet->dest, orig_node->orig, ETH_ALEN); - /* set the destination tt version number */ - unicast_packet->ttvn = - (uint8_t)atomic_read(&orig_node->last_ttvn); - if (atomic_read(&bat_priv->fragmentation) && data_len + sizeof(*unicast_packet) > neigh_node->if_incoming->net_dev->mtu) { diff --git a/unicast.h b/unicast.h index 8fd5535..63d0305 100644 --- a/unicast.h +++ b/unicast.h @@ -33,6 +33,7 @@ void frag_list_free(struct list_head *head); int unicast_send_skb(struct sk_buff *skb, struct bat_priv *bat_priv); int frag_send_skb(struct sk_buff *skb, struct bat_priv *bat_priv, struct hard_iface *hard_iface, const uint8_t dstaddr[]); +bool prepare_unicast_packet(struct sk_buff *skb, struct orig_node *orig_node); static inline int frag_can_reassemble(const struct sk_buff *skb, int mtu) {