Merge HTTP request / response parsing code

This change also fixes a bug so that DNS lookups work correctly when the
first answer is a CNAME record.
This commit is contained in:
Justine Tunney 2021-06-27 17:03:06 -07:00
parent 5a6c0f27c3
commit a68cc690ff
20 changed files with 561 additions and 616 deletions

View file

@ -19,11 +19,25 @@
#include "net/http/ip.h"
/**
* Returns true if IPv4 address can come from the Internet.
* Returns true if IPv4 address is Globally Reachable.
*
* We intentionally omit TEST-NET here which can be used to simulate
* public Internet traffic using non-Internet IPs.
*
* @return true 92.4499% of the time
* @see IANA IPv4 Special-Purpose Address Registry
*/
bool IsPublicIp(uint32_t x) {
return !IsLoopbackIp(x) && !IsPrivateIp(x);
return !((x & 0xffffffff) == 0x00000000 /* 0.0.0.0/32 */ ||
(x & 0xff000000) == 0x00000000 /* 0.0.0.0/8 */ ||
(x & 0xff000000) == 0x0a000000 /* 10.0.0.0/8 */ ||
(x & 0xff000000) == 0x7f000000 /* 127.0.0.0/8 */ ||
(x & 0xfff00000) == 0xac100000 /* 172.16.0.0/12 */ ||
(x & 0xffffff00) == 0xc0000000 /* 192.0.0.0/24 */ ||
(x & 0xffff0000) == 0xc0a80000 /* 192.168.0.0/16 */ ||
(x & 0xffff0000) == 0xa9fe0000 /* 169.254.0.0/16 */ ||
(x & 0xffc00000) == 0x64400000 /* 100.64.0.0/10 */ ||
(x & 0xfffe0000) == 0xc6120000 /* 198.18.0.0/15 */ ||
(x & 0xf0000000) == 0xf0000000 /* 240.0.0.0/4 */ ||
(x & 0xffffffff) == 0xffffffff /* 255.255.255.255/32 */);
}