diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-01-19 12:09:26 -0500 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-01-30 12:49:38 -0500 |
| commit | 781a1745c0908e54e44c761f32b6f7936d6c1a04 (patch) | |
| tree | cc0325ee0122d538f6769c2dc43a6086b18b5d5e /pimd/pim_mroute.c | |
| parent | 8613585e1f5a421cb88cfefa8307f2b3981df378 (diff) | |
pimd: Fixup tracking of where we got OIF's from.
This commit does these three things:
1) Add code to 'show ip pim state' to show where OIF's got their
decision to include that interface
2) Add code in pim_mroute_[add|del] to display what we think we are
adding to the kernel
3) Add code to properly track where we got the incoming request from and
to appropriately not remove a OIL if we have state still
Ticket: CM-14034
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Reviewed-by: Don Slice <dslice@cumulusnetworks.com>
Reviewed-by: Chirag Shah <chirag@cumulusnetworks.com>
Diffstat (limited to 'pimd/pim_mroute.c')
| -rw-r--r-- | pimd/pim_mroute.c | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/pimd/pim_mroute.c b/pimd/pim_mroute.c index dfd22b7022..05d08b6e91 100644 --- a/pimd/pim_mroute.c +++ b/pimd/pim_mroute.c @@ -812,13 +812,10 @@ int pim_mroute_add(struct channel_oil *c_oil, const char *name) if (PIM_DEBUG_MROUTE) { - struct prefix_sg sg; - - sg.src = c_oil->oil.mfcc_origin; - sg.grp = c_oil->oil.mfcc_mcastgrp; - - zlog_debug("%s(%s), Added Route: %s to mroute table", - __PRETTY_FUNCTION__, name, pim_str_sg_dump(&sg)); + char buf[1000]; + zlog_debug("%s(%s), Added Route: %s", + __PRETTY_FUNCTION__, name, + pim_channel_oil_dump (c_oil, buf, sizeof(buf))); } c_oil->installed = 1; @@ -850,14 +847,12 @@ int pim_mroute_del (struct channel_oil *c_oil, const char *name) if (PIM_DEBUG_MROUTE) { - struct prefix_sg sg; - - sg.src = c_oil->oil.mfcc_origin; - sg.grp = c_oil->oil.mfcc_mcastgrp; - - zlog_debug("%s(%s), Deleted Route: %s from mroute table", - __PRETTY_FUNCTION__, name, pim_str_sg_dump(&sg)); + char buf[1000]; + zlog_debug("%s(%s), Deleted Route: %s", + __PRETTY_FUNCTION__, name, + pim_channel_oil_dump (c_oil, buf, sizeof(buf))); } + c_oil->installed = 0; return 0; |