Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 64aae3cb authored by Julius Volz's avatar Julius Volz Committed by Simon Horman
Browse files

IPVS: Add general v4/v6 helper functions / data structures 



Add a struct ip_vs_iphdr for easier handling of common v4 and v6 header
fields in the same code path. ip_vs_fill_iphdr() helps to fill this struct
from an IPv4 or IPv6 header. Add further helper functions for copying and
comparing addresses.

Signed-off-by: default avatarJulius Volz <juliusv@google.com>
Signed-off-by: default avatarSimon Horman <horms@verge.net.au>
parent e7ade46a

include/net/ip_vs.h

+49 −0
Original line number Original line Diff line number Diff line
@@ -25,6 +25,55 @@ 
#include <linux/ipv6.h>			/* for struct ipv6hdr */

#include <linux/ipv6.h>			/* for struct ipv6hdr */

#include <net/ipv6.h>			/* for ipv6_addr_copy */

#include <net/ipv6.h>			/* for ipv6_addr_copy */





struct ip_vs_iphdr {

	int len;

	__u8 protocol;

	union nf_inet_addr saddr;

	union nf_inet_addr daddr;

};



static inline void

ip_vs_fill_iphdr(int af, const void *nh, struct ip_vs_iphdr *iphdr)

{

#ifdef CONFIG_IP_VS_IPV6

	if (af == AF_INET6) {

		const struct ipv6hdr *iph = nh;

		iphdr->len = sizeof(struct ipv6hdr);

		iphdr->protocol = iph->nexthdr;

		ipv6_addr_copy(&iphdr->saddr.in6, &iph->saddr);

		ipv6_addr_copy(&iphdr->daddr.in6, &iph->daddr);

	} else

#endif

	{

		const struct iphdr *iph = nh;

		iphdr->len = iph->ihl * 4;

		iphdr->protocol = iph->protocol;

		iphdr->saddr.ip = iph->saddr;

		iphdr->daddr.ip = iph->daddr;

	}

}



static inline void ip_vs_addr_copy(int af, union nf_inet_addr *dst,

				   const union nf_inet_addr *src)

{

#ifdef CONFIG_IP_VS_IPV6

	if (af == AF_INET6)

		ipv6_addr_copy(&dst->in6, &src->in6);

	else

#endif

	dst->ip = src->ip;

}



static inline int ip_vs_addr_equal(int af, const union nf_inet_addr *a,

				   const union nf_inet_addr *b)

{

#ifdef CONFIG_IP_VS_IPV6

	if (af == AF_INET6)

		return ipv6_addr_equal(&a->in6, &b->in6);

#endif

	return a->ip == b->ip;

}



#ifdef CONFIG_IP_VS_DEBUG

#ifdef CONFIG_IP_VS_DEBUG

#include <linux/net.h>

#include <linux/net.h>