: UDP-Lite support
Subsystems (6)
PATCH 2/2 : UDP-Lite support
[UDPv6]: Support for UDP-Litev6 (RFC 3828).
* consolidated with UDP basis
* basic xfrm/netfilter support
Signed-off-by Gerrit Renker <[email protected]>
--
include/net/ipv6.h | 12 + include/net/transp_v6.h | 2 net/ipv6/af_inet6.c | 21 ++ net/ipv6/ipv6_sockglue.c | 11 + net/ipv6/netfilter/ip6t_LOG.c | 10 - net/ipv6/proc.c | 11 + net/ipv6/udp.c | 330 ++++++++++++++++++++++++------------------ net/ipv6/udplite.c | 103 +++++++++++++ net/ipv6/xfrm6_policy.c | 1 9 files changed, 351 insertions(+), 150 deletions(-)
include/net/transp_v6.h +2 -0
@@ -11,6 +11,7 @@ #ifdef __KERNEL__extern struct proto rawv6_prot;extern struct proto udpv6_prot; +extern struct proto udplitev6_prot;extern struct proto tcpv6_prot;struct flowi ;
@@ -24,6 +25,7 @@ extern void ipv6_destopt_init(void);/* transport protocols */ extern void rawv6_init (void );extern void udpv6_init (void ); +extern void udplitev6_init (void );extern void tcpv6_init (void ); extern int udpv6_connect(struct sock *sk,
net/ipv6/udp.c +189 -141
568 lines not on this page · raw message
net/ipv6/udplite.c new file +103 -0
103 lines not on this page · raw message
include/net/ipv6.h +9 -3
@@ -143,9 +143,13 @@ #define ICMP6_INC_STATS_OFFSET_BH(idev,SNMP_INC_STATS_OFFSET_BH (icmpv6_statistics, field, _offset); \ }) DECLARE_SNMP_STAT(struct udp_mib, udp_stats_in6); -#define UDP6_INC_STATS (field) SNMP_INC_STATS(udp_stats_in6, field) -#define UDP6_INC_STATS_BH (field) SNMP_INC_STATS_BH(udp_stats_in6, field) -#define UDP6_INC_STATS_USER (field) SNMP_INC_STATS_USER(udp_stats_in6, field) +DECLARE_SNMP_STAT(struct udp_mib, udplite_stats_in6); +#define UDP6_INC_STATS_BH (field, is_udplite) do { \ + if (is_udplite) SNMP_INC_STATS_BH(udplite_stats_in6, field); \ + else SNMP_INC_STATS_BH(udp_stats_in6, field); } while(0) +#define UDP6_INC_STATS_USER (field, is_udplite) do { \ + if (is_udplite) SNMP_INC_STATS_USER(udplite_stats_in6, field); \ + else SNMP_INC_STATS_USER(udp_stats_in6, field); } while(0)int snmp6_register_dev (struct inet6_dev *idev);int snmp6_unregister_dev (struct inet6_dev *idev);
@@ -589,6 +593,8 @@ extern int tcp6_proc_init(void);extern void tcp6_proc_exit (void );extern int udp6_proc_init (void );extern void udp6_proc_exit (void ); +extern int udplite6_proc_init (void ); +extern void udplite6_proc_exit (void );extern int ipv6_misc_proc_init (void );extern void ipv6_misc_proc_exit (void );
net/ipv6/af_inet6.c +20 -1
@@ -49,6 +49,7 @@ #include <linux/netfilter_ipv6.h>#include <net/ip.h> #include <net/ipv6.h> #include <net/udp.h> +#include <net/udplite.h> #include <net/tcp.h> #include <net/ipip.h> #include <net/protocol.h>
@@ -737,8 +738,13 @@ static int __init init_ipv6_mibs(void)if (snmp6_mib_init ((void **)udp_stats_in6,sizeof (struct udp_mib ), __alignof__(struct udp_mib )) <0 ) goto err_udp_mib; +if (snmp6_mib_init ((void **)udplite_stats_in6,sizeof (struct udp_mib ), + __alignof__(struct udp_mib )) <0 ) + goto err_udplite_mib;return 0 ; +err_udplite_mib: +snmp6_mib_free ((void **)udp_stats_in6); err_udp_mib:snmp6_mib_free ((void **)icmpv6_statistics); err_icmp_mib:
@@ -753,6 +759,7 @@ static void cleanup_ipv6_mibs(void)snmp6_mib_free ((void **)ipv6_statistics);snmp6_mib_free ((void **)icmpv6_statistics);snmp6_mib_free ((void **)udp_stats_in6); +snmp6_mib_free ((void **)udplite_stats_in6); }static int __init inet6_init (void )
@@ -780,10 +787,14 @@ #endifif (err) goto out_unregister_tcp_proto; - err =proto_register (&rawv6_prot,1 ); + err =proto_register (&udplitev6_prot,1 );if (err) goto out_unregister_udp_proto; + err =proto_register (&rawv6_prot,1 ); +if (err) + goto out_unregister_udplite_proto; +/* Register the socket-side information for inet6_create. */ for (r = &inetsw6[0 ]; r < &inetsw6[SOCK_MAX ]; ++r)
@@ -837,6 +848,8 @@ #ifdef CONFIG_PROC_FS goto proc_tcp6_fail;if (udp6_proc_init ()) goto proc_udp6_fail; +if (udplite6_proc_init ()) + goto proc_udplite6_fail;if (ipv6_misc_proc_init ()) goto proc_misc6_fail;
@@ -862,6 +875,7 @@ #endif/* Init v6 transport protocols. */ udpv6_init (); +udplitev6_init ();tcpv6_init ();ipv6_packet_init ();
@@ -879,6 +893,8 @@ proc_if6_fail: proc_anycast6_fail:ipv6_misc_proc_exit (); proc_misc6_fail: +udplite6_proc_exit (); +proc_udplite6_fail:udp6_proc_exit (); proc_udp6_fail:tcp6_proc_exit ();
@@ -902,6 +918,8 @@ out_unregister_sock:sock_unregister (PF_INET6 ); out_unregister_raw_proto:proto_unregister (&rawv6_prot); +out_unregister_udplite_proto: +proto_unregister (&udplitev6_prot); out_unregister_udp_proto:proto_unregister (&udpv6_prot); out_unregister_tcp_proto:
@@ -919,6 +937,7 @@ #ifdef CONFIG_PROC_FSac6_proc_exit ();ipv6_misc_proc_exit ();udp6_proc_exit (); +udplite6_proc_exit ();tcp6_proc_exit ();raw6_proc_exit ();#endif
net/ipv6/proc.c +11 -0
@@ -49,6 +49,8 @@ static int sockstat6_seq_show(struct seq fold_prot_inuse(&tcpv6_prot));seq_printf (seq,"UDP6: inuse %d\n" ,fold_prot_inuse (&udpv6_prot)); +seq_printf (seq,"UDPLITE6: inuse %d\n" , +fold_prot_inuse (&udplitev6_prot));seq_printf (seq,"RAW6: inuse %d\n" ,fold_prot_inuse (&rawv6_prot)); seq_printf(seq, "FRAG6: inuse %d memory %d\n",
@@ -133,6 +135,14 @@ static struct snmp_mib snmp6_udp6_list[] SNMP_MIB_SENTINEL }; +static struct snmp_mib snmp6_udplite6_list[] = { +SNMP_MIB_ITEM ("UdpLite6InDatagrams" ,UDP_MIB_INDATAGRAMS ), +SNMP_MIB_ITEM ("UdpLite6NoPorts" ,UDP_MIB_NOPORTS ), +SNMP_MIB_ITEM ("UdpLite6InErrors" ,UDP_MIB_INERRORS ), +SNMP_MIB_ITEM ("UdpLite6OutDatagrams" ,UDP_MIB_OUTDATAGRAMS ), +SNMP_MIB_SENTINEL +}; +static unsigned long fold_field (void *mib[],int offt) {
@@ -166,6 +176,7 @@ static int snmp6_seq_show(struct seq_filsnmp6_seq_show_item (seq, (void **)ipv6_statistics, snmp6_ipstats_list);snmp6_seq_show_item (seq, (void **)icmpv6_statistics, snmp6_icmp6_list);snmp6_seq_show_item (seq, (void **)udp_stats_in6, snmp6_udp6_list); +snmp6_seq_show_item (seq, (void **)udplite_stats_in6, snmp6_udplite6_list); }return 0 ; }
net/ipv6/ipv6_sockglue.c +9 -2
@@ -51,6 +51,7 @@ #include <net/addrconf.h>#include <net/inet_common.h> #include <net/tcp.h> #include <net/udp.h> +#include <net/udplite.h> #include <net/xfrm.h> #include <asm/uaccess.h>
@@ -239,6 +240,7 @@ static int do_ipv6_setsockopt(struct socstruct sk_buff *pktopt;if (sk->sk_protocol !=IPPROTO_UDP && + sk->sk_protocol !=IPPROTO_UDPLITE && sk->sk_protocol !=IPPROTO_TCP )break ;
@@ -276,11 +278,15 @@ static int do_ipv6_setsockopt(struct soc sk->sk_family =PF_INET ;tcp_sync_mss (sk, icsk->icsk_pmtu_cookie); }else { +struct proto *prot = &udp_prot; + +if (sk->sk_protocol ==IPPROTO_UDPLITE ) + prot = &udplite_prot;local_bh_disable ();sock_prot_dec_use (sk->sk_prot); -sock_prot_inc_use (&udp_prot); +sock_prot_inc_use (prot);local_bh_enable (); - sk->sk_prot = &udp_prot; + sk->sk_prot = prot; sk->sk_socket->ops = &inet_dgram_ops; sk->sk_family =PF_INET ; }
@@ -813,6 +819,7 @@ static int do_ipv6_getsockopt(struct socswitch (optname) {case IPV6_ADDRFORM :if (sk->sk_protocol !=IPPROTO_UDP && + sk->sk_protocol !=IPPROTO_UDPLITE && sk->sk_protocol !=IPPROTO_TCP )return -EINVAL ;if (sk->sk_state !=TCP_ESTABLISHED )
net/ipv6/xfrm6_policy.c +1 -0
@@ -274,6 +274,7 @@ _decode_session6(struct sk_buff *skb, stbreak ;case IPPROTO_UDP : +case IPPROTO_UDPLITE :case IPPROTO_TCP :case IPPROTO_SCTP :case IPPROTO_DCCP :
net/ipv6/netfilter/ip6t_LOG.c +7 -3
@@ -270,11 +270,15 @@ static void dump_packet(const struct nf_ }break ; } -case IPPROTO_UDP : { +case IPPROTO_UDP : +case IPPROTO_UDPLITE : {struct udphdr _udph, *uh; -/* Max length: 10 "PROTO=UDP " */ -printk ("PROTO=UDP " ); +if (currenthdr ==IPPROTO_UDP ) +/* Max length: 10 "PROTO=UDP " */ +printk ("PROTO=UDP " ); +else /* Max length: 14 "PROTO=UDPLITE " */ +printk ("PROTO=UDPLITE " );if (fragment)break ;