status-im
/
miniupnp
mirror of https://github.com/status-im/miniupnp.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

minissdpd: update getifaddr.c/.h

This commit is contained in:
Thomas Bernard 2019-02-10 16:06:34 +01:00
parent 4e4edf244d
commit f61fbff5e0
No known key found for this signature in database
GPG Key ID: 0FF11B67A5C0863C
2 changed files with 53 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
minissdpd/getifaddr.c
View File

@ -1,7 +1,8 @@
/* $Id: getifaddr.c,v 1.24 2015/07/09 12:27:26 nanard Exp $ */ /* $Id: getifaddr.c,v 1.25 2018/07/06 11:47:29 nanard Exp $ */
/* MiniUPnP project /* vim: tabstop=4 shiftwidth=4 noexpandtab
* http://miniupnp.free.fr/ or http://miniupnp.tuxfamily.org/ * MiniUPnP project
* (c) 2006-2014 Thomas Bernard * http://miniupnp.free.fr/ or https://miniupnp.tuxfamily.org/
* (c) 2006-2018 Thomas Bernard
* This software is subject to the conditions detailed * This software is subject to the conditions detailed
* in the LICENCE file provided within the distribution */ * in the LICENCE file provided within the distribution */
@ -259,3 +260,43 @@ find_ipv6_addr(const char * ifname,
} }
#endif #endif
/* List of IP address blocks which are private / reserved and therefore not suitable for public external IP addresses */
/* If interface has IP address from one of this block, then it is either behind NAT or port forwarding is impossible */
#define IP(a, b, c, d) (((a) << 24) + ((b) << 16) + ((c) << 8) + (d))
#define MSK(m) (32-(m))
static const struct { uint32_t address; uint32_t rmask; } reserved[] = {
{ IP( 0, 0, 0, 0), MSK( 8) }, /* RFC1122 "This host on this network" */
{ IP( 10, 0, 0, 0), MSK( 8) }, /* RFC1918 Private-Use */
{ IP(100, 64, 0, 0), MSK(10) }, /* RFC6598 Shared Address Space */
{ IP(127, 0, 0, 0), MSK( 8) }, /* RFC1122 Loopback */
{ IP(169, 254, 0, 0), MSK(16) }, /* RFC3927 Link-Local */
{ IP(172, 16, 0, 0), MSK(12) }, /* RFC1918 Private-Use */
{ IP(192, 0, 0, 0), MSK(24) }, /* RFC6890 IETF Protocol Assignments */
{ IP(192, 0, 2, 0), MSK(24) }, /* RFC5737 Documentation (TEST-NET-1) */
{ IP(192, 31, 196, 0), MSK(24) }, /* RFC7535 AS112-v4 */
{ IP(192, 52, 193, 0), MSK(24) }, /* RFC7450 AMT */
{ IP(192, 88, 99, 0), MSK(24) }, /* RFC7526 6to4 Relay Anycast */
{ IP(192, 168, 0, 0), MSK(16) }, /* RFC1918 Private-Use */
{ IP(192, 175, 48, 0), MSK(16) }, /* RFC7534 Direct Delegation AS112 Service */
{ IP(198, 18, 0, 0), MSK(15) }, /* RFC2544 Benchmarking */
{ IP(198, 51, 100, 0), MSK(24) }, /* RFC5737 Documentation (TEST-NET-2) */
{ IP(203, 0, 113, 0), MSK(24) }, /* RFC5737 Documentation (TEST-NET-3) */
{ IP(224, 0, 0, 0), MSK( 4) }, /* RFC1112 Multicast */
{ IP(240, 0, 0, 0), MSK( 4) }, /* RFC1112 Reserved for Future Use + RFC919 Limited Broadcast */
};
#undef IP
#undef MSK
int
addr_is_reserved(struct in_addr * addr)
{
uint32_t address = ntohl(addr->s_addr);
size_t i;
for (i = 0; i < sizeof(reserved)/sizeof(reserved[0]); ++i) {
if ((address >> reserved[i].rmask) == (reserved[i].address >> reserved[i].rmask))
return 1;
}
return 0;
}

12
minissdpd/getifaddr.h
View File

@ -1,7 +1,8 @@
/* $Id: getifaddr.h,v 1.10 2014/05/06 14:40:53 nanard Exp $ */ /* $Id: getifaddr.h,v 1.11 2018/07/06 11:47:29 nanard Exp $ */
/* MiniUPnP project /* vim: tabstop=4 shiftwidth=4 noexpandtab
* MiniUPnP project
* http://miniupnp.free.fr/ or http://miniupnp.tuxfamily.org/ * http://miniupnp.free.fr/ or http://miniupnp.tuxfamily.org/
* (c) 2006-2013 Thomas Bernard * (c) 2006-2018 Thomas Bernard
* This software is subject to the conditions detailed * This software is subject to the conditions detailed
* in the LICENCE file provided within the distribution */ * in the LICENCE file provided within the distribution */
@ -28,5 +29,8 @@ int
find_ipv6_addr(const char * ifname, find_ipv6_addr(const char * ifname,
char * dst, int n); char * dst, int n);
#endif /* check if address is in private / reserved block (e.g. local area network) */
int
addr_is_reserved(struct in_addr * addr);
#endif