summaryrefslogtreecommitdiffstats
path: root/pimd
diff options
context:
space:
mode:
authorDonald Sharp <sharpd@cumulusnetworks.com>2015-10-20 17:41:09 +0200
committerDonald Sharp <sharpd@cumulusnetwroks.com>2016-05-26 02:38:34 +0200
commita441b8d7089c6920137078a1dc409607c45a59ed (patch)
tree0ab6edfcce1e06daefdb77f8b3b5006ed3123934 /pimd
parentpimd: Start handling of pim REGISTER packet type (diff)
downloadfrr-a441b8d7089c6920137078a1dc409607c45a59ed.tar.xz
frr-a441b8d7089c6920137078a1dc409607c45a59ed.zip
pimd: Cleanup some comments and documentation
Starting the transition of PIM-SSM to PIM-SM means that we have to cleanup some internal code comments so that the code will match the comments. Signed-off-by: Donald Sharp<sharpd@cumulusnetworks.com
Diffstat (limited to 'pimd')
-rw-r--r--pimd/pim_macro.c2
-rw-r--r--pimd/pim_rpf.c1
2 files changed, 1 insertions, 2 deletions
diff --git a/pimd/pim_macro.c b/pimd/pim_macro.c
index f67636a3f..adb999a2b 100644
--- a/pimd/pim_macro.c
+++ b/pimd/pim_macro.c
@@ -309,10 +309,10 @@ struct pim_assert_metric pim_macro_ch_my_assert_metric_eval(const struct pim_ifc
/*
RFC 4601 4.2. Data Packet Forwarding Rules
- RFC 4601 4.8.2. PIM-SSM-Only Routers
Macro:
inherited_olist(S,G) =
+ inherited_olist(S,G,rpt) (+)
joins(S,G) (+) pim_include(S,G) (-) lost_assert(S,G)
*/
static int pim_macro_chisin_inherited_olist(const struct pim_ifchannel *ch)
diff --git a/pimd/pim_rpf.c b/pimd/pim_rpf.c
index fb3636b2d..183811816 100644
--- a/pimd/pim_rpf.c
+++ b/pimd/pim_rpf.c
@@ -165,7 +165,6 @@ enum pim_rpf_result pim_rpf_update(struct pim_upstream *up,
nhaddr_str,
rpf->source_nexthop.mrib_metric_preference,
rpf->source_nexthop.mrib_route_metric);
- /* warning only */
}
pim_upstream_update_join_desired(up);