summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
Diffstat (limited to 'net')
-rw-r--r--net/frr5/files/patch-bgpd_bgp__routemap.c16
-rw-r--r--net/frr5/files/patch-bgpd_bgpd.c61
-rw-r--r--net/frr5/files/patch-ospfd_ospf__vty.c110
-rw-r--r--net/frr6/files/patch-bgpd_bgp__routemap.c16
-rw-r--r--net/frr6/files/patch-bgpd_bgpd.c61
-rw-r--r--net/frr6/files/patch-ospfd_ospf__vty.c110
-rw-r--r--net/frr7/files/patch-bgpd_bgp__route.c29
-rw-r--r--net/zmap/files/patch-CMakeLists.txt12
8 files changed, 413 insertions, 2 deletions
diff --git a/net/frr5/files/patch-bgpd_bgp__routemap.c b/net/frr5/files/patch-bgpd_bgp__routemap.c
new file mode 100644
index 000000000000..8df1905a7af6
--- /dev/null
+++ b/net/frr5/files/patch-bgpd_bgp__routemap.c
@@ -0,0 +1,16 @@
+--- bgpd/bgp_routemap.c.orig 2019-01-08 08:53:23 UTC
++++ bgpd/bgp_routemap.c
+@@ -2432,11 +2432,11 @@ route_set_ipv6_nexthop_prefer_global(void *rule, struc
+ && peer->su_remote
+ && sockunion_family(peer->su_remote) == AF_INET6) {
+ /* Set next hop preference to global */
+- bgp_info->attr->mp_nexthop_prefer_global = TRUE;
++ bgp_info->attr->mp_nexthop_prefer_global = true;
+ SET_FLAG(bgp_info->attr->rmap_change_flags,
+ BATTR_RMAP_IPV6_PREFER_GLOBAL_CHANGED);
+ } else {
+- bgp_info->attr->mp_nexthop_prefer_global = FALSE;
++ bgp_info->attr->mp_nexthop_prefer_global = false;
+ SET_FLAG(bgp_info->attr->rmap_change_flags,
+ BATTR_RMAP_IPV6_PREFER_GLOBAL_CHANGED);
+ }
diff --git a/net/frr5/files/patch-bgpd_bgpd.c b/net/frr5/files/patch-bgpd_bgpd.c
new file mode 100644
index 000000000000..3464ec2727c9
--- /dev/null
+++ b/net/frr5/files/patch-bgpd_bgpd.c
@@ -0,0 +1,61 @@
+--- bgpd/bgpd.c.orig 2019-01-08 08:53:23 UTC
++++ bgpd/bgpd.c
+@@ -243,7 +243,7 @@ static int bgp_router_id_set(struct bgp *bgp, const st
+
+ /* EVPN uses router id in RD, withdraw them */
+ if (is_evpn_enabled())
+- bgp_evpn_handle_router_id_update(bgp, TRUE);
++ bgp_evpn_handle_router_id_update(bgp, true);
+
+ IPV4_ADDR_COPY(&bgp->router_id, id);
+
+@@ -260,7 +260,7 @@ static int bgp_router_id_set(struct bgp *bgp, const st
+
+ /* EVPN uses router id in RD, update them */
+ if (is_evpn_enabled())
+- bgp_evpn_handle_router_id_update(bgp, FALSE);
++ bgp_evpn_handle_router_id_update(bgp, false);
+
+ return 0;
+ }
+@@ -3098,7 +3098,7 @@ int bgp_handle_socket(struct bgp *bgp, struct vrf *vrf
+ /*
+ * suppress vrf socket
+ */
+- if (create == FALSE) {
++ if (create == false) {
+ bgp_close_vrf_socket(bgp);
+ return 0;
+ }
+@@ -6861,8 +6861,8 @@ static void bgp_config_write_peer_global(struct vty *v
+ struct peer *g_peer = NULL;
+ char buf[SU_ADDRSTRLEN];
+ char *addr;
+- int if_pg_printed = FALSE;
+- int if_ras_printed = FALSE;
++ int if_pg_printed = false;
++ int if_ras_printed = false;
+
+ /* Skip dynamic neighbors. */
+ if (peer_dynamic_neighbor(peer))
+@@ -6884,16 +6884,16 @@ static void bgp_config_write_peer_global(struct vty *v
+
+ if (peer_group_active(peer)) {
+ vty_out(vty, " peer-group %s", peer->group->name);
+- if_pg_printed = TRUE;
++ if_pg_printed = true;
+ } else if (peer->as_type == AS_SPECIFIED) {
+ vty_out(vty, " remote-as %u", peer->as);
+- if_ras_printed = TRUE;
++ if_ras_printed = true;
+ } else if (peer->as_type == AS_INTERNAL) {
+ vty_out(vty, " remote-as internal");
+- if_ras_printed = TRUE;
++ if_ras_printed = true;
+ } else if (peer->as_type == AS_EXTERNAL) {
+ vty_out(vty, " remote-as external");
+- if_ras_printed = TRUE;
++ if_ras_printed = true;
+ }
+
+ vty_out(vty, "\n");
diff --git a/net/frr5/files/patch-ospfd_ospf__vty.c b/net/frr5/files/patch-ospfd_ospf__vty.c
new file mode 100644
index 000000000000..b3f849d82b05
--- /dev/null
+++ b/net/frr5/files/patch-ospfd_ospf__vty.c
@@ -0,0 +1,110 @@
+--- ospfd/ospf_vty.c.orig 2019-01-08 08:53:23 UTC
++++ ospfd/ospf_vty.c
+@@ -3267,7 +3267,7 @@ DEFUN (show_ip_ospf,
+ uint8_t uj = use_json(argc, argv);
+ struct listnode *node = NULL;
+ char *vrf_name = NULL;
+- bool all_vrf = FALSE;
++ bool all_vrf = false;
+ int ret = CMD_SUCCESS;
+ int inst = 0;
+ int idx_vrf = 0;
+@@ -3940,7 +3940,7 @@ DEFUN (show_ip_ospf_interface,
+ uint8_t uj = use_json(argc, argv);
+ struct listnode *node = NULL;
+ char *vrf_name = NULL, *intf_name = NULL;
+- bool all_vrf = FALSE;
++ bool all_vrf = false;
+ int ret = CMD_SUCCESS;
+ int inst = 0;
+ int idx_vrf = 0, idx_intf = 0;
+@@ -4067,7 +4067,7 @@ DEFUN (show_ip_ospf_interface_traffic,
+ struct ospf *ospf = NULL;
+ struct listnode *node = NULL;
+ char *vrf_name = NULL, *intf_name = NULL;
+- bool all_vrf = FALSE;
++ bool all_vrf = false;
+ int inst = 0;
+ int idx_vrf = 0, idx_intf = 0;
+ uint8_t uj = use_json(argc, argv);
+@@ -4322,7 +4322,7 @@ DEFUN (show_ip_ospf_neighbor,
+ uint8_t uj = use_json(argc, argv);
+ struct listnode *node = NULL;
+ char *vrf_name = NULL;
+- bool all_vrf = FALSE;
++ bool all_vrf = false;
+ int ret = CMD_SUCCESS;
+ int inst = 0;
+ int idx_vrf = 0;
+@@ -4535,7 +4535,7 @@ DEFUN (show_ip_ospf_neighbor_all,
+ uint8_t uj = use_json(argc, argv);
+ struct listnode *node = NULL;
+ char *vrf_name = NULL;
+- bool all_vrf = FALSE;
++ bool all_vrf = false;
+ int ret = CMD_SUCCESS;
+ int inst = 0;
+ int idx_vrf = 0;
+@@ -5233,7 +5233,7 @@ DEFUN (show_ip_ospf_neighbor_detail,
+ uint8_t uj = use_json(argc, argv);
+ struct listnode *node = NULL;
+ char *vrf_name = NULL;
+- bool all_vrf = FALSE;
++ bool all_vrf = false;
+ int ret = CMD_SUCCESS;
+ int inst = 0;
+ int idx_vrf = 0;
+@@ -5422,7 +5422,7 @@ DEFUN (show_ip_ospf_neighbor_detail_all,
+ uint8_t uj = use_json(argc, argv);
+ struct listnode *node = NULL;
+ char *vrf_name = NULL;
+- bool all_vrf = FALSE;
++ bool all_vrf = false;
+ int ret = CMD_SUCCESS;
+ int inst = 0;
+ int idx_vrf = 0;
+@@ -6305,7 +6305,7 @@ DEFUN (show_ip_ospf_database_max,
+ struct ospf *ospf = NULL;
+ struct listnode *node = NULL;
+ char *vrf_name = NULL;
+- bool all_vrf = FALSE;
++ bool all_vrf = false;
+ int ret = CMD_SUCCESS;
+ int inst = 0;
+ int idx_vrf = 0;
+@@ -6362,7 +6362,7 @@ DEFUN (show_ip_ospf_instance_database,
+ unsigned short instance = 0;
+ struct listnode *node = NULL;
+ char *vrf_name = NULL;
+- bool all_vrf = FALSE;
++ bool all_vrf = false;
+ int ret = CMD_SUCCESS;
+ int inst = 0;
+ int idx = 0;
+@@ -6512,7 +6512,7 @@ DEFUN (show_ip_ospf_instance_database_type_adv_router,
+ unsigned short instance = 0;
+ struct listnode *node = NULL;
+ char *vrf_name = NULL;
+- bool all_vrf = FALSE;
++ bool all_vrf = false;
+ int ret = CMD_SUCCESS;
+ int inst = 0;
+ int idx = 0, idx_vrf = 0;
+@@ -9299,7 +9299,7 @@ DEFUN (show_ip_ospf_border_routers,
+ struct ospf *ospf = NULL;
+ struct listnode *node = NULL;
+ char *vrf_name = NULL;
+- bool all_vrf = FALSE;
++ bool all_vrf = false;
+ int ret = CMD_SUCCESS;
+ int inst = 0;
+ int idx_vrf = 0;
+@@ -9425,7 +9425,7 @@ DEFUN (show_ip_ospf_route,
+ struct ospf *ospf = NULL;
+ struct listnode *node = NULL;
+ char *vrf_name = NULL;
+- bool all_vrf = FALSE;
++ bool all_vrf = false;
+ int ret = CMD_SUCCESS;
+ int inst = 0;
+ int idx_vrf = 0;
diff --git a/net/frr6/files/patch-bgpd_bgp__routemap.c b/net/frr6/files/patch-bgpd_bgp__routemap.c
new file mode 100644
index 000000000000..ca935b59ebb5
--- /dev/null
+++ b/net/frr6/files/patch-bgpd_bgp__routemap.c
@@ -0,0 +1,16 @@
+--- bgpd/bgp_routemap.c.orig 2019-01-08 08:29:22 UTC
++++ bgpd/bgp_routemap.c
+@@ -2452,11 +2452,11 @@ route_set_ipv6_nexthop_prefer_global(void *rule, const
+ && peer->su_remote
+ && sockunion_family(peer->su_remote) == AF_INET6) {
+ /* Set next hop preference to global */
+- bgp_info->attr->mp_nexthop_prefer_global = TRUE;
++ bgp_info->attr->mp_nexthop_prefer_global = true;
+ SET_FLAG(bgp_info->attr->rmap_change_flags,
+ BATTR_RMAP_IPV6_PREFER_GLOBAL_CHANGED);
+ } else {
+- bgp_info->attr->mp_nexthop_prefer_global = FALSE;
++ bgp_info->attr->mp_nexthop_prefer_global = false;
+ SET_FLAG(bgp_info->attr->rmap_change_flags,
+ BATTR_RMAP_IPV6_PREFER_GLOBAL_CHANGED);
+ }
diff --git a/net/frr6/files/patch-bgpd_bgpd.c b/net/frr6/files/patch-bgpd_bgpd.c
new file mode 100644
index 000000000000..ca302d226a5f
--- /dev/null
+++ b/net/frr6/files/patch-bgpd_bgpd.c
@@ -0,0 +1,61 @@
+--- bgpd/bgpd.c.orig 2019-01-08 08:29:22 UTC
++++ bgpd/bgpd.c
+@@ -245,7 +245,7 @@ static int bgp_router_id_set(struct bgp *bgp, const st
+
+ /* EVPN uses router id in RD, withdraw them */
+ if (is_evpn_enabled())
+- bgp_evpn_handle_router_id_update(bgp, TRUE);
++ bgp_evpn_handle_router_id_update(bgp, true);
+
+ IPV4_ADDR_COPY(&bgp->router_id, id);
+
+@@ -262,7 +262,7 @@ static int bgp_router_id_set(struct bgp *bgp, const st
+
+ /* EVPN uses router id in RD, update them */
+ if (is_evpn_enabled())
+- bgp_evpn_handle_router_id_update(bgp, FALSE);
++ bgp_evpn_handle_router_id_update(bgp, false);
+
+ return 0;
+ }
+@@ -2949,7 +2949,7 @@ int bgp_handle_socket(struct bgp *bgp, struct vrf *vrf
+ /*
+ * suppress vrf socket
+ */
+- if (create == FALSE) {
++ if (create == false) {
+ bgp_close_vrf_socket(bgp);
+ return 0;
+ }
+@@ -6741,8 +6741,8 @@ static void bgp_config_write_peer_global(struct vty *v
+ struct peer *g_peer = NULL;
+ char buf[SU_ADDRSTRLEN];
+ char *addr;
+- int if_pg_printed = FALSE;
+- int if_ras_printed = FALSE;
++ int if_pg_printed = false;
++ int if_ras_printed = false;
+
+ /* Skip dynamic neighbors. */
+ if (peer_dynamic_neighbor(peer))
+@@ -6764,16 +6764,16 @@ static void bgp_config_write_peer_global(struct vty *v
+
+ if (peer_group_active(peer)) {
+ vty_out(vty, " peer-group %s", peer->group->name);
+- if_pg_printed = TRUE;
++ if_pg_printed = true;
+ } else if (peer->as_type == AS_SPECIFIED) {
+ vty_out(vty, " remote-as %u", peer->as);
+- if_ras_printed = TRUE;
++ if_ras_printed = true;
+ } else if (peer->as_type == AS_INTERNAL) {
+ vty_out(vty, " remote-as internal");
+- if_ras_printed = TRUE;
++ if_ras_printed = true;
+ } else if (peer->as_type == AS_EXTERNAL) {
+ vty_out(vty, " remote-as external");
+- if_ras_printed = TRUE;
++ if_ras_printed = true;
+ }
+
+ vty_out(vty, "\n");
diff --git a/net/frr6/files/patch-ospfd_ospf__vty.c b/net/frr6/files/patch-ospfd_ospf__vty.c
new file mode 100644
index 000000000000..4604ffc9c2fb
--- /dev/null
+++ b/net/frr6/files/patch-ospfd_ospf__vty.c
@@ -0,0 +1,110 @@
+--- ospfd/ospf_vty.c.orig 2019-01-08 08:29:22 UTC
++++ ospfd/ospf_vty.c
+@@ -3244,7 +3244,7 @@ DEFUN (show_ip_ospf,
+ uint8_t uj = use_json(argc, argv);
+ struct listnode *node = NULL;
+ char *vrf_name = NULL;
+- bool all_vrf = FALSE;
++ bool all_vrf = false;
+ int ret = CMD_SUCCESS;
+ int inst = 0;
+ int idx_vrf = 0;
+@@ -3917,7 +3917,7 @@ DEFUN (show_ip_ospf_interface,
+ uint8_t uj = use_json(argc, argv);
+ struct listnode *node = NULL;
+ char *vrf_name = NULL, *intf_name = NULL;
+- bool all_vrf = FALSE;
++ bool all_vrf = false;
+ int ret = CMD_SUCCESS;
+ int inst = 0;
+ int idx_vrf = 0, idx_intf = 0;
+@@ -4044,7 +4044,7 @@ DEFUN (show_ip_ospf_interface_traffic,
+ struct ospf *ospf = NULL;
+ struct listnode *node = NULL;
+ char *vrf_name = NULL, *intf_name = NULL;
+- bool all_vrf = FALSE;
++ bool all_vrf = false;
+ int inst = 0;
+ int idx_vrf = 0, idx_intf = 0;
+ uint8_t uj = use_json(argc, argv);
+@@ -4299,7 +4299,7 @@ DEFUN (show_ip_ospf_neighbor,
+ uint8_t uj = use_json(argc, argv);
+ struct listnode *node = NULL;
+ char *vrf_name = NULL;
+- bool all_vrf = FALSE;
++ bool all_vrf = false;
+ int ret = CMD_SUCCESS;
+ int inst = 0;
+ int idx_vrf = 0;
+@@ -4512,7 +4512,7 @@ DEFUN (show_ip_ospf_neighbor_all,
+ uint8_t uj = use_json(argc, argv);
+ struct listnode *node = NULL;
+ char *vrf_name = NULL;
+- bool all_vrf = FALSE;
++ bool all_vrf = false;
+ int ret = CMD_SUCCESS;
+ int inst = 0;
+ int idx_vrf = 0;
+@@ -5213,7 +5213,7 @@ DEFUN (show_ip_ospf_neighbor_detail,
+ uint8_t uj = use_json(argc, argv);
+ struct listnode *node = NULL;
+ char *vrf_name = NULL;
+- bool all_vrf = FALSE;
++ bool all_vrf = false;
+ int ret = CMD_SUCCESS;
+ int inst = 0;
+ int idx_vrf = 0;
+@@ -5402,7 +5402,7 @@ DEFUN (show_ip_ospf_neighbor_detail_all,
+ uint8_t uj = use_json(argc, argv);
+ struct listnode *node = NULL;
+ char *vrf_name = NULL;
+- bool all_vrf = FALSE;
++ bool all_vrf = false;
+ int ret = CMD_SUCCESS;
+ int inst = 0;
+ int idx_vrf = 0;
+@@ -6285,7 +6285,7 @@ DEFUN (show_ip_ospf_database_max,
+ struct ospf *ospf = NULL;
+ struct listnode *node = NULL;
+ char *vrf_name = NULL;
+- bool all_vrf = FALSE;
++ bool all_vrf = false;
+ int ret = CMD_SUCCESS;
+ int inst = 0;
+ int idx_vrf = 0;
+@@ -6342,7 +6342,7 @@ DEFUN (show_ip_ospf_instance_database,
+ unsigned short instance = 0;
+ struct listnode *node = NULL;
+ char *vrf_name = NULL;
+- bool all_vrf = FALSE;
++ bool all_vrf = false;
+ int ret = CMD_SUCCESS;
+ int inst = 0;
+ int idx = 0;
+@@ -6492,7 +6492,7 @@ DEFUN (show_ip_ospf_instance_database_type_adv_router,
+ unsigned short instance = 0;
+ struct listnode *node = NULL;
+ char *vrf_name = NULL;
+- bool all_vrf = FALSE;
++ bool all_vrf = false;
+ int ret = CMD_SUCCESS;
+ int inst = 0;
+ int idx = 0, idx_vrf = 0;
+@@ -9260,7 +9260,7 @@ DEFUN (show_ip_ospf_border_routers,
+ struct ospf *ospf = NULL;
+ struct listnode *node = NULL;
+ char *vrf_name = NULL;
+- bool all_vrf = FALSE;
++ bool all_vrf = false;
+ int ret = CMD_SUCCESS;
+ int inst = 0;
+ int idx_vrf = 0;
+@@ -9386,7 +9386,7 @@ DEFUN (show_ip_ospf_route,
+ struct ospf *ospf = NULL;
+ struct listnode *node = NULL;
+ char *vrf_name = NULL;
+- bool all_vrf = FALSE;
++ bool all_vrf = false;
+ int ret = CMD_SUCCESS;
+ int inst = 0;
+ int idx_vrf = 0;
diff --git a/net/frr7/files/patch-bgpd_bgp__route.c b/net/frr7/files/patch-bgpd_bgp__route.c
new file mode 100644
index 000000000000..4373a06657d7
--- /dev/null
+++ b/net/frr7/files/patch-bgpd_bgp__route.c
@@ -0,0 +1,29 @@
+--- bgpd/bgp_route.c.orig 2020-02-14 14:03:09 UTC
++++ bgpd/bgp_route.c
+@@ -9922,7 +9922,7 @@ static int bgp_show_route_in_table(struct vty *vty, st
+ }
+ } else if (safi == SAFI_EVPN) {
+ struct bgp_node *longest_pfx;
+- bool is_exact_pfxlen_match = FALSE;
++ bool is_exact_pfxlen_match = false;
+
+ for (rn = bgp_table_top(rib); rn; rn = bgp_route_next(rn)) {
+ if (prd && memcmp(rn->p.u.val, prd->val, 8) != 0)
+@@ -9932,7 +9932,7 @@ static int bgp_show_route_in_table(struct vty *vty, st
+ continue;
+
+ longest_pfx = NULL;
+- is_exact_pfxlen_match = FALSE;
++ is_exact_pfxlen_match = false;
+ /*
+ * Search through all the prefixes for a match. The
+ * pfx's are enumerated in ascending order of pfxlens.
+@@ -9951,7 +9951,7 @@ static int bgp_show_route_in_table(struct vty *vty, st
+ int type5_pfxlen =
+ bgp_evpn_get_type5_prefixlen(&rm->p);
+ if (type5_pfxlen == match.prefixlen) {
+- is_exact_pfxlen_match = TRUE;
++ is_exact_pfxlen_match = true;
+ bgp_unlock_node(rm);
+ break;
+ }
diff --git a/net/zmap/files/patch-CMakeLists.txt b/net/zmap/files/patch-CMakeLists.txt
index 4887df5cead1..868b2bf4d5db 100644
--- a/net/zmap/files/patch-CMakeLists.txt
+++ b/net/zmap/files/patch-CMakeLists.txt
@@ -1,6 +1,14 @@
---- CMakeLists.txt.orig 2016-04-20 05:20:38 UTC
+--- CMakeLists.txt.orig 2015-09-11 15:30:41 UTC
+++ CMakeLists.txt
-@@ -135,11 +135,7 @@ message(STATUS "Default ZMap configurati
+@@ -72,6 +72,7 @@ if(WITH_JSON)
+ endif()
+
+ add_definitions("-DJSON")
++ string(REPLACE ";" " " JSON_CFLAGS "${JSON_CFLAGS}")
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${JSON_CFLAGS}")
+ endif()
+
+@@ -135,11 +136,7 @@ message(STATUS "Default ZMap configuration file locati
foreach(EACH_CONF ${CONF_FILES})
get_filename_component(CONF_BASENAME ${EACH_CONF} NAME)
message(STATUS "Checking if ${CONF_BASENAME} exists there...")
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-27 12:38:52 +0000