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

Simpler format of VPN RD

Browse source
This commit is contained in:
Jan Moskyto Matejka 2017-03-28 17:35:32 +02:00
parent ef57b70fa5
commit 2282030b2a
2 changed files with 41 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
conf/cf-lex.l
View file

@ -123,6 +123,37 @@ include ^{WHITE}*include{WHITE}*\".*\"{WHITE}*;
cf_include(start, end-start); cf_include(start, end-start);
} }
{DIGIT}+:{DIGIT}+ {
unsigned long int l, len1, len2;
char *e;
errno = 0;
l = strtoul(yytext, &e, 10);
if (e && (*e != ':') || (errno == ERANGE) || (l >> 32))
cf_error("ASN out of range");
if (l >> 16)
{
len1 = 32;
len2 = 16;
cf_lval.i64 = (2ULL << 48) | (((u64) l) << len2);
}
else
{
len1 = 16;
len2 = 32;
cf_lval.i64 = 0 | (((u64) l) << len2);
}
errno = 0;
l = strtoul(e+1, &e, 10);
if (e && *e || (errno == ERANGE) || (l >> len2))
cf_error("Number out of range");
cf_lval.i64 |= l;
return VPN_RD;
}
[02]:{DIGIT}+:{DIGIT}+ { [02]:{DIGIT}+:{DIGIT}+ {
unsigned long int l, len1, len2; unsigned long int l, len1, len2;
char *e; char *e;
@ -155,17 +186,17 @@ include ^{WHITE}*include{WHITE}*\".*\"{WHITE}*;
return VPN_RD; return VPN_RD;
} }
1:{DIGIT}+\.{DIGIT}+\.{DIGIT}+\.{DIGIT}+:{DIGIT}+ { {DIGIT}+\.{DIGIT}+\.{DIGIT}+\.{DIGIT}+:{DIGIT}+ {
unsigned long int l; unsigned long int l;
ip4_addr ip4; ip4_addr ip4;
char *e; char *e;
cf_lval.i64 = 1ULL << 48; cf_lval.i64 = 1ULL << 48;
e = strchr(yytext+2, ':'); e = strchr(yytext, ':');
*e++ = '\0'; *e++ = '\0';
if (!ip4_pton(yytext+2, &ip4)) if (!ip4_pton(yytext, &ip4))
cf_error("Invalid IPv4 address %s in Route Distinguisher", yytext+2); cf_error("Invalid IPv4 address %s in Route Distinguisher", yytext);
cf_lval.i64 |= ((u64) ip4_to_u32(ip4)) << 16; cf_lval.i64 |= ((u64) ip4_to_u32(ip4)) << 16;
errno = 0; errno = 0;

9
lib/net.c
View file

@ -59,9 +59,12 @@ rd_format(const u64 rd, char *buf, int buflen)
{ {
switch (rd >> 48) switch (rd >> 48)
{ {
case 0: return bsnprintf(buf, buflen, "0:%u:%u", (u32) (rd >> 32), (u32) rd); case 0: return bsnprintf(buf, buflen, "%u:%u", (u32) (rd >> 32), (u32) rd);
case 1: return bsnprintf(buf, buflen, "1:%I4:%u", ip4_from_u32(rd >> 16), (u32) (rd & 0xffff)); case 1: return bsnprintf(buf, buflen, "%I4:%u", ip4_from_u32(rd >> 16), (u32) (rd & 0xffff));
case 2: return bsnprintf(buf, buflen, "2:%u:%u", (u32) (rd >> 16), (u32) (rd & 0xffff)); case 2: if (((u32) (rd >> 16)) >> 16)
return bsnprintf(buf, buflen, "%u:%u", (u32) (rd >> 16), (u32) (rd & 0xffff));
else
return bsnprintf(buf, buflen, "2:%u:%u", (u32) (rd >> 16), (u32) (rd & 0xffff));
default: return bsnprintf(buf, buflen, "X:%08x:%08x", (u32) (rd >> 32), (u32) rd); default: return bsnprintf(buf, buflen, "X:%08x:%08x", (u32) (rd >> 32), (u32) rd);
} }
} }