Skip to content

L
linux
Commit 5a7c2000 authored by David S. Miller's avatar David S. Miller
Browse files
Options

Move IP-specific identity information 

out of struct sock.
Fix -EFAULT handling in TCP direct user copy handling.
Use struct initializers in IPV6 ndisc code.
parent 50b1b006
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 482 additions and 404 deletions
drivers/net/pppoe.c
View file @ 5a7c2000
...@@ -635,7 +635,7 @@ int pppoe_connect(struct socket *sock, struct sockaddr *uservaddr, ...@@ -635,7 +635,7 @@ int pppoe_connect(struct socket *sock, struct sockaddr *uservaddr,
sk->state = PPPOX_CONNECTED; sk->state = PPPOX_CONNECTED;
} }
sk->num = sp->sa_addr.pppoe.sid; po->num = sp->sa_addr.pppoe.sid;
end: end:
release_sock(sk); release_sock(sk);
...@@ -788,7 +788,7 @@ int pppoe_sendmsg(struct socket *sock, struct msghdr *m, ...@@ -788,7 +788,7 @@ int pppoe_sendmsg(struct socket *sock, struct msghdr *m,
hdr.ver = 1; hdr.ver = 1;
hdr.type = 1; hdr.type = 1;
hdr.code = 0; hdr.code = 0;
hdr.sid = sk->num; hdr.sid = po->num;
lock_sock(sk); lock_sock(sk);
...@@ -862,7 +862,7 @@ int __pppoe_xmit(struct sock *sk, struct sk_buff *skb) ...@@ -862,7 +862,7 @@ int __pppoe_xmit(struct sock *sk, struct sk_buff *skb)
hdr.ver = 1; hdr.ver = 1;
hdr.type = 1; hdr.type = 1;
hdr.code = 0; hdr.code = 0;
hdr.sid = sk->num; hdr.sid = po->num;
hdr.length = htons(skb->len); hdr.length = htons(skb->len);
if (!dev) if (!dev)
......
include/linux/if_ec.h
View file @ 5a7c2000
...@@ -53,6 +53,7 @@ struct econet_opt ...@@ -53,6 +53,7 @@ struct econet_opt
unsigned char port; unsigned char port;
unsigned char station; unsigned char station;
unsigned char net; unsigned char net;
unsigned short num;
}; };
#define ec_sk(__sk) ((struct econet_opt *)(__sk)->protinfo) #define ec_sk(__sk) ((struct econet_opt *)(__sk)->protinfo)
......
include/linux/if_pppox.h
View file @ 5a7c2000
...@@ -127,6 +127,7 @@ struct pppox_opt { ...@@ -127,6 +127,7 @@ struct pppox_opt {
union { union {
struct pppoe_opt pppoe; struct pppoe_opt pppoe;
} proto; } proto;
unsigned short num;
}; };
#define pppoe_dev proto.pppoe.dev #define pppoe_dev proto.pppoe.dev
#define pppoe_pa proto.pppoe.pa #define pppoe_pa proto.pppoe.pa
......
include/linux/ip.h
View file @ 5a7c2000
...@@ -116,17 +116,24 @@ struct ip_options { ...@@ -116,17 +116,24 @@ struct ip_options {
#define optlength(opt) (sizeof(struct ip_options) + opt->optlen) #define optlength(opt) (sizeof(struct ip_options) + opt->optlen)
struct inet_opt { struct inet_opt {
/* Socket demultiplex comparisons on incoming packets. */
__u32 daddr; /* Foreign IPv4 addr */
__u32 rcv_saddr; /* Bound local IPv4 addr */
__u16 dport; /* Destination port */
__u16 num; /* Local port */
__u32 saddr; /* Sending source */
int ttl; /* TTL setting */ int ttl; /* TTL setting */
int tos; /* TOS */ int tos; /* TOS */
unsigned cmsg_flags; unsigned cmsg_flags;
struct ip_options *opt; struct ip_options *opt;
__u16 sport; /* Source port */
unsigned char hdrincl; /* Include headers ? */ unsigned char hdrincl; /* Include headers ? */
__u8 mc_ttl; /* Multicasting TTL */ __u8 mc_ttl; /* Multicasting TTL */
__u8 mc_loop; /* Loopback */ __u8 mc_loop; /* Loopback */
__u8 pmtudisc;
__u16 id; /* ID counter for DF pkts */
unsigned recverr : 1, unsigned recverr : 1,
freebind : 1; freebind : 1;
__u16 id; /* ID counter for DF pkts */
__u8 pmtudisc;
int mc_index; /* Multicast device index */ int mc_index; /* Multicast device index */
__u32 mc_addr; __u32 mc_addr;
struct ip_mc_socklist *mc_list; /* Group array */ struct ip_mc_socklist *mc_list; /* Group array */
......
include/net/ip.h
View file @ 5a7c2000
...@@ -197,7 +197,8 @@ static inline void ip_select_ident(struct iphdr *iph, struct dst_entry *dst, str ...@@ -197,7 +197,8 @@ static inline void ip_select_ident(struct iphdr *iph, struct dst_entry *dst, str
* does not change, they drop every other packet in * does not change, they drop every other packet in
* a TCP stream using header compression. * a TCP stream using header compression.
*/ */
iph->id = (sk && sk->daddr) ? htons(inet_sk(sk)->id++) : 0; iph->id = (sk && inet_sk(sk)->daddr) ?
htons(inet_sk(sk)->id++) : 0;
} else } else
__ip_select_ident(iph, dst); __ip_select_ident(iph, dst);
} }
......
include/net/sock.h
View file @ 5a7c2000
...@@ -83,28 +83,22 @@ do { spin_lock_init(&((__sk)->lock.slock)); \ ...@@ -83,28 +83,22 @@ do { spin_lock_init(&((__sk)->lock.slock)); \
} while(0); } while(0);
struct sock { struct sock {
/* Socket demultiplex comparisons on incoming packets. */ /* Begin of struct sock/struct tcp_tw_bucket shared layout */
__u32 daddr; /* Foreign IPv4 addr */ volatile unsigned char state, /* Connection state */
__u32 rcv_saddr; /* Bound local IPv4 addr */ zapped; /* ax25 & ipx means !linked */
__u16 dport; /* Destination port */ unsigned char reuse; /* SO_REUSEADDR setting */
unsigned short num; /* Local port */ unsigned char shutdown;
int bound_dev_if; /* Bound device index if != 0 */ int bound_dev_if; /* Bound device index if != 0 */
/* Main hash linkage for various protocol lookup tables. */ /* Main hash linkage for various protocol lookup tables. */
struct sock *next; struct sock *next;
struct sock **pprev; struct sock **pprev;
struct sock *bind_next; struct sock *bind_next;
struct sock **bind_pprev; struct sock **bind_pprev;
volatile unsigned char state, /* Connection state */
zapped; /* In ax25 & ipx means not linked */
__u16 sport; /* Source port */
unsigned short family; /* Address family */
unsigned char reuse; /* SO_REUSEADDR setting */
unsigned char shutdown;
atomic_t refcnt; /* Reference count */ atomic_t refcnt; /* Reference count */
unsigned short family; /* Address family */
/* End of struct sock/struct tcp_tw_bucket shared layout */
unsigned char use_write_queue;
unsigned char userlocks;
socket_lock_t lock; /* Synchronizer... */ socket_lock_t lock; /* Synchronizer... */
int rcvbuf; /* Size of receive buffer in bytes */ int rcvbuf; /* Size of receive buffer in bytes */
...@@ -118,7 +112,6 @@ struct sock { ...@@ -118,7 +112,6 @@ struct sock {
atomic_t omem_alloc; /* "o" is "option" or "other" */ atomic_t omem_alloc; /* "o" is "option" or "other" */
int wmem_queued; /* Persistent queue size */ int wmem_queued; /* Persistent queue size */
int forward_alloc; /* Space allocated forward. */ int forward_alloc; /* Space allocated forward. */
__u32 saddr; /* Sending source */
unsigned int allocation; /* Allocation mode */ unsigned int allocation; /* Allocation mode */
int sndbuf; /* Size of send buffer in bytes */ int sndbuf; /* Size of send buffer in bytes */
struct sock *prev; struct sock *prev;
...@@ -137,9 +130,7 @@ struct sock { ...@@ -137,9 +130,7 @@ struct sock {
bsdism; bsdism;
unsigned char debug; unsigned char debug;
unsigned char rcvtstamp; unsigned char rcvtstamp;
unsigned char use_write_queue; /* Hole of 1 byte. Try to pack. */
unsigned char userlocks;
/* Hole of 3 bytes. Try to pack. */
int route_caps; int route_caps;
int proc; int proc;
unsigned long lingertime; unsigned long lingertime;
......
include/net/tcp.h
View file @ 5a7c2000
...@@ -53,7 +53,7 @@ struct tcp_ehash_bucket { ...@@ -53,7 +53,7 @@ struct tcp_ehash_bucket {
* 2) If all sockets have sk->reuse set, and none of them are in * 2) If all sockets have sk->reuse set, and none of them are in
* TCP_LISTEN state, the port may be shared. * TCP_LISTEN state, the port may be shared.
* Failing that, goto test 3. * Failing that, goto test 3.
* 3) If all sockets are bound to a specific sk->rcv_saddr local * 3) If all sockets are bound to a specific inet_sk(sk)->rcv_saddr local
* address, and none of them are the same, the port may be * address, and none of them are the same, the port may be
* shared. * shared.
* Failing this, the port cannot be shared. * Failing this, the port cannot be shared.
...@@ -162,23 +162,26 @@ struct tcp_tw_bucket { ...@@ -162,23 +162,26 @@ struct tcp_tw_bucket {
* XXX Yes I know this is gross, but I'd have to edit every single * XXX Yes I know this is gross, but I'd have to edit every single
* XXX networking file if I created a "struct sock_header". -DaveM * XXX networking file if I created a "struct sock_header". -DaveM
*/ */
__u32 daddr; volatile unsigned char state, /* Connection state */
__u32 rcv_saddr; substate; /* "zapped" -> "substate" */
__u16 dport; unsigned char reuse; /* SO_REUSEADDR setting */
unsigned short num; unsigned char rcv_wscale; /* also TW bucket specific */
int bound_dev_if; int bound_dev_if;
/* Main hash linkage for various protocol lookup tables. */
struct sock *next; struct sock *next;
struct sock **pprev; struct sock **pprev;
struct sock *bind_next; struct sock *bind_next;
struct sock **bind_pprev; struct sock **bind_pprev;
unsigned char state,
substate; /* "zapped" is replaced with "substate" */
__u16 sport;
unsigned short family;
unsigned char reuse,
rcv_wscale; /* It is also TW bucket specific */
atomic_t refcnt; atomic_t refcnt;
unsigned short family;
/* End of struct sock/struct tcp_tw_bucket shared layout */
__u16 sport;
/* Socket demultiplex comparisons on incoming packets. */
/* these five are in inet_opt */
__u32 daddr;
__u32 rcv_saddr;
__u16 dport;
__u16 num;
/* And these are ours. */ /* And these are ours. */
int hashent; int hashent;
int timeout; int timeout;
...@@ -236,20 +239,20 @@ extern void tcp_tw_deschedule(struct tcp_tw_bucket *tw); ...@@ -236,20 +239,20 @@ extern void tcp_tw_deschedule(struct tcp_tw_bucket *tw);
__u64 __name = (((__u64)(__daddr))<<32)|((__u64)(__saddr)); __u64 __name = (((__u64)(__daddr))<<32)|((__u64)(__saddr));
#endif /* __BIG_ENDIAN */ #endif /* __BIG_ENDIAN */
#define TCP_IPV4_MATCH(__sk, __cookie, __saddr, __daddr, __ports, __dif)\ #define TCP_IPV4_MATCH(__sk, __cookie, __saddr, __daddr, __ports, __dif)\
(((*((__u64 *)&((__sk)->daddr)))== (__cookie)) && \ (((*((__u64 *)&(inet_sk(__sk)->daddr)))== (__cookie)) && \
((*((__u32 *)&((__sk)->dport)))== (__ports)) && \ ((*((__u32 *)&(inet_sk(__sk)->dport)))== (__ports)) && \
(!((__sk)->bound_dev_if) || ((__sk)->bound_dev_if == (__dif)))) (!((__sk)->bound_dev_if) || ((__sk)->bound_dev_if == (__dif))))
#else /* 32-bit arch */ #else /* 32-bit arch */
#define TCP_V4_ADDR_COOKIE(__name, __saddr, __daddr) #define TCP_V4_ADDR_COOKIE(__name, __saddr, __daddr)
#define TCP_IPV4_MATCH(__sk, __cookie, __saddr, __daddr, __ports, __dif)\ #define TCP_IPV4_MATCH(__sk, __cookie, __saddr, __daddr, __ports, __dif)\
(((__sk)->daddr == (__saddr)) && \ ((inet_sk(__sk)->daddr == (__saddr)) && \
((__sk)->rcv_saddr == (__daddr)) && \ (inet_sk(__sk)->rcv_saddr == (__daddr)) && \
((*((__u32 *)&((__sk)->dport)))== (__ports)) && \ ((*((__u32 *)&(inet_sk(__sk)->dport)))== (__ports)) && \
(!((__sk)->bound_dev_if) || ((__sk)->bound_dev_if == (__dif)))) (!((__sk)->bound_dev_if) || ((__sk)->bound_dev_if == (__dif))))
#endif /* 64-bit arch */ #endif /* 64-bit arch */
#define TCP_IPV6_MATCH(__sk, __saddr, __daddr, __ports, __dif) \ #define TCP_IPV6_MATCH(__sk, __saddr, __daddr, __ports, __dif) \
(((*((__u32 *)&((__sk)->dport)))== (__ports)) && \ (((*((__u32 *)&(inet_sk(__sk)->dport)))== (__ports)) && \
((__sk)->family == AF_INET6) && \ ((__sk)->family == AF_INET6) && \
!ipv6_addr_cmp(&inet6_sk(__sk)->daddr, (__saddr)) && \ !ipv6_addr_cmp(&inet6_sk(__sk)->daddr, (__saddr)) && \
!ipv6_addr_cmp(&inet6_sk(__sk)->rcv_saddr, (__daddr)) && \ !ipv6_addr_cmp(&inet6_sk(__sk)->rcv_saddr, (__daddr)) && \
...@@ -263,7 +266,7 @@ static __inline__ int tcp_lhashfn(unsigned short num) ...@@ -263,7 +266,7 @@ static __inline__ int tcp_lhashfn(unsigned short num)
static __inline__ int tcp_sk_listen_hashfn(struct sock *sk) static __inline__ int tcp_sk_listen_hashfn(struct sock *sk)
{ {
return tcp_lhashfn(sk->num); return tcp_lhashfn(inet_sk(sk)->num);
} }
#define MAX_TCP_HEADER (128 + MAX_HEADER) #define MAX_TCP_HEADER (128 + MAX_HEADER)
......
include/net/udp.h
View file @ 5a7c2000
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
#define _UDP_H #define _UDP_H
#include <linux/udp.h> #include <linux/udp.h>
#include <linux/ip.h>
#include <net/sock.h> #include <net/sock.h>
#define UDP_HTABLE_SIZE 128 #define UDP_HTABLE_SIZE 128
...@@ -41,7 +42,7 @@ static inline int udp_lport_inuse(u16 num) ...@@ -41,7 +42,7 @@ static inline int udp_lport_inuse(u16 num)
struct sock *sk = udp_hash[num & (UDP_HTABLE_SIZE - 1)]; struct sock *sk = udp_hash[num & (UDP_HTABLE_SIZE - 1)];
for(; sk != NULL; sk = sk->next) { for(; sk != NULL; sk = sk->next) {
if(sk->num == num) if (inet_sk(sk)->num == num)
return 1; return 1;
} }
return 0; return 0;
......
net/econet/af_econet.c
View file @ 5a7c2000
...@@ -554,7 +554,7 @@ static int econet_create(struct socket *sock, int protocol) ...@@ -554,7 +554,7 @@ static int econet_create(struct socket *sock, int protocol)
memset(eo, 0, sizeof(*eo)); memset(eo, 0, sizeof(*eo));
sk->zapped=0; sk->zapped=0;
sk->family = PF_ECONET; sk->family = PF_ECONET;
sk->num = protocol; eo->num = protocol;
sklist_insert_socket(&econet_sklist, sk); sklist_insert_socket(&econet_sklist, sk);
return(0); return(0);
......
net/ipv4/af_inet.c
View file @ 5a7c2000
...@@ -270,14 +270,15 @@ int inet_getsockopt(struct socket *sock, int level, int optname, ...@@ -270,14 +270,15 @@ int inet_getsockopt(struct socket *sock, int level, int optname,
static int inet_autobind(struct sock *sk) static int inet_autobind(struct sock *sk)
{ {
struct inet_opt *inet = inet_sk(sk);
/* We may need to bind the socket. */ /* We may need to bind the socket. */
lock_sock(sk); lock_sock(sk);
if (sk->num == 0) { if (!inet->num) {
if (sk->prot->get_port(sk, 0) != 0) { if (sk->prot->get_port(sk, 0) != 0) {
release_sock(sk); release_sock(sk);
return -EAGAIN; return -EAGAIN;
} }
sk->sport = htons(sk->num); inet->sport = htons(inet->num);
} }
release_sock(sk); release_sock(sk);
return 0; return 0;
...@@ -397,7 +398,7 @@ static int inet_create(struct socket *sock, int protocol) ...@@ -397,7 +398,7 @@ static int inet_create(struct socket *sock, int protocol)
inet = inet_sk(sk); inet = inet_sk(sk);
if (SOCK_RAW == sock->type) { if (SOCK_RAW == sock->type) {
sk->num = protocol; inet->num = protocol;
if (IPPROTO_RAW == protocol) if (IPPROTO_RAW == protocol)
inet->hdrincl = 1; inet->hdrincl = 1;
} }
...@@ -430,13 +431,13 @@ static int inet_create(struct socket *sock, int protocol) ...@@ -430,13 +431,13 @@ static int inet_create(struct socket *sock, int protocol)
atomic_inc(&inet_sock_nr); atomic_inc(&inet_sock_nr);
#endif #endif
if (sk->num) { if (inet->num) {
/* It assumes that any protocol which allows /* It assumes that any protocol which allows
* the user to assign a number at socket * the user to assign a number at socket
* creation time automatically * creation time automatically
* shares. * shares.
*/ */
sk->sport = htons(sk->num); inet->sport = htons(inet->num);
/* Add to protocol hash chains. */ /* Add to protocol hash chains. */
sk->prot->hash(sk); sk->prot->hash(sk);
...@@ -551,28 +552,27 @@ static int inet_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len) ...@@ -551,28 +552,27 @@ static int inet_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)
/* Check these errors (active socket, double bind). */ /* Check these errors (active socket, double bind). */
err = -EINVAL; err = -EINVAL;
if ((sk->state != TCP_CLOSE) || if (sk->state != TCP_CLOSE || inet->num)
(sk->num != 0))
goto out; goto out;
sk->rcv_saddr = sk->saddr = addr->sin_addr.s_addr; inet->rcv_saddr = inet->saddr = addr->sin_addr.s_addr;
if (chk_addr_ret == RTN_MULTICAST || chk_addr_ret == RTN_BROADCAST) if (chk_addr_ret == RTN_MULTICAST || chk_addr_ret == RTN_BROADCAST)
sk->saddr = 0; /* Use device */ inet->saddr = 0; /* Use device */
/* Make sure we are allowed to bind here. */ /* Make sure we are allowed to bind here. */
if (sk->prot->get_port(sk, snum) != 0) { if (sk->prot->get_port(sk, snum) != 0) {
sk->saddr = sk->rcv_saddr = 0; inet->saddr = inet->rcv_saddr = 0;
err = -EADDRINUSE; err = -EADDRINUSE;
goto out; goto out;
} }
if (sk->rcv_saddr) if (inet->rcv_saddr)
sk->userlocks |= SOCK_BINDADDR_LOCK; sk->userlocks |= SOCK_BINDADDR_LOCK;
if (snum) if (snum)
sk->userlocks |= SOCK_BINDPORT_LOCK; sk->userlocks |= SOCK_BINDPORT_LOCK;
sk->sport = htons(sk->num); inet->sport = htons(inet->num);
sk->daddr = 0; inet->daddr = 0;
sk->dport = 0; inet->dport = 0;
sk_dst_reset(sk); sk_dst_reset(sk);
err = 0; err = 0;
out: out:
...@@ -588,7 +588,7 @@ int inet_dgram_connect(struct socket *sock, struct sockaddr * uaddr, ...@@ -588,7 +588,7 @@ int inet_dgram_connect(struct socket *sock, struct sockaddr * uaddr,
if (uaddr->sa_family == AF_UNSPEC) if (uaddr->sa_family == AF_UNSPEC)
return sk->prot->disconnect(sk, flags); return sk->prot->disconnect(sk, flags);
if (sk->num==0 && inet_autobind(sk) != 0) if (!inet_sk(sk)->num && inet_autobind(sk))
return -EAGAIN; return -EAGAIN;
return sk->prot->connect(sk, (struct sockaddr *)uaddr, addr_len); return sk->prot->connect(sk, (struct sockaddr *)uaddr, addr_len);
} }
...@@ -627,6 +627,7 @@ int inet_stream_connect(struct socket *sock, struct sockaddr * uaddr, ...@@ -627,6 +627,7 @@ int inet_stream_connect(struct socket *sock, struct sockaddr * uaddr,
int addr_len, int flags) int addr_len, int flags)
{ {
struct sock *sk=sock->sk; struct sock *sk=sock->sk;
struct inet_opt *inet = inet_sk(sk);
int err; int err;
long timeo; long timeo;
...@@ -655,10 +656,10 @@ int inet_stream_connect(struct socket *sock, struct sockaddr * uaddr, ...@@ -655,10 +656,10 @@ int inet_stream_connect(struct socket *sock, struct sockaddr * uaddr,
goto out; goto out;
err = -EAGAIN; err = -EAGAIN;
if (sk->num == 0) { if (!inet->num) {
if (sk->prot->get_port(sk, 0) != 0) if (sk->prot->get_port(sk, 0) != 0)
goto out; goto out;
sk->sport = htons(sk->num); inet->sport = htons(inet->num);
} }
err = sk->prot->connect(sk, uaddr, addr_len); err = sk->prot->connect(sk, uaddr, addr_len);
...@@ -748,21 +749,22 @@ static int inet_getname(struct socket *sock, struct sockaddr *uaddr, ...@@ -748,21 +749,22 @@ static int inet_getname(struct socket *sock, struct sockaddr *uaddr,
int *uaddr_len, int peer) int *uaddr_len, int peer)
{ {
struct sock *sk = sock->sk; struct sock *sk = sock->sk;
struct inet_opt *inet = inet_sk(sk);
struct sockaddr_in *sin = (struct sockaddr_in *)uaddr; struct sockaddr_in *sin = (struct sockaddr_in *)uaddr;
sin->sin_family = AF_INET; sin->sin_family = AF_INET;
if (peer) { if (peer) {
if (!sk->dport) if (!inet->dport)
return -ENOTCONN; return -ENOTCONN;
if (((1<<sk->state)&(TCPF_CLOSE|TCPF_SYN_SENT)) && peer == 1) if (((1<<sk->state)&(TCPF_CLOSE|TCPF_SYN_SENT)) && peer == 1)
return -ENOTCONN; return -ENOTCONN;
sin->sin_port = sk->dport; sin->sin_port = inet->dport;
sin->sin_addr.s_addr = sk->daddr; sin->sin_addr.s_addr = inet->daddr;
} else { } else {
__u32 addr = sk->rcv_saddr; __u32 addr = inet->rcv_saddr;
if (!addr) if (!addr)
addr = sk->saddr; addr = inet->saddr;
sin->sin_port = sk->sport; sin->sin_port = inet->sport;
sin->sin_addr.s_addr = addr; sin->sin_addr.s_addr = addr;
} }
*uaddr_len = sizeof(*sin); *uaddr_len = sizeof(*sin);
...@@ -792,7 +794,7 @@ int inet_sendmsg(struct socket *sock, struct msghdr *msg, int size, ...@@ -792,7 +794,7 @@ int inet_sendmsg(struct socket *sock, struct msghdr *msg, int size,
struct sock *sk = sock->sk; struct sock *sk = sock->sk;
/* We may need to bind the socket. */ /* We may need to bind the socket. */
if (sk->num==0 && inet_autobind(sk) != 0) if (!inet_sk(sk)->num && inet_autobind(sk))
return -EAGAIN; return -EAGAIN;
return sk->prot->sendmsg(sk, msg, size); return sk->prot->sendmsg(sk, msg, size);
......
net/ipv4/ip_input.c
View file @ 5a7c2000
...@@ -166,7 +166,7 @@ int ip_call_ra_chain(struct sk_buff *skb) ...@@ -166,7 +166,7 @@ int ip_call_ra_chain(struct sk_buff *skb)
/* If socket is bound to an interface, only report /* If socket is bound to an interface, only report
* the packet if it came from that interface. * the packet if it came from that interface.
*/ */
if (sk && sk->num == protocol if (sk && inet_sk(sk)->num == protocol
&& ((sk->bound_dev_if == 0) && ((sk->bound_dev_if == 0)
|| (sk->bound_dev_if == skb->dev->ifindex))) { || (sk->bound_dev_if == skb->dev->ifindex))) {
if (skb->nh.iph->frag_off & htons(IP_MF|IP_OFFSET)) { if (skb->nh.iph->frag_off & htons(IP_MF|IP_OFFSET)) {
......
net/ipv4/ip_output.c
View file @ 5a7c2000
...@@ -360,7 +360,7 @@ int ip_queue_xmit(struct sk_buff *skb) ...@@ -360,7 +360,7 @@ int ip_queue_xmit(struct sk_buff *skb)
u32 daddr; u32 daddr;
/* Use correct destination address if we have options. */ /* Use correct destination address if we have options. */
daddr = sk->daddr; daddr = inet->daddr;
if(opt && opt->srr) if(opt && opt->srr)
daddr = opt->faddr; daddr = opt->faddr;
...@@ -368,7 +368,7 @@ int ip_queue_xmit(struct sk_buff *skb) ...@@ -368,7 +368,7 @@ int ip_queue_xmit(struct sk_buff *skb)
* keep trying until route appears or the connection times itself * keep trying until route appears or the connection times itself
* out. * out.
*/ */
if (ip_route_output(&rt, daddr, sk->saddr, if (ip_route_output(&rt, daddr, inet->saddr,
RT_CONN_FLAGS(sk), RT_CONN_FLAGS(sk),
sk->bound_dev_if)) sk->bound_dev_if))
goto no_route; goto no_route;
...@@ -395,7 +395,7 @@ int ip_queue_xmit(struct sk_buff *skb) ...@@ -395,7 +395,7 @@ int ip_queue_xmit(struct sk_buff *skb)
if(opt && opt->optlen) { if(opt && opt->optlen) {
iph->ihl += opt->optlen >> 2; iph->ihl += opt->optlen >> 2;
ip_options_build(skb, opt, sk->daddr, rt, 0); ip_options_build(skb, opt, inet->daddr, rt, 0);
} }
return NF_HOOK(PF_INET, NF_IP_LOCAL_OUT, skb, NULL, rt->u.dst.dev, return NF_HOOK(PF_INET, NF_IP_LOCAL_OUT, skb, NULL, rt->u.dst.dev,
...@@ -471,7 +471,7 @@ static int ip_build_xmit_slow(struct sock *sk, ...@@ -471,7 +471,7 @@ static int ip_build_xmit_slow(struct sock *sk,
} }
if (length + fragheaderlen > 0xFFFF) { if (length + fragheaderlen > 0xFFFF) {
ip_local_error(sk, EMSGSIZE, rt->rt_dst, sk->dport, mtu); ip_local_error(sk, EMSGSIZE, rt->rt_dst, inet->dport, mtu);
return -EMSGSIZE; return -EMSGSIZE;
} }
...@@ -503,7 +503,7 @@ static int ip_build_xmit_slow(struct sock *sk, ...@@ -503,7 +503,7 @@ static int ip_build_xmit_slow(struct sock *sk,
*/ */
if (offset > 0 && inet->pmtudisc == IP_PMTUDISC_DO) { if (offset > 0 && inet->pmtudisc == IP_PMTUDISC_DO) {
ip_local_error(sk, EMSGSIZE, rt->rt_dst, sk->dport, mtu); ip_local_error(sk, EMSGSIZE, rt->rt_dst, inet->dport, mtu);
return -EMSGSIZE; return -EMSGSIZE;
} }
if (flags&MSG_PROBE) if (flags&MSG_PROBE)
...@@ -659,7 +659,8 @@ int ip_build_xmit(struct sock *sk, ...@@ -659,7 +659,8 @@ int ip_build_xmit(struct sock *sk,
return ip_build_xmit_slow(sk,getfrag,frag,length,ipc,rt,flags); return ip_build_xmit_slow(sk,getfrag,frag,length,ipc,rt,flags);
} else { } else {
if (length > rt->u.dst.dev->mtu) { if (length > rt->u.dst.dev->mtu) {
ip_local_error(sk, EMSGSIZE, rt->rt_dst, sk->dport, rt->u.dst.dev->mtu); ip_local_error(sk, EMSGSIZE, rt->rt_dst, inet->dport,
rt->u.dst.dev->mtu);
return -EMSGSIZE; return -EMSGSIZE;
} }
} }
......
net/ipv4/ip_sockglue.c
View file @ 5a7c2000
...@@ -193,7 +193,7 @@ int ip_ra_control(struct sock *sk, unsigned char on, void (*destructor)(struct s ...@@ -193,7 +193,7 @@ int ip_ra_control(struct sock *sk, unsigned char on, void (*destructor)(struct s
{ {
struct ip_ra_chain *ra, *new_ra, **rap; struct ip_ra_chain *ra, *new_ra, **rap;
if (sk->type != SOCK_RAW || sk->num == IPPROTO_RAW) if (sk->type != SOCK_RAW || inet_sk(sk)->num == IPPROTO_RAW)
return -EINVAL; return -EINVAL;
new_ra = on ? kmalloc(sizeof(*new_ra), GFP_KERNEL) : NULL; new_ra = on ? kmalloc(sizeof(*new_ra), GFP_KERNEL) : NULL;
...@@ -435,7 +435,7 @@ int ip_setsockopt(struct sock *sk, int level, int optname, char *optval, int opt ...@@ -435,7 +435,7 @@ int ip_setsockopt(struct sock *sk, int level, int optname, char *optval, int opt
#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) #if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
if (sk->family == PF_INET || if (sk->family == PF_INET ||
(!((1<<sk->state)&(TCPF_LISTEN|TCPF_CLOSE)) (!((1<<sk->state)&(TCPF_LISTEN|TCPF_CLOSE))
&& sk->daddr != LOOPBACK4_IPV6)) { && inet->daddr != LOOPBACK4_IPV6)) {
#endif #endif
if (opt) if (opt)
tp->ext_header_len = opt->optlen; tp->ext_header_len = opt->optlen;
...@@ -771,8 +771,8 @@ int ip_getsockopt(struct sock *sk, int level, int optname, char *optval, int *op ...@@ -771,8 +771,8 @@ int ip_getsockopt(struct sock *sk, int level, int optname, char *optval, int *op
if (inet->cmsg_flags & IP_CMSG_PKTINFO) { if (inet->cmsg_flags & IP_CMSG_PKTINFO) {
struct in_pktinfo info; struct in_pktinfo info;
info.ipi_addr.s_addr = sk->rcv_saddr; info.ipi_addr.s_addr = inet->rcv_saddr;
info.ipi_spec_dst.s_addr = sk->rcv_saddr; info.ipi_spec_dst.s_addr = inet->rcv_saddr;
info.ipi_ifindex = inet->mc_index; info.ipi_ifindex = inet->mc_index;
put_cmsg(&msg, SOL_IP, IP_PKTINFO, sizeof(info), &info); put_cmsg(&msg, SOL_IP, IP_PKTINFO, sizeof(info), &info);
} }
......
net/ipv4/netfilter/ip_conntrack_core.c
View file @ 5a7c2000
...@@ -969,9 +969,12 @@ ip_ct_selective_cleanup(int (*kill)(const struct ip_conntrack *i, void *data), ...@@ -969,9 +969,12 @@ ip_ct_selective_cleanup(int (*kill)(const struct ip_conntrack *i, void *data),
static int static int
getorigdst(struct sock *sk, int optval, void *user, int *len) getorigdst(struct sock *sk, int optval, void *user, int *len)
{ {
struct inet_opt *inet = inet_sk(sk);
struct ip_conntrack_tuple_hash *h; struct ip_conntrack_tuple_hash *h;
struct ip_conntrack_tuple tuple = { { sk->rcv_saddr, { sk->sport } }, struct ip_conntrack_tuple tuple = { { inet->rcv_saddr,
{ sk->daddr, { sk->dport }, { inet->sport } },
{ inet->daddr,
{ inet->dport },
IPPROTO_TCP } }; IPPROTO_TCP } };
/* We only do TCP at the moment: is there a better way? */ /* We only do TCP at the moment: is there a better way? */
......
net/ipv4/raw.c
View file @ 5a7c2000
...@@ -70,7 +70,8 @@ rwlock_t raw_v4_lock = RW_LOCK_UNLOCKED; ...@@ -70,7 +70,8 @@ rwlock_t raw_v4_lock = RW_LOCK_UNLOCKED;
static void raw_v4_hash(struct sock *sk) static void raw_v4_hash(struct sock *sk)
{ {
struct sock **skp = &raw_v4_htable[sk->num & (RAWV4_HTABLE_SIZE - 1)]; struct sock **skp = &raw_v4_htable[inet_sk(sk)->num &
(RAWV4_HTABLE_SIZE - 1)];
write_lock_bh(&raw_v4_lock); write_lock_bh(&raw_v4_lock);
if ((sk->next = *skp) != NULL) if ((sk->next = *skp) != NULL)
...@@ -103,9 +104,11 @@ struct sock *__raw_v4_lookup(struct sock *sk, unsigned short num, ...@@ -103,9 +104,11 @@ struct sock *__raw_v4_lookup(struct sock *sk, unsigned short num,
struct sock *s = sk; struct sock *s = sk;
for (s = sk; s; s = s->next) { for (s = sk; s; s = s->next) {
if (s->num == num && struct inet_opt *inet = inet_sk(s);
!(s->daddr && s->daddr != raddr) &&
!(s->rcv_saddr && s->rcv_saddr != laddr) && if (inet->num == num &&
!(inet->daddr && inet->daddr != raddr) &&
!(inet->rcv_saddr && inet->rcv_saddr != laddr) &&
!(s->bound_dev_if && s->bound_dev_if != dif)) !(s->bound_dev_if && s->bound_dev_if != dif))
break; /* gotcha */ break; /* gotcha */
} }
...@@ -364,10 +367,10 @@ static int raw_sendmsg(struct sock *sk, struct msghdr *msg, int len) ...@@ -364,10 +367,10 @@ static int raw_sendmsg(struct sock *sk, struct msghdr *msg, int len)
err = -EINVAL; err = -EINVAL;
if (sk->state != TCP_ESTABLISHED) if (sk->state != TCP_ESTABLISHED)
goto out; goto out;
daddr = sk->daddr; daddr = inet->daddr;
} }
ipc.addr = sk->saddr; ipc.addr = inet->saddr;
ipc.opt = NULL; ipc.opt = NULL;
ipc.oif = sk->bound_dev_if; ipc.oif = sk->bound_dev_if;
...@@ -458,6 +461,7 @@ static void raw_close(struct sock *sk, long timeout) ...@@ -458,6 +461,7 @@ static void raw_close(struct sock *sk, long timeout)
/* This gets rid of all the nasties in af_inet. -DaveM */ /* This gets rid of all the nasties in af_inet. -DaveM */
static int raw_bind(struct sock *sk, struct sockaddr *uaddr, int addr_len) static int raw_bind(struct sock *sk, struct sockaddr *uaddr, int addr_len)
{ {
struct inet_opt *inet = inet_sk(sk);
struct sockaddr_in *addr = (struct sockaddr_in *) uaddr; struct sockaddr_in *addr = (struct sockaddr_in *) uaddr;
int ret = -EINVAL; int ret = -EINVAL;
int chk_addr_ret; int chk_addr_ret;
...@@ -469,9 +473,9 @@ static int raw_bind(struct sock *sk, struct sockaddr *uaddr, int addr_len) ...@@ -469,9 +473,9 @@ static int raw_bind(struct sock *sk, struct sockaddr *uaddr, int addr_len)
if (addr->sin_addr.s_addr && chk_addr_ret != RTN_LOCAL && if (addr->sin_addr.s_addr && chk_addr_ret != RTN_LOCAL &&
chk_addr_ret != RTN_MULTICAST && chk_addr_ret != RTN_BROADCAST) chk_addr_ret != RTN_MULTICAST && chk_addr_ret != RTN_BROADCAST)
goto out; goto out;
sk->rcv_saddr = sk->saddr = addr->sin_addr.s_addr; inet->rcv_saddr = inet->saddr = addr->sin_addr.s_addr;
if (chk_addr_ret == RTN_MULTICAST || chk_addr_ret == RTN_BROADCAST) if (chk_addr_ret == RTN_MULTICAST || chk_addr_ret == RTN_BROADCAST)
sk->saddr = 0; /* Use device */ inet->saddr = 0; /* Use device */
sk_dst_reset(sk); sk_dst_reset(sk);
ret = 0; ret = 0;
out: return ret; out: return ret;
...@@ -534,7 +538,7 @@ out: return err ? : copied; ...@@ -534,7 +538,7 @@ out: return err ? : copied;
static int raw_init(struct sock *sk) static int raw_init(struct sock *sk)
{ {
struct raw_opt *tp = raw4_sk(sk); struct raw_opt *tp = raw4_sk(sk);
if (sk->num == IPPROTO_ICMP) if (inet_sk(sk)->num == IPPROTO_ICMP)
memset(&tp->filter, 0, sizeof(tp->filter)); memset(&tp->filter, 0, sizeof(tp->filter));
return 0; return 0;
} }
...@@ -574,7 +578,7 @@ static int raw_setsockopt(struct sock *sk, int level, int optname, ...@@ -574,7 +578,7 @@ static int raw_setsockopt(struct sock *sk, int level, int optname,
return ip_setsockopt(sk, level, optname, optval, optlen); return ip_setsockopt(sk, level, optname, optval, optlen);
if (optname == ICMP_FILTER) { if (optname == ICMP_FILTER) {
if (sk->num != IPPROTO_ICMP) if (inet_sk(sk)->num != IPPROTO_ICMP)
return -EOPNOTSUPP; return -EOPNOTSUPP;
else else
return raw_seticmpfilter(sk, optval, optlen); return raw_seticmpfilter(sk, optval, optlen);
...@@ -589,7 +593,7 @@ static int raw_getsockopt(struct sock *sk, int level, int optname, ...@@ -589,7 +593,7 @@ static int raw_getsockopt(struct sock *sk, int level, int optname,
return ip_getsockopt(sk, level, optname, optval, optlen); return ip_getsockopt(sk, level, optname, optval, optlen);
if (optname == ICMP_FILTER) { if (optname == ICMP_FILTER) {
if (sk->num != IPPROTO_ICMP) if (inet_sk(sk)->num != IPPROTO_ICMP)
return -EOPNOTSUPP; return -EOPNOTSUPP;
else else
return raw_geticmpfilter(sk, optval, optlen); return raw_geticmpfilter(sk, optval, optlen);
...@@ -627,10 +631,11 @@ static int raw_ioctl(struct sock *sk, int cmd, unsigned long arg) ...@@ -627,10 +631,11 @@ static int raw_ioctl(struct sock *sk, int cmd, unsigned long arg)
static void get_raw_sock(struct sock *sp, char *tmpbuf, int i) static void get_raw_sock(struct sock *sp, char *tmpbuf, int i)
{ {
unsigned int dest = sp->daddr, struct inet_opt *inet = inet_sk(sp);
src = sp->rcv_saddr; unsigned int dest = inet->daddr,
src = inet->rcv_saddr;
__u16 destp = 0, __u16 destp = 0,
srcp = sp->num; srcp = inet->num;
sprintf(tmpbuf, "%4d: %08X:%04X %08X:%04X" sprintf(tmpbuf, "%4d: %08X:%04X %08X:%04X"
" %02X %08X:%08X %02X:%08lX %08X %5d %8d %ld %d %p", " %02X %08X:%08X %02X:%08lX %08X %5d %8d %ld %d %p",
......
net/ipv4/tcp.c
View file @ 5a7c2000
...@@ -524,6 +524,7 @@ int tcp_ioctl(struct sock *sk, int cmd, unsigned long arg) ...@@ -524,6 +524,7 @@ int tcp_ioctl(struct sock *sk, int cmd, unsigned long arg)
int tcp_listen_start(struct sock *sk) int tcp_listen_start(struct sock *sk)
{ {
struct inet_opt *inet = inet_sk(sk);
struct tcp_opt *tp = tcp_sk(sk); struct tcp_opt *tp = tcp_sk(sk);
struct tcp_listen_opt *lopt; struct tcp_listen_opt *lopt;
...@@ -552,8 +553,8 @@ int tcp_listen_start(struct sock *sk) ...@@ -552,8 +553,8 @@ int tcp_listen_start(struct sock *sk)
* after validation is complete. * after validation is complete.
*/ */
sk->state = TCP_LISTEN; sk->state = TCP_LISTEN;
if (sk->prot->get_port(sk, sk->num) == 0) { if (!sk->prot->get_port(sk, inet->num)) {
sk->sport = htons(sk->num); inet->sport = htons(inet->num);
sk_dst_reset(sk); sk_dst_reset(sk);
sk->prot->hash(sk); sk->prot->hash(sk);
...@@ -1786,8 +1787,8 @@ void tcp_destroy_sock(struct sock *sk) ...@@ -1786,8 +1787,8 @@ void tcp_destroy_sock(struct sock *sk)
/* It cannot be in hash table! */ /* It cannot be in hash table! */
BUG_TRAP(sk->pprev==NULL); BUG_TRAP(sk->pprev==NULL);
/* If it has not 0 sk->num, it must be bound */ /* If it has not 0 inet_sk(sk)->num, it must be bound */
BUG_TRAP(!sk->num || sk->prev!=NULL); BUG_TRAP(!inet_sk(sk)->num || sk->prev);
#ifdef TCP_DEBUG #ifdef TCP_DEBUG
if (sk->zapped) { if (sk->zapped) {
...@@ -1988,6 +1989,7 @@ extern __inline__ int tcp_need_reset(int state) ...@@ -1988,6 +1989,7 @@ extern __inline__ int tcp_need_reset(int state)
int tcp_disconnect(struct sock *sk, int flags) int tcp_disconnect(struct sock *sk, int flags)
{ {
struct inet_opt *inet = inet_sk(sk);
struct tcp_opt *tp = tcp_sk(sk); struct tcp_opt *tp = tcp_sk(sk);
int old_state; int old_state;
int err = 0; int err = 0;
...@@ -2015,11 +2017,10 @@ int tcp_disconnect(struct sock *sk, int flags) ...@@ -2015,11 +2017,10 @@ int tcp_disconnect(struct sock *sk, int flags)
tcp_writequeue_purge(sk); tcp_writequeue_purge(sk);
__skb_queue_purge(&tp->out_of_order_queue); __skb_queue_purge(&tp->out_of_order_queue);
sk->dport = 0; inet->dport = 0;
if (!(sk->userlocks&SOCK_BINDADDR_LOCK)) { if (!(sk->userlocks&SOCK_BINDADDR_LOCK)) {
sk->rcv_saddr = 0; inet->rcv_saddr = inet->saddr = 0;
sk->saddr = 0;
#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) #if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
if (sk->family == PF_INET6) { if (sk->family == PF_INET6) {
struct ipv6_pinfo *np = inet6_sk(sk); struct ipv6_pinfo *np = inet6_sk(sk);
...@@ -2049,7 +2050,7 @@ int tcp_disconnect(struct sock *sk, int flags) ...@@ -2049,7 +2050,7 @@ int tcp_disconnect(struct sock *sk, int flags)
tcp_sack_reset(tp); tcp_sack_reset(tp);
__sk_dst_reset(sk); __sk_dst_reset(sk);
BUG_TRAP(!sk->num || sk->prev); BUG_TRAP(!inet->num || sk->prev);
sk->error_report(sk); sk->error_report(sk);
return err; return err;
......
net/ipv4/tcp_diag.c
View file @ 5a7c2000
...@@ -44,6 +44,7 @@ static struct sock *tcpnl; ...@@ -44,6 +44,7 @@ static struct sock *tcpnl;
static int tcpdiag_fill(struct sk_buff *skb, struct sock *sk, static int tcpdiag_fill(struct sk_buff *skb, struct sock *sk,
int ext, u32 pid, u32 seq) int ext, u32 pid, u32 seq)
{ {
struct inet_opt *inet = inet_sk(sk);
struct tcp_opt *tp = tcp_sk(sk); struct tcp_opt *tp = tcp_sk(sk);
struct tcpdiagmsg *r; struct tcpdiagmsg *r;
struct nlmsghdr *nlh; struct nlmsghdr *nlh;
...@@ -64,10 +65,6 @@ static int tcpdiag_fill(struct sk_buff *skb, struct sock *sk, ...@@ -64,10 +65,6 @@ static int tcpdiag_fill(struct sk_buff *skb, struct sock *sk,
r->tcpdiag_timer = 0; r->tcpdiag_timer = 0;
r->tcpdiag_retrans = 0; r->tcpdiag_retrans = 0;
r->id.tcpdiag_sport = sk->sport;
r->id.tcpdiag_dport = sk->dport;
r->id.tcpdiag_src[0] = sk->rcv_saddr;
r->id.tcpdiag_dst[0] = sk->daddr;
r->id.tcpdiag_if = sk->bound_dev_if; r->id.tcpdiag_if = sk->bound_dev_if;
*((struct sock **)&r->id.tcpdiag_cookie) = sk; *((struct sock **)&r->id.tcpdiag_cookie) = sk;
...@@ -77,6 +74,10 @@ static int tcpdiag_fill(struct sk_buff *skb, struct sock *sk, ...@@ -77,6 +74,10 @@ static int tcpdiag_fill(struct sk_buff *skb, struct sock *sk,
if (tmo < 0) if (tmo < 0)
tmo = 0; tmo = 0;
r->id.tcpdiag_sport = tw->sport;
r->id.tcpdiag_dport = tw->dport;
r->id.tcpdiag_src[0] = tw->rcv_saddr;
r->id.tcpdiag_dst[0] = tw->daddr;
r->tcpdiag_state = tw->substate; r->tcpdiag_state = tw->substate;
r->tcpdiag_timer = 3; r->tcpdiag_timer = 3;
r->tcpdiag_expires = (tmo*1000+HZ-1)/HZ; r->tcpdiag_expires = (tmo*1000+HZ-1)/HZ;
...@@ -94,6 +95,11 @@ static int tcpdiag_fill(struct sk_buff *skb, struct sock *sk, ...@@ -94,6 +95,11 @@ static int tcpdiag_fill(struct sk_buff *skb, struct sock *sk,
return skb->len; return skb->len;
} }
r->id.tcpdiag_sport = inet->sport;
r->id.tcpdiag_dport = inet->dport;
r->id.tcpdiag_src[0] = inet->rcv_saddr;
r->id.tcpdiag_dst[0] = inet->daddr;
#ifdef CONFIG_IPV6 #ifdef CONFIG_IPV6
if (r->tcpdiag_family == AF_INET6) { if (r->tcpdiag_family == AF_INET6) {
struct ipv6_pinfo *np = inet6_sk(sk); struct ipv6_pinfo *np = inet6_sk(sk);
...@@ -291,6 +297,7 @@ int tcpdiag_bc_run(char *bc, int len, struct sock *sk) ...@@ -291,6 +297,7 @@ int tcpdiag_bc_run(char *bc, int len, struct sock *sk)
{ {
while (len > 0) { while (len > 0) {
int yes = 1; int yes = 1;
struct inet_opt *inet = inet_sk(sk);
struct tcpdiag_bc_op *op = (struct tcpdiag_bc_op*)bc; struct tcpdiag_bc_op *op = (struct tcpdiag_bc_op*)bc;
switch (op->code) { switch (op->code) {
...@@ -300,16 +307,16 @@ int tcpdiag_bc_run(char *bc, int len, struct sock *sk) ...@@ -300,16 +307,16 @@ int tcpdiag_bc_run(char *bc, int len, struct sock *sk)
yes = 0; yes = 0;
break; break;
case TCPDIAG_BC_S_GE: case TCPDIAG_BC_S_GE:
yes = (sk->num >= op[1].no); yes = inet->num >= op[1].no;
break; break;
case TCPDIAG_BC_S_LE: case TCPDIAG_BC_S_LE:
yes = (sk->num <= op[1].no); yes = inet->num <= op[1].no;
break; break;
case TCPDIAG_BC_D_GE: case TCPDIAG_BC_D_GE:
yes = (ntohs(sk->dport) >= op[1].no); yes = ntohs(inet->dport) >= op[1].no;
break; break;
case TCPDIAG_BC_D_LE: case TCPDIAG_BC_D_LE:
yes = (ntohs(sk->dport) <= op[1].no); yes = ntohs(inet->dport) <= op[1].no;
break; break;
case TCPDIAG_BC_AUTO: case TCPDIAG_BC_AUTO:
yes = !(sk->userlocks&SOCK_BINDPORT_LOCK); yes = !(sk->userlocks&SOCK_BINDPORT_LOCK);
...@@ -321,7 +328,8 @@ int tcpdiag_bc_run(char *bc, int len, struct sock *sk) ...@@ -321,7 +328,8 @@ int tcpdiag_bc_run(char *bc, int len, struct sock *sk)
u32 *addr; u32 *addr;
if (cond->port != -1 && if (cond->port != -1 &&
cond->port != (op->code == TCPDIAG_BC_S_COND ? sk->num : ntohs(sk->dport))) { cond->port != (op->code == TCPDIAG_BC_S_COND ?
inet->num : ntohs(inet->dport))) {
yes = 0; yes = 0;
break; break;
} }
...@@ -341,9 +349,9 @@ int tcpdiag_bc_run(char *bc, int len, struct sock *sk) ...@@ -341,9 +349,9 @@ int tcpdiag_bc_run(char *bc, int len, struct sock *sk)
#endif #endif
{ {
if (op->code == TCPDIAG_BC_S_COND) if (op->code == TCPDIAG_BC_S_COND)
addr = &sk->rcv_saddr; addr = &inet->rcv_saddr;
else else
addr = &sk->daddr; addr = &inet->daddr;
} }
if (bitstring_match(addr, cond->addr, cond->prefix_len)) if (bitstring_match(addr, cond->addr, cond->prefix_len))
...@@ -453,12 +461,14 @@ int tcpdiag_dump(struct sk_buff *skb, struct netlink_callback *cb) ...@@ -453,12 +461,14 @@ int tcpdiag_dump(struct sk_buff *skb, struct netlink_callback *cb)
for (sk = tcp_listening_hash[i], num = 0; for (sk = tcp_listening_hash[i], num = 0;
sk != NULL; sk != NULL;
sk = sk->next, num++) { sk = sk->next, num++) {
struct inet_opt *inet = inet_sk(sk);
if (num < s_num) if (num < s_num)
continue; continue;
if (!(r->tcpdiag_states&TCPF_LISTEN) || if (!(r->tcpdiag_states&TCPF_LISTEN) ||
r->id.tcpdiag_dport) r->id.tcpdiag_dport)
continue; continue;
if (r->id.tcpdiag_sport != sk->sport && r->id.tcpdiag_sport) if (r->id.tcpdiag_sport != inet->sport &&
r->id.tcpdiag_sport)
continue; continue;
if (bc && !tcpdiag_bc_run(RTA_DATA(bc), RTA_PAYLOAD(bc), sk)) if (bc && !tcpdiag_bc_run(RTA_DATA(bc), RTA_PAYLOAD(bc), sk))
continue; continue;
...@@ -491,13 +501,16 @@ int tcpdiag_dump(struct sk_buff *skb, struct netlink_callback *cb) ...@@ -491,13 +501,16 @@ int tcpdiag_dump(struct sk_buff *skb, struct netlink_callback *cb)
for (sk = head->chain, num = 0; for (sk = head->chain, num = 0;
sk != NULL; sk != NULL;
sk = sk->next, num++) { sk = sk->next, num++) {
struct inet_opt *inet = inet_sk(sk);
if (num < s_num) if (num < s_num)
continue; continue;
if (!(r->tcpdiag_states&(1<<sk->state))) if (!(r->tcpdiag_states&(1<<sk->state)))
continue; continue;
if (r->id.tcpdiag_sport != sk->sport && r->id.tcpdiag_sport) if (r->id.tcpdiag_sport != inet->sport &&
r->id.tcpdiag_sport)
continue; continue;
if (r->id.tcpdiag_dport != sk->dport && r->id.tcpdiag_dport) if (r->id.tcpdiag_dport != inet->dport && r->id.tcpdiag_dport)
continue; continue;
if (bc && !tcpdiag_bc_run(RTA_DATA(bc), RTA_PAYLOAD(bc), sk)) if (bc && !tcpdiag_bc_run(RTA_DATA(bc), RTA_PAYLOAD(bc), sk))
continue; continue;
...@@ -513,13 +526,17 @@ int tcpdiag_dump(struct sk_buff *skb, struct netlink_callback *cb) ...@@ -513,13 +526,17 @@ int tcpdiag_dump(struct sk_buff *skb, struct netlink_callback *cb)
for (sk = tcp_ehash[i+tcp_ehash_size].chain; for (sk = tcp_ehash[i+tcp_ehash_size].chain;
sk != NULL; sk != NULL;
sk = sk->next, num++) { sk = sk->next, num++) {
struct inet_opt *inet = inet_sk(sk);
if (num < s_num) if (num < s_num)
continue; continue;
if (!(r->tcpdiag_states&(1<<sk->zapped))) if (!(r->tcpdiag_states&(1<<sk->zapped)))
continue; continue;
if (r->id.tcpdiag_sport != sk->sport && r->id.tcpdiag_sport) if (r->id.tcpdiag_sport != inet->sport &&
r->id.tcpdiag_sport)
continue; continue;
if (r->id.tcpdiag_dport != sk->dport && r->id.tcpdiag_dport) if (r->id.tcpdiag_dport != inet->dport &&
r->id.tcpdiag_dport)
continue; continue;
if (bc && !tcpdiag_bc_run(RTA_DATA(bc), RTA_PAYLOAD(bc), sk)) if (bc && !tcpdiag_bc_run(RTA_DATA(bc), RTA_PAYLOAD(bc), sk))
continue; continue;
......
net/ipv4/tcp_input.c
View file @ 5a7c2000
...@@ -1329,9 +1329,10 @@ static __inline__ int tcp_packet_delayed(struct tcp_opt *tp) ...@@ -1329,9 +1329,10 @@ static __inline__ int tcp_packet_delayed(struct tcp_opt *tp)
#if FASTRETRANS_DEBUG > 1 #if FASTRETRANS_DEBUG > 1
static void DBGUNDO(struct sock *sk, struct tcp_opt *tp, const char *msg) static void DBGUNDO(struct sock *sk, struct tcp_opt *tp, const char *msg)
{ {
struct inet_opt *inet = inet_sk(sk);
printk(KERN_DEBUG "Undo %s %u.%u.%u.%u/%u c%u l%u ss%u/%u p%u\n", printk(KERN_DEBUG "Undo %s %u.%u.%u.%u/%u c%u l%u ss%u/%u p%u\n",
msg, msg,
NIPQUAD(sk->daddr), ntohs(sk->dport), NIPQUAD(inet->daddr), ntohs(inet->dport),
tp->snd_cwnd, tp->left_out, tp->snd_cwnd, tp->left_out,
tp->snd_ssthresh, tp->prior_ssthresh, tp->packets_out); tp->snd_ssthresh, tp->prior_ssthresh, tp->packets_out);
} }
...@@ -2570,15 +2571,12 @@ static void tcp_data_queue(struct sock *sk, struct sk_buff *skb) ...@@ -2570,15 +2571,12 @@ static void tcp_data_queue(struct sock *sk, struct sk_buff *skb)
__set_current_state(TASK_RUNNING); __set_current_state(TASK_RUNNING);
local_bh_enable(); local_bh_enable();
if (skb_copy_datagram_iovec(skb, 0, tp->ucopy.iov, if (!skb_copy_datagram_iovec(skb, 0, tp->ucopy.iov, chunk)) {
chunk)) { tp->ucopy.len -= chunk;
sk->err = EFAULT; tp->copied_seq += chunk;
sk->error_report(sk); eaten = (chunk == skb->len && !th->fin);
} }
local_bh_disable(); local_bh_disable();
tp->ucopy.len -= chunk;
tp->copied_seq += chunk;
eaten = (chunk == skb->len && !th->fin);
} }
if (eaten <= 0) { if (eaten <= 0) {
...@@ -3178,17 +3176,8 @@ static int tcp_copy_to_iovec(struct sock *sk, struct sk_buff *skb, int hlen) ...@@ -3178,17 +3176,8 @@ static int tcp_copy_to_iovec(struct sock *sk, struct sk_buff *skb, int hlen)
tp->ucopy.iov); tp->ucopy.iov);
if (!err) { if (!err) {
update: tp->ucopy.len -= chunk;
tp->ucopy.len -= chunk;
tp->copied_seq += chunk; tp->copied_seq += chunk;
local_bh_disable();
return 0;
}
if (err == -EFAULT) {
sk->err = EFAULT;
sk->error_report(sk);
goto update;
} }
local_bh_disable(); local_bh_disable();
...@@ -3327,19 +3316,16 @@ int tcp_rcv_established(struct sock *sk, struct sk_buff *skb, ...@@ -3327,19 +3316,16 @@ int tcp_rcv_established(struct sock *sk, struct sk_buff *skb,
tp->copied_seq == tp->rcv_nxt && tp->copied_seq == tp->rcv_nxt &&
len - tcp_header_len <= tp->ucopy.len && len - tcp_header_len <= tp->ucopy.len &&
sk->lock.users) { sk->lock.users) {
eaten = 1;
NET_INC_STATS_BH(TCPHPHitsToUser);
__set_current_state(TASK_RUNNING); __set_current_state(TASK_RUNNING);
if (tcp_copy_to_iovec(sk, skb, tcp_header_len)) if (!tcp_copy_to_iovec(sk, skb, tcp_header_len)) {
goto csum_error; __skb_pull(skb, tcp_header_len);
tp->rcv_nxt = TCP_SKB_CB(skb)->end_seq;
__skb_pull(skb,tcp_header_len); NET_INC_STATS_BH(TCPHPHitsToUser);
eaten = 1;
tp->rcv_nxt = TCP_SKB_CB(skb)->end_seq; }
} else { }
if (!eaten) {
if (tcp_checksum_complete_user(sk, skb)) if (tcp_checksum_complete_user(sk, skb))
goto csum_error; goto csum_error;
......
net/ipv4/tcp_ipv4.c
View file @ 5a7c2000
This diff is collapsed.
net/ipv4/tcp_minisocks.c
View file @ 5a7c2000
...@@ -327,10 +327,10 @@ static void __tcp_tw_hashdance(struct sock *sk, struct tcp_tw_bucket *tw) ...@@ -327,10 +327,10 @@ static void __tcp_tw_hashdance(struct sock *sk, struct tcp_tw_bucket *tw)
write_unlock(&ehead->lock); write_unlock(&ehead->lock);
/* Step 3: Put TW into bind hash. Original socket stays there too. /* Step 3: Put TW into bind hash. Original socket stays there too.
Note, that any socket with sk->num!=0 MUST be bound in binding Note, that any socket with inet_sk(sk)->num != 0 MUST be bound in
cache, even if it is closed. binding cache, even if it is closed.
*/ */
bhead = &tcp_bhash[tcp_bhashfn(sk->num)]; bhead = &tcp_bhash[tcp_bhashfn(inet_sk(sk)->num)];
spin_lock(&bhead->lock); spin_lock(&bhead->lock);
tw->tb = (struct tcp_bind_bucket *)sk->prev; tw->tb = (struct tcp_bind_bucket *)sk->prev;
BUG_TRAP(sk->prev!=NULL); BUG_TRAP(sk->prev!=NULL);
...@@ -357,17 +357,18 @@ void tcp_time_wait(struct sock *sk, int state, int timeo) ...@@ -357,17 +357,18 @@ void tcp_time_wait(struct sock *sk, int state, int timeo)
tw = kmem_cache_alloc(tcp_timewait_cachep, SLAB_ATOMIC); tw = kmem_cache_alloc(tcp_timewait_cachep, SLAB_ATOMIC);
if(tw != NULL) { if(tw != NULL) {
struct inet_opt *inet = inet_sk(sk);
int rto = (tp->rto<<2) - (tp->rto>>1); int rto = (tp->rto<<2) - (tp->rto>>1);
/* Give us an identity. */ /* Give us an identity. */
tw->daddr = sk->daddr; tw->daddr = inet->daddr;
tw->rcv_saddr = sk->rcv_saddr; tw->rcv_saddr = inet->rcv_saddr;
tw->bound_dev_if= sk->bound_dev_if; tw->bound_dev_if= sk->bound_dev_if;
tw->num = sk->num; tw->num = inet->num;
tw->state = TCP_TIME_WAIT; tw->state = TCP_TIME_WAIT;
tw->substate = state; tw->substate = state;
tw->sport = sk->sport; tw->sport = inet->sport;
tw->dport = sk->dport; tw->dport = inet->dport;
tw->family = sk->family; tw->family = sk->family;
tw->reuse = sk->reuse; tw->reuse = sk->reuse;
tw->rcv_wscale = tp->rcv_wscale; tw->rcv_wscale = tp->rcv_wscale;
...@@ -660,7 +661,7 @@ struct sock *tcp_create_openreq_child(struct sock *sk, struct open_request *req, ...@@ -660,7 +661,7 @@ struct sock *tcp_create_openreq_child(struct sock *sk, struct open_request *req,
newsk->prev = NULL; newsk->prev = NULL;
/* Clone the TCP header template */ /* Clone the TCP header template */
newsk->dport = req->rmt_port; inet_sk(newsk)->dport = req->rmt_port;
sock_lock_init(newsk); sock_lock_init(newsk);
bh_lock_sock(newsk); bh_lock_sock(newsk);
......
net/ipv4/tcp_output.c
View file @ 5a7c2000
...@@ -188,6 +188,7 @@ static __inline__ u16 tcp_select_window(struct sock *sk) ...@@ -188,6 +188,7 @@ static __inline__ u16 tcp_select_window(struct sock *sk)
int tcp_transmit_skb(struct sock *sk, struct sk_buff *skb) int tcp_transmit_skb(struct sock *sk, struct sk_buff *skb)
{ {
if(skb != NULL) { if(skb != NULL) {
struct inet_opt *inet = inet_sk(sk);
struct tcp_opt *tp = tcp_sk(sk); struct tcp_opt *tp = tcp_sk(sk);
struct tcp_skb_cb *tcb = TCP_SKB_CB(skb); struct tcp_skb_cb *tcb = TCP_SKB_CB(skb);
int tcp_header_size = tp->tcp_header_len; int tcp_header_size = tp->tcp_header_len;
...@@ -227,8 +228,8 @@ int tcp_transmit_skb(struct sock *sk, struct sk_buff *skb) ...@@ -227,8 +228,8 @@ int tcp_transmit_skb(struct sock *sk, struct sk_buff *skb)
skb_set_owner_w(skb, sk); skb_set_owner_w(skb, sk);
/* Build TCP header and checksum it. */ /* Build TCP header and checksum it. */
th->source = sk->sport; th->source = inet->sport;
th->dest = sk->dport; th->dest = inet->dport;
th->seq = htonl(tcb->seq); th->seq = htonl(tcb->seq);
th->ack_seq = htonl(tp->rcv_nxt); th->ack_seq = htonl(tp->rcv_nxt);
*(((__u16 *)th) + 6) = htons(((tcp_header_size >> 2) << 12) | tcb->flags); *(((__u16 *)th) + 6) = htons(((tcp_header_size >> 2) << 12) | tcb->flags);
...@@ -1120,7 +1121,7 @@ struct sk_buff * tcp_make_synack(struct sock *sk, struct dst_entry *dst, ...@@ -1120,7 +1121,7 @@ struct sk_buff * tcp_make_synack(struct sock *sk, struct dst_entry *dst,
th->syn = 1; th->syn = 1;
th->ack = 1; th->ack = 1;
TCP_ECN_make_synack(req, th); TCP_ECN_make_synack(req, th);
th->source = sk->sport; th->source = inet_sk(sk)->sport;
th->dest = req->rmt_port; th->dest = req->rmt_port;
TCP_SKB_CB(skb)->seq = req->snt_isn; TCP_SKB_CB(skb)->seq = req->snt_isn;
TCP_SKB_CB(skb)->end_seq = TCP_SKB_CB(skb)->seq + 1; TCP_SKB_CB(skb)->end_seq = TCP_SKB_CB(skb)->seq + 1;
......
net/ipv4/tcp_timer.c
View file @ 5a7c2000
...@@ -334,10 +334,12 @@ static void tcp_retransmit_timer(struct sock *sk) ...@@ -334,10 +334,12 @@ static void tcp_retransmit_timer(struct sock *sk)
* we cannot allow such beasts to hang infinitely. * we cannot allow such beasts to hang infinitely.
*/ */
#ifdef TCP_DEBUG #ifdef TCP_DEBUG
if (net_ratelimit()) if (net_ratelimit()) {
struct inet_opt *inet = inet_sk(sk);
printk(KERN_DEBUG "TCP: Treason uncloaked! Peer %u.%u.%u.%u:%u/%u shrinks window %u:%u. Repaired.\n", printk(KERN_DEBUG "TCP: Treason uncloaked! Peer %u.%u.%u.%u:%u/%u shrinks window %u:%u. Repaired.\n",
NIPQUAD(sk->daddr), htons(sk->dport), sk->num, NIPQUAD(inet->daddr), htons(inet->dport),
tp->snd_una, tp->snd_nxt); inet->num, tp->snd_una, tp->snd_nxt);
}
#endif #endif
if (tcp_time_stamp - tp->rcv_tstamp > TCP_RTO_MAX) { if (tcp_time_stamp - tp->rcv_tstamp > TCP_RTO_MAX) {
tcp_write_err(sk); tcp_write_err(sk);
......
net/ipv4/udp.c
View file @ 5a7c2000
...@@ -108,6 +108,8 @@ int udp_port_rover; ...@@ -108,6 +108,8 @@ int udp_port_rover;
static int udp_v4_get_port(struct sock *sk, unsigned short snum) static int udp_v4_get_port(struct sock *sk, unsigned short snum)
{ {
struct inet_opt *inet = inet_sk(sk);
write_lock_bh(&udp_hash_lock); write_lock_bh(&udp_hash_lock);
if (snum == 0) { if (snum == 0) {
int best_size_so_far, best, result, i; int best_size_so_far, best, result, i;
...@@ -118,11 +120,11 @@ static int udp_v4_get_port(struct sock *sk, unsigned short snum) ...@@ -118,11 +120,11 @@ static int udp_v4_get_port(struct sock *sk, unsigned short snum)
best_size_so_far = 32767; best_size_so_far = 32767;
best = result = udp_port_rover; best = result = udp_port_rover;
for (i = 0; i < UDP_HTABLE_SIZE; i++, result++) { for (i = 0; i < UDP_HTABLE_SIZE; i++, result++) {
struct sock *sk; struct sock *sk2;
int size; int size;
sk = udp_hash[result & (UDP_HTABLE_SIZE - 1)]; sk2 = udp_hash[result & (UDP_HTABLE_SIZE - 1)];
if (!sk) { if (!sk2) {
if (result > sysctl_local_port_range[1]) if (result > sysctl_local_port_range[1])
result = sysctl_local_port_range[0] + result = sysctl_local_port_range[0] +
((result - sysctl_local_port_range[0]) & ((result - sysctl_local_port_range[0]) &
...@@ -133,7 +135,7 @@ static int udp_v4_get_port(struct sock *sk, unsigned short snum) ...@@ -133,7 +135,7 @@ static int udp_v4_get_port(struct sock *sk, unsigned short snum)
do { do {
if (++size >= best_size_so_far) if (++size >= best_size_so_far)
goto next; goto next;
} while ((sk = sk->next) != NULL); } while ((sk2 = sk2->next) != NULL);
best_size_so_far = size; best_size_so_far = size;
best = result; best = result;
next:; next:;
...@@ -157,17 +159,19 @@ static int udp_v4_get_port(struct sock *sk, unsigned short snum) ...@@ -157,17 +159,19 @@ static int udp_v4_get_port(struct sock *sk, unsigned short snum)
for (sk2 = udp_hash[snum & (UDP_HTABLE_SIZE - 1)]; for (sk2 = udp_hash[snum & (UDP_HTABLE_SIZE - 1)];
sk2 != NULL; sk2 != NULL;
sk2 = sk2->next) { sk2 = sk2->next) {
if (sk2->num == snum && struct inet_opt *inet2 = inet_sk(sk2);
if (inet2->num == snum &&
sk2 != sk && sk2 != sk &&
sk2->bound_dev_if == sk->bound_dev_if && sk2->bound_dev_if == sk->bound_dev_if &&
(!sk2->rcv_saddr || (!inet2->rcv_saddr ||
!sk->rcv_saddr || !inet->rcv_saddr ||
sk2->rcv_saddr == sk->rcv_saddr) && inet2->rcv_saddr == inet->rcv_saddr) &&
(!sk2->reuse || !sk->reuse)) (!sk2->reuse || !sk->reuse))
goto fail; goto fail;
} }
} }
sk->num = snum; inet->num = snum;
if (sk->pprev == NULL) { if (sk->pprev == NULL) {
struct sock **skp = &udp_hash[snum & (UDP_HTABLE_SIZE - 1)]; struct sock **skp = &udp_hash[snum & (UDP_HTABLE_SIZE - 1)];
if ((sk->next = *skp) != NULL) if ((sk->next = *skp) != NULL)
...@@ -198,7 +202,7 @@ static void udp_v4_unhash(struct sock *sk) ...@@ -198,7 +202,7 @@ static void udp_v4_unhash(struct sock *sk)
sk->next->pprev = sk->pprev; sk->next->pprev = sk->pprev;
*sk->pprev = sk->next; *sk->pprev = sk->next;
sk->pprev = NULL; sk->pprev = NULL;
sk->num = 0; inet_sk(sk)->num = 0;
sock_prot_dec_use(sk->prot); sock_prot_dec_use(sk->prot);
__sock_put(sk); __sock_put(sk);
} }
...@@ -215,20 +219,22 @@ struct sock *udp_v4_lookup_longway(u32 saddr, u16 sport, u32 daddr, u16 dport, i ...@@ -215,20 +219,22 @@ struct sock *udp_v4_lookup_longway(u32 saddr, u16 sport, u32 daddr, u16 dport, i
int badness = -1; int badness = -1;
for(sk = udp_hash[hnum & (UDP_HTABLE_SIZE - 1)]; sk != NULL; sk = sk->next) { for(sk = udp_hash[hnum & (UDP_HTABLE_SIZE - 1)]; sk != NULL; sk = sk->next) {
if(sk->num == hnum) { struct inet_opt *inet = inet_sk(sk);
if (inet->num == hnum) {
int score = 0; int score = 0;
if(sk->rcv_saddr) { if (inet->rcv_saddr) {
if(sk->rcv_saddr != daddr) if (inet->rcv_saddr != daddr)
continue; continue;
score++; score++;
} }
if(sk->daddr) { if (inet->daddr) {
if(sk->daddr != saddr) if (inet->daddr != saddr)
continue; continue;
score++; score++;
} }
if(sk->dport) { if (inet->dport) {
if(sk->dport != sport) if (inet->dport != sport)
continue; continue;
score++; score++;
} }
...@@ -269,10 +275,12 @@ static inline struct sock *udp_v4_mcast_next(struct sock *sk, ...@@ -269,10 +275,12 @@ static inline struct sock *udp_v4_mcast_next(struct sock *sk,
struct sock *s = sk; struct sock *s = sk;
unsigned short hnum = ntohs(loc_port); unsigned short hnum = ntohs(loc_port);
for(; s; s = s->next) { for(; s; s = s->next) {
if ((s->num != hnum) || struct inet_opt *inet = inet_sk(s);
(s->daddr && s->daddr!=rmt_addr) ||
(s->dport != rmt_port && s->dport != 0) || if (inet->num != hnum ||
(s->rcv_saddr && s->rcv_saddr != loc_addr) || (inet->daddr && inet->daddr != rmt_addr) ||
(inet->dport != rmt_port && inet->dport) ||
(inet->rcv_saddr && inet->rcv_saddr != loc_addr) ||
(s->bound_dev_if && s->bound_dev_if != dif)) (s->bound_dev_if && s->bound_dev_if != dif))
continue; continue;
break; break;
...@@ -469,15 +477,15 @@ int udp_sendmsg(struct sock *sk, struct msghdr *msg, int len) ...@@ -469,15 +477,15 @@ int udp_sendmsg(struct sock *sk, struct msghdr *msg, int len)
} else { } else {
if (sk->state != TCP_ESTABLISHED) if (sk->state != TCP_ESTABLISHED)
return -ENOTCONN; return -ENOTCONN;
ufh.daddr = sk->daddr; ufh.daddr = inet->daddr;
ufh.uh.dest = sk->dport; ufh.uh.dest = inet->dport;
/* Open fast path for connected socket. /* Open fast path for connected socket.
Route will not be used, if at least one option is set. Route will not be used, if at least one option is set.
*/ */
connected = 1; connected = 1;
} }
ipc.addr = sk->saddr; ipc.addr = inet->saddr;
ufh.uh.source = sk->sport; ufh.uh.source = inet->sport;
ipc.opt = NULL; ipc.opt = NULL;
ipc.oif = sk->bound_dev_if; ipc.oif = sk->bound_dev_if;
...@@ -728,7 +736,7 @@ int udp_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len) ...@@ -728,7 +736,7 @@ int udp_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len)
sk_dst_reset(sk); sk_dst_reset(sk);
err = ip_route_connect(&rt, usin->sin_addr.s_addr, sk->saddr, err = ip_route_connect(&rt, usin->sin_addr.s_addr, inet->saddr,
RT_CONN_FLAGS(sk), sk->bound_dev_if); RT_CONN_FLAGS(sk), sk->bound_dev_if);
if (err) if (err)
return err; return err;
...@@ -736,12 +744,12 @@ int udp_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len) ...@@ -736,12 +744,12 @@ int udp_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len)
ip_rt_put(rt); ip_rt_put(rt);
return -EACCES; return -EACCES;
} }
if(!sk->saddr) if (!inet->saddr)
sk->saddr = rt->rt_src; /* Update source address */ inet->saddr = rt->rt_src; /* Update source address */
if(!sk->rcv_saddr) if (!inet->rcv_saddr)
sk->rcv_saddr = rt->rt_src; inet->rcv_saddr = rt->rt_src;
sk->daddr = rt->rt_dst; inet->daddr = rt->rt_dst;
sk->dport = usin->sin_port; inet->dport = usin->sin_port;
sk->state = TCP_ESTABLISHED; sk->state = TCP_ESTABLISHED;
inet->id = jiffies; inet->id = jiffies;
...@@ -751,17 +759,17 @@ int udp_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len) ...@@ -751,17 +759,17 @@ int udp_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len)
int udp_disconnect(struct sock *sk, int flags) int udp_disconnect(struct sock *sk, int flags)
{ {
struct inet_opt *inet = inet_sk(sk);
/* /*
* 1003.1g - break association. * 1003.1g - break association.
*/ */
sk->state = TCP_CLOSE; sk->state = TCP_CLOSE;
sk->daddr = 0; inet->daddr = 0;
sk->dport = 0; inet->dport = 0;
sk->bound_dev_if = 0; sk->bound_dev_if = 0;
if (!(sk->userlocks&SOCK_BINDADDR_LOCK)) { if (!(sk->userlocks&SOCK_BINDADDR_LOCK)) {
sk->rcv_saddr = 0; inet->rcv_saddr = inet->saddr = 0;
sk->saddr = 0;
#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) #if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
if (sk->family == PF_INET6) { if (sk->family == PF_INET6) {
struct ipv6_pinfo *np = inet6_sk(sk); struct ipv6_pinfo *np = inet6_sk(sk);
...@@ -773,7 +781,7 @@ int udp_disconnect(struct sock *sk, int flags) ...@@ -773,7 +781,7 @@ int udp_disconnect(struct sock *sk, int flags)
} }
if (!(sk->userlocks&SOCK_BINDPORT_LOCK)) { if (!(sk->userlocks&SOCK_BINDPORT_LOCK)) {
sk->prot->unhash(sk); sk->prot->unhash(sk);
sk->sport = 0; inet->sport = 0;
} }
sk_dst_reset(sk); sk_dst_reset(sk);
return 0; return 0;
...@@ -962,13 +970,14 @@ int udp_rcv(struct sk_buff *skb) ...@@ -962,13 +970,14 @@ int udp_rcv(struct sk_buff *skb)
static void get_udp_sock(struct sock *sp, char *tmpbuf, int i) static void get_udp_sock(struct sock *sp, char *tmpbuf, int i)
{ {
struct inet_opt *inet = inet_sk(sp);
unsigned int dest, src; unsigned int dest, src;
__u16 destp, srcp; __u16 destp, srcp;
dest = sp->daddr; dest = inet->daddr;
src = sp->rcv_saddr; src = inet->rcv_saddr;
destp = ntohs(sp->dport); destp = ntohs(inet->dport);
srcp = ntohs(sp->sport); srcp = ntohs(inet->sport);
sprintf(tmpbuf, "%4d: %08X:%04X %08X:%04X" sprintf(tmpbuf, "%4d: %08X:%04X %08X:%04X"
" %02X %08X:%08X %02X:%08lX %08X %5d %8d %ld %d %p", " %02X %08X:%08X %02X:%08lX %08X %5d %8d %ld %d %p",
i, src, srcp, dest, destp, sp->state, i, src, srcp, dest, destp, sp->state,
......
net/ipv6/af_inet6.c
View file @ 5a7c2000
...@@ -200,7 +200,7 @@ static int inet6_create(struct socket *sock, int protocol) ...@@ -200,7 +200,7 @@ static int inet6_create(struct socket *sock, int protocol)
inet = inet_sk(sk); inet = inet_sk(sk);
if (SOCK_RAW == sock->type) { if (SOCK_RAW == sock->type) {
sk->num = protocol; inet->num = protocol;
if (IPPROTO_RAW == protocol) if (IPPROTO_RAW == protocol)
inet->hdrincl = 1; inet->hdrincl = 1;
} }
...@@ -241,12 +241,12 @@ static int inet6_create(struct socket *sock, int protocol) ...@@ -241,12 +241,12 @@ static int inet6_create(struct socket *sock, int protocol)
#endif #endif
MOD_INC_USE_COUNT; MOD_INC_USE_COUNT;
if (sk->num) { if (inet->num) {
/* It assumes that any protocol which allows /* It assumes that any protocol which allows
* the user to assign a number at socket * the user to assign a number at socket
* creation time automatically shares. * creation time automatically shares.
*/ */
sk->sport = ntohs(sk->num); inet->sport = ntohs(inet->num);
sk->prot->hash(sk); sk->prot->hash(sk);
} }
if (sk->prot->init) { if (sk->prot->init) {
...@@ -278,6 +278,7 @@ static int inet6_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len) ...@@ -278,6 +278,7 @@ static int inet6_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)
{ {
struct sockaddr_in6 *addr=(struct sockaddr_in6 *)uaddr; struct sockaddr_in6 *addr=(struct sockaddr_in6 *)uaddr;
struct sock *sk = sock->sk; struct sock *sk = sock->sk;
struct inet_opt *inet = inet_sk(sk);
struct ipv6_pinfo *np = inet6_sk(sk); struct ipv6_pinfo *np = inet6_sk(sk);
__u32 v4addr = 0; __u32 v4addr = 0;
unsigned short snum; unsigned short snum;
...@@ -318,8 +319,7 @@ static int inet6_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len) ...@@ -318,8 +319,7 @@ static int inet6_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)
lock_sock(sk); lock_sock(sk);
/* Check these errors (active socket, double bind). */ /* Check these errors (active socket, double bind). */
if ((sk->state != TCP_CLOSE) || if (sk->state != TCP_CLOSE || inet->num) {
(sk->num != 0)) {
release_sock(sk); release_sock(sk);
return -EINVAL; return -EINVAL;
} }
...@@ -340,8 +340,8 @@ static int inet6_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len) ...@@ -340,8 +340,8 @@ static int inet6_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)
} }
} }
sk->rcv_saddr = v4addr; inet->rcv_saddr = v4addr;
sk->saddr = v4addr; inet->saddr = v4addr;
ipv6_addr_copy(&np->rcv_saddr, &addr->sin6_addr); ipv6_addr_copy(&np->rcv_saddr, &addr->sin6_addr);
...@@ -350,8 +350,7 @@ static int inet6_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len) ...@@ -350,8 +350,7 @@ static int inet6_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)
/* Make sure we are allowed to bind here. */ /* Make sure we are allowed to bind here. */
if (sk->prot->get_port(sk, snum) != 0) { if (sk->prot->get_port(sk, snum) != 0) {
sk->rcv_saddr = 0; inet->rcv_saddr = inet->saddr = 0;
sk->saddr = 0;
memset(&np->rcv_saddr, 0, sizeof(struct in6_addr)); memset(&np->rcv_saddr, 0, sizeof(struct in6_addr));
memset(&np->saddr, 0, sizeof(struct in6_addr)); memset(&np->saddr, 0, sizeof(struct in6_addr));
...@@ -363,9 +362,9 @@ static int inet6_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len) ...@@ -363,9 +362,9 @@ static int inet6_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)
sk->userlocks |= SOCK_BINDADDR_LOCK; sk->userlocks |= SOCK_BINDADDR_LOCK;
if (snum) if (snum)
sk->userlocks |= SOCK_BINDPORT_LOCK; sk->userlocks |= SOCK_BINDPORT_LOCK;
sk->sport = ntohs(sk->num); inet->sport = ntohs(inet->num);
sk->dport = 0; inet->dport = 0;
sk->daddr = 0; inet->daddr = 0;
release_sock(sk); release_sock(sk);
return 0; return 0;
...@@ -421,17 +420,18 @@ static int inet6_getname(struct socket *sock, struct sockaddr *uaddr, ...@@ -421,17 +420,18 @@ static int inet6_getname(struct socket *sock, struct sockaddr *uaddr,
{ {
struct sockaddr_in6 *sin=(struct sockaddr_in6 *)uaddr; struct sockaddr_in6 *sin=(struct sockaddr_in6 *)uaddr;
struct sock *sk = sock->sk; struct sock *sk = sock->sk;
struct inet_opt *inet = inet_sk(sk);
struct ipv6_pinfo *np = inet6_sk(sk); struct ipv6_pinfo *np = inet6_sk(sk);
sin->sin6_family = AF_INET6; sin->sin6_family = AF_INET6;
sin->sin6_flowinfo = 0; sin->sin6_flowinfo = 0;
sin->sin6_scope_id = 0; sin->sin6_scope_id = 0;
if (peer) { if (peer) {
if (!sk->dport) if (!inet->dport)
return -ENOTCONN; return -ENOTCONN;
if (((1<<sk->state)&(TCPF_CLOSE|TCPF_SYN_SENT)) && peer == 1) if (((1<<sk->state)&(TCPF_CLOSE|TCPF_SYN_SENT)) && peer == 1)
return -ENOTCONN; return -ENOTCONN;
sin->sin6_port = sk->dport; sin->sin6_port = inet->dport;
memcpy(&sin->sin6_addr, &np->daddr, sizeof(struct in6_addr)); memcpy(&sin->sin6_addr, &np->daddr, sizeof(struct in6_addr));
if (np->sndflow) if (np->sndflow)
sin->sin6_flowinfo = np->flow_label; sin->sin6_flowinfo = np->flow_label;
...@@ -443,7 +443,7 @@ static int inet6_getname(struct socket *sock, struct sockaddr *uaddr, ...@@ -443,7 +443,7 @@ static int inet6_getname(struct socket *sock, struct sockaddr *uaddr,
memcpy(&sin->sin6_addr, &np->rcv_saddr, memcpy(&sin->sin6_addr, &np->rcv_saddr,
sizeof(struct in6_addr)); sizeof(struct in6_addr));
sin->sin6_port = sk->sport; sin->sin6_port = inet->sport;
} }
if (ipv6_addr_type(&sin->sin6_addr) & IPV6_ADDR_LINKLOCAL) if (ipv6_addr_type(&sin->sin6_addr) & IPV6_ADDR_LINKLOCAL)
sin->sin6_scope_id = sk->bound_dev_if; sin->sin6_scope_id = sk->bound_dev_if;
......
net/ipv6/ipv6_sockglue.c
View file @ 5a7c2000
...@@ -79,7 +79,7 @@ int ip6_ra_control(struct sock *sk, int sel, void (*destructor)(struct sock *)) ...@@ -79,7 +79,7 @@ int ip6_ra_control(struct sock *sk, int sel, void (*destructor)(struct sock *))
struct ip6_ra_chain *ra, *new_ra, **rap; struct ip6_ra_chain *ra, *new_ra, **rap;
/* RA packet may be delivered ONLY to IPPROTO_RAW socket */ /* RA packet may be delivered ONLY to IPPROTO_RAW socket */
if (sk->type != SOCK_RAW || sk->num != IPPROTO_RAW) if (sk->type != SOCK_RAW || inet_sk(sk)->num != IPPROTO_RAW)
return -EINVAL; return -EINVAL;
new_ra = (sel>=0) ? kmalloc(sizeof(*new_ra), GFP_KERNEL) : NULL; new_ra = (sel>=0) ? kmalloc(sizeof(*new_ra), GFP_KERNEL) : NULL;
...@@ -283,7 +283,7 @@ int ipv6_setsockopt(struct sock *sk, int level, int optname, char *optval, ...@@ -283,7 +283,7 @@ int ipv6_setsockopt(struct sock *sk, int level, int optname, char *optval,
if (opt) { if (opt) {
struct tcp_opt *tp = tcp_sk(sk); struct tcp_opt *tp = tcp_sk(sk);
if (!((1<<sk->state)&(TCPF_LISTEN|TCPF_CLOSE)) if (!((1<<sk->state)&(TCPF_LISTEN|TCPF_CLOSE))
&& sk->daddr != LOOPBACK4_IPV6) { && inet_sk(sk)->daddr != LOOPBACK4_IPV6) {
tp->ext_header_len = opt->opt_flen + opt->opt_nflen; tp->ext_header_len = opt->opt_flen + opt->opt_nflen;
tcp_sync_mss(sk, tp->pmtu_cookie); tcp_sync_mss(sk, tp->pmtu_cookie);
} }
......
net/ipv6/ndisc.c
View file @ 5a7c2000
...@@ -84,58 +84,63 @@ static int pndisc_constructor(struct pneigh_entry *n); ...@@ -84,58 +84,63 @@ static int pndisc_constructor(struct pneigh_entry *n);
static void pndisc_destructor(struct pneigh_entry *n); static void pndisc_destructor(struct pneigh_entry *n);
static void pndisc_redo(struct sk_buff *skb); static void pndisc_redo(struct sk_buff *skb);
static struct neigh_ops ndisc_generic_ops = static struct neigh_ops ndisc_generic_ops = {
{ family: AF_INET6,
AF_INET6, solicit: ndisc_solicit,
NULL, error_report: ndisc_error_report,
ndisc_solicit, output: neigh_resolve_output,
ndisc_error_report, connected_output: neigh_connected_output,
neigh_resolve_output, hh_output: dev_queue_xmit,
neigh_connected_output, queue_xmit: dev_queue_xmit,
dev_queue_xmit,
dev_queue_xmit
}; };
static struct neigh_ops ndisc_hh_ops = static struct neigh_ops ndisc_hh_ops = {
{ family: AF_INET6,
AF_INET6, solicit: ndisc_solicit,
NULL, error_report: ndisc_error_report,
ndisc_solicit, output: neigh_resolve_output,
ndisc_error_report, connected_output: neigh_resolve_output,
neigh_resolve_output, hh_output: dev_queue_xmit,
neigh_resolve_output, queue_xmit: dev_queue_xmit,
dev_queue_xmit,
dev_queue_xmit
}; };
static struct neigh_ops ndisc_direct_ops = static struct neigh_ops ndisc_direct_ops = {
{ family: AF_INET6,
AF_INET6, output: dev_queue_xmit,
NULL, connected_output: dev_queue_xmit,
NULL, hh_output: dev_queue_xmit,
NULL, queue_xmit: dev_queue_xmit,
dev_queue_xmit,
dev_queue_xmit,
dev_queue_xmit,
dev_queue_xmit
}; };
struct neigh_table nd_tbl = struct neigh_table nd_tbl = {
{ family: AF_INET6,
NULL, entry_size: sizeof(struct neighbour) + sizeof(struct in6_addr),
AF_INET6, key_len: sizeof(struct in6_addr),
sizeof(struct neighbour) + sizeof(struct in6_addr), hash: ndisc_hash,
sizeof(struct in6_addr), constructor: ndisc_constructor,
ndisc_hash, pconstructor: pndisc_constructor,
ndisc_constructor, pdestructor: pndisc_destructor,
pndisc_constructor, proxy_redo: pndisc_redo,
pndisc_destructor, id: "ndisc_cache",
pndisc_redo, parms: {
"ndisc_cache", tbl: &nd_tbl,
{ NULL, NULL, &nd_tbl, 0, NULL, NULL, base_reachable_time: 30 * HZ,
30*HZ, 1*HZ, 60*HZ, 30*HZ, 5*HZ, 3, 3, 0, 3, 1*HZ, (8*HZ)/10, 64, 0 }, retrans_time: 1 * HZ,
30*HZ, 128, 512, 1024, gc_staletime: 60 * HZ,
reachable_time: 30 * HZ,
delay_probe_time: 5 * HZ,
queue_len: 3,
ucast_probes: 3,
mcast_probes: 3,
anycast_delay: 1 * HZ,
proxy_delay: (8 * HZ) / 10,
proxy_qlen: 64,
},
gc_interval: 30 * HZ,
gc_thresh1: 128,
gc_thresh2: 512,
gc_thresh3: 1024,
}; };
#define NDISC_OPT_SPACE(len) (((len)+2+7)&~7) #define NDISC_OPT_SPACE(len) (((len)+2+7)&~7)
......
net/ipv6/raw.c
View file @ 5a7c2000
...@@ -50,7 +50,8 @@ rwlock_t raw_v6_lock = RW_LOCK_UNLOCKED; ...@@ -50,7 +50,8 @@ rwlock_t raw_v6_lock = RW_LOCK_UNLOCKED;
static void raw_v6_hash(struct sock *sk) static void raw_v6_hash(struct sock *sk)
{ {
struct sock **skp = &raw_v6_htable[sk->num & (RAWV6_HTABLE_SIZE - 1)]; struct sock **skp = &raw_v6_htable[inet_sk(sk)->num &
(RAWV6_HTABLE_SIZE - 1)];
write_lock_bh(&raw_v6_lock); write_lock_bh(&raw_v6_lock);
if ((sk->next = *skp) != NULL) if ((sk->next = *skp) != NULL)
...@@ -85,7 +86,7 @@ struct sock *__raw_v6_lookup(struct sock *sk, unsigned short num, ...@@ -85,7 +86,7 @@ struct sock *__raw_v6_lookup(struct sock *sk, unsigned short num,
int addr_type = ipv6_addr_type(loc_addr); int addr_type = ipv6_addr_type(loc_addr);
for(s = sk; s; s = s->next) { for(s = sk; s; s = s->next) {
if(s->num == num) { if (inet_sk(s)->num == num) {
struct ipv6_pinfo *np = inet6_sk(s); struct ipv6_pinfo *np = inet6_sk(s);
if (!ipv6_addr_any(&np->daddr) && if (!ipv6_addr_any(&np->daddr) &&
...@@ -186,6 +187,7 @@ struct sock * ipv6_raw_deliver(struct sk_buff *skb, int nexthdr) ...@@ -186,6 +187,7 @@ struct sock * ipv6_raw_deliver(struct sk_buff *skb, int nexthdr)
/* This cleans up af_inet6 a bit. -DaveM */ /* This cleans up af_inet6 a bit. -DaveM */
static int rawv6_bind(struct sock *sk, struct sockaddr *uaddr, int addr_len) static int rawv6_bind(struct sock *sk, struct sockaddr *uaddr, int addr_len)
{ {
struct inet_opt *inet = inet_sk(sk);
struct ipv6_pinfo *np = inet6_sk(sk); struct ipv6_pinfo *np = inet6_sk(sk);
struct sockaddr_in6 *addr = (struct sockaddr_in6 *) uaddr; struct sockaddr_in6 *addr = (struct sockaddr_in6 *) uaddr;
__u32 v4addr = 0; __u32 v4addr = 0;
...@@ -233,8 +235,7 @@ static int rawv6_bind(struct sock *sk, struct sockaddr *uaddr, int addr_len) ...@@ -233,8 +235,7 @@ static int rawv6_bind(struct sock *sk, struct sockaddr *uaddr, int addr_len)
} }
} }
sk->rcv_saddr = v4addr; inet->rcv_saddr = inet->saddr = v4addr;
sk->saddr = v4addr;
ipv6_addr_copy(&np->rcv_saddr, &addr->sin6_addr); ipv6_addr_copy(&np->rcv_saddr, &addr->sin6_addr);
if (!(addr_type & IPV6_ADDR_MULTICAST)) if (!(addr_type & IPV6_ADDR_MULTICAST))
ipv6_addr_copy(&np->saddr, &addr->sin6_addr); ipv6_addr_copy(&np->saddr, &addr->sin6_addr);
...@@ -439,6 +440,7 @@ static int rawv6_sendmsg(struct sock *sk, struct msghdr *msg, int len) ...@@ -439,6 +440,7 @@ static int rawv6_sendmsg(struct sock *sk, struct msghdr *msg, int len)
{ {
struct ipv6_txoptions opt_space; struct ipv6_txoptions opt_space;
struct sockaddr_in6 * sin6 = (struct sockaddr_in6 *) msg->msg_name; struct sockaddr_in6 * sin6 = (struct sockaddr_in6 *) msg->msg_name;
struct inet_opt *inet = inet_sk(sk);
struct ipv6_pinfo *np = inet6_sk(sk); struct ipv6_pinfo *np = inet6_sk(sk);
struct ipv6_txoptions *opt = NULL; struct ipv6_txoptions *opt = NULL;
struct ip6_flowlabel *flowlabel = NULL; struct ip6_flowlabel *flowlabel = NULL;
...@@ -478,7 +480,7 @@ static int rawv6_sendmsg(struct sock *sk, struct msghdr *msg, int len) ...@@ -478,7 +480,7 @@ static int rawv6_sendmsg(struct sock *sk, struct msghdr *msg, int len)
proto = ntohs(sin6->sin6_port); proto = ntohs(sin6->sin6_port);
if (!proto) if (!proto)
proto = sk->num; proto = inet->num;
if (proto > 255) if (proto > 255)
return(-EINVAL); return(-EINVAL);
...@@ -507,7 +509,7 @@ static int rawv6_sendmsg(struct sock *sk, struct msghdr *msg, int len) ...@@ -507,7 +509,7 @@ static int rawv6_sendmsg(struct sock *sk, struct msghdr *msg, int len)
if (sk->state != TCP_ESTABLISHED) if (sk->state != TCP_ESTABLISHED)
return(-EINVAL); return(-EINVAL);
proto = sk->num; proto = inet->num;
daddr = &np->daddr; daddr = &np->daddr;
fl.fl6_flowlabel = np->flow_label; fl.fl6_flowlabel = np->flow_label;
} }
...@@ -635,7 +637,7 @@ static int rawv6_setsockopt(struct sock *sk, int level, int optname, ...@@ -635,7 +637,7 @@ static int rawv6_setsockopt(struct sock *sk, int level, int optname,
break; break;
case SOL_ICMPV6: case SOL_ICMPV6:
if (sk->num != IPPROTO_ICMPV6) if (inet_sk(sk)->num != IPPROTO_ICMPV6)
return -EOPNOTSUPP; return -EOPNOTSUPP;
return rawv6_seticmpfilter(sk, level, optname, optval, return rawv6_seticmpfilter(sk, level, optname, optval,
optlen); optlen);
...@@ -678,7 +680,7 @@ static int rawv6_getsockopt(struct sock *sk, int level, int optname, ...@@ -678,7 +680,7 @@ static int rawv6_getsockopt(struct sock *sk, int level, int optname,
break; break;
case SOL_ICMPV6: case SOL_ICMPV6:
if (sk->num != IPPROTO_ICMPV6) if (inet_sk(sk)->num != IPPROTO_ICMPV6)
return -EOPNOTSUPP; return -EOPNOTSUPP;
return rawv6_geticmpfilter(sk, level, optname, optval, return rawv6_geticmpfilter(sk, level, optname, optval,
optlen); optlen);
...@@ -741,7 +743,7 @@ static int rawv6_ioctl(struct sock *sk, int cmd, unsigned long arg) ...@@ -741,7 +743,7 @@ static int rawv6_ioctl(struct sock *sk, int cmd, unsigned long arg)
static void rawv6_close(struct sock *sk, long timeout) static void rawv6_close(struct sock *sk, long timeout)
{ {
if (sk->num == IPPROTO_RAW) if (inet_sk(sk)->num == IPPROTO_RAW)
ip6_ra_control(sk, -1, NULL); ip6_ra_control(sk, -1, NULL);
inet_sock_release(sk); inet_sock_release(sk);
...@@ -764,7 +766,7 @@ static void get_raw6_sock(struct sock *sp, char *tmpbuf, int i) ...@@ -764,7 +766,7 @@ static void get_raw6_sock(struct sock *sp, char *tmpbuf, int i)
dest = &np->daddr; dest = &np->daddr;
src = &np->rcv_saddr; src = &np->rcv_saddr;
destp = 0; destp = 0;
srcp = sp->num; srcp = inet_sk(sp)->num;
sprintf(tmpbuf, sprintf(tmpbuf,
"%4d: %08X%08X%08X%08X:%04X %08X%08X%08X%08X:%04X " "%4d: %08X%08X%08X%08X:%04X %08X%08X%08X%08X:%04X "
"%02X %08X:%08X %02X:%08lX %08X %5d %8d %ld %d %p", "%02X %08X:%08X %02X:%08lX %08X %5d %8d %ld %d %p",
......
net/ipv6/tcp_ipv6.c
View file @ 5a7c2000
This diff is collapsed.
net/ipv6/udp.c
View file @ 5a7c2000
...@@ -65,11 +65,11 @@ static int udp_v6_get_port(struct sock *sk, unsigned short snum) ...@@ -65,11 +65,11 @@ static int udp_v6_get_port(struct sock *sk, unsigned short snum)
best_size_so_far = 32767; best_size_so_far = 32767;
best = result = udp_port_rover; best = result = udp_port_rover;
for (i = 0; i < UDP_HTABLE_SIZE; i++, result++) { for (i = 0; i < UDP_HTABLE_SIZE; i++, result++) {
struct sock *sk; struct sock *sk2;
int size; int size;
sk = udp_hash[result & (UDP_HTABLE_SIZE - 1)]; sk2 = udp_hash[result & (UDP_HTABLE_SIZE - 1)];
if (!sk) { if (!sk2) {
if (result > sysctl_local_port_range[1]) if (result > sysctl_local_port_range[1])
result = sysctl_local_port_range[0] + result = sysctl_local_port_range[0] +
((result - sysctl_local_port_range[0]) & ((result - sysctl_local_port_range[0]) &
...@@ -80,7 +80,7 @@ static int udp_v6_get_port(struct sock *sk, unsigned short snum) ...@@ -80,7 +80,7 @@ static int udp_v6_get_port(struct sock *sk, unsigned short snum)
do { do {
if (++size >= best_size_so_far) if (++size >= best_size_so_far)
goto next; goto next;
} while ((sk = sk->next) != NULL); } while ((sk2 = sk2->next) != NULL);
best_size_so_far = size; best_size_so_far = size;
best = result; best = result;
next:; next:;
...@@ -104,23 +104,24 @@ static int udp_v6_get_port(struct sock *sk, unsigned short snum) ...@@ -104,23 +104,24 @@ static int udp_v6_get_port(struct sock *sk, unsigned short snum)
for (sk2 = udp_hash[snum & (UDP_HTABLE_SIZE - 1)]; for (sk2 = udp_hash[snum & (UDP_HTABLE_SIZE - 1)];
sk2 != NULL; sk2 != NULL;
sk2 = sk2->next) { sk2 = sk2->next) {
struct inet_opt *inet2 = inet_sk(sk2);
struct ipv6_pinfo *np2 = inet6_sk(sk2); struct ipv6_pinfo *np2 = inet6_sk(sk2);
if (sk2->num == snum && if (inet2->num == snum &&
sk2 != sk && sk2 != sk &&
sk2->bound_dev_if == sk->bound_dev_if && sk2->bound_dev_if == sk->bound_dev_if &&
(!sk2->rcv_saddr || (!inet2->rcv_saddr ||
addr_type == IPV6_ADDR_ANY || addr_type == IPV6_ADDR_ANY ||
!ipv6_addr_cmp(&np->rcv_saddr, &np2->rcv_saddr) || !ipv6_addr_cmp(&np->rcv_saddr, &np2->rcv_saddr) ||
(addr_type == IPV6_ADDR_MAPPED && (addr_type == IPV6_ADDR_MAPPED &&
sk2->family == AF_INET && sk2->family == AF_INET &&
sk->rcv_saddr == sk2->rcv_saddr)) && inet_sk(sk)->rcv_saddr == inet2->rcv_saddr)) &&
(!sk2->reuse || !sk->reuse)) (!sk2->reuse || !sk->reuse))
goto fail; goto fail;
} }
} }
sk->num = snum; inet_sk(sk)->num = snum;
if (sk->pprev == NULL) { if (sk->pprev == NULL) {
struct sock **skp = &udp_hash[snum & (UDP_HTABLE_SIZE - 1)]; struct sock **skp = &udp_hash[snum & (UDP_HTABLE_SIZE - 1)];
if ((sk->next = *skp) != NULL) if ((sk->next = *skp) != NULL)
...@@ -151,7 +152,7 @@ static void udp_v6_unhash(struct sock *sk) ...@@ -151,7 +152,7 @@ static void udp_v6_unhash(struct sock *sk)
sk->next->pprev = sk->pprev; sk->next->pprev = sk->pprev;
*sk->pprev = sk->next; *sk->pprev = sk->next;
sk->pprev = NULL; sk->pprev = NULL;
sk->num = 0; inet_sk(sk)->num = 0;
sock_prot_dec_use(sk->prot); sock_prot_dec_use(sk->prot);
__sock_put(sk); __sock_put(sk);
} }
...@@ -167,12 +168,13 @@ static struct sock *udp_v6_lookup(struct in6_addr *saddr, u16 sport, ...@@ -167,12 +168,13 @@ static struct sock *udp_v6_lookup(struct in6_addr *saddr, u16 sport,
read_lock(&udp_hash_lock); read_lock(&udp_hash_lock);
for(sk = udp_hash[hnum & (UDP_HTABLE_SIZE - 1)]; sk != NULL; sk = sk->next) { for(sk = udp_hash[hnum & (UDP_HTABLE_SIZE - 1)]; sk != NULL; sk = sk->next) {
if((sk->num == hnum) && struct inet_opt *inet = inet_sk(sk);
(sk->family == PF_INET6)) {
if (inet->num == hnum && sk->family == PF_INET6) {
struct ipv6_pinfo *np = inet6_sk(sk); struct ipv6_pinfo *np = inet6_sk(sk);
int score = 0; int score = 0;
if(sk->dport) { if (inet->dport) {
if(sk->dport != sport) if (inet->dport != sport)
continue; continue;
score++; score++;
} }
...@@ -213,6 +215,7 @@ static struct sock *udp_v6_lookup(struct in6_addr *saddr, u16 sport, ...@@ -213,6 +215,7 @@ static struct sock *udp_v6_lookup(struct in6_addr *saddr, u16 sport,
int udpv6_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len) int udpv6_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len)
{ {
struct sockaddr_in6 *usin = (struct sockaddr_in6 *) uaddr; struct sockaddr_in6 *usin = (struct sockaddr_in6 *) uaddr;
struct inet_opt *inet = inet_sk(sk);
struct ipv6_pinfo *np = inet6_sk(sk); struct ipv6_pinfo *np = inet6_sk(sk);
struct in6_addr *daddr; struct in6_addr *daddr;
struct in6_addr saddr; struct in6_addr saddr;
...@@ -268,16 +271,16 @@ int udpv6_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len) ...@@ -268,16 +271,16 @@ int udpv6_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len)
if (err < 0) if (err < 0)
return err; return err;
ipv6_addr_set(&np->daddr, 0, 0, htonl(0x0000ffff), sk->daddr); ipv6_addr_set(&np->daddr, 0, 0, htonl(0x0000ffff), inet->daddr);
if (ipv6_addr_any(&np->saddr)) { if (ipv6_addr_any(&np->saddr)) {
ipv6_addr_set(&np->saddr, 0, 0, htonl(0x0000ffff), ipv6_addr_set(&np->saddr, 0, 0, htonl(0x0000ffff),
sk->saddr); inet->saddr);
} }
if (ipv6_addr_any(&np->rcv_saddr)) { if (ipv6_addr_any(&np->rcv_saddr)) {
ipv6_addr_set(&np->rcv_saddr, 0, 0, htonl(0x0000ffff), ipv6_addr_set(&np->rcv_saddr, 0, 0, htonl(0x0000ffff),
sk->rcv_saddr); inet->rcv_saddr);
} }
return 0; return 0;
} }
...@@ -300,7 +303,7 @@ int udpv6_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len) ...@@ -300,7 +303,7 @@ int udpv6_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len)
ipv6_addr_copy(&np->daddr, daddr); ipv6_addr_copy(&np->daddr, daddr);
np->flow_label = fl.fl6_flowlabel; np->flow_label = fl.fl6_flowlabel;
sk->dport = usin->sin6_port; inet->dport = usin->sin6_port;
/* /*
* Check for a route to destination an obtain the * Check for a route to destination an obtain the
...@@ -311,8 +314,8 @@ int udpv6_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len) ...@@ -311,8 +314,8 @@ int udpv6_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len)
fl.fl6_dst = &np->daddr; fl.fl6_dst = &np->daddr;
fl.fl6_src = &saddr; fl.fl6_src = &saddr;
fl.oif = sk->bound_dev_if; fl.oif = sk->bound_dev_if;
fl.uli_u.ports.dport = sk->dport; fl.uli_u.ports.dport = inet->dport;
fl.uli_u.ports.sport = sk->sport; fl.uli_u.ports.sport = inet->sport;
if (flowlabel) { if (flowlabel) {
if (flowlabel->opt && flowlabel->opt->srcrt) { if (flowlabel->opt && flowlabel->opt->srcrt) {
...@@ -344,7 +347,7 @@ int udpv6_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len) ...@@ -344,7 +347,7 @@ int udpv6_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len)
if (ipv6_addr_any(&np->rcv_saddr)) { if (ipv6_addr_any(&np->rcv_saddr)) {
ipv6_addr_copy(&np->rcv_saddr, &saddr); ipv6_addr_copy(&np->rcv_saddr, &saddr);
sk->rcv_saddr = LOOPBACK4_IPV6; inet->rcv_saddr = LOOPBACK4_IPV6;
} }
sk->state = TCP_ESTABLISHED; sk->state = TCP_ESTABLISHED;
} }
...@@ -528,10 +531,12 @@ static struct sock *udp_v6_mcast_next(struct sock *sk, ...@@ -528,10 +531,12 @@ static struct sock *udp_v6_mcast_next(struct sock *sk,
struct sock *s = sk; struct sock *s = sk;
unsigned short num = ntohs(loc_port); unsigned short num = ntohs(loc_port);
for(; s; s = s->next) { for(; s; s = s->next) {
if(s->num == num) { struct inet_opt *inet = inet_sk(s);
if (inet->num == num) {
struct ipv6_pinfo *np = inet6_sk(s); struct ipv6_pinfo *np = inet6_sk(s);
if(s->dport) { if (inet->dport) {
if(s->dport != rmt_port) if (inet->dport != rmt_port)
continue; continue;
} }
if (!ipv6_addr_any(&np->daddr) && if (!ipv6_addr_any(&np->daddr) &&
...@@ -757,6 +762,7 @@ static int udpv6_sendmsg(struct sock *sk, struct msghdr *msg, int ulen) ...@@ -757,6 +762,7 @@ static int udpv6_sendmsg(struct sock *sk, struct msghdr *msg, int ulen)
{ {
struct ipv6_txoptions opt_space; struct ipv6_txoptions opt_space;
struct udpv6fakehdr udh; struct udpv6fakehdr udh;
struct inet_opt *inet = inet_sk(sk);
struct ipv6_pinfo *np = inet6_sk(sk); struct ipv6_pinfo *np = inet6_sk(sk);
struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *) msg->msg_name; struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *) msg->msg_name;
struct ipv6_txoptions *opt = NULL; struct ipv6_txoptions *opt = NULL;
...@@ -818,7 +824,7 @@ static int udpv6_sendmsg(struct sock *sk, struct msghdr *msg, int ulen) ...@@ -818,7 +824,7 @@ static int udpv6_sendmsg(struct sock *sk, struct msghdr *msg, int ulen)
if (sk->state != TCP_ESTABLISHED) if (sk->state != TCP_ESTABLISHED)
return -ENOTCONN; return -ENOTCONN;
udh.uh.dest = sk->dport; udh.uh.dest = inet->dport;
daddr = &np->daddr; daddr = &np->daddr;
fl.fl6_flowlabel = np->flow_label; fl.fl6_flowlabel = np->flow_label;
} }
...@@ -867,7 +873,7 @@ static int udpv6_sendmsg(struct sock *sk, struct msghdr *msg, int ulen) ...@@ -867,7 +873,7 @@ static int udpv6_sendmsg(struct sock *sk, struct msghdr *msg, int ulen)
if (opt && opt->srcrt) if (opt && opt->srcrt)
udh.daddr = daddr; udh.daddr = daddr;
udh.uh.source = sk->sport; udh.uh.source = inet->sport;
udh.uh.len = len < 0x10000 ? htons(len) : 0; udh.uh.len = len < 0x10000 ? htons(len) : 0;
udh.uh.check = 0; udh.uh.check = 0;
udh.iov = msg->msg_iov; udh.iov = msg->msg_iov;
...@@ -905,14 +911,15 @@ static struct inet6_protocol udpv6_protocol = { ...@@ -905,14 +911,15 @@ static struct inet6_protocol udpv6_protocol = {
static void get_udp6_sock(struct sock *sp, char *tmpbuf, int i) static void get_udp6_sock(struct sock *sp, char *tmpbuf, int i)
{ {
struct inet_opt *inet = inet_sk(sp);
struct ipv6_pinfo *np = inet6_sk(sp); struct ipv6_pinfo *np = inet6_sk(sp);
struct in6_addr *dest, *src; struct in6_addr *dest, *src;
__u16 destp, srcp; __u16 destp, srcp;
dest = &np->daddr; dest = &np->daddr;
src = &np->rcv_saddr; src = &np->rcv_saddr;
destp = ntohs(sp->dport); destp = ntohs(inet->dport);
srcp = ntohs(sp->sport); srcp = ntohs(inet->sport);
sprintf(tmpbuf, sprintf(tmpbuf,
"%4d: %08X%08X%08X%08X:%04X %08X%08X%08X%08X:%04X " "%4d: %08X%08X%08X%08X:%04X %08X%08X%08X%08X:%04X "
"%02X %08X:%08X %02X:%08lX %08X %5d %8d %ld %d %p", "%02X %08X:%08X %02X:%08lX %08X %5d %8d %ld %d %p",
......
net/packet/af_packet.c
View file @ 5a7c2000
...@@ -180,6 +180,7 @@ struct packet_opt ...@@ -180,6 +180,7 @@ struct packet_opt
spinlock_t bind_lock; spinlock_t bind_lock;
char running; /* prot_hook is attached*/ char running; /* prot_hook is attached*/
int ifindex; /* bound device */ int ifindex; /* bound device */
unsigned short num;
struct tpacket_stats stats; struct tpacket_stats stats;
#ifdef CONFIG_PACKET_MULTICAST #ifdef CONFIG_PACKET_MULTICAST
struct packet_mclist *mclist; struct packet_mclist *mclist;
...@@ -678,8 +679,10 @@ static int packet_sendmsg(struct socket *sock, struct msghdr *msg, int len, ...@@ -678,8 +679,10 @@ static int packet_sendmsg(struct socket *sock, struct msghdr *msg, int len,
*/ */
if (saddr == NULL) { if (saddr == NULL) {
ifindex = pkt_sk(sk)->ifindex; struct packet_opt *po = pkt_sk(sk);
proto = sk->num;
ifindex = po->ifindex;
proto = po->num;
addr = NULL; addr = NULL;
} else { } else {
err = -EINVAL; err = -EINVAL;
...@@ -839,7 +842,7 @@ static int packet_do_bind(struct sock *sk, struct net_device *dev, int protocol) ...@@ -839,7 +842,7 @@ static int packet_do_bind(struct sock *sk, struct net_device *dev, int protocol)
po->running = 0; po->running = 0;
} }
sk->num = protocol; po->num = protocol;
po->prot_hook.type = protocol; po->prot_hook.type = protocol;
po->prot_hook.dev = dev; po->prot_hook.dev = dev;
...@@ -894,7 +897,7 @@ static int packet_bind_spkt(struct socket *sock, struct sockaddr *uaddr, int add ...@@ -894,7 +897,7 @@ static int packet_bind_spkt(struct socket *sock, struct sockaddr *uaddr, int add
dev = dev_get_by_name(name); dev = dev_get_by_name(name);
if (dev) { if (dev) {
err = packet_do_bind(sk, dev, sk->num); err = packet_do_bind(sk, dev, pkt_sk(sk)->num);
dev_put(dev); dev_put(dev);
} }
return err; return err;
...@@ -924,7 +927,7 @@ static int packet_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len ...@@ -924,7 +927,7 @@ static int packet_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len
if (dev == NULL) if (dev == NULL)
goto out; goto out;
} }
err = packet_do_bind(sk, dev, sll->sll_protocol ? : sk->num); err = packet_do_bind(sk, dev, sll->sll_protocol ? : pkt_sk(sk)->num);
if (dev) if (dev)
dev_put(dev); dev_put(dev);
...@@ -972,7 +975,7 @@ static int packet_create(struct socket *sock, int protocol) ...@@ -972,7 +975,7 @@ static int packet_create(struct socket *sock, int protocol)
goto out_free; goto out_free;
memset(po, 0, sizeof(*po)); memset(po, 0, sizeof(*po));
sk->family = PF_PACKET; sk->family = PF_PACKET;
sk->num = protocol; po->num = protocol;
sk->destruct = packet_sock_destruct; sk->destruct = packet_sock_destruct;
atomic_inc(&packet_socks_nr); atomic_inc(&packet_socks_nr);
...@@ -1131,7 +1134,7 @@ static int packet_getname(struct socket *sock, struct sockaddr *uaddr, ...@@ -1131,7 +1134,7 @@ static int packet_getname(struct socket *sock, struct sockaddr *uaddr,
sll->sll_family = AF_PACKET; sll->sll_family = AF_PACKET;
sll->sll_ifindex = po->ifindex; sll->sll_ifindex = po->ifindex;
sll->sll_protocol = sk->num; sll->sll_protocol = po->num;
dev = dev_get_by_index(po->ifindex); dev = dev_get_by_index(po->ifindex);
if (dev) { if (dev) {
sll->sll_hatype = dev->type; sll->sll_hatype = dev->type;
...@@ -1410,7 +1413,8 @@ static int packet_notifier(struct notifier_block *this, unsigned long msg, void ...@@ -1410,7 +1413,8 @@ static int packet_notifier(struct notifier_block *this, unsigned long msg, void
break; break;
case NETDEV_UP: case NETDEV_UP:
spin_lock(&po->bind_lock); spin_lock(&po->bind_lock);
if (dev->ifindex == po->ifindex && sk->num && po->running==0) { if (dev->ifindex == po->ifindex && po->num &&
!po->running) {
dev_add_pack(&po->prot_hook); dev_add_pack(&po->prot_hook);
sock_hold(sk); sock_hold(sk);
po->running = 1; po->running = 1;
...@@ -1861,7 +1865,7 @@ static int packet_read_proc(char *buffer, char **start, off_t offset, ...@@ -1861,7 +1865,7 @@ static int packet_read_proc(char *buffer, char **start, off_t offset,
s, s,
atomic_read(&s->refcnt), atomic_read(&s->refcnt),
s->type, s->type,
ntohs(s->num), ntohs(po->num),
po->ifindex, po->ifindex,
po->running, po->running,
atomic_read(&s->rmem_alloc), atomic_read(&s->rmem_alloc),
......
net/sunrpc/svcsock.c
View file @ 5a7c2000
...@@ -1161,7 +1161,8 @@ if (svsk->sk_sk == NULL) ...@@ -1161,7 +1161,8 @@ if (svsk->sk_sk == NULL)
/* Register socket with portmapper */ /* Register socket with portmapper */
if (*errp >= 0 && pmap_register) if (*errp >= 0 && pmap_register)
*errp = svc_register(serv, inet->protocol, ntohs(inet->sport)); *errp = svc_register(serv, inet->protocol,
ntohs(inet_sk(inet)->sport));
if (*errp < 0) { if (*errp < 0) {
inet->user_data = NULL; inet->user_data = NULL;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7