tree-wide: convert open calls to remove spaces to skip_spaces() lib function

[safe/jmp/linux-2.6] / net / netfilter / xt_esp.c

diff --git a/net/netfilter/xt_esp.c b/net/netfilter/xt_esp.c
index 7b19bc9..6094399 100644 (file)
--- a/net/netfilter/xt_esp.c
+++ b/net/netfilter/xt_esp.c
@@ -20,7 +20,7 @@
 
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Yon Uriarte <yon@astaro.de>");
-MODULE_DESCRIPTION("x_tables ESP SPI match module");
+MODULE_DESCRIPTION("Xtables: IPsec-ESP packet match");
 MODULE_ALIAS("ipt_esp");
 MODULE_ALIAS("ip6t_esp");
 
@@ -31,10 +31,10 @@ MODULE_ALIAS("ip6t_esp");
 #endif
 
 /* Returns 1 if the spi is matched by the range, 0 otherwise */
-static inline int
-spi_match(u_int32_t min, u_int32_t max, u_int32_t spi, int invert)
+static inline bool
+spi_match(u_int32_t min, u_int32_t max, u_int32_t spi, bool invert)
 {
-       int r = 0;
+       bool r;
        duprintf("esp spi_match:%c 0x%x <= 0x%x <= 0x%x", invert ? '!' : ' ',
                 min, spi, max);
        r = (spi >= min && spi <= max) ^ invert;
@@ -42,86 +42,72 @@ spi_match(u_int32_t min, u_int32_t max, u_int32_t spi, int invert)
        return r;
 }
 
-static int
-match(const struct sk_buff *skb,
-      const struct net_device *in,
-      const struct net_device *out,
-      const struct xt_match *match,
-      const void *matchinfo,
-      int offset,
-      unsigned int protoff,
-      int *hotdrop)
+static bool esp_mt(const struct sk_buff *skb, const struct xt_match_param *par)
 {
-       struct ip_esp_hdr _esp, *eh;
-       const struct xt_esp *espinfo = matchinfo;
+       const struct ip_esp_hdr *eh;
+       struct ip_esp_hdr _esp;
+       const struct xt_esp *espinfo = par->matchinfo;
 
        /* Must not be a fragment. */
-       if (offset)
-               return 0;
+       if (par->fragoff != 0)
+               return false;
 
-       eh = skb_header_pointer(skb, protoff, sizeof(_esp), &_esp);
+       eh = skb_header_pointer(skb, par->thoff, sizeof(_esp), &_esp);
        if (eh == NULL) {
                /* We've been asked to examine this packet, and we
                 * can't.  Hence, no choice but to drop.
                 */
                duprintf("Dropping evil ESP tinygram.\n");
-               *hotdrop = 1;
-               return 0;
+               *par->hotdrop = true;
+               return false;
        }
 
        return spi_match(espinfo->spis[0], espinfo->spis[1], ntohl(eh->spi),
                         !!(espinfo->invflags & XT_ESP_INV_SPI));
 }
 
-/* Called when user tries to insert an entry of this type. */
-static int
-checkentry(const char *tablename,
-          const void *ip_void,
-          const struct xt_match *match,
-          void *matchinfo,
-          unsigned int matchinfosize,
-          unsigned int hook_mask)
+static bool esp_mt_check(const struct xt_mtchk_param *par)
 {
-       const struct xt_esp *espinfo = matchinfo;
+       const struct xt_esp *espinfo = par->matchinfo;
 
        if (espinfo->invflags & ~XT_ESP_INV_MASK) {
                duprintf("xt_esp: unknown flags %X\n", espinfo->invflags);
-               return 0;
+               return false;
        }
 
-       return 1;
+       return true;
 }
 
-static struct xt_match xt_esp_match[] = {
+static struct xt_match esp_mt_reg[] __read_mostly = {
        {
                .name           = "esp",
-               .family         = AF_INET,
-               .checkentry     = checkentry,
-               .match          = match,
+               .family         = NFPROTO_IPV4,
+               .checkentry     = esp_mt_check,
+               .match          = esp_mt,
                .matchsize      = sizeof(struct xt_esp),
                .proto          = IPPROTO_ESP,
                .me             = THIS_MODULE,
        },
        {
                .name           = "esp",
-               .family         = AF_INET6,
-               .checkentry     = checkentry,
-               .match          = match,
+               .family         = NFPROTO_IPV6,
+               .checkentry     = esp_mt_check,
+               .match          = esp_mt,
                .matchsize      = sizeof(struct xt_esp),
                .proto          = IPPROTO_ESP,
                .me             = THIS_MODULE,
        },
 };
 
-static int __init xt_esp_init(void)
+static int __init esp_mt_init(void)
 {
-       return xt_register_matches(xt_esp_match, ARRAY_SIZE(xt_esp_match));
+       return xt_register_matches(esp_mt_reg, ARRAY_SIZE(esp_mt_reg));
 }
 
-static void __exit xt_esp_cleanup(void)
+static void __exit esp_mt_exit(void)
 {
-       xt_unregister_matches(xt_esp_match, ARRAY_SIZE(xt_esp_match));
+       xt_unregister_matches(esp_mt_reg, ARRAY_SIZE(esp_mt_reg));
 }
 
-module_init(xt_esp_init);
-module_exit(xt_esp_cleanup);
+module_init(esp_mt_init);
+module_exit(esp_mt_exit);