[TCP_IPV4]: CodingStyle cleanups, no code change
Mostly related to CONFIG_TCP_MD5SIG recent merge. Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com>
This commit is contained in:
Arnaldo Carvalho de Melo
David S. Miller
parent
32aac18dfa
commit
7174259e6c
|
|
@ -93,10 +93,12 @@ static struct socket *tcp_socket;
|
|||
void tcp_v4_send_check(struct sock *sk, int len, struct sk_buff *skb);
|
||||
|
||||
#ifdef CONFIG_TCP_MD5SIG
|
||||
static struct tcp_md5sig_key *tcp_v4_md5_do_lookup(struct sock *sk, __be32 addr);
|
||||
static struct tcp_md5sig_key *tcp_v4_md5_do_lookup(struct sock *sk,
|
||||
__be32 addr);
|
||||
static int tcp_v4_do_calc_md5_hash(char *md5_hash, struct tcp_md5sig_key *key,
|
||||
__be32 saddr, __be32 daddr, struct tcphdr *th,
|
||||
int protocol, int tcplen);
|
||||
__be32 saddr, __be32 daddr,
|
||||
struct tcphdr *th, int protocol,
|
||||
int tcplen);
|
||||
#endif
|
||||
|
||||
struct inet_hashinfo __cacheline_aligned tcp_hashinfo = {
|
||||
|
|
@ -215,13 +217,14 @@ int tcp_v4_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len)
|
|||
if (tcp_death_row.sysctl_tw_recycle &&
|
||||
!tp->rx_opt.ts_recent_stamp && rt->rt_dst == daddr) {
|
||||
struct inet_peer *peer = rt_get_peer(rt);
|
||||
|
||||
/* VJ's idea. We save last timestamp seen from
|
||||
* the destination in peer table, when entering state TIME-WAIT
|
||||
* and initialize rx_opt.ts_recent from it, when trying new connection.
|
||||
/*
|
||||
* VJ's idea. We save last timestamp seen from
|
||||
* the destination in peer table, when entering state
|
||||
* TIME-WAIT * and initialize rx_opt.ts_recent from it,
|
||||
* when trying new connection.
|
||||
*/
|
||||
|
||||
if (peer && peer->tcp_ts_stamp + TCP_PAWS_MSL >= xtime.tv_sec) {
|
||||
if (peer != NULL &&
|
||||
peer->tcp_ts_stamp + TCP_PAWS_MSL >= xtime.tv_sec) {
|
||||
tp->rx_opt.ts_recent_stamp = peer->tcp_ts_stamp;
|
||||
tp->rx_opt.ts_recent = peer->tcp_ts;
|
||||
}
|
||||
|
|
@ -246,7 +249,8 @@ int tcp_v4_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len)
|
|||
if (err)
|
||||
goto failure;
|
||||
|
||||
err = ip_route_newports(&rt, IPPROTO_TCP, inet->sport, inet->dport, sk);
|
||||
err = ip_route_newports(&rt, IPPROTO_TCP,
|
||||
inet->sport, inet->dport, sk);
|
||||
if (err)
|
||||
goto failure;
|
||||
|
||||
|
|
@ -270,7 +274,10 @@ int tcp_v4_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len)
|
|||
return 0;
|
||||
|
||||
failure:
|
||||
/* This unhashes the socket and releases the local port, if necessary. */
|
||||
/*
|
||||
* This unhashes the socket and releases the local port,
|
||||
* if necessary.
|
||||
*/
|
||||
tcp_set_state(sk, TCP_CLOSE);
|
||||
ip_rt_put(rt);
|
||||
sk->sk_route_caps = 0;
|
||||
|
|
@ -495,7 +502,8 @@ void tcp_v4_send_check(struct sock *sk, int len, struct sk_buff *skb)
|
|||
struct tcphdr *th = skb->h.th;
|
||||
|
||||
if (skb->ip_summed == CHECKSUM_PARTIAL) {
|
||||
th->check = ~tcp_v4_check(th, len, inet->saddr, inet->daddr, 0);
|
||||
th->check = ~tcp_v4_check(th, len,
|
||||
inet->saddr, inet->daddr, 0);
|
||||
skb->csum = offsetof(struct tcphdr, check);
|
||||
} else {
|
||||
th->check = tcp_v4_check(th, len, inet->saddr, inet->daddr,
|
||||
|
|
@ -572,7 +580,7 @@ static void tcp_v4_send_reset(struct sock *sk, struct sk_buff *skb)
|
|||
skb->len - (th->doff << 2));
|
||||
}
|
||||
|
||||
memset(&arg, 0, sizeof arg);
|
||||
memset(&arg, 0, sizeof(arg));
|
||||
arg.iov[0].iov_base = (unsigned char *)&rep;
|
||||
arg.iov[0].iov_len = sizeof(rep.th);
|
||||
|
||||
|
|
@ -595,7 +603,6 @@ static void tcp_v4_send_reset(struct sock *sk, struct sk_buff *skb)
|
|||
arg.iov[0].iov_len);
|
||||
}
|
||||
#endif
|
||||
|
||||
arg.csum = csum_tcpudp_nofold(skb->nh.iph->daddr,
|
||||
skb->nh.iph->saddr, /* XXX */
|
||||
sizeof(struct tcphdr), IPPROTO_TCP, 0);
|
||||
|
|
@ -631,7 +638,7 @@ static void tcp_v4_send_ack(struct tcp_timewait_sock *twsk,
|
|||
#endif
|
||||
|
||||
memset(&rep.th, 0, sizeof(struct tcphdr));
|
||||
memset(&arg, 0, sizeof arg);
|
||||
memset(&arg, 0, sizeof(arg));
|
||||
|
||||
arg.iov[0].iov_base = (unsigned char *)&rep;
|
||||
arg.iov[0].iov_len = sizeof(rep.th);
|
||||
|
|
@ -668,9 +675,8 @@ static void tcp_v4_send_ack(struct tcp_timewait_sock *twsk,
|
|||
tw_key.key = twsk->tw_md5_key;
|
||||
tw_key.keylen = twsk->tw_md5_keylen;
|
||||
key = &tw_key;
|
||||
} else {
|
||||
} else
|
||||
key = NULL;
|
||||
}
|
||||
|
||||
if (key) {
|
||||
int offset = (ts) ? 3 : 0;
|
||||
|
|
@ -690,7 +696,6 @@ static void tcp_v4_send_ack(struct tcp_timewait_sock *twsk,
|
|||
arg.iov[0].iov_len);
|
||||
}
|
||||
#endif
|
||||
|
||||
arg.csum = csum_tcpudp_nofold(skb->nh.iph->daddr,
|
||||
skb->nh.iph->saddr, /* XXX */
|
||||
arg.iov[0].iov_len, IPPROTO_TCP, 0);
|
||||
|
|
@ -707,12 +712,14 @@ static void tcp_v4_timewait_ack(struct sock *sk, struct sk_buff *skb)
|
|||
struct tcp_timewait_sock *tcptw = tcp_twsk(sk);
|
||||
|
||||
tcp_v4_send_ack(tcptw, skb, tcptw->tw_snd_nxt, tcptw->tw_rcv_nxt,
|
||||
tcptw->tw_rcv_wnd >> tw->tw_rcv_wscale, tcptw->tw_ts_recent);
|
||||
tcptw->tw_rcv_wnd >> tw->tw_rcv_wscale,
|
||||
tcptw->tw_ts_recent);
|
||||
|
||||
inet_twsk_put(tw);
|
||||
}
|
||||
|
||||
static void tcp_v4_reqsk_send_ack(struct sk_buff *skb, struct request_sock *req)
|
||||
static void tcp_v4_reqsk_send_ack(struct sk_buff *skb,
|
||||
struct request_sock *req)
|
||||
{
|
||||
tcp_v4_send_ack(NULL, skb, tcp_rsk(req)->snt_isn + 1,
|
||||
tcp_rsk(req)->rcv_isn + 1, req->rcv_wnd,
|
||||
|
|
@ -809,7 +816,8 @@ static struct ip_options *tcp_v4_save_options(struct sock *sk,
|
|||
*/
|
||||
|
||||
/* Find the Key structure for an address. */
|
||||
static struct tcp_md5sig_key *tcp_v4_md5_do_lookup(struct sock *sk, __be32 addr)
|
||||
static struct tcp_md5sig_key *
|
||||
tcp_v4_md5_do_lookup(struct sock *sk, __be32 addr)
|
||||
{
|
||||
struct tcp_sock *tp = tcp_sk(sk);
|
||||
int i;
|
||||
|
|
@ -818,7 +826,8 @@ static struct tcp_md5sig_key *tcp_v4_md5_do_lookup(struct sock *sk, __be32 addr)
|
|||
return NULL;
|
||||
for (i = 0; i < tp->md5sig_info->entries4; i++) {
|
||||
if (tp->md5sig_info->keys4[i].addr == addr)
|
||||
return (struct tcp_md5sig_key *)&tp->md5sig_info->keys4[i];
|
||||
return (struct tcp_md5sig_key *)
|
||||
&tp->md5sig_info->keys4[i];
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
|
|
@ -915,13 +924,12 @@ int tcp_v4_md5_do_del(struct sock *sk, __be32 addr)
|
|||
if (tp->md5sig_info->entries4 == 0) {
|
||||
kfree(tp->md5sig_info->keys4);
|
||||
tp->md5sig_info->keys4 = NULL;
|
||||
} else {
|
||||
} else if (tp->md5sig_info->entries4 != i) {
|
||||
/* Need to do some manipulation */
|
||||
if (tp->md5sig_info->entries4 != i)
|
||||
memcpy(&tp->md5sig_info->keys4[i],
|
||||
&tp->md5sig_info->keys4[i+1],
|
||||
(tp->md5sig_info->entries4 - i)
|
||||
* sizeof (struct tcp4_md5sig_key));
|
||||
(tp->md5sig_info->entries4 - i) *
|
||||
sizeof(struct tcp4_md5sig_key));
|
||||
}
|
||||
tcp_free_md5sig_pool();
|
||||
return 0;
|
||||
|
|
@ -981,9 +989,8 @@ static int tcp_v4_parse_md5_keys (struct sock *sk, char __user *optval,
|
|||
|
||||
if (!tcp_sk(sk)->md5sig_info) {
|
||||
struct tcp_sock *tp = tcp_sk(sk);
|
||||
struct tcp_md5sig_info *p;
|
||||
struct tcp_md5sig_info *p = kzalloc(sizeof(*p), GFP_KERNEL);
|
||||
|
||||
p = kzalloc(sizeof(struct tcp_md5sig_info), GFP_KERNEL);
|
||||
if (!p)
|
||||
return -EINVAL;
|
||||
|
||||
|
|
@ -1200,22 +1207,18 @@ done_opts:
|
|||
return 0;
|
||||
|
||||
if (hash_expected && !hash_location) {
|
||||
if (net_ratelimit()) {
|
||||
printk(KERN_INFO "MD5 Hash NOT expected but found "
|
||||
LIMIT_NETDEBUG(KERN_INFO "MD5 Hash NOT expected but found "
|
||||
"(" NIPQUAD_FMT ", %d)->(" NIPQUAD_FMT ", %d)\n",
|
||||
NIPQUAD(iph->saddr), ntohs(th->source),
|
||||
NIPQUAD(iph->daddr), ntohs(th->dest));
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
|
||||
if (!hash_expected && hash_location) {
|
||||
if (net_ratelimit()) {
|
||||
printk(KERN_INFO "MD5 Hash NOT expected but found "
|
||||
LIMIT_NETDEBUG(KERN_INFO "MD5 Hash NOT expected but found "
|
||||
"(" NIPQUAD_FMT ", %d)->(" NIPQUAD_FMT ", %d)\n",
|
||||
NIPQUAD(iph->saddr), ntohs(th->source),
|
||||
NIPQUAD(iph->daddr), ntohs(th->dest));
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
|
@ -1240,7 +1243,8 @@ done_opts:
|
|||
int i;
|
||||
printk("Received: ");
|
||||
for (i = 0; i < 16; i++)
|
||||
printk("%02x ", 0xff & (int)hash_location[i]);
|
||||
printk("%02x ",
|
||||
0xff & (int)hash_location[i]);
|
||||
printk("\n");
|
||||
printk("Calculated: ");
|
||||
for (i = 0; i < 16; i++)
|
||||
|
|
@ -2356,7 +2360,8 @@ static void get_tcp4_sock(struct sock *sp, char *tmpbuf, int i)
|
|||
"%08X %5d %8d %lu %d %p %u %u %u %u %d",
|
||||
i, src, srcp, dest, destp, sp->sk_state,
|
||||
tp->write_seq - tp->snd_una,
|
||||
(sp->sk_state == TCP_LISTEN) ? sp->sk_ack_backlog : (tp->rcv_nxt - tp->copied_seq),
|
||||
sp->sk_state == TCP_LISTEN ? sp->sk_ack_backlog :
|
||||
(tp->rcv_nxt - tp->copied_seq),
|
||||
timer_active,
|
||||
jiffies_to_clock_t(timer_expires - jiffies),
|
||||
icsk->icsk_retransmits,
|
||||
|
|
@ -2371,7 +2376,8 @@ static void get_tcp4_sock(struct sock *sp, char *tmpbuf, int i)
|
|||
tp->snd_ssthresh >= 0xFFFF ? -1 : tp->snd_ssthresh);
|
||||
}
|
||||
|
||||
static void get_timewait4_sock(struct inet_timewait_sock *tw, char *tmpbuf, int i)
|
||||
static void get_timewait4_sock(struct inet_timewait_sock *tw,
|
||||
char *tmpbuf, int i)
|
||||
{
|
||||
__be32 dest, src;
|
||||
__u16 destp, srcp;
|
||||
|
|
@ -2484,7 +2490,8 @@ struct proto tcp_prot = {
|
|||
|
||||
void __init tcp_v4_init(struct net_proto_family *ops)
|
||||
{
|
||||
if (inet_csk_ctl_sock_create(&tcp_socket, PF_INET, SOCK_RAW, IPPROTO_TCP) < 0)
|
||||
if (inet_csk_ctl_sock_create(&tcp_socket, PF_INET, SOCK_RAW,
|
||||
IPPROTO_TCP) < 0)
|
||||
panic("Failed to create the TCP control socket.\n");
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue