flashii/glovechat
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

you can now parse b00b::d00d/88

Browse source
This commit is contained in:
malloc 2019-01-31 13:00:47 -06:00
parent 69adca5d3e
commit b3143ffcf8
2 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/server/main.c
View file

@ -2,6 +2,6 @@
#include "util/ipaddr.h" #include "util/ipaddr.h"
int main(int argc, char** argv) { int main(int argc, char** argv) {
ipaddr_t test = glv_ip_aton("192.168.1.150/24"); ipaddr_t test = glv_ip_aton("1234::/64");
return 0; return 0;
} }

20
src/server/util/ipaddr.c
View file

@ -6,7 +6,7 @@ ipaddr_t glv_ip_aton(const char* addr) {
const int length = strlen(addr); const int length = strlen(addr);
ipaddr_t addr_out = {{0, 0, 0, 0, 0, 0, 0, 0}, 128}; ipaddr_t addr_out = {{0, 0, 0, 0, 0, 0, 0, 0}, 128};
char token[5] = {0, 0, 0, 0, 0}; char token[5] = {0, 0, 0, 0, 0};
int i, j = 0, k = 0, cidr = 0, gap = -1, valid, tmp; int i, j = 0, k = 0, cidr = 0, gap = -2, valid, tmp;
if(strchr(addr, ':') != NULL && strchr(addr, '.') != NULL) if(strchr(addr, ':') != NULL && strchr(addr, '.') != NULL)
return error_addr; return error_addr;
@ -75,8 +75,13 @@ ipaddr_t glv_ip_aton(const char* addr) {
if(addr[i] == ':' || addr[i] == '/' || i == length - 1) { if(addr[i] == ':' || addr[i] == '/' || i == length - 1) {
valid = 1; valid = 1;
if(j == 0 && !(k == 0 && i != length - 1 && addr[i + 1] == ':')) if (j == 0 &&
!(k == 0 && i != length - 1 && addr[i + 1] == ':') &&
!(i - 2 >= 0 && addr[i] == '/' &&
addr[i - 1] == ':' && addr[i - 2] == ':'))
{
return error_addr; return error_addr;
}
token[j] = 0; token[j] = 0;
tmp = cidr ? atoi(token) : axtoi(token); tmp = cidr ? atoi(token) : axtoi(token);
@ -85,7 +90,7 @@ ipaddr_t glv_ip_aton(const char* addr) {
if(tmp > 128) if(tmp > 128)
return error_addr; return error_addr;
addr_out.cidr = tmp; addr_out.cidr = tmp;
} else { } else if(j != 0) {
addr_out.addr[k] = tmp; addr_out.addr[k] = tmp;
j = 0; j = 0;
++k; ++k;
@ -99,7 +104,7 @@ ipaddr_t glv_ip_aton(const char* addr) {
if(i == length - 1) if(i == length - 1)
return error_addr; return error_addr;
if(addr[i + 1] == ':') { if(addr[i + 1] == ':') {
if(gap == -1) { if(gap == -2) {
++i; ++i;
gap = k - 1; gap = k - 1;
continue; continue;
@ -112,6 +117,13 @@ ipaddr_t glv_ip_aton(const char* addr) {
if(!valid) if(!valid)
return error_addr; return error_addr;
} }
if(gap > -2) {
for(i = k - 1; i > gap; --i) {
addr_out.addr[7 - (k - 1 - i)] = addr_out.addr[i];
addr_out.addr[i] = 0;
}
}
} }
return addr_out; return addr_out;