proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-15 07:21:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

lib: fix prefix2str return value and assert

Browse Source 
Signed-off-by: Christian Franke <chris@opensourcerouting.org>
This commit is contained in:
Christian Franke 2016-11-21 19:39:10 +01:00 committed by Christian Franke
parent d987f2339d
commit 942e4486d8
1 changed files with 13 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
lib/prefix.c
View File

@ -893,29 +893,22 @@ const char *
prefix2str (union prefix46constptr pu, char *str, int size)
{
const struct prefix *p = pu.p;
char buf[PREFIX2STR_BUFFER];
if (p->family == AF_ETHERNET) {
int i;
char *s = str;
assert(size > (3*ETHER_ADDR_LEN) + 1 /* slash */ + 3 /* plen */ );
for (i = 0; i < ETHER_ADDR_LEN; ++i) {
sprintf(s, "%02x", p->u.prefix_eth.octet[i]);
if (i < (ETHER_ADDR_LEN - 1)) {
*(s+2) = ':';
s += 3;
} else {
s += 2;
}
}
sprintf(s, "/%d", p->prefixlen);
return 0;
}
snprintf (str, size, "%s/%d",
inet_ntop (p->family, &p->u.prefix, buf, PREFIX2STR_BUFFER),
if (p->family == AF_ETHERNET)
{
snprintf(str, size, "%02x:%02x:%02x:%02x:%02x:%02x/%d",
p->u.prefix_eth.octet[0], p->u.prefix_eth.octet[1],
p->u.prefix_eth.octet[2], p->u.prefix_eth.octet[3],
p->u.prefix_eth.octet[4], p->u.prefix_eth.octet[5],
p->prefixlen);
}
else
{
char buf[PREFIX2STR_BUFFER];
inet_ntop(p->family, &p->u.prefix, buf, sizeof(buf));
snprintf(str, size, "%s/%d", buf, p->prefixlen);
}
return str;
}