Xtables-addons 1.45

Fixes: "WARNING 'ipv6_find_hdr' [xt_TARPIT.ko] not found" in
<= linux-2.6.37.

configure.ac

@@ -1,4 +1,4 @@
-AC_INIT([xtables-addons], [1.44])
+AC_INIT([xtables-addons], [1.45])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([m4])

doc/changelog.txt

@@ -3,6 +3,16 @@ HEAD
 ====
 
 
+v1.45 (2012-07-16)
+==================
+Fixes:
+- build: export missing functions
+  (fixes: "WARNING 'xtnu_ipv6_find_hdr' [xt_TARPIT.ko] not found")
+- build: avoid use of unexported functions
+  (fixes: "WARNING 'ipv6_find_hdr' [xt_TARPIT.ko] not found"
+  in <= linux-2.6.37)
+
+
 v1.44 (2012-07-15)
 ==================
 Fixes:

extensions/compat_xtables.c

@@ -623,6 +623,7 @@ int xtnu_ipv6_skip_exthdr(const struct sk_buff *skb, int start,
 {
 	return ipv6_skip_exthdr(skb, start, nexthdrp);
 }
+EXPORT_SYMBOL_GPL(xtnu_ipv6_skip_exthdr);
 #endif
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 5, 0) && defined(WITH_IPV6)
@@ -631,6 +632,7 @@ int xtnu_ipv6_find_hdr(const struct sk_buff *skb, unsigned int *offset,
 {
 	return ipv6_find_hdr(skb, offset, target, fragoff);
 }
+EXPORT_SYMBOL_GPL(xtnu_ipv6_find_hdr);
 #endif
 
 MODULE_LICENSE("GPL");

extensions/xt_TARPIT.c

@@ -374,16 +374,15 @@ static void tarpit_tcp6(struct sk_buff *oldskb, unsigned int hook,
 	ip6h->daddr = oip6h->saddr;
 
 	/* Adjust IP TTL */
-	if (mode == XTTARPIT_HONEYPOT)
+	if (mode == XTTARPIT_HONEYPOT) {
 		ip6h->hop_limit = 128;
-	else
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 26)
+	} else {
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 38)
 		ip6h->hop_limit = ip6_dst_hoplimit(skb_dst(nskb));
 #else
-		ip6h->hop_limit = dst_metric(dst, RTAX_HOPLIMIT);
-		if (ip6h->hop_limit < 0)
-			ip6h->hop_limit = ipv6_get_hoplimit((skb_dst(nskb))->dev).
+		ip6h->hop_limit = dst_metric(skb_dst(nskb), RTAX_HOPLIMIT);
 #endif
+	}
 
 	tcph = (struct tcphdr *)(skb_network_header(nskb) +
 	       sizeof(struct ipv6hdr));

xtables-addons.8.in

@@ -1,4 +1,4 @@
-.TH xtables-addons 8 "v1.44 (2012-07-15)" "" "v1.44 (2012-07-15)"
+.TH xtables-addons 8 "v1.45 (2012-07-16)" "" "v1.45 (2012-07-16)"
 .SH Name
 Xtables-addons \(em additional extensions for iptables, ip6tables, etc.
 .SH Targets