*: s/TRUE/true/, s/FALSE/false/

[mirror_frr.git] / ospfd / ospf_vty.c

diff --git a/ospfd/ospf_vty.c b/ospfd/ospf_vty.c
index b5d8739fcb1ecc7d5e2fb6ef48a336baf8900939..dfa34f15efa47d25a789eaf3ed94bfd8a9580197 100644 (file)
--- a/ospfd/ospf_vty.c
+++ b/ospfd/ospf_vty.c
@@ -3252,7 +3252,7 @@ DEFUN (show_ip_ospf,
        bool 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;
@@ -3269,7 +3269,7 @@ DEFUN (show_ip_ospf,
 
        /* vrf input is provided could be all or specific vrf*/
        if (vrf_name) {
-               bool ospf_output = FALSE;
+               bool ospf_output = false;
 
                use_vrf = 1;
 
@@ -3277,7 +3277,7 @@ DEFUN (show_ip_ospf,
                        for (ALL_LIST_ELEMENTS_RO(om->ospf, node, ospf)) {
                                if (!ospf->oi_running)
                                        continue;
-                               ospf_output = TRUE;
+                               ospf_output = true;
                                ret = show_ip_ospf_common(vty, ospf, json,
                                                          use_vrf);
                        }
@@ -3942,7 +3942,7 @@ DEFUN (show_ip_ospf_interface,
        bool 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;
@@ -4082,7 +4082,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;
        bool uj = use_json(argc, argv);
@@ -4337,7 +4337,7 @@ DEFUN (show_ip_ospf_neighbor,
        bool 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;
@@ -4563,7 +4563,7 @@ DEFUN (show_ip_ospf_neighbor_all,
        bool 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;
@@ -5257,7 +5257,7 @@ DEFUN (show_ip_ospf_neighbor_detail,
        bool 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;
@@ -5446,7 +5446,7 @@ DEFUN (show_ip_ospf_neighbor_detail_all,
        bool 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;
@@ -5626,12 +5626,12 @@ DEFUN (show_ip_ospf_neighbor_int_detail,
        bool uj = use_json(argc, argv);
        struct listnode *node = NULL;
        int ret = CMD_SUCCESS;
-       bool ospf_output = FALSE;
+       bool ospf_output = false;
 
        for (ALL_LIST_ELEMENTS_RO(om->ospf, node, ospf)) {
                if (!ospf->oi_running)
                        continue;
-               ospf_output = TRUE;
+               ospf_output = true;
                ret = show_ip_ospf_neighbor_int_detail_common(vty, ospf, 0,
                                                              argv, uj);
        }
@@ -6334,7 +6334,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;
@@ -6343,7 +6343,7 @@ DEFUN (show_ip_ospf_database_max,
        OSPF_FIND_VRF_ARGS(argv, argc, idx_vrf, vrf_name, all_vrf);
 
        if (vrf_name) {
-               bool ospf_output = FALSE;
+               bool ospf_output = false;
 
                use_vrf = 1;
 
@@ -6351,7 +6351,7 @@ DEFUN (show_ip_ospf_database_max,
                        for (ALL_LIST_ELEMENTS_RO(om->ospf, node, ospf)) {
                                if (!ospf->oi_running)
                                        continue;
-                               ospf_output = TRUE;
+                               ospf_output = true;
                                ret = show_ip_ospf_database_common(
                                        vty, ospf, idx_vrf ? 2 : 0, argc, argv,
                                        use_vrf);
@@ -6403,7 +6403,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;
@@ -6561,7 +6561,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;
@@ -6584,7 +6584,7 @@ DEFUN (show_ip_ospf_instance_database_type_adv_router,
        OSPF_FIND_VRF_ARGS(argv, argc, idx_vrf, vrf_name, all_vrf);
 
        if (vrf_name) {
-               bool ospf_output = FALSE;
+               bool ospf_output = false;
 
                use_vrf = 1;
 
@@ -6592,7 +6592,7 @@ DEFUN (show_ip_ospf_instance_database_type_adv_router,
                        for (ALL_LIST_ELEMENTS_RO(om->ospf, node, ospf)) {
                                if (!ospf->oi_running)
                                        continue;
-                               ospf_output = TRUE;
+                               ospf_output = true;
                                ret = show_ip_ospf_database_type_adv_router_common(
                                        vty, ospf, idx ? 1 : 0, argc, argv,
                                        use_vrf);
@@ -9372,7 +9372,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;
@@ -9381,7 +9381,7 @@ DEFUN (show_ip_ospf_border_routers,
        OSPF_FIND_VRF_ARGS(argv, argc, idx_vrf, vrf_name, all_vrf);
 
        if (vrf_name) {
-               bool ospf_output = FALSE;
+               bool ospf_output = false;
 
                use_vrf = 1;
 
@@ -9390,7 +9390,7 @@ DEFUN (show_ip_ospf_border_routers,
                                if (!ospf->oi_running)
                                        continue;
 
-                               ospf_output = TRUE;
+                               ospf_output = true;
                                ret = show_ip_ospf_border_routers_common(
                                        vty, ospf, use_vrf);
                        }
@@ -9510,7 +9510,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;
@@ -9525,7 +9525,7 @@ DEFUN (show_ip_ospf_route,
 
        /* vrf input is provided could be all or specific vrf*/
        if (vrf_name) {
-               bool ospf_output = FALSE;
+               bool ospf_output = false;
 
                use_vrf = 1;
 
@@ -9533,7 +9533,7 @@ DEFUN (show_ip_ospf_route,
                        for (ALL_LIST_ELEMENTS_RO(om->ospf, node, ospf)) {
                                if (!ospf->oi_running)
                                        continue;
-                               ospf_output = TRUE;
+                               ospf_output = true;
                                ret = show_ip_ospf_route_common(vty, ospf, json,
                                                                use_vrf);
                        }
@@ -9733,7 +9733,7 @@ static int config_write_interface_one(struct vty *vty, struct vrf *vrf)
                                        vty_out(vty, " ip ospf network %s",
                                                ospf_int_type_str
                                                        [params->type]);
-                                       if (params != IF_DEF_PARAMS(ifp))
+                                       if (params != IF_DEF_PARAMS(ifp) && rn)
                                                vty_out(vty, " %s",
                                                        inet_ntoa(
                                                                rn->p.u.prefix4));
@@ -9770,7 +9770,7 @@ static int config_write_interface_one(struct vty *vty, struct vrf *vrf)
 
                                vty_out(vty, " ip ospf authentication%s",
                                        auth_str);
-                               if (params != IF_DEF_PARAMS(ifp))
+                               if (params != IF_DEF_PARAMS(ifp) && rn)
                                        vty_out(vty, " %s",
                                                inet_ntoa(rn->p.u.prefix4));
                                vty_out(vty, "\n");
@@ -9781,7 +9781,7 @@ static int config_write_interface_one(struct vty *vty, struct vrf *vrf)
                            && params->auth_simple[0] != '\0') {
                                vty_out(vty, " ip ospf authentication-key %s",
                                        params->auth_simple);
-                               if (params != IF_DEF_PARAMS(ifp))
+                               if (params != IF_DEF_PARAMS(ifp) && rn)
                                        vty_out(vty, " %s",
                                                inet_ntoa(rn->p.u.prefix4));
                                vty_out(vty, "\n");
@@ -9794,7 +9794,7 @@ static int config_write_interface_one(struct vty *vty, struct vrf *vrf)
                                        vty_out(vty,
                                                " ip ospf message-digest-key %d md5 %s",
                                                ck->key_id, ck->auth_key);
-                                       if (params != IF_DEF_PARAMS(ifp))
+                                       if (params != IF_DEF_PARAMS(ifp) && rn)
                                                vty_out(vty, " %s",
                                                        inet_ntoa(
                                                                rn->p.u.prefix4));
@@ -9806,7 +9806,7 @@ static int config_write_interface_one(struct vty *vty, struct vrf *vrf)
                        if (OSPF_IF_PARAM_CONFIGURED(params, output_cost_cmd)) {
                                vty_out(vty, " ip ospf cost %u",
                                        params->output_cost_cmd);
-                               if (params != IF_DEF_PARAMS(ifp))
+                               if (params != IF_DEF_PARAMS(ifp) && rn)
                                        vty_out(vty, " %s",
                                                inet_ntoa(rn->p.u.prefix4));
                                vty_out(vty, "\n");
@@ -9817,7 +9817,7 @@ static int config_write_interface_one(struct vty *vty, struct vrf *vrf)
                            && params->v_hello != OSPF_HELLO_INTERVAL_DEFAULT) {
                                vty_out(vty, " ip ospf hello-interval %u",
                                        params->v_hello);
-                               if (params != IF_DEF_PARAMS(ifp))
+                               if (params != IF_DEF_PARAMS(ifp) && rn)
                                        vty_out(vty, " %s",
                                                inet_ntoa(rn->p.u.prefix4));
                                vty_out(vty, "\n");
@@ -9839,7 +9839,7 @@ static int config_write_interface_one(struct vty *vty, struct vrf *vrf)
                                else
                                        vty_out(vty, "%u", params->v_wait);
 
-                               if (params != IF_DEF_PARAMS(ifp))
+                               if (params != IF_DEF_PARAMS(ifp) && rn)
                                        vty_out(vty, " %s",
                                                inet_ntoa(rn->p.u.prefix4));
                                vty_out(vty, "\n");
@@ -9851,7 +9851,7 @@ static int config_write_interface_one(struct vty *vty, struct vrf *vrf)
                                       != OSPF_ROUTER_PRIORITY_DEFAULT) {
                                vty_out(vty, " ip ospf priority %u",
                                        params->priority);
-                               if (params != IF_DEF_PARAMS(ifp))
+                               if (params != IF_DEF_PARAMS(ifp) && rn)
                                        vty_out(vty, " %s",
                                                inet_ntoa(rn->p.u.prefix4));
                                vty_out(vty, "\n");
@@ -9864,7 +9864,7 @@ static int config_write_interface_one(struct vty *vty, struct vrf *vrf)
                                       != OSPF_RETRANSMIT_INTERVAL_DEFAULT) {
                                vty_out(vty, " ip ospf retransmit-interval %u",
                                        params->retransmit_interval);
-                               if (params != IF_DEF_PARAMS(ifp))
+                               if (params != IF_DEF_PARAMS(ifp) && rn)
                                        vty_out(vty, " %s",
                                                inet_ntoa(rn->p.u.prefix4));
                                vty_out(vty, "\n");
@@ -9876,7 +9876,7 @@ static int config_write_interface_one(struct vty *vty, struct vrf *vrf)
                                       != OSPF_TRANSMIT_DELAY_DEFAULT) {
                                vty_out(vty, " ip ospf transmit-delay %u",
                                        params->transmit_delay);
-                               if (params != IF_DEF_PARAMS(ifp))
+                               if (params != IF_DEF_PARAMS(ifp) && rn)
                                        vty_out(vty, " %s",
                                                inet_ntoa(rn->p.u.prefix4));
                                vty_out(vty, "\n");
@@ -9895,7 +9895,7 @@ static int config_write_interface_one(struct vty *vty, struct vrf *vrf)
                                area_id2str(buf, sizeof(buf), &params->if_area,
                                            params->if_area_id_fmt);
                                vty_out(vty, " area %s", buf);
-                               if (params != IF_DEF_PARAMS(ifp))
+                               if (params != IF_DEF_PARAMS(ifp) && rn)
                                        vty_out(vty, " %s",
                                                inet_ntoa(rn->p.u.prefix4));
                                vty_out(vty, "\n");
@@ -9912,7 +9912,7 @@ static int config_write_interface_one(struct vty *vty, struct vrf *vrf)
                                        vty_out(vty, " no ip ospf mtu-ignore");
                                else
                                        vty_out(vty, " ip ospf mtu-ignore");
-                               if (params != IF_DEF_PARAMS(ifp))
+                               if (params != IF_DEF_PARAMS(ifp) && rn)
                                        vty_out(vty, " %s",
                                                inet_ntoa(rn->p.u.prefix4));
                                vty_out(vty, "\n");