diff options
| author | Mathieu Arnold <mat@FreeBSD.org> | 2016-07-19 14:16:24 +0000 |
|---|---|---|
| committer | Mathieu Arnold <mat@FreeBSD.org> | 2016-07-19 14:16:24 +0000 |
| commit | 111d7e34290151819322b9a6247936c4a9f561f0 (patch) | |
| tree | deb443b9c6ba263773bd450e831a9dcf33f00da7 /net/quagga | |
| parent | 25bd18224dfcac44439b7cf97495772c460fedbd (diff) | |
| download | ports-111d7e34290151819322b9a6247936c4a9f561f0.tar.gz ports-111d7e34290151819322b9a6247936c4a9f561f0.zip | |
Fix the OSPF_NEXTHOP patch.
PR: 210835
Reported by: dgilbert eicat ca, miha rylov rambler ru
Sponsored by: Absolight
Notes
Notes:
svn path=/head/; revision=418795
Diffstat (limited to 'net/quagga')
| -rw-r--r-- | net/quagga/files/extra-patch-ospf-nexthop | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/net/quagga/files/extra-patch-ospf-nexthop b/net/quagga/files/extra-patch-ospf-nexthop index 3fa9a4d44d3d..8c2993c5617a 100644 --- a/net/quagga/files/extra-patch-ospf-nexthop +++ b/net/quagga/files/extra-patch-ospf-nexthop @@ -1,4 +1,4 @@ ---- ospfd/ospf_asbr.c.orig 2015-03-02 23:50:57 UTC +--- ospfd/ospf_asbr.c.orig 2016-03-15 23:17:17 UTC +++ ospfd/ospf_asbr.c @@ -122,6 +122,7 @@ ospf_reset_route_map_set_values (struct { @@ -8,7 +8,7 @@ } int ---- ospfd/ospf_asbr.h.orig 2015-03-02 23:50:57 UTC +--- ospfd/ospf_asbr.h.orig 2016-03-15 23:17:17 UTC +++ ospfd/ospf_asbr.h @@ -27,6 +27,7 @@ struct route_map_set_values { @@ -26,9 +26,9 @@ }; #define OSPF_ASBR_CHECK_DELAY 30 ---- ospfd/ospf_lsa.c.orig 2015-03-02 23:50:57 UTC +--- ospfd/ospf_lsa.c.orig 2016-03-15 23:17:17 UTC +++ ospfd/ospf_lsa.c -@@ -1633,7 +1633,8 @@ ospf_external_lsa_body_set (struct strea +@@ -1644,7 +1644,8 @@ ospf_external_lsa_body_set (struct strea stream_put_ospf_metric (s, mvalue); /* Get forwarding address to nexthop if on the Connection List, else 0. */ @@ -38,7 +38,7 @@ /* Put forwarding address. */ stream_put_ipv4 (s, fwd_addr.s_addr); ---- ospfd/ospf_routemap.c.orig 2015-03-02 23:50:57 UTC +--- ospfd/ospf_routemap.c.orig 2016-03-15 23:17:17 UTC +++ ospfd/ospf_routemap.c @@ -531,6 +531,62 @@ struct route_map_rule_cmd route_set_metr route_set_metric_type_free, @@ -169,3 +169,14 @@ + install_element (RMAP_NODE, &no_set_ip_nexthop_cmd); + install_element (RMAP_NODE, &no_set_ip_nexthop_val_cmd); } +--- vtysh/extract.pl.orig 2016-07-19 14:12:32 UTC ++++ vtysh/extract.pl +@@ -180,7 +180,7 @@ foreach (@ARGV) { + } + } + +-my $bad_cli_stomps = 89; ++my $bad_cli_stomps = 92; + # Currently we have $bad_cli_stomps. This was determined by + # running this script and counting up the collisions from what + # was returned. |