Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[IPV4] sctp: Use ipv4_is_<type>

Browse source 
Signed-off-by: Joe Perches <joe@perches.com>
Acked-by: Vlad Yasevich <vladislav.yasevich@hp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Joe Perches 2007-12-16 13:46:59 -08:00 committed by David S. Miller
parent 37ef8dd7f3
commit b5cb2bbc4c
2 changed files with 13 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
include/net/sctp/constants.h
View file

@ -365,36 +365,12 @@ typedef enum {
* Also, RFC 8.4, non-unicast addresses are not considered valid SCTP * Also, RFC 8.4, non-unicast addresses are not considered valid SCTP
* addresses. * addresses.
*/ */
#define IS_IPV4_UNUSABLE_ADDRESS(a) \ #define IS_IPV4_UNUSABLE_ADDRESS(a) \
((htonl(INADDR_BROADCAST) == *a) || \ ((htonl(INADDR_BROADCAST) == a) || \
(MULTICAST(*a)) || \ ipv4_is_multicast(a) || \
(((unsigned char *)(a))[0] == 0) || \ ipv4_is_zeronet(a) || \
((((unsigned char *)(a))[0] == 198) && \ ipv4_is_test_198(a) || \
(((unsigned char *)(a))[1] == 18) && \ ipv4_is_anycast_6to4(a))
(((unsigned char *)(a))[2] == 0)) || \
((((unsigned char *)(a))[0] == 192) && \
(((unsigned char *)(a))[1] == 88) && \
(((unsigned char *)(a))[2] == 99)))
/* IPv4 Link-local addresses: 169.254.0.0/16. */
#define IS_IPV4_LINK_ADDRESS(a) \
((((unsigned char *)(a))[0] == 169) && \
(((unsigned char *)(a))[1] == 254))
/* RFC 1918 "Address Allocation for Private Internets" defines the IPv4
* private address space as the following:
*
* 10.0.0.0 - 10.255.255.255 (10/8 prefix)
* 172.16.0.0.0 - 172.31.255.255 (172.16/12 prefix)
* 192.168.0.0 - 192.168.255.255 (192.168/16 prefix)
*/
#define IS_IPV4_PRIVATE_ADDRESS(a) \
((((unsigned char *)(a))[0] == 10) || \
((((unsigned char *)(a))[0] == 172) && \
(((unsigned char *)(a))[1] >= 16) && \
(((unsigned char *)(a))[1] < 32)) || \
((((unsigned char *)(a))[0] == 192) && \
(((unsigned char *)(a))[1] == 168)))
/* Flags used for the bind address copy functions. */ /* Flags used for the bind address copy functions. */
#define SCTP_ADDR6_ALLOWED 0x00000001 /* IPv6 address is allowed by #define SCTP_ADDR6_ALLOWED 0x00000001 /* IPv6 address is allowed by

12
net/sctp/protocol.c
View file

@ -359,7 +359,7 @@ static int sctp_v4_addr_valid(union sctp_addr *addr,
const struct sk_buff *skb) const struct sk_buff *skb)
{ {
/* Is this a non-unicast address or a unusable SCTP address? */ /* Is this a non-unicast address or a unusable SCTP address? */
if (IS_IPV4_UNUSABLE_ADDRESS(&addr->v4.sin_addr.s_addr)) if (IS_IPV4_UNUSABLE_ADDRESS(addr->v4.sin_addr.s_addr))
return 0; return 0;
/* Is this a broadcast address? */ /* Is this a broadcast address? */
@ -408,13 +408,15 @@ static sctp_scope_t sctp_v4_scope(union sctp_addr *addr)
*/ */
/* Check for unusable SCTP addresses. */ /* Check for unusable SCTP addresses. */
if (IS_IPV4_UNUSABLE_ADDRESS(&addr->v4.sin_addr.s_addr)) { if (IS_IPV4_UNUSABLE_ADDRESS(addr->v4.sin_addr.s_addr)) {
retval = SCTP_SCOPE_UNUSABLE; retval = SCTP_SCOPE_UNUSABLE;
} else if (LOOPBACK(addr->v4.sin_addr.s_addr)) { } else if (ipv4_is_loopback(addr->v4.sin_addr.s_addr)) {
retval = SCTP_SCOPE_LOOPBACK; retval = SCTP_SCOPE_LOOPBACK;
} else if (IS_IPV4_LINK_ADDRESS(&addr->v4.sin_addr.s_addr)) { } else if (ipv4_is_linklocal_169(addr->v4.sin_addr.s_addr)) {
retval = SCTP_SCOPE_LINK; retval = SCTP_SCOPE_LINK;
} else if (IS_IPV4_PRIVATE_ADDRESS(&addr->v4.sin_addr.s_addr)) { } else if (ipv4_is_private_10(addr->v4.sin_addr.s_addr) ||
ipv4_is_private_172(addr->v4.sin_addr.s_addr) ||
ipv4_is_private_192(addr->v4.sin_addr.s_addr)) {
retval = SCTP_SCOPE_PRIVATE; retval = SCTP_SCOPE_PRIVATE;
} else { } else {
retval = SCTP_SCOPE_GLOBAL; retval = SCTP_SCOPE_GLOBAL;