[NETFILTER]: nf_conntrack_sctp: reduce line length further
Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=8528819adc613e0b4bc3e5cb4123b4b33d2b03c4
Commit: 8528819adc613e0b4bc3e5cb4123b4b33d2b03c4
Parent: 112f35c9c164e06e038d506dd3eb15e76829ef8a
Author: Patrick McHardy [EMAIL PROTECTED]
AuthorDate: Mon Jan 14 23:46:37 2008 -0800
Committer: David S. Miller [EMAIL PROTECTED]
CommitDate: Mon Jan 28 15:02:35 2008 -0800
[NETFILTER]: nf_conntrack_sctp: reduce line length further
Eliminate a few lines over 80 characters by using a local variable to
hold the conntrack direction instead of using CTINFO2DIR everywhere.
Signed-off-by: Patrick McHardy [EMAIL PROTECTED]
Signed-off-by: David S. Miller [EMAIL PROTECTED]
---
net/netfilter/nf_conntrack_proto_sctp.c | 23 ---
1 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/net/netfilter/nf_conntrack_proto_sctp.c
b/net/netfilter/nf_conntrack_proto_sctp.c
index 84e37e9..fdabef5 100644
--- a/net/netfilter/nf_conntrack_proto_sctp.c
+++ b/net/netfilter/nf_conntrack_proto_sctp.c
@@ -300,6 +300,7 @@ static int sctp_packet(struct nf_conn *ct,
unsigned int hooknum)
{
enum sctp_conntrack newconntrack, oldsctpstate;
+ enum ip_conntrack_dir dir = CTINFO2DIR(ctinfo);
sctp_sctphdr_t _sctph, *sh;
sctp_chunkhdr_t _sch, *sch;
u_int32_t offset, count;
@@ -318,7 +319,7 @@ static int sctp_packet(struct nf_conn *ct,
!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[CTINFO2DIR(ctinfo)]) {
+ sh-vtag != ct-proto.sctp.vtag[dir]) {
pr_debug(Verification tag check failed\n);
return -1;
}
@@ -336,35 +337,35 @@ static int sctp_packet(struct nf_conn *ct,
}
} else if (sch-type == SCTP_CID_ABORT) {
/* Sec 8.5.1 (B) */
- if (sh-vtag != ct-proto.sctp.vtag[CTINFO2DIR(ctinfo)]
- sh-vtag != ct-proto.sctp.vtag[1 -
CTINFO2DIR(ctinfo)]) {
+ if (sh-vtag != ct-proto.sctp.vtag[dir]
+ sh-vtag != ct-proto.sctp.vtag[!dir]) {
write_unlock_bh(sctp_lock);
return -1;
}
} else if (sch-type == SCTP_CID_SHUTDOWN_COMPLETE) {
/* Sec 8.5.1 (C) */
- if (sh-vtag != ct-proto.sctp.vtag[CTINFO2DIR(ctinfo)]
- sh-vtag != ct-proto.sctp.vtag[1 -
CTINFO2DIR(ctinfo)]
+ if (sh-vtag != ct-proto.sctp.vtag[dir]
+ sh-vtag != ct-proto.sctp.vtag[!dir]
(sch-flags 1)) {
write_unlock_bh(sctp_lock);
return -1;
}
} else if (sch-type == SCTP_CID_COOKIE_ECHO) {
/* Sec 8.5.1 (D) */
- if (sh-vtag !=
ct-proto.sctp.vtag[CTINFO2DIR(ctinfo)]) {
+ if (sh-vtag != ct-proto.sctp.vtag[dir]) {
write_unlock_bh(sctp_lock);
return -1;
}
}
oldsctpstate = ct-proto.sctp.state;
- newconntrack = new_state(CTINFO2DIR(ctinfo), oldsctpstate,
sch-type);
+ newconntrack = new_state(dir, oldsctpstate, sch-type);
/* Invalid */
if (newconntrack == SCTP_CONNTRACK_MAX) {
pr_debug(nf_conntrack_sctp: Invalid dir=%i ctype=%u
conntrack=%u\n,
-CTINFO2DIR(ctinfo), sch-type, oldsctpstate);
+dir, sch-type, oldsctpstate);
write_unlock_bh(sctp_lock);
return -1;
}
@@ -381,8 +382,8 @@ static int sctp_packet(struct nf_conn *ct,
return -1;
}
pr_debug(Setting vtag %x for dir %d\n,
-ih-init_tag, !CTINFO2DIR(ctinfo));
- ct-proto.sctp.vtag[!CTINFO2DIR(ctinfo)] = ih-init_tag;
+ih-init_tag, !dir);
+ ct-proto.sctp.vtag[!dir] = ih-init_tag;
}
ct-proto.sctp.state = newconntrack;
@@ -394,7 +395,7 @@ static int sctp_packet(struct nf_conn *ct,
nf_ct_refresh_acct(ct, ctinfo, skb, *sctp_timeouts[newconntrack]);
if (oldsctpstate == SCTP_CONNTRACK_COOKIE_ECHOED
- CTINFO2DIR(ctinfo) == IP_CT_DIR_REPLY
+ dir == IP_CT_DIR_REPLY
newconntrack == SCTP_CONNTRACK_ESTABLISHED
[NETFILTER]: nf_conntrack_sctp: reduce line length
Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=112f35c9c164e06e038d506dd3eb15e76829ef8a
Commit: 112f35c9c164e06e038d506dd3eb15e76829ef8a
Parent: 35c6d3cbe1b97b860087f6082e764ac8da2a12b2
Author: Patrick McHardy [EMAIL PROTECTED]
AuthorDate: Mon Jan 14 23:46:20 2008 -0800
Committer: David S. Miller [EMAIL PROTECTED]
CommitDate: Mon Jan 28 15:02:34 2008 -0800
[NETFILTER]: nf_conntrack_sctp: reduce line length
Reduce the length of some overly long lines by renaming all
conntrack variables to ct.
Signed-off-by: Patrick McHardy [EMAIL PROTECTED]
Signed-off-by: David S. Miller [EMAIL PROTECTED]
---
net/netfilter/nf_conntrack_proto_sctp.c | 43 +++
1 files changed, 21 insertions(+), 22 deletions(-)
diff --git a/net/netfilter/nf_conntrack_proto_sctp.c
b/net/netfilter/nf_conntrack_proto_sctp.c
index 5166bb3..84e37e9 100644
--- a/net/netfilter/nf_conntrack_proto_sctp.c
+++ b/net/netfilter/nf_conntrack_proto_sctp.c
@@ -173,13 +173,12 @@ static int sctp_print_tuple(struct seq_file *s,
}
/* 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;
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]);
@@ -192,7 +191,7 @@ for ((offset) = (dataoff) + sizeof(sctp_sctphdr_t), (count)
= 0;\
(offset) += (ntohs((sch)-length) + 3) ~3, (count)++)
/* 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,
unsigned long *map)
@@ -293,7 +292,7 @@ static int new_state(enum ip_conntrack_dir dir,
}
/* Returns verdict for packet, or -1 for invalid. */
-static int sctp_packet(struct nf_conn *conntrack,
+static int sctp_packet(struct nf_conn *ct,
const struct sk_buff *skb,
unsigned int dataoff,
enum ip_conntrack_info ctinfo,
@@ -310,7 +309,7 @@ static int sctp_packet(struct nf_conn *conntrack,
if (sh == NULL)
return -1;
- if (do_basic_checks(conntrack, skb, dataoff, map) != 0)
+ if (do_basic_checks(ct, skb, dataoff, map) != 0)
return -1;
/* Check the verification tag (Sec 8.5) */
@@ -319,7 +318,7 @@ static int sctp_packet(struct nf_conn *conntrack,
!test_bit(SCTP_CID_COOKIE_ECHO, map)
!test_bit(SCTP_CID_ABORT, map)
!test_bit(SCTP_CID_SHUTDOWN_ACK, map)
- sh-vtag != conntrack-proto.sctp.vtag[CTINFO2DIR(ctinfo)]) {
+ sh-vtag != ct-proto.sctp.vtag[CTINFO2DIR(ctinfo)]) {
pr_debug(Verification tag check failed\n);
return -1;
}
@@ -337,28 +336,28 @@ static int sctp_packet(struct nf_conn *conntrack,
}
} 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)]) {
+ if (sh-vtag != ct-proto.sctp.vtag[CTINFO2DIR(ctinfo)]
+ sh-vtag != ct-proto.sctp.vtag[1 -
CTINFO2DIR(ctinfo)]) {
write_unlock_bh(sctp_lock);
return -1;
}
} 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)]
+ if (sh-vtag != ct-proto.sctp.vtag[CTINFO2DIR(ctinfo)]
+ sh-vtag != ct-proto.sctp.vtag[1 -
CTINFO2DIR(ctinfo)]
(sch-flags 1)) {
write_unlock_bh(sctp_lock);
return -1;
}
} else if (sch-type == SCTP_CID_COOKIE_ECHO) {
/* Sec 8.5.1 (D) */
- if (sh-vtag !=
conntrack-proto.sctp.vtag[CTINFO2DIR(ctinfo)]) {
+ if (sh-vtag !=
ct-proto.sctp.vtag[CTINFO2DIR(ctinfo)]) {
write_unlock_bh(sctp_lock);
return -1;
}
}
- oldsctpstate
