OpenVZ Forum


Home » Mailing lists » Devel » [PATCH 4/4] Consolidate equal handlers in tunnel4.c
[PATCH 4/4] Consolidate equal handlers in tunnel4.c [message #23012] Fri, 09 November 2007 13:18 Go to next message
Pavel Emelianov is currently offline  Pavel Emelianov
Messages: 1149
Registered: September 2006
Senior Member
Two sets - tunnel[6]4_rcv() and tunnel[6]4_err - do the same
thing, but scan for different lists of tunnels, so this code
is easily consolidated.

Signed-off-by: Pavel Emelyanov <xemul@openvz.ogr>

---

diff --git a/net/ipv4/tunnel4.c b/net/ipv4/tunnel4.c
index b662a9e..c85547d 100644
--- a/net/ipv4/tunnel4.c
+++ b/net/ipv4/tunnel4.c
@@ -101,14 +101,14 @@ void iptunnel_xmit(struct sk_buff *skb, struct rtable *rt,
 
 EXPORT_SYMBOL(iptunnel_xmit);
 
-static int tunnel4_rcv(struct sk_buff *skb)
+static int tunnel_rcv(struct xfrm_tunnel *handlers, struct sk_buff *skb)
 {
 	struct xfrm_tunnel *handler;
 
 	if (!pskb_may_pull(skb, sizeof(struct iphdr)))
 		goto drop;
 
-	for (handler = tunnel4_handlers; handler; handler = handler->next)
+	for (handler = handlers; handler; handler = handler->next)
 		if (!handler->handler(skb))
 			return 0;
 
@@ -119,43 +119,36 @@ drop:
 	return 0;
 }
 
+static int tunnel4_rcv(struct sk_buff *skb)
+{
+	return tunnel_rcv(tunnel4_handlers, skb);
+}
+
 #if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
 static int tunnel64_rcv(struct sk_buff *skb)
 {
-	struct xfrm_tunnel *handler;
-
-	if (!pskb_may_pull(skb, sizeof(struct iphdr)))
-		goto drop;
-
-	for (handler = tunnel64_handlers; handler; handler = handler->next)
-		if (!handler->handler(skb))
-			return 0;
-
-	icmp_send(skb, ICMP_DEST_UNREACH, ICMP_PORT_UNREACH, 0);
-
-drop:
-	kfree_skb(skb);
-	return 0;
+	return tunnel_rcv(tunnel64_handlers, skb);
 }
 #endif
 
-static void tunnel4_err(struct sk_buff *skb, u32 info)
+static void tunnel_err(struct xfrm_tunnel *handlers, struct sk_buff *skb, u32 i)
 {
 	struct xfrm_tunnel *handler;
 
-	for (handler = tunnel4_handlers; handler; handler = handler->next)
-		if (!handler->err_handler(skb, info))
+	for (handler = handlers; handler; handler = handler->next)
+		if (!handler->err_handler(skb, i))
 			break;
 }
 
+static void tunnel4_err(struct sk_buff *skb, u32 info)
+{
+	tunnel_err(tunnel4_handlers, skb, info);
+}
+
 #if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
 static void tunnel64_err(struct sk_buff *skb, u32 info)
 {
-	struct xfrm_tunnel *handler;
-
-	for (handler = tunnel64_handlers; handler; handler = handler->next)
-		if (!handler->err_handler(skb, info))
-			break;
+	tunnel_err(tunnel64_handlers, skb, info);
 }
 #endif
 
-- 
1.5.3.4
Re: [PATCH 4/4] Consolidate equal handlers in tunnel4.c [message #23053 is a reply to message #23012] Sun, 11 November 2007 05:50 Go to previous message
davem is currently offline  davem
Messages: 463
Registered: February 2006
Senior Member
From: Pavel Emelyanov <xemul@openvz.org>
Date: Fri, 09 Nov 2007 16:18:48 +0300

> Two sets - tunnel[6]4_rcv() and tunnel[6]4_err - do the same
> thing, but scan for different lists of tunnels, so this code
> is easily consolidated.
> 
> Signed-off-by: Pavel Emelyanov <xemul@openvz.ogr>

This doesn't apply because I did not apply your
IPTUNNEL_RCV() change.
Previous Topic: [PATCH 3/4] Cleanup the xfrm4_tunnel_(un)register
Next Topic: [PATCH 1/3][UNIX] Make unix_tot_inflight counter non-atomic
Goto Forum:
  


Current Time: Tue Jun 25 06:30:19 GMT 2024

Total time taken to generate the page: 0.03601 seconds