diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-05-18 02:33:43 +0200 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-05-18 02:33:43 +0200 |
| commit | 4a07939b68450a2fa4dbf808316da5cc3149d754 (patch) | |
| tree | 65836664e58ca6938374be7283cc671de626847c /pimd/pim_neighbor.c | |
| parent | Merge pull request #537 from donaldsharp/vrf_stuff (diff) | |
| download | frr-4a07939b68450a2fa4dbf808316da5cc3149d754.tar.xz frr-4a07939b68450a2fa4dbf808316da5cc3149d754.zip | |
pimd: Thread changes allow pim to crash a boo
When we add a thread pointer to thread_add_XXX functions
when the specified function is called, thread.c is setting
the thread pointer to NULL. This was causing pim to
liberally pull it's zassert grenade pin's.
Additionally clean up code to not set the NULL pointer.
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Diffstat (limited to 'pimd/pim_neighbor.c')
| -rw-r--r-- | pimd/pim_neighbor.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/pimd/pim_neighbor.c b/pimd/pim_neighbor.c index 00190bd83..7583be858 100644 --- a/pimd/pim_neighbor.c +++ b/pimd/pim_neighbor.c @@ -223,8 +223,6 @@ static int on_neighbor_timer(struct thread *t) neigh->holdtime, src_str, ifp->name); } - neigh->t_expire_timer = NULL; - snprintf(msg, sizeof(msg), "%d-sec holdtime expired", neigh->holdtime); pim_neighbor_delete(ifp, neigh, msg); @@ -278,7 +276,6 @@ on_neighbor_jp_timer (struct thread *t) zlog_debug("%s:Sending JP Agg to %s on %s with %d groups", __PRETTY_FUNCTION__, src_str, neigh->interface->name, neigh->upstream_jp_agg->count); } - neigh->jp_timer = NULL; rpf.source_nexthop.interface = neigh->interface; rpf.rpf_addr.u.prefix4 = neigh->source_addr; |