]> pilppa.org Git - linux-2.6-omap-h63xx.git/blobdiff - net/ipv6/netfilter/ip6t_REJECT.c
Merge branches 'release', 'button-sysfs', 'misc', 'mismatch', 'randconfig' and 'toshi...
[linux-2.6-omap-h63xx.git] / net / ipv6 / netfilter / ip6t_REJECT.c
index 14008dc6a197ae9a93a08aa36341c673d840d308..b23baa635fe0f591f8584123e9283244dbbec280 100644 (file)
 #include <linux/netfilter_ipv6/ip6t_REJECT.h>
 
 MODULE_AUTHOR("Yasuyuki KOZAKAI <yasuyuki.kozakai@toshiba.co.jp>");
-MODULE_DESCRIPTION("IP6 tables REJECT target module");
+MODULE_DESCRIPTION("Xtables: packet \"rejection\" target for IPv6");
 MODULE_LICENSE("GPL");
 
-#if 0
-#define DEBUGP printk
-#else
-#define DEBUGP(format, args...)
-#endif
-
 /* Send RST reply */
 static void send_reset(struct sk_buff *oldskb)
 {
@@ -54,7 +48,7 @@ static void send_reset(struct sk_buff *oldskb)
 
        if ((!(ipv6_addr_type(&oip6h->saddr) & IPV6_ADDR_UNICAST)) ||
            (!(ipv6_addr_type(&oip6h->daddr) & IPV6_ADDR_UNICAST))) {
-               DEBUGP("ip6t_REJECT: addr is not unicast.\n");
+               pr_debug("ip6t_REJECT: addr is not unicast.\n");
                return;
        }
 
@@ -62,7 +56,7 @@ static void send_reset(struct sk_buff *oldskb)
        tcphoff = ipv6_skip_exthdr(oldskb, ((u8*)(oip6h+1) - oldskb->data), &proto);
 
        if ((tcphoff < 0) || (tcphoff > oldskb->len)) {
-               DEBUGP("ip6t_REJECT: Can't get TCP header.\n");
+               pr_debug("ip6t_REJECT: Can't get TCP header.\n");
                return;
        }
 
@@ -70,8 +64,9 @@ static void send_reset(struct sk_buff *oldskb)
 
        /* IP header checks: fragment, too short. */
        if (proto != IPPROTO_TCP || otcplen < sizeof(struct tcphdr)) {
-               DEBUGP("ip6t_REJECT: proto(%d) != IPPROTO_TCP, or too short. otcplen = %d\n",
-                       proto, otcplen);
+               pr_debug("ip6t_REJECT: proto(%d) != IPPROTO_TCP, "
+                        "or too short. otcplen = %d\n",
+                        proto, otcplen);
                return;
        }
 
@@ -80,14 +75,14 @@ static void send_reset(struct sk_buff *oldskb)
 
        /* No RST for RST. */
        if (otcph.rst) {
-               DEBUGP("ip6t_REJECT: RST is set\n");
+               pr_debug("ip6t_REJECT: RST is set\n");
                return;
        }
 
        /* Check checksum. */
        if (csum_ipv6_magic(&oip6h->saddr, &oip6h->daddr, otcplen, IPPROTO_TCP,
                            skb_checksum(oldskb, tcphoff, otcplen, 0))) {
-               DEBUGP("ip6t_REJECT: TCP checksum is invalid\n");
+               pr_debug("ip6t_REJECT: TCP checksum is invalid\n");
                return;
        }
 
@@ -126,7 +121,6 @@ static void send_reset(struct sk_buff *oldskb)
        ip6h->version = 6;
        ip6h->hop_limit = dst_metric(dst, RTAX_HOPLIMIT);
        ip6h->nexthdr = IPPROTO_TCP;
-       ip6h->payload_len = htons(sizeof(struct tcphdr));
        ipv6_addr_copy(&ip6h->saddr, &oip6h->daddr);
        ipv6_addr_copy(&ip6h->daddr, &oip6h->saddr);
 
@@ -164,53 +158,50 @@ static void send_reset(struct sk_buff *oldskb)
 
        nf_ct_attach(nskb, oldskb);
 
-       NF_HOOK(PF_INET6, NF_IP6_LOCAL_OUT, nskb, NULL, nskb->dst->dev,
-               dst_output);
+       ip6_local_out(nskb);
 }
 
 static inline void
 send_unreach(struct sk_buff *skb_in, unsigned char code, unsigned int hooknum)
 {
-       if (hooknum == NF_IP6_LOCAL_OUT && skb_in->dev == NULL)
-               skb_in->dev = &loopback_dev;
+       if (hooknum == NF_INET_LOCAL_OUT && skb_in->dev == NULL)
+               skb_in->dev = init_net.loopback_dev;
 
        icmpv6_send(skb_in, ICMPV6_DEST_UNREACH, code, 0, NULL);
 }
 
-static unsigned int reject6_target(struct sk_buff **pskb,
-                          const struct net_device *in,
-                          const struct net_device *out,
-                          unsigned int hooknum,
-                          const struct xt_target *target,
-                          const void *targinfo)
+static unsigned int
+reject_tg6(struct sk_buff *skb, const struct net_device *in,
+           const struct net_device *out, unsigned int hooknum,
+           const struct xt_target *target, const void *targinfo)
 {
        const struct ip6t_reject_info *reject = targinfo;
 
-       DEBUGP(KERN_DEBUG "%s: medium point\n", __FUNCTION__);
+       pr_debug("%s: medium point\n", __FUNCTION__);
        /* WARNING: This code causes reentry within ip6tables.
           This means that the ip6tables jump stack is now crap.  We
           must return an absolute verdict. --RR */
        switch (reject->with) {
        case IP6T_ICMP6_NO_ROUTE:
-               send_unreach(*pskb, ICMPV6_NOROUTE, hooknum);
+               send_unreach(skb, ICMPV6_NOROUTE, hooknum);
                break;
        case IP6T_ICMP6_ADM_PROHIBITED:
-               send_unreach(*pskb, ICMPV6_ADM_PROHIBITED, hooknum);
+               send_unreach(skb, ICMPV6_ADM_PROHIBITED, hooknum);
                break;
        case IP6T_ICMP6_NOT_NEIGHBOUR:
-               send_unreach(*pskb, ICMPV6_NOT_NEIGHBOUR, hooknum);
+               send_unreach(skb, ICMPV6_NOT_NEIGHBOUR, hooknum);
                break;
        case IP6T_ICMP6_ADDR_UNREACH:
-               send_unreach(*pskb, ICMPV6_ADDR_UNREACH, hooknum);
+               send_unreach(skb, ICMPV6_ADDR_UNREACH, hooknum);
                break;
        case IP6T_ICMP6_PORT_UNREACH:
-               send_unreach(*pskb, ICMPV6_PORT_UNREACH, hooknum);
+               send_unreach(skb, ICMPV6_PORT_UNREACH, hooknum);
                break;
        case IP6T_ICMP6_ECHOREPLY:
                /* Do nothing */
                break;
        case IP6T_TCP_RESET:
-               send_reset(*pskb);
+               send_reset(skb);
                break;
        default:
                if (net_ratelimit())
@@ -221,11 +212,10 @@ static unsigned int reject6_target(struct sk_buff **pskb,
        return NF_DROP;
 }
 
-static bool check(const char *tablename,
-                 const void *entry,
-                 const struct xt_target *target,
-                 void *targinfo,
-                 unsigned int hook_mask)
+static bool
+reject_tg6_check(const char *tablename, const void *entry,
+                 const struct xt_target *target, void *targinfo,
+                 unsigned int hook_mask)
 {
        const struct ip6t_reject_info *rejinfo = targinfo;
        const struct ip6t_entry *e = entry;
@@ -237,34 +227,34 @@ static bool check(const char *tablename,
                /* Must specify that it's a TCP packet */
                if (e->ipv6.proto != IPPROTO_TCP
                    || (e->ipv6.invflags & XT_INV_PROTO)) {
-                       DEBUGP("ip6t_REJECT: TCP_RESET illegal for non-tcp\n");
+                       printk("ip6t_REJECT: TCP_RESET illegal for non-tcp\n");
                        return false;
                }
        }
        return true;
 }
 
-static struct xt_target ip6t_reject_reg __read_mostly = {
+static struct xt_target reject_tg6_reg __read_mostly = {
        .name           = "REJECT",
        .family         = AF_INET6,
-       .target         = reject6_target,
+       .target         = reject_tg6,
        .targetsize     = sizeof(struct ip6t_reject_info),
        .table          = "filter",
-       .hooks          = (1 << NF_IP6_LOCAL_IN) | (1 << NF_IP6_FORWARD) |
-                         (1 << NF_IP6_LOCAL_OUT),
-       .checkentry     = check,
+       .hooks          = (1 << NF_INET_LOCAL_IN) | (1 << NF_INET_FORWARD) |
+                         (1 << NF_INET_LOCAL_OUT),
+       .checkentry     = reject_tg6_check,
        .me             = THIS_MODULE
 };
 
-static int __init ip6t_reject_init(void)
+static int __init reject_tg6_init(void)
 {
-       return xt_register_target(&ip6t_reject_reg);
+       return xt_register_target(&reject_tg6_reg);
 }
 
-static void __exit ip6t_reject_fini(void)
+static void __exit reject_tg6_exit(void)
 {
-       xt_unregister_target(&ip6t_reject_reg);
+       xt_unregister_target(&reject_tg6_reg);
 }
 
-module_init(ip6t_reject_init);
-module_exit(ip6t_reject_fini);
+module_init(reject_tg6_init);
+module_exit(reject_tg6_exit);