From 233a812bb060ef68aa606a55d478efaf62b44c9b Mon Sep 17 00:00:00 2001 From: Anton Date: Sat, 2 Dec 2017 20:32:19 +0400 Subject: moved PICA_is_reserved_addr_ipv4() to new file PICA_netconf.c --- PICA_nodeaddrlist.c | 27 +-------------------------- 1 file changed, 1 insertion(+), 26 deletions(-) (limited to 'PICA_nodeaddrlist.c') diff --git a/PICA_nodeaddrlist.c b/PICA_nodeaddrlist.c index 52e4f29..d16eb33 100644 --- a/PICA_nodeaddrlist.c +++ b/PICA_nodeaddrlist.c @@ -6,37 +6,12 @@ #include "PICA_log.h" -#define PREFIX4 htonl(0xf0000000U) -#define PREFIX8 htonl(0xff000000U) -#define PREFIX12 htonl(0xfff00000U) -#define PREFIX16 htonl(0xffff0000U) -#define PREFIX24 htonl(0xffffff00U) - -#define MAKEIP(a, b, c, d) (htonl( (a&0xFF) << 24 | (b&0xFF) << 16 | (c&0xFF) << 8 | (d&0xFF) )) - struct cb_param { struct PICA_nodeaddr **n_addr; int *N; }; -int PICA_is_reserved_addr_ipv4(in_addr_t addr) -{ - if ((addr & PREFIX8) == 0 //0.0.0.0/8 - || (addr & PREFIX8) == MAKEIP(10, 0, 0, 0) //10.0.0.0/8 - || (addr & PREFIX8) == MAKEIP(127, 0, 0, 0)//127.0.0.0/8 - || (addr & PREFIX16) == MAKEIP(169, 254, 0, 0) //169.254.0.0/16 - || (addr & PREFIX12) == MAKEIP(172, 16, 0, 0) //172.16.0.0/12 - || (addr & PREFIX16) == MAKEIP(192, 168, 0, 0) //192.168.0.0/16 - || (addr & PREFIX4) == MAKEIP(224, 0, 0, 0) //224.0.0.0/4 - || (addr & PREFIX4) == MAKEIP(240, 0, 0, 0) //240.0.0.0/4 - || addr == INADDR_BROADCAST - ) - return 1; - - return 0; -} - static int nodeaddr_load_sqlite_cb(void *p, int argc, char **argv, char **ColName) { struct cb_param *cp = (struct cb_param*)p; @@ -236,4 +211,4 @@ void PICA_nodeaddr_list_free(struct PICA_nodeaddr *list_head) free(pp); pp = pn; } -} \ No newline at end of file +} -- cgit v1.2.1