summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsven-ola <sven-ola@3484d885-4da6-438d-b19d-107d078dd756>2010-10-16 06:53:09 +0200
committersven-ola <sven-ola@3484d885-4da6-438d-b19d-107d078dd756>2010-10-16 06:53:09 +0200
commit8959874f052a73f7dc46f645b1c373c3fc19d5fc (patch)
treed4e65562b331c10c93ae6ac12c4065eea7e5813c
parent5e42936c6035519cc1d41c637a02939726c87a71 (diff)
downloadNPTv6-8959874f052a73f7dc46f645b1c373c3fc19d5fc.tar
NPTv6-8959874f052a73f7dc46f645b1c373c3fc19d5fc.zip
git-svn-id: https://map66.svn.sourceforge.net/svnroot/map66@47 3484d885-4da6-438d-b19d-107d078dd756
-rw-r--r--TODO4
-rw-r--r--ip6t_MAP66.c8
2 files changed, 1 insertions, 11 deletions
diff --git a/TODO b/TODO
index a7df696..0626c3c 100644
--- a/TODO
+++ b/TODO
@@ -36,7 +36,3 @@ while (c != NEXTHDR_NONE && ip6t_ext_hdr(currenthdr)) {
c = hp->nexthdr;
ptr += hdrlen;
}
-
- csum = ~add16(add16(~htons(csum_orig), ~csum16((u_int16_t *)&old, 3)), csum16((u_int16_t *)&new, 3));
- printf("%04hx normal buf1\n", ntohs(csum));
-
diff --git a/ip6t_MAP66.c b/ip6t_MAP66.c
index 28e7e80..8a2e70b 100644
--- a/ip6t_MAP66.c
+++ b/ip6t_MAP66.c
@@ -132,12 +132,10 @@ static bool is_my_ipv6_addr(
const struct net_device *dev,
const struct in6_addr *addr)
{
- pr_devel("MAP66: is_my_ipv6_addr(%s, " NIP6_FMT ")\n", NULL != dev ? dev->name : "", NIP6(*addr));
if (NULL != dev) {
const struct inet6_ifaddr *ifa;
const struct inet6_dev *idev = rcu_dereference(dev->ip6_ptr);
for (ifa = idev->addr_list; NULL != ifa; ifa = ifa->if_next) {
- pr_devel("MAP66: cmp " NIP6_FMT "\n", NIP6(ifa->addr));
if (ipv6_addr_equal(&ifa->addr, addr)) return true;
}
}
@@ -211,13 +209,12 @@ static unsigned int MAP66_tg6(
csum_transport = &((struct icmp6hdr*)transport)->icmp6_cksum;
break;
default:
- pr_devel("MAP66: Unsupported protocol %d\n", nexthdr);
+ pr_devel("MAP66: Unsupported protocol %d dropped\n", nexthdr);
return NF_DROP;
}
}
if (0 != (IP6T_MAP66_OPT_DST_TO & info->mapflags)) {
- pr_devel("MAP66: DST_TO, ip_summed=%d\n", skb->ip_summed);
if (0 != (IP6T_MAP66_OPT_NOCHECK & info->mapflags) || !is_my_ipv6_addr(
NF_INET_PRE_ROUTING == par->hooknum ? par->in : par->out, &hdr->daddr))
{
@@ -231,7 +228,6 @@ static unsigned int MAP66_tg6(
}
if (0 != (IP6T_MAP66_OPT_SRC_TO & info->mapflags)) {
- pr_devel("MAP66: SRC_TO, ip_summed=%d\n", skb->ip_summed);
if (0 != (IP6T_MAP66_OPT_CSUM & info->mapflags)) {
map_csum(&hdr->saddr, &info->pfix_src_to, info->pfix_src_len, info->pfix_src_csum, csum_transport);
}
@@ -384,13 +380,11 @@ static struct xt_target MAP66_tg6_reg __read_mostly = {
static int __init MAP66_tg6_init(void)
{
- pr_devel("MAP66: register\n");
return xt_register_target(&MAP66_tg6_reg);
}
static void __exit MAP66_tg6_exit(void)
{
- pr_devel("MAP66: unregister\n");
xt_unregister_target(&MAP66_tg6_reg);
}