Pim 5549 Additions #304

donaldsharp · 2017-03-30T13:45:28Z

This implements option #2 of https://tools.ietf.org/html/draft-pim-with-ipv4-prefix-over-ipv6-nh-00

PIM was partially implementing 5549, in that a received v6 NH would be looked up by the neighbor out that interface. In the case of shared media this method would fail.

During IETF discussion of this draft I strongly encouraged dropping options 1 and 3 and just going with option 2

Convert the pim address family from a #define into an enum. Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>

This code change adds the ability to specify that we should be able to work with older versions of PIM. In future commits we will actually use this data. Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>

When we are checking RP addresses and looking at the secondary address. With the addition of the ability to handle v6 addresses in the secondary list. Assuming that the secondary address is a v4 address is a no go. Convert to prefix_same. Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>

With RFC 5549 we need a methodology to find a neighbor based upon a nexthop that is v6 based. This commit sets us up for that by allowing you to find the neigbor by the secondary list. In a future commit we will add code to pass the v6 secondary addresses. Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>

Add ability to encode/decode the v6 secondary addresses if they are passed to us. This also fixes the issue where if we are passed a v6 secondary address list we will not refuse to form neighbors. Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>

Send v6 secondary addresses to our neighbor in hello's. Additionally allow the disabling it via the cli introduced earlier. Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>

When we receive a v6 nexthop in v4, lookup the nbr by it's secondary address. Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>

Add code to properly receive v6 addresses up from zebra and to properly place them into our interface secondary address list. Additionally cleanup some code in pim_cmd.c that was broken by these changes. Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>

NetDEF-CI · 2017-03-30T14:46:22Z

Continous Integration Result: SUCCESSFUL

Congratulations, this patch passed basic tests

Tested-by: NetDEF / OpenSourceRouting.org CI System

CI System Testrun URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-404/

This is a comment from an EXPERIMENTAL automated CI system.
For questions and feedback in regards to this CI system, please feel free to email
Martin Winter - mwinter (at) opensourcerouting.org.

NetDEF-CI · 2017-03-30T15:37:52Z

Continous Integration Result: SUCCESSFUL

Congratulations, this patch passed basic tests

Tested-by: NetDEF / OpenSourceRouting.org CI System

CI System Testrun URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-405/

This is a comment from an EXPERIMENTAL automated CI system.
For questions and feedback in regards to this CI system, please feel free to email
Martin Winter - mwinter (at) opensourcerouting.org.

NetDEF-CI · 2017-04-01T13:01:12Z

Continous Integration Result: SUCCESSFUL

Congratulations, this patch passed basic tests

Tested-by: NetDEF / OpenSourceRouting.org CI System

CI System Testrun URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-418/

This is a comment from an EXPERIMENTAL automated CI system.
For questions and feedback in regards to this CI system, please feel free to email
Martin Winter - mwinter (at) opensourcerouting.org.

donaldsharp · 2017-04-05T16:49:37Z

@Jafaral @eqvinox any input on this commit?

NetDEF-CI · 2017-04-05T18:43:53Z

Continous Integration Result: SUCCESSFUL

Congratulations, this patch passed basic tests

Tested-by: NetDEF / OpenSourceRouting.org CI System

CI System Testrun URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-440/

This is a comment from an EXPERIMENTAL automated CI system.
For questions and feedback in regards to this CI system, please feel free to email
Martin Winter - mwinter (at) opensourcerouting.org.

eqvinox

looking good overall, but several places could use some sizeof

eqvinox · 2017-04-05T20:23:25Z

pimd/pim_cmd.c

@@ -828,7 +829,8 @@ static void pim_show_interfaces_single(struct vty *vty, const char *ifname, u_ch

        sec_list = json_object_new_array();
        for (ALL_LIST_ELEMENTS_RO(pim_ifp->sec_addr_list, sec_node, sec_addr)) {
-          json_object_array_add(sec_list, json_object_new_string(inet_ntoa(sec_addr->addr)));
+          json_object_array_add(sec_list,
+                                json_object_new_string(prefix2str(&sec_addr->addr, pbuf, PREFIX2STR_BUFFER)));


style / defensive coding: sizeof(pbuf) instead of PREFIX2STR_BUFFER

eqvinox · 2017-04-05T20:23:36Z

pimd/pim_cmd.c

        for (ALL_LIST_ELEMENTS_RO(pim_ifp->sec_addr_list, sec_node, sec_addr)) {
          vty_out(vty, "             %s%s",
-                                    inet_ntoa(sec_addr->addr), VTY_NEWLINE);
+                  prefix2str(&sec_addr->addr, pbuf, PREFIX2STR_BUFFER), VTY_NEWLINE);


style / defensive coding: sizeof(pbuf) instead of PREFIX2STR_BUFFER

eqvinox · 2017-04-05T20:24:06Z

pimd/pim_cmd.c

-
-	pim_inet4_dump("<src?>", p->u.prefix4,
-		       neigh_sec_str, sizeof(neigh_sec_str));
+	prefix2str(p, neigh_sec_str, 100);


urgh, the "100" sticks out like a sore thumb ... PREFIX2STR_BUFFER above and sizeof here?

eqvinox · 2017-04-05T20:25:23Z

pimd/pim_tlv.c

+
+    p->family = AF_INET6;
+    p->prefixlen = IPV6_MAX_PREFIXLEN;
+    memcpy(&p->u.prefix6, addr, 16);


sizeof(struct in6_addr)? (16 in one line + sizeof in the next looks really weird)

eqvinox · 2017-04-05T20:25:37Z

pimd/pim_zlookup.c

+
+      p.family = AF_INET6;
+      p.prefixlen = IPV6_MAX_PREFIXLEN;
+      memcpy (&p.u.prefix6, &nexthop_tab[num_ifindex].nexthop_addr.u.prefix6, 16);


eqvinox · 2017-04-05T20:28:19Z

btw, yes, i'm nitpicking on this... it's just that the confusion with BUFSIZ is what led to the previous security issue in the IPv6 RA code, so i'm a bit sensitised on this. For a "defensive" coding style, only the variable declaration should have a number (or macro/constant), everything else should always be sizeof.

(And, yes, I'm working on a coccinelle semantic-patch to fix this across the codebase!)

donaldsharp · 2017-04-06T02:52:33Z

David -> All are reasonable, I'll fix the issues.

Jafaral · 2017-04-06T16:36:19Z

@donaldsharp Will give this a go once you address the issues pointed out by @eqvinox

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>

NetDEF-CI · 2017-04-06T22:56:13Z

Continous Integration Result: SUCCESSFUL

Congratulations, this patch passed basic tests

Tested-by: NetDEF / OpenSourceRouting.org CI System

CI System Testrun URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-449/

This is a comment from an EXPERIMENTAL automated CI system.
For questions and feedback in regards to this CI system, please feel free to email
Martin Winter - mwinter (at) opensourcerouting.org.

donaldsharp added 9 commits March 30, 2017 09:34

pimd: Convert pim address family from #define -> enum

3468716

Convert the pim address family from a #define into an enum. Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>

pimd: Add code to allow backwards compatibility

71bbe73

This code change adds the ability to specify that we should be able to work with older versions of PIM. In future commits we will actually use this data. Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>

pimd: Send v6 secondary addresses to neighbors in hello

dba7860

Send v6 secondary addresses to our neighbor in hello's. Additionally allow the disabling it via the cli introduced earlier. Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>

pimd: Use better 5549 resolution

eeff6d3

When we receive a v6 nexthop in v4, lookup the nbr by it's secondary address. Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>

pimd: Fix header to be more descriptive of what it is doing

2e725ad

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>

Merge branch 'master' into pim_5549

2aaa554

Merge branch 'master' into pim_5549

0963981

eqvinox reviewed Apr 5, 2017

View reviewed changes

pimd: Fix various sizeof and buffer length issues

4390fb9

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>

Jafaral merged commit b43d5ea into FRRouting:master Apr 10, 2017

donaldsharp deleted the pim_5549 branch November 30, 2017 14:48

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Pim 5549 Additions #304

Pim 5549 Additions #304

donaldsharp commented Mar 30, 2017

NetDEF-CI commented Mar 30, 2017

NetDEF-CI commented Mar 30, 2017

NetDEF-CI commented Apr 1, 2017

donaldsharp commented Apr 5, 2017

NetDEF-CI commented Apr 5, 2017

eqvinox left a comment

eqvinox Apr 5, 2017

eqvinox Apr 5, 2017

eqvinox Apr 5, 2017

eqvinox Apr 5, 2017

eqvinox Apr 5, 2017

eqvinox commented Apr 5, 2017

donaldsharp commented Apr 6, 2017

Jafaral commented Apr 6, 2017

NetDEF-CI commented Apr 6, 2017

Pim 5549 Additions #304

Pim 5549 Additions #304

Conversation

donaldsharp commented Mar 30, 2017

NetDEF-CI commented Mar 30, 2017

Continous Integration Result: SUCCESSFUL

NetDEF-CI commented Mar 30, 2017

Continous Integration Result: SUCCESSFUL

NetDEF-CI commented Apr 1, 2017

Continous Integration Result: SUCCESSFUL

donaldsharp commented Apr 5, 2017

NetDEF-CI commented Apr 5, 2017

Continous Integration Result: SUCCESSFUL

eqvinox left a comment

Choose a reason for hiding this comment

eqvinox Apr 5, 2017

Choose a reason for hiding this comment

eqvinox Apr 5, 2017

Choose a reason for hiding this comment

eqvinox Apr 5, 2017

Choose a reason for hiding this comment

eqvinox Apr 5, 2017

Choose a reason for hiding this comment

eqvinox Apr 5, 2017

Choose a reason for hiding this comment

eqvinox commented Apr 5, 2017

donaldsharp commented Apr 6, 2017

Jafaral commented Apr 6, 2017

NetDEF-CI commented Apr 6, 2017

Continous Integration Result: SUCCESSFUL