[UDP]: Make full use of proto.h.udp_hash innovation.
After this we have only udp_lib_get_port to get the port and two stubs for ipv4 and ipv6. No difference in udp and udplite except for initialized h.udp_hash member. I tried to find a graceful way to drop the only difference between udp_v4_get_port and udp_v6_get_port (i.e. the rcv_saddr comparison routine), but adding one more callback on the struct proto didn't appear such :( Maybe later. Signed-off-by: Pavel Emelyanov <xemul@openvz.org> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Pavel Emelyanov
David S. Miller
parent
39d8cda76c
commit
6ba5a3c52d
|
|
@ -125,6 +125,8 @@ static inline void udp_lib_close(struct sock *sk, long timeout)
|
|||
sk_common_release(sk);
|
||||
}
|
||||
|
||||
extern int udp_lib_get_port(struct sock *sk, unsigned short snum,
|
||||
int (*)(const struct sock*,const struct sock*));
|
||||
|
||||
/* net/ipv4/udp.c */
|
||||
extern int udp_get_port(struct sock *sk, unsigned short snum,
|
||||
|
|
|
|||
|
|
@ -143,18 +143,17 @@ static inline int __udp_lib_lport_inuse(struct net *net, __u16 num,
|
|||
}
|
||||
|
||||
/**
|
||||
* __udp_lib_get_port - UDP/-Lite port lookup for IPv4 and IPv6
|
||||
* udp_lib_get_port - UDP/-Lite port lookup for IPv4 and IPv6
|
||||
*
|
||||
* @sk: socket struct in question
|
||||
* @snum: port number to look up
|
||||
* @udptable: hash list table, must be of UDP_HTABLE_SIZE
|
||||
* @saddr_comp: AF-dependent comparison of bound local IP addresses
|
||||
*/
|
||||
int __udp_lib_get_port(struct sock *sk, unsigned short snum,
|
||||
struct hlist_head udptable[],
|
||||
int udp_lib_get_port(struct sock *sk, unsigned short snum,
|
||||
int (*saddr_comp)(const struct sock *sk1,
|
||||
const struct sock *sk2 ) )
|
||||
{
|
||||
struct hlist_head *udptable = sk->sk_prot->h.udp_hash;
|
||||
struct hlist_node *node;
|
||||
struct hlist_head *head;
|
||||
struct sock *sk2;
|
||||
|
|
@ -240,13 +239,7 @@ fail:
|
|||
return error;
|
||||
}
|
||||
|
||||
int udp_get_port(struct sock *sk, unsigned short snum,
|
||||
int (*scmp)(const struct sock *, const struct sock *))
|
||||
{
|
||||
return __udp_lib_get_port(sk, snum, udp_hash, scmp);
|
||||
}
|
||||
|
||||
int ipv4_rcv_saddr_equal(const struct sock *sk1, const struct sock *sk2)
|
||||
static int ipv4_rcv_saddr_equal(const struct sock *sk1, const struct sock *sk2)
|
||||
{
|
||||
struct inet_sock *inet1 = inet_sk(sk1), *inet2 = inet_sk(sk2);
|
||||
|
||||
|
|
@ -255,9 +248,9 @@ int ipv4_rcv_saddr_equal(const struct sock *sk1, const struct sock *sk2)
|
|||
inet1->rcv_saddr == inet2->rcv_saddr ));
|
||||
}
|
||||
|
||||
static inline int udp_v4_get_port(struct sock *sk, unsigned short snum)
|
||||
int udp_v4_get_port(struct sock *sk, unsigned short snum)
|
||||
{
|
||||
return udp_get_port(sk, snum, ipv4_rcv_saddr_equal);
|
||||
return udp_lib_get_port(sk, snum, ipv4_rcv_saddr_equal);
|
||||
}
|
||||
|
||||
/* UDP is nearly always wildcards out the wazoo, it makes no sense to try
|
||||
|
|
@ -1498,6 +1491,7 @@ struct proto udp_prot = {
|
|||
.sysctl_wmem = &sysctl_udp_wmem_min,
|
||||
.sysctl_rmem = &sysctl_udp_rmem_min,
|
||||
.obj_size = sizeof(struct udp_sock),
|
||||
.h.udp_hash = udp_hash,
|
||||
#ifdef CONFIG_COMPAT
|
||||
.compat_setsockopt = compat_udp_setsockopt,
|
||||
.compat_getsockopt = compat_udp_getsockopt,
|
||||
|
|
@ -1741,12 +1735,12 @@ EXPORT_SYMBOL(udp_disconnect);
|
|||
EXPORT_SYMBOL(udp_hash);
|
||||
EXPORT_SYMBOL(udp_hash_lock);
|
||||
EXPORT_SYMBOL(udp_ioctl);
|
||||
EXPORT_SYMBOL(udp_get_port);
|
||||
EXPORT_SYMBOL(udp_prot);
|
||||
EXPORT_SYMBOL(udp_sendmsg);
|
||||
EXPORT_SYMBOL(udp_lib_getsockopt);
|
||||
EXPORT_SYMBOL(udp_lib_setsockopt);
|
||||
EXPORT_SYMBOL(udp_poll);
|
||||
EXPORT_SYMBOL(udp_lib_get_port);
|
||||
|
||||
#ifdef CONFIG_PROC_FS
|
||||
EXPORT_SYMBOL(udp_proc_register);
|
||||
|
|
|
|||
|
|
@ -8,11 +8,7 @@
|
|||
extern int __udp4_lib_rcv(struct sk_buff *, struct hlist_head [], int );
|
||||
extern void __udp4_lib_err(struct sk_buff *, u32, struct hlist_head []);
|
||||
|
||||
extern int __udp_lib_get_port(struct sock *sk, unsigned short snum,
|
||||
struct hlist_head udptable[],
|
||||
int (*)(const struct sock*,const struct sock*));
|
||||
extern int ipv4_rcv_saddr_equal(const struct sock *, const struct sock *);
|
||||
|
||||
extern int udp_v4_get_port(struct sock *sk, unsigned short snum);
|
||||
|
||||
extern int udp_setsockopt(struct sock *sk, int level, int optname,
|
||||
char __user *optval, int optlen);
|
||||
|
|
|
|||
|
|
@ -17,17 +17,6 @@ DEFINE_SNMP_STAT(struct udp_mib, udplite_statistics) __read_mostly;
|
|||
|
||||
struct hlist_head udplite_hash[UDP_HTABLE_SIZE];
|
||||
|
||||
int udplite_get_port(struct sock *sk, unsigned short p,
|
||||
int (*c)(const struct sock *, const struct sock *))
|
||||
{
|
||||
return __udp_lib_get_port(sk, p, udplite_hash, c);
|
||||
}
|
||||
|
||||
static int udplite_v4_get_port(struct sock *sk, unsigned short snum)
|
||||
{
|
||||
return udplite_get_port(sk, snum, ipv4_rcv_saddr_equal);
|
||||
}
|
||||
|
||||
static int udplite_rcv(struct sk_buff *skb)
|
||||
{
|
||||
return __udp4_lib_rcv(skb, udplite_hash, IPPROTO_UDPLITE);
|
||||
|
|
@ -63,8 +52,9 @@ struct proto udplite_prot = {
|
|||
.backlog_rcv = udp_queue_rcv_skb,
|
||||
.hash = udp_lib_hash,
|
||||
.unhash = udp_lib_unhash,
|
||||
.get_port = udplite_v4_get_port,
|
||||
.get_port = udp_v4_get_port,
|
||||
.obj_size = sizeof(struct udp_sock),
|
||||
.h.udp_hash = udplite_hash,
|
||||
#ifdef CONFIG_COMPAT
|
||||
.compat_setsockopt = compat_udp_setsockopt,
|
||||
.compat_getsockopt = compat_udp_getsockopt,
|
||||
|
|
@ -118,4 +108,3 @@ out_register_err:
|
|||
|
||||
EXPORT_SYMBOL(udplite_hash);
|
||||
EXPORT_SYMBOL(udplite_prot);
|
||||
EXPORT_SYMBOL(udplite_get_port);
|
||||
|
|
|
|||
|
|
@ -51,9 +51,9 @@
|
|||
#include <linux/seq_file.h>
|
||||
#include "udp_impl.h"
|
||||
|
||||
static inline int udp_v6_get_port(struct sock *sk, unsigned short snum)
|
||||
int udp_v6_get_port(struct sock *sk, unsigned short snum)
|
||||
{
|
||||
return udp_get_port(sk, snum, ipv6_rcv_saddr_equal);
|
||||
return udp_lib_get_port(sk, snum, ipv6_rcv_saddr_equal);
|
||||
}
|
||||
|
||||
static struct sock *__udp6_lib_lookup(struct net *net,
|
||||
|
|
@ -1024,6 +1024,7 @@ struct proto udpv6_prot = {
|
|||
.sysctl_wmem = &sysctl_udp_wmem_min,
|
||||
.sysctl_rmem = &sysctl_udp_rmem_min,
|
||||
.obj_size = sizeof(struct udp6_sock),
|
||||
.h.udp_hash = udp_hash,
|
||||
#ifdef CONFIG_COMPAT
|
||||
.compat_setsockopt = compat_udpv6_setsockopt,
|
||||
.compat_getsockopt = compat_udpv6_getsockopt,
|
||||
|
|
|
|||
|
|
@ -11,6 +11,8 @@ extern int __udp6_lib_rcv(struct sk_buff *, struct hlist_head [], int );
|
|||
extern void __udp6_lib_err(struct sk_buff *, struct inet6_skb_parm *,
|
||||
int , int , int , __be32 , struct hlist_head []);
|
||||
|
||||
extern int udp_v6_get_port(struct sock *sk, unsigned short snum);
|
||||
|
||||
extern int udpv6_getsockopt(struct sock *sk, int level, int optname,
|
||||
char __user *optval, int __user *optlen);
|
||||
extern int udpv6_setsockopt(struct sock *sk, int level, int optname,
|
||||
|
|
|
|||
|
|
@ -35,11 +35,6 @@ static struct inet6_protocol udplitev6_protocol = {
|
|||
.flags = INET6_PROTO_NOPOLICY|INET6_PROTO_FINAL,
|
||||
};
|
||||
|
||||
static int udplite_v6_get_port(struct sock *sk, unsigned short snum)
|
||||
{
|
||||
return udplite_get_port(sk, snum, ipv6_rcv_saddr_equal);
|
||||
}
|
||||
|
||||
DEFINE_PROTO_INUSE(udplitev6)
|
||||
|
||||
struct proto udplitev6_prot = {
|
||||
|
|
@ -58,8 +53,9 @@ struct proto udplitev6_prot = {
|
|||
.backlog_rcv = udpv6_queue_rcv_skb,
|
||||
.hash = udp_lib_hash,
|
||||
.unhash = udp_lib_unhash,
|
||||
.get_port = udplite_v6_get_port,
|
||||
.get_port = udp_v6_get_port,
|
||||
.obj_size = sizeof(struct udp6_sock),
|
||||
.h.udp_hash = udplite_hash,
|
||||
#ifdef CONFIG_COMPAT
|
||||
.compat_setsockopt = compat_udpv6_setsockopt,
|
||||
.compat_getsockopt = compat_udpv6_getsockopt,
|
||||
|
|
|
|||
Reference in New Issue