Jerry/bird
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Use undefined scope for undefined IPv6 addresses.

Browse source
This commit is contained in:
Ondrej Zajicek 2011-09-24 11:06:42 +02:00
parent 4116db182d
commit bf6d91dc4e
4 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/ip.c
View file

@ -27,9 +27,9 @@
char * char *
ip_scope_text(unsigned scope) ip_scope_text(unsigned scope)
{ {
static char *scope_table[] = { "host", "link", "site", "org", "univ" }; static char *scope_table[] = { "host", "link", "site", "org", "univ", "undef" };
if (scope > SCOPE_UNIVERSE) if (scope > SCOPE_UNDEFINED)
return "?"; return "?";
else else
return scope_table[scope]; return scope_table[scope];

1
lib/ip.h
View file

@ -37,6 +37,7 @@
#define SCOPE_SITE 2 #define SCOPE_SITE 2
#define SCOPE_ORGANIZATION 3 #define SCOPE_ORGANIZATION 3
#define SCOPE_UNIVERSE 4 #define SCOPE_UNIVERSE 4
#define SCOPE_UNDEFINED 5
char *ip_scope_text(unsigned); char *ip_scope_text(unsigned);

3
lib/ipv6.c
View file

@ -85,6 +85,7 @@ ipv6_classify(ip_addr *a)
case 5: return IADDR_MULTICAST | SCOPE_SITE; case 5: return IADDR_MULTICAST | SCOPE_SITE;
case 8: return IADDR_MULTICAST | SCOPE_ORGANIZATION; case 8: return IADDR_MULTICAST | SCOPE_ORGANIZATION;
case 14: return IADDR_MULTICAST | SCOPE_UNIVERSE; case 14: return IADDR_MULTICAST | SCOPE_UNIVERSE;
default: return IADDR_MULTICAST | SCOPE_UNDEFINED;
} }
} }
if (!x && !a->addr[1] && !a->addr[2]) if (!x && !a->addr[1] && !a->addr[2])
@ -102,7 +103,7 @@ ipv6_classify(ip_addr *a)
if (y >= 0x01000000 && y < 0xe0000000) if (y >= 0x01000000 && y < 0xe0000000)
return IADDR_HOST | SCOPE_UNIVERSE; return IADDR_HOST | SCOPE_UNIVERSE;
} }
return IADDR_INVALID; return IADDR_HOST | SCOPE_UNDEFINED;
} }
void void

2
nest/config.Y
View file

@ -49,7 +49,7 @@ CF_KEYWORDS(RELOAD, IN, OUT, MRTDUMP, MESSAGES, RESTRICT, MEMORY, IGP_METRIC)
CF_ENUM(T_ENUM_RTS, RTS_, DUMMY, STATIC, INHERIT, DEVICE, STATIC_DEVICE, REDIRECT, CF_ENUM(T_ENUM_RTS, RTS_, DUMMY, STATIC, INHERIT, DEVICE, STATIC_DEVICE, REDIRECT,
RIP, OSPF, OSPF_IA, OSPF_EXT1, OSPF_EXT2, BGP, PIPE) RIP, OSPF, OSPF_IA, OSPF_EXT1, OSPF_EXT2, BGP, PIPE)
CF_ENUM(T_ENUM_SCOPE, SCOPE_, HOST, LINK, SITE, ORGANIZATION, UNIVERSE) CF_ENUM(T_ENUM_SCOPE, SCOPE_, HOST, LINK, SITE, ORGANIZATION, UNIVERSE, UNDEFINED)
CF_ENUM(T_ENUM_RTC, RTC_, UNICAST, BROADCAST, MULTICAST, ANYCAST) CF_ENUM(T_ENUM_RTC, RTC_, UNICAST, BROADCAST, MULTICAST, ANYCAST)
CF_ENUM(T_ENUM_RTD, RTD_, ROUTER, DEVICE, BLACKHOLE, UNREACHABLE, PROHIBIT, MULTIPATH) CF_ENUM(T_ENUM_RTD, RTD_, ROUTER, DEVICE, BLACKHOLE, UNREACHABLE, PROHIBIT, MULTIPATH)