[NETNS]: Add namespace parameter to ip_dev_find.

[linux-2.6-omap-h63xx.git] / net / netfilter / nf_conntrack_proto_sctp.c

diff --git a/net/netfilter/nf_conntrack_proto_sctp.c b/net/netfilter/nf_conntrack_proto_sctp.c
index af568777372be3d8c99f67791339665e71694f54..21d29e782baf3ae0970efac12e8587b934fa1f47 100644 (file)
--- a/net/netfilter/nf_conntrack_proto_sctp.c
+++ b/net/netfilter/nf_conntrack_proto_sctp.c
@@ -1,25 +1,15 @@
 /*
  * Connection tracking protocol helper module for SCTP.
 /*
  * Connection tracking protocol helper module for SCTP.

- * 
- * SCTP is defined in RFC 2960. References to various sections in this code 
+ *
+ * SCTP is defined in RFC 2960. References to various sections in this code

  * are to this RFC.
  * are to this RFC.

- * 
+ *

  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.

- *
- * 17 Oct 2004: Yasuyuki Kozakai @USAGI <yasuyuki.kozakai@toshiba.co.jp>
- *     - enable working with L3 protocol independent connection tracking.
- *
- * Derived from net/ipv4/ip_conntrack_sctp.c
- */
-
-/*
- * Added support for proc manipulation of timeouts.

  */
 
 #include <linux/types.h>
  */
 
 #include <linux/types.h>

-#include <linux/sched.h>

 #include <linux/timer.h>
 #include <linux/netfilter.h>
 #include <linux/module.h>
 #include <linux/timer.h>
 #include <linux/netfilter.h>
 #include <linux/module.h>


@@ -32,19 +22,14 @@
 #include <linux/interrupt.h>
 
 #include <net/netfilter/nf_conntrack.h>
 #include <linux/interrupt.h>
 
 #include <net/netfilter/nf_conntrack.h>

-#include <net/netfilter/nf_conntrack_protocol.h>
-
-#if 0
-#define DEBUGP(format, ...) printk(format, ## __VA_ARGS__)
-#else
-#define DEBUGP(format, args...)
-#endif
+#include <net/netfilter/nf_conntrack_l4proto.h>
+#include <net/netfilter/nf_conntrack_ecache.h>

 
 /* Protects conntrack->proto.sctp */
 static DEFINE_RWLOCK(sctp_lock);
 
 /* FIXME: Examine ipfilter's timeouts and conntrack transitions more
 
 /* Protects conntrack->proto.sctp */
 static DEFINE_RWLOCK(sctp_lock);
 
 /* FIXME: Examine ipfilter's timeouts and conntrack transitions more

-   closely.  They're more complex. --RR 
+   closely.  They're more complex. --RR

 
    And so for me for SCTP :D -Kiran */
 
 
    And so for me for SCTP :D -Kiran */
 


@@ -64,24 +49,15 @@ static const char *sctp_conntrack_names[] = {
 #define HOURS * 60 MINS
 #define DAYS  * 24 HOURS
 
 #define HOURS * 60 MINS
 #define DAYS  * 24 HOURS
 

-static unsigned int nf_ct_sctp_timeout_closed __read_mostly          =  10 SECS;
-static unsigned int nf_ct_sctp_timeout_cookie_wait __read_mostly     =   3 SECS;
-static unsigned int nf_ct_sctp_timeout_cookie_echoed __read_mostly   =   3 SECS;
-static unsigned int nf_ct_sctp_timeout_established __read_mostly     =   5 DAYS;
-static unsigned int nf_ct_sctp_timeout_shutdown_sent __read_mostly   = 300 SECS / 1000;
-static unsigned int nf_ct_sctp_timeout_shutdown_recd __read_mostly   = 300 SECS / 1000;
-static unsigned int nf_ct_sctp_timeout_shutdown_ack_sent __read_mostly = 3 SECS;
-
-static unsigned int * sctp_timeouts[]
-= { NULL,                                  /* SCTP_CONNTRACK_NONE  */
-    &nf_ct_sctp_timeout_closed,                   /* SCTP_CONNTRACK_CLOSED */
-    &nf_ct_sctp_timeout_cookie_wait,       /* SCTP_CONNTRACK_COOKIE_WAIT */
-    &nf_ct_sctp_timeout_cookie_echoed,     /* SCTP_CONNTRACK_COOKIE_ECHOED */
-    &nf_ct_sctp_timeout_established,       /* SCTP_CONNTRACK_ESTABLISHED */
-    &nf_ct_sctp_timeout_shutdown_sent,     /* SCTP_CONNTRACK_SHUTDOWN_SENT */
-    &nf_ct_sctp_timeout_shutdown_recd,     /* SCTP_CONNTRACK_SHUTDOWN_RECD */
-    &nf_ct_sctp_timeout_shutdown_ack_sent  /* SCTP_CONNTRACK_SHUTDOWN_ACK_SENT */
- };
+static unsigned int sctp_timeouts[SCTP_CONNTRACK_MAX] __read_mostly = {
+       [SCTP_CONNTRACK_CLOSED]                 = 10 SECS,
+       [SCTP_CONNTRACK_COOKIE_WAIT]            = 3 SECS,
+       [SCTP_CONNTRACK_COOKIE_ECHOED]          = 3 SECS,
+       [SCTP_CONNTRACK_ESTABLISHED]            = 5 DAYS,
+       [SCTP_CONNTRACK_SHUTDOWN_SENT]          = 300 SECS / 1000,
+       [SCTP_CONNTRACK_SHUTDOWN_RECD]          = 300 SECS / 1000,
+       [SCTP_CONNTRACK_SHUTDOWN_ACK_SENT]      = 3 SECS,
+};

 
 #define sNO SCTP_CONNTRACK_NONE
 #define        sCL SCTP_CONNTRACK_CLOSED
 
 #define sNO SCTP_CONNTRACK_NONE
 #define        sCL SCTP_CONNTRACK_CLOSED


@@ -93,39 +69,39 @@ static unsigned int * sctp_timeouts[]
 #define        sSA SCTP_CONNTRACK_SHUTDOWN_ACK_SENT
 #define        sIV SCTP_CONNTRACK_MAX
 
 #define        sSA SCTP_CONNTRACK_SHUTDOWN_ACK_SENT
 #define        sIV SCTP_CONNTRACK_MAX
 

-/* 
+/*

        These are the descriptions of the states:
 
        These are the descriptions of the states:
 

-NOTE: These state names are tantalizingly similar to the states of an 
+NOTE: These state names are tantalizingly similar to the states of an

 SCTP endpoint. But the interpretation of the states is a little different,
 SCTP endpoint. But the interpretation of the states is a little different,

-considering that these are the states of the connection and not of an end 
+considering that these are the states of the connection and not of an end

 point. Please note the subtleties. -Kiran
 
 NONE              - Nothing so far.
 point. Please note the subtleties. -Kiran
 
 NONE              - Nothing so far.

-COOKIE WAIT       - We have seen an INIT chunk in the original direction, or also 
-                    an INIT_ACK chunk in the reply direction.
+COOKIE WAIT       - We have seen an INIT chunk in the original direction, or also
+                   an INIT_ACK chunk in the reply direction.

 COOKIE ECHOED     - We have seen a COOKIE_ECHO chunk in the original direction.
 ESTABLISHED       - We have seen a COOKIE_ACK in the reply direction.
 SHUTDOWN_SENT     - We have seen a SHUTDOWN chunk in the original direction.
 SHUTDOWN_RECD     - We have seen a SHUTDOWN chunk in the reply directoin.
 SHUTDOWN_ACK_SENT - We have seen a SHUTDOWN_ACK chunk in the direction opposite
 COOKIE ECHOED     - We have seen a COOKIE_ECHO chunk in the original direction.
 ESTABLISHED       - We have seen a COOKIE_ACK in the reply direction.
 SHUTDOWN_SENT     - We have seen a SHUTDOWN chunk in the original direction.
 SHUTDOWN_RECD     - We have seen a SHUTDOWN chunk in the reply directoin.
 SHUTDOWN_ACK_SENT - We have seen a SHUTDOWN_ACK chunk in the direction opposite

-                    to that of the SHUTDOWN chunk.
-CLOSED            - We have seen a SHUTDOWN_COMPLETE chunk in the direction of 
-                    the SHUTDOWN chunk. Connection is closed.
+                   to that of the SHUTDOWN chunk.
+CLOSED            - We have seen a SHUTDOWN_COMPLETE chunk in the direction of
+                   the SHUTDOWN chunk. Connection is closed.

 */
 
 /* TODO
 */
 
 /* TODO

- - I have assumed that the first INIT is in the original direction. 
+ - I have assumed that the first INIT is in the original direction.

  This messes things when an INIT comes in the reply direction in CLOSED
  state.
  This messes things when an INIT comes in the reply direction in CLOSED
  state.

- - Check the error type in the reply dir before transitioning from 
+ - Check the error type in the reply dir before transitioning from

 cookie echoed to closed.
  - Sec 5.2.4 of RFC 2960
  - Multi Homing support.
 */
 
 /* SCTP conntrack state transitions */
 cookie echoed to closed.
  - Sec 5.2.4 of RFC 2960
  - Multi Homing support.
 */
 
 /* SCTP conntrack state transitions */

-static enum sctp_conntrack sctp_conntracks[2][9][SCTP_CONNTRACK_MAX] = {
+static const u8 sctp_conntracks[2][9][SCTP_CONNTRACK_MAX] = {

        {
 /*     ORIGINAL        */
 /*                  sNO, sCL, sCW, sCE, sES, sSS, sSR, sSA */
        {
 /*     ORIGINAL        */
 /*                  sNO, sCL, sCW, sCE, sES, sSS, sSR, sSA */


@@ -160,9 +136,6 @@ static int sctp_pkt_to_tuple(const struct sk_buff *skb,
 {
        sctp_sctphdr_t _hdr, *hp;
 
 {
        sctp_sctphdr_t _hdr, *hp;
 

-       DEBUGP(__FUNCTION__);
-       DEBUGP("\n");
-

        /* Actually only need first 8 bytes. */
        hp = skb_header_pointer(skb, dataoff, 8, &_hdr);
        if (hp == NULL)
        /* Actually only need first 8 bytes. */
        hp = skb_header_pointer(skb, dataoff, 8, &_hdr);
        if (hp == NULL)


@@ -176,9 +149,6 @@ static int sctp_pkt_to_tuple(const struct sk_buff *skb,
 static int sctp_invert_tuple(struct nf_conntrack_tuple *tuple,
                             const struct nf_conntrack_tuple *orig)
 {
 static int sctp_invert_tuple(struct nf_conntrack_tuple *tuple,
                             const struct nf_conntrack_tuple *orig)
 {

-       DEBUGP(__FUNCTION__);
-       DEBUGP("\n");
-

        tuple->src.u.sctp.port = orig->dst.u.sctp.port;
        tuple->dst.u.sctp.port = orig->src.u.sctp.port;
        return 1;
        tuple->src.u.sctp.port = orig->dst.u.sctp.port;
        tuple->dst.u.sctp.port = orig->src.u.sctp.port;
        return 1;


@@ -188,289 +158,270 @@ static int sctp_invert_tuple(struct nf_conntrack_tuple *tuple,
 static int sctp_print_tuple(struct seq_file *s,
                            const struct nf_conntrack_tuple *tuple)
 {
 static int sctp_print_tuple(struct seq_file *s,
                            const struct nf_conntrack_tuple *tuple)
 {

-       DEBUGP(__FUNCTION__);
-       DEBUGP("\n");
-

        return seq_printf(s, "sport=%hu dport=%hu ",
                          ntohs(tuple->src.u.sctp.port),
                          ntohs(tuple->dst.u.sctp.port));
 }
 
 /* Print out the private part of the conntrack. */
        return seq_printf(s, "sport=%hu dport=%hu ",
                          ntohs(tuple->src.u.sctp.port),
                          ntohs(tuple->dst.u.sctp.port));
 }
 
 /* Print out the private part of the conntrack. */

-static int sctp_print_conntrack(struct seq_file *s,
-                               const struct nf_conn *conntrack)
+static int sctp_print_conntrack(struct seq_file *s, const struct nf_conn *ct)

 {
        enum sctp_conntrack state;
 
 {
        enum sctp_conntrack state;
 

-       DEBUGP(__FUNCTION__);
-       DEBUGP("\n");
-

        read_lock_bh(&sctp_lock);
        read_lock_bh(&sctp_lock);

-       state = conntrack->proto.sctp.state;
+       state = ct->proto.sctp.state;

        read_unlock_bh(&sctp_lock);
 
        return seq_printf(s, "%s ", sctp_conntrack_names[state]);
 }
 
 #define for_each_sctp_chunk(skb, sch, _sch, offset, dataoff, count)    \
        read_unlock_bh(&sctp_lock);
 
        return seq_printf(s, "%s ", sctp_conntrack_names[state]);
 }
 
 #define for_each_sctp_chunk(skb, sch, _sch, offset, dataoff, count)    \

-for (offset = dataoff + sizeof(sctp_sctphdr_t), count = 0;             \
-       offset < skb->len &&                                            \
-       (sch = skb_header_pointer(skb, offset, sizeof(_sch), &_sch));   \
-       offset += (htons(sch->length) + 3) & ~3, count++)
+for ((offset) = (dataoff) + sizeof(sctp_sctphdr_t), (count) = 0;       \
+       (offset) < (skb)->len &&                                        \
+       ((sch) = skb_header_pointer((skb), (offset), sizeof(_sch), &(_sch)));   \
+       (offset) += (ntohs((sch)->length) + 3) & ~3, (count)++)

 
 /* Some validity checks to make sure the chunks are fine */
 
 /* Some validity checks to make sure the chunks are fine */

-static int do_basic_checks(struct nf_conn *conntrack,
+static int do_basic_checks(struct nf_conn *ct,

                           const struct sk_buff *skb,
                           unsigned int dataoff,
                           const struct sk_buff *skb,
                           unsigned int dataoff,

-                          char *map)
+                          unsigned long *map)

 {
        u_int32_t offset, count;
        sctp_chunkhdr_t _sch, *sch;
        int flag;
 
 {
        u_int32_t offset, count;
        sctp_chunkhdr_t _sch, *sch;
        int flag;
 

-       DEBUGP(__FUNCTION__);
-       DEBUGP("\n");
-

        flag = 0;
 
        for_each_sctp_chunk (skb, sch, _sch, offset, dataoff, count) {
        flag = 0;
 
        for_each_sctp_chunk (skb, sch, _sch, offset, dataoff, count) {

-               DEBUGP("Chunk Num: %d  Type: %d\n", count, sch->type);
+               pr_debug("Chunk Num: %d  Type: %d\n", count, sch->type);

 
 

-               if (sch->type == SCTP_CID_INIT 
-                       || sch->type == SCTP_CID_INIT_ACK
-                       || sch->type == SCTP_CID_SHUTDOWN_COMPLETE) {
+               if (sch->type == SCTP_CID_INIT ||
+                   sch->type == SCTP_CID_INIT_ACK ||
+                   sch->type == SCTP_CID_SHUTDOWN_COMPLETE)

                        flag = 1;
                        flag = 1;

-               }

 
                /*
                 * Cookie Ack/Echo chunks not the first OR
                 * Init / Init Ack / Shutdown compl chunks not the only chunks
                 * OR zero-length.
                 */
 
                /*
                 * Cookie Ack/Echo chunks not the first OR
                 * Init / Init Ack / Shutdown compl chunks not the only chunks
                 * OR zero-length.
                 */

-               if (((sch->type == SCTP_CID_COOKIE_ACK
-                       || sch->type == SCTP_CID_COOKIE_ECHO
-                       || flag)
-                     && count !=0) || !sch->length) {
-                       DEBUGP("Basic checks failed\n");
+               if (((sch->type == SCTP_CID_COOKIE_ACK ||
+                     sch->type == SCTP_CID_COOKIE_ECHO ||
+                     flag) &&
+                    count != 0) || !sch->length) {
+                       pr_debug("Basic checks failed\n");

                        return 1;
                }
 
                        return 1;
                }
 

-               if (map) {
-                       set_bit(sch->type, (void *)map);
-               }
+               if (map)
+                       set_bit(sch->type, map);

        }
 
        }
 

-       DEBUGP("Basic checks passed\n");
+       pr_debug("Basic checks passed\n");

        return count == 0;
 }
 
        return count == 0;
 }
 

-static int new_state(enum ip_conntrack_dir dir,
-                    enum sctp_conntrack cur_state,
-                    int chunk_type)
+static int sctp_new_state(enum ip_conntrack_dir dir,
+                         enum sctp_conntrack cur_state,
+                         int chunk_type)

 {
        int i;
 
 {
        int i;
 

-       DEBUGP(__FUNCTION__);
-       DEBUGP("\n");
-
-       DEBUGP("Chunk type: %d\n", chunk_type);
+       pr_debug("Chunk type: %d\n", chunk_type);

 
        switch (chunk_type) {
 
        switch (chunk_type) {

-               case SCTP_CID_INIT: 
-                       DEBUGP("SCTP_CID_INIT\n");
-                       i = 0; break;
-               case SCTP_CID_INIT_ACK: 
-                       DEBUGP("SCTP_CID_INIT_ACK\n");
-                       i = 1; break;
-               case SCTP_CID_ABORT: 
-                       DEBUGP("SCTP_CID_ABORT\n");
-                       i = 2; break;
-               case SCTP_CID_SHUTDOWN: 
-                       DEBUGP("SCTP_CID_SHUTDOWN\n");
-                       i = 3; break;
-               case SCTP_CID_SHUTDOWN_ACK: 
-                       DEBUGP("SCTP_CID_SHUTDOWN_ACK\n");
-                       i = 4; break;
-               case SCTP_CID_ERROR: 
-                       DEBUGP("SCTP_CID_ERROR\n");
-                       i = 5; break;
-               case SCTP_CID_COOKIE_ECHO: 
-                       DEBUGP("SCTP_CID_COOKIE_ECHO\n");
-                       i = 6; break;
-               case SCTP_CID_COOKIE_ACK: 
-                       DEBUGP("SCTP_CID_COOKIE_ACK\n");
-                       i = 7; break;
-               case SCTP_CID_SHUTDOWN_COMPLETE: 
-                       DEBUGP("SCTP_CID_SHUTDOWN_COMPLETE\n");
-                       i = 8; break;
-               default:
-                       /* Other chunks like DATA, SACK, HEARTBEAT and
-                       its ACK do not cause a change in state */
-                       DEBUGP("Unknown chunk type, Will stay in %s\n", 
-                                               sctp_conntrack_names[cur_state]);
-                       return cur_state;
+       case SCTP_CID_INIT:
+               pr_debug("SCTP_CID_INIT\n");
+               i = 0;
+               break;
+       case SCTP_CID_INIT_ACK:
+               pr_debug("SCTP_CID_INIT_ACK\n");
+               i = 1;
+               break;
+       case SCTP_CID_ABORT:
+               pr_debug("SCTP_CID_ABORT\n");
+               i = 2;
+               break;
+       case SCTP_CID_SHUTDOWN:
+               pr_debug("SCTP_CID_SHUTDOWN\n");
+               i = 3;
+               break;
+       case SCTP_CID_SHUTDOWN_ACK:
+               pr_debug("SCTP_CID_SHUTDOWN_ACK\n");
+               i = 4;
+               break;
+       case SCTP_CID_ERROR:
+               pr_debug("SCTP_CID_ERROR\n");
+               i = 5;
+               break;
+       case SCTP_CID_COOKIE_ECHO:
+               pr_debug("SCTP_CID_COOKIE_ECHO\n");
+               i = 6;
+               break;
+       case SCTP_CID_COOKIE_ACK:
+               pr_debug("SCTP_CID_COOKIE_ACK\n");
+               i = 7;
+               break;
+       case SCTP_CID_SHUTDOWN_COMPLETE:
+               pr_debug("SCTP_CID_SHUTDOWN_COMPLETE\n");
+               i = 8;
+               break;
+       default:
+               /* Other chunks like DATA, SACK, HEARTBEAT and
+               its ACK do not cause a change in state */
+               pr_debug("Unknown chunk type, Will stay in %s\n",
+                        sctp_conntrack_names[cur_state]);
+               return cur_state;

        }
 
        }
 

-       DEBUGP("dir: %d   cur_state: %s  chunk_type: %d  new_state: %s\n", 
-                       dir, sctp_conntrack_names[cur_state], chunk_type,
-                       sctp_conntrack_names[sctp_conntracks[dir][i][cur_state]]);
+       pr_debug("dir: %d   cur_state: %s  chunk_type: %d  new_state: %s\n",
+                dir, sctp_conntrack_names[cur_state], chunk_type,
+                sctp_conntrack_names[sctp_conntracks[dir][i][cur_state]]);

 
        return sctp_conntracks[dir][i][cur_state];
 }
 
 
        return sctp_conntracks[dir][i][cur_state];
 }
 

-/* Returns verdict for packet, or -1 for invalid. */
-static int sctp_packet(struct nf_conn *conntrack,
+/* Returns verdict for packet, or -NF_ACCEPT for invalid. */
+static int sctp_packet(struct nf_conn *ct,

                       const struct sk_buff *skb,
                       unsigned int dataoff,
                       enum ip_conntrack_info ctinfo,
                       int pf,
                       unsigned int hooknum)
 {
                       const struct sk_buff *skb,
                       unsigned int dataoff,
                       enum ip_conntrack_info ctinfo,
                       int pf,
                       unsigned int hooknum)
 {

-       enum sctp_conntrack newconntrack, oldsctpstate;
+       enum sctp_conntrack new_state, old_state;
+       enum ip_conntrack_dir dir = CTINFO2DIR(ctinfo);

        sctp_sctphdr_t _sctph, *sh;
        sctp_chunkhdr_t _sch, *sch;
        u_int32_t offset, count;
        sctp_sctphdr_t _sctph, *sh;
        sctp_chunkhdr_t _sch, *sch;
        u_int32_t offset, count;

-       char map[256 / sizeof (char)] = {0};
-
-       DEBUGP(__FUNCTION__);
-       DEBUGP("\n");
+       unsigned long map[256 / sizeof(unsigned long)] = { 0 };

 
        sh = skb_header_pointer(skb, dataoff, sizeof(_sctph), &_sctph);
        if (sh == NULL)
 
        sh = skb_header_pointer(skb, dataoff, sizeof(_sctph), &_sctph);
        if (sh == NULL)

-               return -1;
+               goto out;

 
 

-       if (do_basic_checks(conntrack, skb, dataoff, map) != 0)
-               return -1;
+       if (do_basic_checks(ct, skb, dataoff, map) != 0)
+               goto out;

 
        /* Check the verification tag (Sec 8.5) */
 
        /* Check the verification tag (Sec 8.5) */

-       if (!test_bit(SCTP_CID_INIT, (void *)map)
-               && !test_bit(SCTP_CID_SHUTDOWN_COMPLETE, (void *)map)
-               && !test_bit(SCTP_CID_COOKIE_ECHO, (void *)map)
-               && !test_bit(SCTP_CID_ABORT, (void *)map)
-               && !test_bit(SCTP_CID_SHUTDOWN_ACK, (void *)map)
-               && (sh->vtag != conntrack->proto.sctp.vtag[CTINFO2DIR(ctinfo)])) {
-               DEBUGP("Verification tag check failed\n");
-               return -1;
+       if (!test_bit(SCTP_CID_INIT, map) &&
+           !test_bit(SCTP_CID_SHUTDOWN_COMPLETE, map) &&
+           !test_bit(SCTP_CID_COOKIE_ECHO, map) &&
+           !test_bit(SCTP_CID_ABORT, map) &&
+           !test_bit(SCTP_CID_SHUTDOWN_ACK, map) &&
+           sh->vtag != ct->proto.sctp.vtag[dir]) {
+               pr_debug("Verification tag check failed\n");
+               goto out;

        }
 
        }
 

-       oldsctpstate = newconntrack = SCTP_CONNTRACK_MAX;
+       old_state = new_state = SCTP_CONNTRACK_MAX;
+       write_lock_bh(&sctp_lock);

        for_each_sctp_chunk (skb, sch, _sch, offset, dataoff, count) {
        for_each_sctp_chunk (skb, sch, _sch, offset, dataoff, count) {

-               write_lock_bh(&sctp_lock);
-

                /* Special cases of Verification tag check (Sec 8.5.1) */
                if (sch->type == SCTP_CID_INIT) {
                        /* Sec 8.5.1 (A) */
                /* Special cases of Verification tag check (Sec 8.5.1) */
                if (sch->type == SCTP_CID_INIT) {
                        /* Sec 8.5.1 (A) */

-                       if (sh->vtag != 0) {
-                               write_unlock_bh(&sctp_lock);
-                               return -1;
-                       }
+                       if (sh->vtag != 0)
+                               goto out_unlock;

                } else if (sch->type == SCTP_CID_ABORT) {
                        /* Sec 8.5.1 (B) */
                } else if (sch->type == SCTP_CID_ABORT) {
                        /* Sec 8.5.1 (B) */

-                       if (!(sh->vtag == conntrack->proto.sctp.vtag[CTINFO2DIR(ctinfo)])
-                               && !(sh->vtag == conntrack->proto.sctp.vtag
-                                                       [1 - CTINFO2DIR(ctinfo)])) {
-                               write_unlock_bh(&sctp_lock);
-                               return -1;
-                       }
+                       if (sh->vtag != ct->proto.sctp.vtag[dir] &&
+                           sh->vtag != ct->proto.sctp.vtag[!dir])
+                               goto out_unlock;

                } else if (sch->type == SCTP_CID_SHUTDOWN_COMPLETE) {
                        /* Sec 8.5.1 (C) */
                } else if (sch->type == SCTP_CID_SHUTDOWN_COMPLETE) {
                        /* Sec 8.5.1 (C) */

-                       if (!(sh->vtag == conntrack->proto.sctp.vtag[CTINFO2DIR(ctinfo)])
-                               && !(sh->vtag == conntrack->proto.sctp.vtag
-                                                       [1 - CTINFO2DIR(ctinfo)] 
-                                       && (sch->flags & 1))) {
-                               write_unlock_bh(&sctp_lock);
-                               return -1;
-                       }
+                       if (sh->vtag != ct->proto.sctp.vtag[dir] &&
+                           sh->vtag != ct->proto.sctp.vtag[!dir] &&
+                           sch->flags & SCTP_CHUNK_FLAG_T)
+                               goto out_unlock;

                } else if (sch->type == SCTP_CID_COOKIE_ECHO) {
                        /* Sec 8.5.1 (D) */
                } else if (sch->type == SCTP_CID_COOKIE_ECHO) {
                        /* Sec 8.5.1 (D) */

-                       if (!(sh->vtag == conntrack->proto.sctp.vtag[CTINFO2DIR(ctinfo)])) {
-                               write_unlock_bh(&sctp_lock);
-                               return -1;
-                       }
+                       if (sh->vtag != ct->proto.sctp.vtag[dir])
+                               goto out_unlock;

                }
 
                }
 

-               oldsctpstate = conntrack->proto.sctp.state;
-               newconntrack = new_state(CTINFO2DIR(ctinfo), oldsctpstate, sch->type);
+               old_state = ct->proto.sctp.state;
+               new_state = sctp_new_state(dir, old_state, sch->type);

 
                /* Invalid */
 
                /* Invalid */

-               if (newconntrack == SCTP_CONNTRACK_MAX) {
-                       DEBUGP("nf_conntrack_sctp: Invalid dir=%i ctype=%u conntrack=%u\n",
-                              CTINFO2DIR(ctinfo), sch->type, oldsctpstate);
-                       write_unlock_bh(&sctp_lock);
-                       return -1;
+               if (new_state == SCTP_CONNTRACK_MAX) {
+                       pr_debug("nf_conntrack_sctp: Invalid dir=%i ctype=%u "
+                                "conntrack=%u\n",
+                                dir, sch->type, old_state);
+                       goto out_unlock;

                }
 
                /* If it is an INIT or an INIT ACK note down the vtag */
                }
 
                /* If it is an INIT or an INIT ACK note down the vtag */

-               if (sch->type == SCTP_CID_INIT 
-                       || sch->type == SCTP_CID_INIT_ACK) {
+               if (sch->type == SCTP_CID_INIT ||
+                   sch->type == SCTP_CID_INIT_ACK) {

                        sctp_inithdr_t _inithdr, *ih;
 
                        ih = skb_header_pointer(skb, offset + sizeof(sctp_chunkhdr_t),
                        sctp_inithdr_t _inithdr, *ih;
 
                        ih = skb_header_pointer(skb, offset + sizeof(sctp_chunkhdr_t),

-                                               sizeof(_inithdr), &_inithdr);
-                       if (ih == NULL) {
-                                       write_unlock_bh(&sctp_lock);
-                                       return -1;
-                       }
-                       DEBUGP("Setting vtag %x for dir %d\n", 
-                                       ih->init_tag, !CTINFO2DIR(ctinfo));
-                       conntrack->proto.sctp.vtag[!CTINFO2DIR(ctinfo)] = ih->init_tag;
+                                               sizeof(_inithdr), &_inithdr);
+                       if (ih == NULL)
+                               goto out_unlock;
+                       pr_debug("Setting vtag %x for dir %d\n",
+                                ih->init_tag, !dir);
+                       ct->proto.sctp.vtag[!dir] = ih->init_tag;

                }
 
                }
 

-               conntrack->proto.sctp.state = newconntrack;
-               if (oldsctpstate != newconntrack)
+               ct->proto.sctp.state = new_state;
+               if (old_state != new_state)

                        nf_conntrack_event_cache(IPCT_PROTOINFO, skb);
                        nf_conntrack_event_cache(IPCT_PROTOINFO, skb);

-               write_unlock_bh(&sctp_lock);

        }
        }

+       write_unlock_bh(&sctp_lock);

 
 

-       nf_ct_refresh_acct(conntrack, ctinfo, skb, *sctp_timeouts[newconntrack]);
+       nf_ct_refresh_acct(ct, ctinfo, skb, sctp_timeouts[new_state]);

 
 

-       if (oldsctpstate == SCTP_CONNTRACK_COOKIE_ECHOED
-               && CTINFO2DIR(ctinfo) == IP_CT_DIR_REPLY
-               && newconntrack == SCTP_CONNTRACK_ESTABLISHED) {
-               DEBUGP("Setting assured bit\n");
-               set_bit(IPS_ASSURED_BIT, &conntrack->status);
+       if (old_state == SCTP_CONNTRACK_COOKIE_ECHOED &&
+           dir == IP_CT_DIR_REPLY &&
+           new_state == SCTP_CONNTRACK_ESTABLISHED) {
+               pr_debug("Setting assured bit\n");
+               set_bit(IPS_ASSURED_BIT, &ct->status);

                nf_conntrack_event_cache(IPCT_STATUS, skb);
        }
 
        return NF_ACCEPT;
                nf_conntrack_event_cache(IPCT_STATUS, skb);
        }
 
        return NF_ACCEPT;

+
+out_unlock:
+       write_unlock_bh(&sctp_lock);
+out:
+       return -NF_ACCEPT;

 }
 
 /* Called when a new connection for this protocol found. */
 }
 
 /* Called when a new connection for this protocol found. */

-static int sctp_new(struct nf_conn *conntrack, const struct sk_buff *skb,
+static int sctp_new(struct nf_conn *ct, const struct sk_buff *skb,

                    unsigned int dataoff)
 {
                    unsigned int dataoff)
 {

-       enum sctp_conntrack newconntrack;
+       enum sctp_conntrack new_state;

        sctp_sctphdr_t _sctph, *sh;
        sctp_chunkhdr_t _sch, *sch;
        u_int32_t offset, count;
        sctp_sctphdr_t _sctph, *sh;
        sctp_chunkhdr_t _sch, *sch;
        u_int32_t offset, count;

-       char map[256 / sizeof (char)] = {0};
-
-       DEBUGP(__FUNCTION__);
-       DEBUGP("\n");
+       unsigned long map[256 / sizeof(unsigned long)] = { 0 };

 
        sh = skb_header_pointer(skb, dataoff, sizeof(_sctph), &_sctph);
        if (sh == NULL)
                return 0;
 
 
        sh = skb_header_pointer(skb, dataoff, sizeof(_sctph), &_sctph);
        if (sh == NULL)
                return 0;
 

-       if (do_basic_checks(conntrack, skb, dataoff, map) != 0)
+       if (do_basic_checks(ct, skb, dataoff, map) != 0)

                return 0;
 
        /* If an OOTB packet has any of these chunks discard (Sec 8.4) */
                return 0;
 
        /* If an OOTB packet has any of these chunks discard (Sec 8.4) */

-       if ((test_bit (SCTP_CID_ABORT, (void *)map))
-               || (test_bit (SCTP_CID_SHUTDOWN_COMPLETE, (void *)map))
-               || (test_bit (SCTP_CID_COOKIE_ACK, (void *)map))) {
+       if (test_bit(SCTP_CID_ABORT, map) ||
+           test_bit(SCTP_CID_SHUTDOWN_COMPLETE, map) ||
+           test_bit(SCTP_CID_COOKIE_ACK, map))

                return 0;
                return 0;

-       }

 
 

-       newconntrack = SCTP_CONNTRACK_MAX;
+       new_state = SCTP_CONNTRACK_MAX;

        for_each_sctp_chunk (skb, sch, _sch, offset, dataoff, count) {
                /* Don't need lock here: this conntrack not in circulation yet */
        for_each_sctp_chunk (skb, sch, _sch, offset, dataoff, count) {
                /* Don't need lock here: this conntrack not in circulation yet */

-               newconntrack = new_state(IP_CT_DIR_ORIGINAL, 
-                                        SCTP_CONNTRACK_NONE, sch->type);
+               new_state = sctp_new_state(IP_CT_DIR_ORIGINAL,
+                                          SCTP_CONNTRACK_NONE, sch->type);

 
                /* Invalid: delete conntrack */
 
                /* Invalid: delete conntrack */

-               if (newconntrack == SCTP_CONNTRACK_MAX) {
-                       DEBUGP("nf_conntrack_sctp: invalid new deleting.\n");
+               if (new_state == SCTP_CONNTRACK_NONE ||
+                   new_state == SCTP_CONNTRACK_MAX) {
+                       pr_debug("nf_conntrack_sctp: invalid new deleting.\n");

                        return 0;
                }
 
                        return 0;
                }
 


@@ -480,14 +431,14 @@ static int sctp_new(struct nf_conn *conntrack, const struct sk_buff *skb,
                                sctp_inithdr_t _inithdr, *ih;
 
                                ih = skb_header_pointer(skb, offset + sizeof(sctp_chunkhdr_t),
                                sctp_inithdr_t _inithdr, *ih;
 
                                ih = skb_header_pointer(skb, offset + sizeof(sctp_chunkhdr_t),

-                                                       sizeof(_inithdr), &_inithdr);
+                                                       sizeof(_inithdr), &_inithdr);

                                if (ih == NULL)
                                        return 0;
 
                                if (ih == NULL)
                                        return 0;
 

-                               DEBUGP("Setting vtag %x for new conn\n", 
-                                       ih->init_tag);
+                               pr_debug("Setting vtag %x for new conn\n",
+                                        ih->init_tag);

 
 

-                               conntrack->proto.sctp.vtag[IP_CT_DIR_REPLY] = 
+                               ct->proto.sctp.vtag[IP_CT_DIR_REPLY] =

                                                                ih->init_tag;
                        } else {
                                /* Sec 8.5.1 (A) */
                                                                ih->init_tag;
                        } else {
                                /* Sec 8.5.1 (A) */


@@ -497,174 +448,209 @@ static int sctp_new(struct nf_conn *conntrack, const struct sk_buff *skb,
                /* If it is a shutdown ack OOTB packet, we expect a return
                   shutdown complete, otherwise an ABORT Sec 8.4 (5) and (8) */
                else {
                /* If it is a shutdown ack OOTB packet, we expect a return
                   shutdown complete, otherwise an ABORT Sec 8.4 (5) and (8) */
                else {

-                       DEBUGP("Setting vtag %x for new conn OOTB\n", 
-                               sh->vtag);
-                       conntrack->proto.sctp.vtag[IP_CT_DIR_REPLY] = sh->vtag;
+                       pr_debug("Setting vtag %x for new conn OOTB\n",
+                                sh->vtag);
+                       ct->proto.sctp.vtag[IP_CT_DIR_REPLY] = sh->vtag;

                }
 
                }
 

-               conntrack->proto.sctp.state = newconntrack;
+               ct->proto.sctp.state = new_state;

        }
 
        return 1;
 }
 
        }
 
        return 1;
 }
 

-struct nf_conntrack_protocol nf_conntrack_protocol_sctp4 = { 
-       .l3proto         = PF_INET,
-       .proto           = IPPROTO_SCTP, 
-       .name            = "sctp",
-       .pkt_to_tuple    = sctp_pkt_to_tuple, 
-       .invert_tuple    = sctp_invert_tuple, 
-       .print_tuple     = sctp_print_tuple, 
-       .print_conntrack = sctp_print_conntrack,
-       .packet          = sctp_packet, 
-       .new             = sctp_new, 
-       .destroy         = NULL, 
-       .me              = THIS_MODULE 
-};
-
-struct nf_conntrack_protocol nf_conntrack_protocol_sctp6 = { 
-       .l3proto         = PF_INET6,
-       .proto           = IPPROTO_SCTP, 
-       .name            = "sctp",
-       .pkt_to_tuple    = sctp_pkt_to_tuple, 
-       .invert_tuple    = sctp_invert_tuple, 
-       .print_tuple     = sctp_print_tuple, 
-       .print_conntrack = sctp_print_conntrack,
-       .packet          = sctp_packet, 
-       .new             = sctp_new, 
-       .destroy         = NULL, 
-       .me              = THIS_MODULE 
-};
-

 #ifdef CONFIG_SYSCTL
 #ifdef CONFIG_SYSCTL

-static ctl_table nf_ct_sysctl_table[] = {
+static unsigned int sctp_sysctl_table_users;
+static struct ctl_table_header *sctp_sysctl_header;
+static struct ctl_table sctp_sysctl_table[] = {

        {
        {

-               .ctl_name       = NET_NF_CONNTRACK_SCTP_TIMEOUT_CLOSED,

                .procname       = "nf_conntrack_sctp_timeout_closed",
                .procname       = "nf_conntrack_sctp_timeout_closed",

-               .data           = &nf_ct_sctp_timeout_closed,
+               .data           = &sctp_timeouts[SCTP_CONNTRACK_CLOSED],

                .maxlen         = sizeof(unsigned int),
                .mode           = 0644,
                .proc_handler   = &proc_dointvec_jiffies,
        },
        {
                .maxlen         = sizeof(unsigned int),
                .mode           = 0644,
                .proc_handler   = &proc_dointvec_jiffies,
        },
        {

-               .ctl_name       = NET_NF_CONNTRACK_SCTP_TIMEOUT_COOKIE_WAIT,

                .procname       = "nf_conntrack_sctp_timeout_cookie_wait",
                .procname       = "nf_conntrack_sctp_timeout_cookie_wait",

-               .data           = &nf_ct_sctp_timeout_cookie_wait,
+               .data           = &sctp_timeouts[SCTP_CONNTRACK_COOKIE_WAIT],

                .maxlen         = sizeof(unsigned int),
                .mode           = 0644,
                .proc_handler   = &proc_dointvec_jiffies,
        },
        {
                .maxlen         = sizeof(unsigned int),
                .mode           = 0644,
                .proc_handler   = &proc_dointvec_jiffies,
        },
        {

-               .ctl_name       = NET_NF_CONNTRACK_SCTP_TIMEOUT_COOKIE_ECHOED,

                .procname       = "nf_conntrack_sctp_timeout_cookie_echoed",
                .procname       = "nf_conntrack_sctp_timeout_cookie_echoed",

-               .data           = &nf_ct_sctp_timeout_cookie_echoed,
+               .data           = &sctp_timeouts[SCTP_CONNTRACK_COOKIE_ECHOED],

                .maxlen         = sizeof(unsigned int),
                .mode           = 0644,
                .proc_handler   = &proc_dointvec_jiffies,
        },
        {
                .maxlen         = sizeof(unsigned int),
                .mode           = 0644,
                .proc_handler   = &proc_dointvec_jiffies,
        },
        {

-               .ctl_name       = NET_NF_CONNTRACK_SCTP_TIMEOUT_ESTABLISHED,

                .procname       = "nf_conntrack_sctp_timeout_established",
                .procname       = "nf_conntrack_sctp_timeout_established",

-               .data           = &nf_ct_sctp_timeout_established,
+               .data           = &sctp_timeouts[SCTP_CONNTRACK_ESTABLISHED],

                .maxlen         = sizeof(unsigned int),
                .mode           = 0644,
                .proc_handler   = &proc_dointvec_jiffies,
        },
        {
                .maxlen         = sizeof(unsigned int),
                .mode           = 0644,
                .proc_handler   = &proc_dointvec_jiffies,
        },
        {

-               .ctl_name       = NET_NF_CONNTRACK_SCTP_TIMEOUT_SHUTDOWN_SENT,

                .procname       = "nf_conntrack_sctp_timeout_shutdown_sent",
                .procname       = "nf_conntrack_sctp_timeout_shutdown_sent",

-               .data           = &nf_ct_sctp_timeout_shutdown_sent,
+               .data           = &sctp_timeouts[SCTP_CONNTRACK_SHUTDOWN_SENT],

                .maxlen         = sizeof(unsigned int),
                .mode           = 0644,
                .proc_handler   = &proc_dointvec_jiffies,
        },
        {
                .maxlen         = sizeof(unsigned int),
                .mode           = 0644,
                .proc_handler   = &proc_dointvec_jiffies,
        },
        {

-               .ctl_name       = NET_NF_CONNTRACK_SCTP_TIMEOUT_SHUTDOWN_RECD,

                .procname       = "nf_conntrack_sctp_timeout_shutdown_recd",
                .procname       = "nf_conntrack_sctp_timeout_shutdown_recd",

-               .data           = &nf_ct_sctp_timeout_shutdown_recd,
+               .data           = &sctp_timeouts[SCTP_CONNTRACK_SHUTDOWN_RECD],

                .maxlen         = sizeof(unsigned int),
                .mode           = 0644,
                .proc_handler   = &proc_dointvec_jiffies,
        },
        {
                .maxlen         = sizeof(unsigned int),
                .mode           = 0644,
                .proc_handler   = &proc_dointvec_jiffies,
        },
        {

-               .ctl_name       = NET_NF_CONNTRACK_SCTP_TIMEOUT_SHUTDOWN_ACK_SENT,

                .procname       = "nf_conntrack_sctp_timeout_shutdown_ack_sent",
                .procname       = "nf_conntrack_sctp_timeout_shutdown_ack_sent",

-               .data           = &nf_ct_sctp_timeout_shutdown_ack_sent,
+               .data           = &sctp_timeouts[SCTP_CONNTRACK_SHUTDOWN_ACK_SENT],

                .maxlen         = sizeof(unsigned int),
                .mode           = 0644,
                .proc_handler   = &proc_dointvec_jiffies,
        },
                .maxlen         = sizeof(unsigned int),
                .mode           = 0644,
                .proc_handler   = &proc_dointvec_jiffies,
        },

-       { .ctl_name = 0 }
+       {
+               .ctl_name = 0
+       }

 };
 
 };
 

-static ctl_table nf_ct_netfilter_table[] = {
+#ifdef CONFIG_NF_CONNTRACK_PROC_COMPAT
+static struct ctl_table sctp_compat_sysctl_table[] = {

        {
        {

-               .ctl_name       = NET_NETFILTER,
-               .procname       = "netfilter",
-               .mode           = 0555,
-               .child          = nf_ct_sysctl_table,
+               .procname       = "ip_conntrack_sctp_timeout_closed",
+               .data           = &sctp_timeouts[SCTP_CONNTRACK_CLOSED],
+               .maxlen         = sizeof(unsigned int),
+               .mode           = 0644,
+               .proc_handler   = &proc_dointvec_jiffies,

        },
        },

-       { .ctl_name = 0 }
-};
-
-static ctl_table nf_ct_net_table[] = {

        {
        {

-               .ctl_name       = CTL_NET,
-               .procname       = "net",
-               .mode           = 0555, 
-               .child          = nf_ct_netfilter_table,
+               .procname       = "ip_conntrack_sctp_timeout_cookie_wait",
+               .data           = &sctp_timeouts[SCTP_CONNTRACK_COOKIE_WAIT],
+               .maxlen         = sizeof(unsigned int),
+               .mode           = 0644,
+               .proc_handler   = &proc_dointvec_jiffies,

        },
        },

-       { .ctl_name = 0 }
+       {
+               .procname       = "ip_conntrack_sctp_timeout_cookie_echoed",
+               .data           = &sctp_timeouts[SCTP_CONNTRACK_COOKIE_ECHOED],
+               .maxlen         = sizeof(unsigned int),
+               .mode           = 0644,
+               .proc_handler   = &proc_dointvec_jiffies,
+       },
+       {
+               .procname       = "ip_conntrack_sctp_timeout_established",
+               .data           = &sctp_timeouts[SCTP_CONNTRACK_ESTABLISHED],
+               .maxlen         = sizeof(unsigned int),
+               .mode           = 0644,
+               .proc_handler   = &proc_dointvec_jiffies,
+       },
+       {
+               .procname       = "ip_conntrack_sctp_timeout_shutdown_sent",
+               .data           = &sctp_timeouts[SCTP_CONNTRACK_SHUTDOWN_SENT],
+               .maxlen         = sizeof(unsigned int),
+               .mode           = 0644,
+               .proc_handler   = &proc_dointvec_jiffies,
+       },
+       {
+               .procname       = "ip_conntrack_sctp_timeout_shutdown_recd",
+               .data           = &sctp_timeouts[SCTP_CONNTRACK_SHUTDOWN_RECD],
+               .maxlen         = sizeof(unsigned int),
+               .mode           = 0644,
+               .proc_handler   = &proc_dointvec_jiffies,
+       },
+       {
+               .procname       = "ip_conntrack_sctp_timeout_shutdown_ack_sent",
+               .data           = &sctp_timeouts[SCTP_CONNTRACK_SHUTDOWN_ACK_SENT],
+               .maxlen         = sizeof(unsigned int),
+               .mode           = 0644,
+               .proc_handler   = &proc_dointvec_jiffies,
+       },
+       {
+               .ctl_name = 0
+       }
+};
+#endif /* CONFIG_NF_CONNTRACK_PROC_COMPAT */
+#endif
+
+static struct nf_conntrack_l4proto nf_conntrack_l4proto_sctp4 __read_mostly = {
+       .l3proto                = PF_INET,
+       .l4proto                = IPPROTO_SCTP,
+       .name                   = "sctp",
+       .pkt_to_tuple           = sctp_pkt_to_tuple,
+       .invert_tuple           = sctp_invert_tuple,
+       .print_tuple            = sctp_print_tuple,
+       .print_conntrack        = sctp_print_conntrack,
+       .packet                 = sctp_packet,
+       .new                    = sctp_new,
+       .me                     = THIS_MODULE,
+#if defined(CONFIG_NF_CT_NETLINK) || defined(CONFIG_NF_CT_NETLINK_MODULE)
+       .tuple_to_nlattr        = nf_ct_port_tuple_to_nlattr,
+       .nlattr_to_tuple        = nf_ct_port_nlattr_to_tuple,
+       .nla_policy             = nf_ct_port_nla_policy,
+#endif
+#ifdef CONFIG_SYSCTL
+       .ctl_table_users        = &sctp_sysctl_table_users,
+       .ctl_table_header       = &sctp_sysctl_header,
+       .ctl_table              = sctp_sysctl_table,
+#ifdef CONFIG_NF_CONNTRACK_PROC_COMPAT
+       .ctl_compat_table       = sctp_compat_sysctl_table,
+#endif
+#endif

 };
 
 };
 

-static struct ctl_table_header *nf_ct_sysctl_header;
+static struct nf_conntrack_l4proto nf_conntrack_l4proto_sctp6 __read_mostly = {
+       .l3proto                = PF_INET6,
+       .l4proto                = IPPROTO_SCTP,
+       .name                   = "sctp",
+       .pkt_to_tuple           = sctp_pkt_to_tuple,
+       .invert_tuple           = sctp_invert_tuple,
+       .print_tuple            = sctp_print_tuple,
+       .print_conntrack        = sctp_print_conntrack,
+       .packet                 = sctp_packet,
+       .new                    = sctp_new,
+       .me                     = THIS_MODULE,
+#if defined(CONFIG_NF_CT_NETLINK) || defined(CONFIG_NF_CT_NETLINK_MODULE)
+       .tuple_to_nlattr        = nf_ct_port_tuple_to_nlattr,
+       .nlattr_to_tuple        = nf_ct_port_nlattr_to_tuple,
+       .nla_policy             = nf_ct_port_nla_policy,

 #endif
 #endif

+#ifdef CONFIG_SYSCTL
+       .ctl_table_users        = &sctp_sysctl_table_users,
+       .ctl_table_header       = &sctp_sysctl_header,
+       .ctl_table              = sctp_sysctl_table,
+#endif
+};

 
 int __init nf_conntrack_proto_sctp_init(void)
 {
        int ret;
 
 
 int __init nf_conntrack_proto_sctp_init(void)
 {
        int ret;
 

-       ret = nf_conntrack_protocol_register(&nf_conntrack_protocol_sctp4);
+       ret = nf_conntrack_l4proto_register(&nf_conntrack_l4proto_sctp4);

        if (ret) {
        if (ret) {

-               printk("nf_conntrack_proto_sctp4: protocol register failed\n");
+               printk("nf_conntrack_l4proto_sctp4: protocol register failed\n");

                goto out;
        }
                goto out;
        }

-       ret = nf_conntrack_protocol_register(&nf_conntrack_protocol_sctp6);
+       ret = nf_conntrack_l4proto_register(&nf_conntrack_l4proto_sctp6);

        if (ret) {
        if (ret) {

-               printk("nf_conntrack_proto_sctp6: protocol register failed\n");
+               printk("nf_conntrack_l4proto_sctp6: protocol register failed\n");

                goto cleanup_sctp4;
        }
 
                goto cleanup_sctp4;
        }
 

-#ifdef CONFIG_SYSCTL
-       nf_ct_sysctl_header = register_sysctl_table(nf_ct_net_table, 0);
-       if (nf_ct_sysctl_header == NULL) {
-               printk("nf_conntrack_proto_sctp: can't register to sysctl.\n");
-               goto cleanup;
-       }
-#endif
-

        return ret;
 
        return ret;
 

-#ifdef CONFIG_SYSCTL
- cleanup:
-       nf_conntrack_protocol_unregister(&nf_conntrack_protocol_sctp6);
-#endif

  cleanup_sctp4:
  cleanup_sctp4:

-       nf_conntrack_protocol_unregister(&nf_conntrack_protocol_sctp4);
+       nf_conntrack_l4proto_unregister(&nf_conntrack_l4proto_sctp4);

  out:
  out:

-       DEBUGP("SCTP conntrack module loading %s\n", 
-                                       ret ? "failed": "succeeded");

        return ret;
 }
 
 void __exit nf_conntrack_proto_sctp_fini(void)
 {
        return ret;
 }
 
 void __exit nf_conntrack_proto_sctp_fini(void)
 {

-       nf_conntrack_protocol_unregister(&nf_conntrack_protocol_sctp6);
-       nf_conntrack_protocol_unregister(&nf_conntrack_protocol_sctp4);
-#ifdef CONFIG_SYSCTL
-       unregister_sysctl_table(nf_ct_sysctl_header);
-#endif
-       DEBUGP("SCTP conntrack module unloaded\n");
+       nf_conntrack_l4proto_unregister(&nf_conntrack_l4proto_sctp6);
+       nf_conntrack_l4proto_unregister(&nf_conntrack_l4proto_sctp4);

 }
 
 module_init(nf_conntrack_proto_sctp_init);
 }
 
 module_init(nf_conntrack_proto_sctp_init);


@@ -673,3 +659,4 @@ module_exit(nf_conntrack_proto_sctp_fini);
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Kiran Kumar Immidi");
 MODULE_DESCRIPTION("Netfilter connection tracking protocol helper for SCTP");
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Kiran Kumar Immidi");
 MODULE_DESCRIPTION("Netfilter connection tracking protocol helper for SCTP");

+MODULE_ALIAS("ip_conntrack_proto_sctp");