proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-05 02:46:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #5677 from qlyoung/fix-my-bfd-screwups

Browse Source 
zebra: bfd message handling cleanup foo
This commit is contained in:
David Lamparter 2020-01-15 14:04:44 +01:00 committed by GitHub
commit f014634e85
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
zebra/zebra_ptm.c
View File

@ -1295,6 +1295,7 @@ static void zebra_ptm_send_bfdd(struct stream *msg)
} }
stream_free(msgc); stream_free(msgc);
stream_free(msg);
} }
static void zebra_ptm_send_clients(struct stream *msg) static void zebra_ptm_send_clients(struct stream *msg)
@ -1326,6 +1327,7 @@ static void zebra_ptm_send_clients(struct stream *msg)
} }
stream_free(msgc); stream_free(msgc);
stream_free(msg);
} }
static int _zebra_ptm_bfd_client_deregister(struct zserv *zs) static int _zebra_ptm_bfd_client_deregister(struct zserv *zs)
@ -1367,8 +1369,6 @@ static int _zebra_ptm_bfd_client_deregister(struct zserv *zs)
zebra_ptm_send_bfdd(msg); zebra_ptm_send_bfdd(msg);
stream_free(msg);
pp_free(pp); pp_free(pp);
return 0; return 0;
@ -1423,6 +1423,7 @@ static void _zebra_ptm_reroute(struct zserv *zs, struct zebra_vrf *zvrf,
stream_putw_at(msgc, 0, STREAM_READABLE(msgc)); stream_putw_at(msgc, 0, STREAM_READABLE(msgc));
zebra_ptm_send_bfdd(msgc); zebra_ptm_send_bfdd(msgc);
msgc = NULL;
/* Registrate process PID for shutdown hook. */ /* Registrate process PID for shutdown hook. */
STREAM_GETL(msg, ppid); STREAM_GETL(msg, ppid);
@ -1431,7 +1432,8 @@ static void _zebra_ptm_reroute(struct zserv *zs, struct zebra_vrf *zvrf,
return; return;
stream_failure: stream_failure:
stream_free(msgc); if (msgc)
stream_free(msgc);
zlog_err("%s:%d failed to registrate client pid", __FILE__, __LINE__); zlog_err("%s:%d failed to registrate client pid", __FILE__, __LINE__);
} }