3party/mongoose
0
0
Fork 0
mirror of https://github.com/cesanta/mongoose.git synced 2024-12-29 16:25:54 +08:00
Code Issues Projects Releases Wiki Activity

Handle ipv4-mapped addresses

Browse Source
This commit is contained in:
Sergey Lyubka 2021-09-18 19:38:59 +01:00
parent 9d1e61de93
commit a7afea0963
3 changed files with 44 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
mongoose.c
View File

@ -2405,8 +2405,24 @@ static bool mg_aton4(struct mg_str str, struct mg_addr *addr) {
return true; return true;
} }
static bool mg_v4mapped(struct mg_str str, struct mg_addr *addr) {
int i;
if (str.len < 14) return false;
if (str.ptr[0] != ':' || str.ptr[1] != ':' || str.ptr[6] != ':') return false;
for (i = 2; i < 6; i++) {
if (str.ptr[i] != 'f' && str.ptr[i] != 'F') return false;
}
if (!mg_aton4(mg_str_n(&str.ptr[7], str.len - 7), addr)) return false;
memset(addr->ip6, 0, sizeof(addr->ip6));
addr->ip6[10] = addr->ip6[11] = 255;
memcpy(&addr->ip6[12], &addr->ip, 4);
addr->is_ip6 = true;
return true;
}
static bool mg_aton6(struct mg_str str, struct mg_addr *addr) { static bool mg_aton6(struct mg_str str, struct mg_addr *addr) {
size_t i, j = 0, n = 0, dc = 42; size_t i, j = 0, n = 0, dc = 42;
if (mg_v4mapped(str, addr)) return true;
for (i = 0; i < str.len; i++) { for (i = 0; i < str.len; i++) {
if ((str.ptr[i] >= '0' && str.ptr[i] <= '9') || if ((str.ptr[i] >= '0' && str.ptr[i] <= '9') ||
(str.ptr[i] >= 'a' && str.ptr[i] <= 'f') || (str.ptr[i] >= 'a' && str.ptr[i] <= 'f') ||
@ -2416,8 +2432,8 @@ static bool mg_aton6(struct mg_str str, struct mg_addr *addr) {
// LOG(LL_DEBUG, ("%zu %zu [%.*s]", i, j, (int) (i - j + 1), // LOG(LL_DEBUG, ("%zu %zu [%.*s]", i, j, (int) (i - j + 1),
// &str.ptr[j])); // &str.ptr[j]));
val = mg_unhexn(&str.ptr[j], i - j + 1); val = mg_unhexn(&str.ptr[j], i - j + 1);
addr->ip6[n] = (uint8_t)((val >> 8) & 255); addr->ip6[n] = (uint8_t) ((val >> 8) & 255);
addr->ip6[n + 1] = (uint8_t)(val & 255); addr->ip6[n + 1] = (uint8_t) (val & 255);
} else if (str.ptr[i] == ':') { } else if (str.ptr[i] == ':') {
j = i + 1; j = i + 1;
if (i > 0 && str.ptr[i - 1] == ':') { if (i > 0 && str.ptr[i - 1] == ':') {

20
src/net.c
View File

@ -70,8 +70,24 @@ static bool mg_aton4(struct mg_str str, struct mg_addr *addr) {
return true; return true;
} }
static bool mg_v4mapped(struct mg_str str, struct mg_addr *addr) {
int i;
if (str.len < 14) return false;
if (str.ptr[0] != ':' || str.ptr[1] != ':' || str.ptr[6] != ':') return false;
for (i = 2; i < 6; i++) {
if (str.ptr[i] != 'f' && str.ptr[i] != 'F') return false;
}
if (!mg_aton4(mg_str_n(&str.ptr[7], str.len - 7), addr)) return false;
memset(addr->ip6, 0, sizeof(addr->ip6));
addr->ip6[10] = addr->ip6[11] = 255;
memcpy(&addr->ip6[12], &addr->ip, 4);
addr->is_ip6 = true;
return true;
}
static bool mg_aton6(struct mg_str str, struct mg_addr *addr) { static bool mg_aton6(struct mg_str str, struct mg_addr *addr) {
size_t i, j = 0, n = 0, dc = 42; size_t i, j = 0, n = 0, dc = 42;
if (mg_v4mapped(str, addr)) return true;
for (i = 0; i < str.len; i++) { for (i = 0; i < str.len; i++) {
if ((str.ptr[i] >= '0' && str.ptr[i] <= '9') || if ((str.ptr[i] >= '0' && str.ptr[i] <= '9') ||
(str.ptr[i] >= 'a' && str.ptr[i] <= 'f') || (str.ptr[i] >= 'a' && str.ptr[i] <= 'f') ||
@ -81,8 +97,8 @@ static bool mg_aton6(struct mg_str str, struct mg_addr *addr) {
// LOG(LL_DEBUG, ("%zu %zu [%.*s]", i, j, (int) (i - j + 1), // LOG(LL_DEBUG, ("%zu %zu [%.*s]", i, j, (int) (i - j + 1),
// &str.ptr[j])); // &str.ptr[j]));
val = mg_unhexn(&str.ptr[j], i - j + 1); val = mg_unhexn(&str.ptr[j], i - j + 1);
addr->ip6[n] = (uint8_t)((val >> 8) & 255); addr->ip6[n] = (uint8_t) ((val >> 8) & 255);
addr->ip6[n + 1] = (uint8_t)(val & 255); addr->ip6[n + 1] = (uint8_t) (val & 255);
} else if (str.ptr[i] == ':') { } else if (str.ptr[i] == ':') {
j = i + 1; j = i + 1;
if (i > 0 && str.ptr[i - 1] == ':') { if (i > 0 && str.ptr[i - 1] == ':') {

8
test/unit_test.c
View File

@ -1196,6 +1196,14 @@ static void test_util(void) {
"\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01", "\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01",
sizeof(a.ip6)) == 0); sizeof(a.ip6)) == 0);
memset(a.ip6, 0xaa, sizeof(a.ip6));
ASSERT(mg_aton(mg_str("::fFff:1.2.3.4"), &a) == true);
ASSERT(a.is_ip6 == true);
ASSERT(memcmp(a.ip6,
"\x00\x00\x00\x00\x00\x00\x00\x00"
"\x00\x00\xff\xff\x01\x02\x03\x04",
sizeof(a.ip6)) == 0);
memset(a.ip6, 0xaa, sizeof(a.ip6)); memset(a.ip6, 0xaa, sizeof(a.ip6));
ASSERT(mg_aton(mg_str("::1"), &a) == true); ASSERT(mg_aton(mg_str("::1"), &a) == true);
ASSERT(a.is_ip6 == true); ASSERT(a.is_ip6 == true);