proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-09 14:50:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #11132 from anlancs/fix/bgpd-prefix

Browse Source 
bgpd: delay "stream_new" in str2prefix_rd()
This commit is contained in:
Donald Sharp 2022-05-02 13:17:08 -04:00 committed by GitHub
commit 6c65d0e8dc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
bgpd/bgp_rd.c
View File

@ -99,20 +99,16 @@ void decode_rd_vnc_eth(const uint8_t *pnt, struct rd_vnc_eth *rd_vnc_eth)
int str2prefix_rd(const char *str, struct prefix_rd *prd) int str2prefix_rd(const char *str, struct prefix_rd *prd)
{ {
int ret; /* ret of called functions */ int ret = 0;
int lret; /* local ret, of this func */
char *p; char *p;
char *p2; char *p2;
struct stream *s = NULL; struct stream *s = NULL;
char *half = NULL; char *half = NULL;
struct in_addr addr; struct in_addr addr;
s = stream_new(8);
prd->family = AF_UNSPEC; prd->family = AF_UNSPEC;
prd->prefixlen = 64; prd->prefixlen = 64;
lret = 0;
p = strchr(str, ':'); p = strchr(str, ':');
if (!p) if (!p)
goto out; goto out;
@ -120,6 +116,8 @@ int str2prefix_rd(const char *str, struct prefix_rd *prd)
if (!all_digit(p + 1)) if (!all_digit(p + 1))
goto out; goto out;
s = stream_new(RD_BYTES);
half = XMALLOC(MTYPE_TMP, (p - str) + 1); half = XMALLOC(MTYPE_TMP, (p - str) + 1);
memcpy(half, str, (p - str)); memcpy(half, str, (p - str));
half[p - str] = '\0'; half[p - str] = '\0';
@ -143,8 +141,7 @@ int str2prefix_rd(const char *str, struct prefix_rd *prd)
stream_putl(s, atol(p + 1)); stream_putl(s, atol(p + 1));
} }
} else { } else {
ret = inet_aton(half, &addr); if (!inet_aton(half, &addr))
if (!ret)
goto out; goto out;
stream_putw(s, RD_TYPE_IP); stream_putw(s, RD_TYPE_IP);
@ -152,13 +149,13 @@ int str2prefix_rd(const char *str, struct prefix_rd *prd)
stream_putw(s, atol(p + 1)); stream_putw(s, atol(p + 1));
} }
memcpy(prd->val, s->data, 8); memcpy(prd->val, s->data, 8);
lret = 1; ret = 1;
out: out:
if (s) if (s)
stream_free(s); stream_free(s);
XFREE(MTYPE_TMP, half); XFREE(MTYPE_TMP, half);
return lret; return ret;
} }
char *prefix_rd2str(const struct prefix_rd *prd, char *buf, size_t size) char *prefix_rd2str(const struct prefix_rd *prd, char *buf, size_t size)