openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

net - IP_NODEFRAG option for IPv4 socket 

this patch is implementing IP_NODEFRAG option for IPv4 socket.
The reason is, there's no other way to send out the packet with user
customized header of the reassembly part.

Signed-off-by: Jiri Olsa <jolsa@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Jiri Olsa 2010-06-15 01:07:31 +00:00 committed by David S. Miller
parent 01fc3e86c6
commit 7b2ff18ee7
5 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/linux/in.h
View File

@ -85,6 +85,7 @@ struct in_addr {
#define IP_RECVORIGDSTADDR IP_ORIGDSTADDR #define IP_RECVORIGDSTADDR IP_ORIGDSTADDR
#define IP_MINTTL 21 #define IP_MINTTL 21
#define IP_NODEFRAG 22
/* IP_MTU_DISCOVER values */ /* IP_MTU_DISCOVER values */
#define IP_PMTUDISC_DONT 0 /* Never send DF frames */ #define IP_PMTUDISC_DONT 0 /* Never send DF frames */

3
include/net/inet_sock.h
View File

@ -137,7 +137,8 @@ struct inet_sock {
hdrincl:1, hdrincl:1,
mc_loop:1, mc_loop:1,
transparent:1, transparent:1,
mc_all:1; mc_all:1,
nodefrag:1;
int mc_index; int mc_index;
__be32 mc_addr; __be32 mc_addr;
struct ip_mc_socklist *mc_list; struct ip_mc_socklist *mc_list;

2
net/ipv4/af_inet.c
View File

@ -355,6 +355,8 @@ static int inet_create(struct net *net, struct socket *sock, int protocol,
inet = inet_sk(sk); inet = inet_sk(sk);
inet->is_icsk = (INET_PROTOSW_ICSK & answer_flags) != 0; inet->is_icsk = (INET_PROTOSW_ICSK & answer_flags) != 0;
inet->nodefrag = 0;
if (SOCK_RAW == sock->type) { if (SOCK_RAW == sock->type) {
inet->inet_num = protocol; inet->inet_num = protocol;
if (IPPROTO_RAW == protocol) if (IPPROTO_RAW == protocol)

9
net/ipv4/ip_sockglue.c
View File

@ -465,7 +465,7 @@ static int do_ip_setsockopt(struct sock *sk, int level,
(1<<IP_MTU_DISCOVER) | (1<<IP_RECVERR) | (1<<IP_MTU_DISCOVER) | (1<<IP_RECVERR) |
(1<<IP_ROUTER_ALERT) | (1<<IP_FREEBIND) | (1<<IP_ROUTER_ALERT) | (1<<IP_FREEBIND) |
(1<<IP_PASSSEC) | (1<<IP_TRANSPARENT) | (1<<IP_PASSSEC) | (1<<IP_TRANSPARENT) |
(1<<IP_MINTTL))) || (1<<IP_MINTTL) | (1<<IP_NODEFRAG))) ||
optname == IP_MULTICAST_TTL || optname == IP_MULTICAST_TTL ||
optname == IP_MULTICAST_ALL || optname == IP_MULTICAST_ALL ||
optname == IP_MULTICAST_LOOP || optname == IP_MULTICAST_LOOP ||
@ -588,6 +588,13 @@ static int do_ip_setsockopt(struct sock *sk, int level,
} }
inet->hdrincl = val ? 1 : 0; inet->hdrincl = val ? 1 : 0;
break; break;
case IP_NODEFRAG:
if (sk->sk_type != SOCK_RAW) {
err = -ENOPROTOOPT;
break;
}
inet->nodefrag = val ? 1 : 0;
break;
case IP_MTU_DISCOVER: case IP_MTU_DISCOVER:
if (val < IP_PMTUDISC_DONT || val > IP_PMTUDISC_PROBE) if (val < IP_PMTUDISC_DONT || val > IP_PMTUDISC_PROBE)
goto e_inval; goto e_inval;

5
net/ipv4/netfilter/nf_defrag_ipv4.c
View File

@ -66,6 +66,11 @@ static unsigned int ipv4_conntrack_defrag(unsigned int hooknum,
const struct net_device *out, const struct net_device *out,
int (*okfn)(struct sk_buff *)) int (*okfn)(struct sk_buff *))
{ {
struct inet_sock *inet = inet_sk(skb->sk);
if (inet && inet->nodefrag)
return NF_ACCEPT;
#if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE) #if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
#if !defined(CONFIG_NF_NAT) && !defined(CONFIG_NF_NAT_MODULE) #if !defined(CONFIG_NF_NAT) && !defined(CONFIG_NF_NAT_MODULE)
/* Previously seen (loopback)? Ignore. Do this before /* Previously seen (loopback)? Ignore. Do this before