ospf6d: VNL -> VTYNL

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>

diff --git a/lib/vty.h b/lib/vty.h
index 2e2449fe82d3156b940e6904161e2be7227a6c9d..27deaea3ef41efbe8f9cc59baa3beb94eda19510 100644 (file)
--- a/lib/vty.h
+++ b/lib/vty.h
@@ -196,7 +196,7 @@ struct vty_arg
 #endif
 
 #define VNL                                       "\n" \
-/*     CPP_WARN("VNL has been replaced with \\n.") */
+       CPP_WARN("VNL has been replaced with \\n.")
 #define VTYNL                                     "\n" \
 /*     CPP_WARN("VTYNL has been replaced with \\n.") */
 #define VTY_NEWLINE                               "\n" \

diff --git a/ospf6d/ospf6_abr.c b/ospf6d/ospf6_abr.c
index 7ef7fdd94a1292f69a79519e650bf931e999c1cc..4048acbd61379253815cd9483c90dd5df330d9a2 100644 (file)
--- a/ospf6d/ospf6_abr.c
+++ b/ospf6d/ospf6_abr.c
@@ -1067,15 +1067,15 @@ ospf6_inter_area_prefix_lsa_show (struct vty *vty, struct ospf6_lsa *lsa)
     OSPF6_LSA_HEADER_END (lsa->header);
 
   vty_out (vty, "     Metric: %lu%s",
-           (u_long) OSPF6_ABR_SUMMARY_METRIC (prefix_lsa), VNL);
+           (u_long) OSPF6_ABR_SUMMARY_METRIC (prefix_lsa), VTYNL);
 
   ospf6_prefix_options_printbuf (prefix_lsa->prefix.prefix_options,
                                  buf, sizeof (buf));
-  vty_out (vty, "     Prefix Options: %s%s", buf, VNL);
+  vty_out (vty, "     Prefix Options: %s%s", buf, VTYNL);
 
   vty_out (vty, "     Prefix: %s%s",
           ospf6_inter_area_prefix_lsa_get_prefix_str (lsa, buf, sizeof(buf),
-                                                      0), VNL);
+                                                      0), VTYNL);
 
   return 0;
 }
@@ -1109,12 +1109,12 @@ ospf6_inter_area_router_lsa_show (struct vty *vty, struct ospf6_lsa *lsa)
     OSPF6_LSA_HEADER_END (lsa->header);
 
   ospf6_options_printbuf (router_lsa->options, buf, sizeof (buf));
-  vty_out (vty, "     Options: %s%s", buf, VNL);
+  vty_out (vty, "     Options: %s%s", buf, VTYNL);
   vty_out (vty, "     Metric: %lu%s",
-           (u_long) OSPF6_ABR_SUMMARY_METRIC (router_lsa), VNL);
+           (u_long) OSPF6_ABR_SUMMARY_METRIC (router_lsa), VTYNL);
 
   inet_ntop (AF_INET, &router_lsa->router_id, buf, sizeof (buf));
-  vty_out (vty, "     Destination Router ID: %s%s", buf, VNL);
+  vty_out (vty, "     Destination Router ID: %s%s", buf, VTYNL);
 
   return 0;
 }
@@ -1149,7 +1149,7 @@ int
 config_write_ospf6_debug_abr (struct vty *vty)
 {
   if (IS_OSPF6_DEBUG_ABR)
-    vty_out (vty, "debug ospf6 abr%s", VNL);
+    vty_out (vty, "debug ospf6 abr%s", VTYNL);
   return 0;
 }
 

diff --git a/ospf6d/ospf6_area.c b/ospf6d/ospf6_area.c
index ee4d7559eeb6fc4986f9992cfc1d632157ffdf1c..c1222a2c2e0541de9587aab7da6bf339f06d9c0d 100644 (file)
--- a/ospf6d/ospf6_area.c
+++ b/ospf6d/ospf6_area.c
@@ -371,25 +371,25 @@ ospf6_area_show (struct vty *vty, struct ospf6_area *oa)
   unsigned long result;
 
   if (!IS_AREA_STUB (oa))
-    vty_out (vty, " Area %s%s", oa->name, VNL);
+    vty_out (vty, " Area %s%s", oa->name, VTYNL);
   else
     {
       if (oa->no_summary)
        {
-         vty_out (vty, " Area %s[Stub, No Summary]%s", oa->name, VNL);
+         vty_out (vty, " Area %s[Stub, No Summary]%s", oa->name, VTYNL);
        }
       else
        {
-         vty_out (vty, " Area %s[Stub]%s", oa->name, VNL);
+         vty_out (vty, " Area %s[Stub]%s", oa->name, VTYNL);
        }
     }
   vty_out (vty, "     Number of Area scoped LSAs is %u%s",
-           oa->lsdb->count, VNL);
+           oa->lsdb->count, VTYNL);
 
   vty_out (vty, "     Interface attached to this area:");
   for (ALL_LIST_ELEMENTS_RO (oa->if_list, i, oi))
     vty_out (vty, " %s", oi->interface->name);
-  vty_out (vty, "%s", VNL);
+  vty_out (vty, "%s", VTYNL);
 
   if (oa->ts_spf.tv_sec || oa->ts_spf.tv_usec)
     {
@@ -417,7 +417,7 @@ ospf6_area_show (struct vty *vty, struct ospf6_area *oa)
   u_int32_t area_id = htonl (strtoul (str, &ep, 10));      \
   if (*ep && inet_pton (AF_INET, str, &area_id) != 1)      \
     {                                                      \
-      vty_out (vty, "Malformed Area-ID: %s%s", str, VNL);  \
+      vty_out (vty, "Malformed Area-ID: %s%s", str, VTYNL);  \
       return CMD_SUCCESS;                                  \
     }                                                      \
   int format = !*ep ? OSPF6_AREA_FMT_DECIMAL :             \
@@ -454,7 +454,7 @@ DEFUN (area_range,
   ret = str2prefix (argv[idx_ipv6_prefixlen]->arg, &prefix);
   if (ret != 1 || prefix.family != AF_INET6)
     {
-      vty_out (vty, "Malformed argument: %s%s", argv[idx_ipv6_prefixlen]->arg, VNL);
+      vty_out (vty, "Malformed argument: %s%s", argv[idx_ipv6_prefixlen]->arg, VTYNL);
       return CMD_SUCCESS;
     }
 
@@ -528,14 +528,14 @@ DEFUN (no_area_range,
   ret = str2prefix (argv[idx_ipv6]->arg, &prefix);
   if (ret != 1 || prefix.family != AF_INET6)
     {
-      vty_out (vty, "Malformed argument: %s%s", argv[idx_ipv6]->arg, VNL);
+      vty_out (vty, "Malformed argument: %s%s", argv[idx_ipv6]->arg, VTYNL);
       return CMD_SUCCESS;
     }
 
   range = ospf6_route_lookup (&prefix, oa->range_table);
   if (range == NULL)
     {
-      vty_out (vty, "Range %s does not exists.%s", argv[idx_ipv6]->arg, VNL);
+      vty_out (vty, "Range %s does not exists.%s", argv[idx_ipv6]->arg, VTYNL);
       return CMD_SUCCESS;
     }
 
@@ -583,28 +583,28 @@ ospf6_area_config_write (struct vty *vty)
               if (range->path.u.cost_config != OSPF_AREA_RANGE_COST_UNSPEC)
                 vty_out (vty, " cost %d", range->path.u.cost_config);
             }
-          vty_out (vty, "%s", VNL);
+          vty_out (vty, "%s", VTYNL);
 
         }
       if (IS_AREA_STUB (oa))
        {
          if (oa->no_summary)
-           vty_out (vty, " area %s stub no-summary%s", oa->name, VNL);
+           vty_out (vty, " area %s stub no-summary%s", oa->name, VTYNL);
          else
-           vty_out (vty, " area %s stub%s", oa->name, VNL);
+           vty_out (vty, " area %s stub%s", oa->name, VTYNL);
        }
       if (PREFIX_NAME_IN (oa))
         vty_out (vty, " area %s filter-list prefix %s in%s",
-                 oa->name, PREFIX_NAME_IN (oa), VNL);
+                 oa->name, PREFIX_NAME_IN (oa), VTYNL);
       if (PREFIX_NAME_OUT (oa))
         vty_out (vty, " area %s filter-list prefix %s out%s",
-                 oa->name, PREFIX_NAME_OUT (oa), VNL);
+                 oa->name, PREFIX_NAME_OUT (oa), VTYNL);
       if (IMPORT_NAME (oa))
         vty_out (vty, " area %s import-list %s%s",
-                 oa->name, IMPORT_NAME (oa), VNL);
+                 oa->name, IMPORT_NAME (oa), VTYNL);
       if (EXPORT_NAME (oa))
         vty_out (vty, " area %s export-list %s%s",
-                 oa->name, EXPORT_NAME (oa), VNL);
+                 oa->name, EXPORT_NAME (oa), VTYNL);
     }
 }
 
@@ -832,7 +832,7 @@ DEFUN (show_ipv6_ospf6_spf_tree,
       if (route == NULL)
         {
           vty_out (vty, "LS entry for root not found in area %s%s",
-                   oa->name, VNL);
+                   oa->name, VTYNL);
           continue;
         }
       root = (struct ospf6_vertex *) route->route_option;
@@ -866,13 +866,13 @@ DEFUN (show_ipv6_ospf6_area_spf_tree,
 
   if (inet_pton (AF_INET, argv[idx_ipv4]->arg, &area_id) != 1)
     {
-      vty_out (vty, "Malformed Area-ID: %s%s", argv[idx_ipv4]->arg, VNL);
+      vty_out (vty, "Malformed Area-ID: %s%s", argv[idx_ipv4]->arg, VTYNL);
       return CMD_SUCCESS;
     }
   oa = ospf6_area_lookup (area_id, ospf6);
   if (oa == NULL)
     {
-      vty_out (vty, "No such Area: %s%s", argv[idx_ipv4]->arg, VNL);
+      vty_out (vty, "No such Area: %s%s", argv[idx_ipv4]->arg, VTYNL);
       return CMD_SUCCESS;
     }
 
@@ -880,7 +880,7 @@ DEFUN (show_ipv6_ospf6_area_spf_tree,
   if (route == NULL)
     {
       vty_out (vty, "LS entry for root not found in area %s%s",
-               oa->name, VNL);
+               oa->name, VTYNL);
       return CMD_SUCCESS;
     }
   root = (struct ospf6_vertex *) route->route_option;
@@ -919,13 +919,13 @@ DEFUN (show_ipv6_ospf6_simulate_spf_tree_root,
 
   if (inet_pton (AF_INET, argv[idx_ipv4_2]->arg, &area_id) != 1)
     {
-      vty_out (vty, "Malformed Area-ID: %s%s", argv[idx_ipv4_2]->arg, VNL);
+      vty_out (vty, "Malformed Area-ID: %s%s", argv[idx_ipv4_2]->arg, VTYNL);
       return CMD_SUCCESS;
     }
   oa = ospf6_area_lookup (area_id, ospf6);
   if (oa == NULL)
     {
-      vty_out (vty, "No such Area: %s%s", argv[idx_ipv4_2]->arg, VNL);
+      vty_out (vty, "No such Area: %s%s", argv[idx_ipv4_2]->arg, VTYNL);
       return CMD_SUCCESS;
     }
 

diff --git a/ospf6d/ospf6_asbr.c b/ospf6d/ospf6_asbr.c
index 302d8c9865fcf6f19c0540e7a4d3e60dc9e5aa3c..6c50f7040f704d8117c2b03cea207a7803071a08 100644 (file)
--- a/ospf6d/ospf6_asbr.c
+++ b/ospf6d/ospf6_asbr.c
@@ -760,10 +760,10 @@ ospf6_redistribute_config_write (struct vty *vty)
 
       if (ospf6->rmap[type].name)
         vty_out (vty, " redistribute %s route-map %s%s",
-                 ZROUTE_NAME (type), ospf6->rmap[type].name, VNL);
+                 ZROUTE_NAME (type), ospf6->rmap[type].name, VTYNL);
       else
         vty_out (vty, " redistribute %s%s",
-                 ZROUTE_NAME (type), VNL);
+                 ZROUTE_NAME (type), VTYNL);
     }
 
   return 0;
@@ -789,7 +789,7 @@ ospf6_redistribute_show_config (struct vty *vty)
       total++;
     }
 
-  vty_out (vty, "Redistributing External Routes from:%s", VNL);
+  vty_out (vty, "Redistributing External Routes from:%s", VTYNL);
   for (type = 0; type < ZEBRA_ROUTE_MAX; type++)
     {
       if (type == ZEBRA_ROUTE_OSPF6)
@@ -801,12 +801,12 @@ ospf6_redistribute_show_config (struct vty *vty)
         vty_out (vty, "    %d: %s with route-map \"%s\"%s%s", nroute[type],
                  ZROUTE_NAME (type), ospf6->rmap[type].name,
                  (ospf6->rmap[type].map ? "" : " (not found !)"),
-                 VNL);
+                 VTYNL);
       else
         vty_out (vty, "    %d: %s%s", nroute[type],
-                 ZROUTE_NAME (type), VNL);
+                 ZROUTE_NAME (type), VTYNL);
     }
-  vty_out (vty, "Total %d routes%s", total, VNL);
+  vty_out (vty, "Total %d routes%s", total, VTYNL);
 }
 
 
@@ -1082,13 +1082,13 @@ route_map_command_status (struct vty *vty, int ret)
   switch (ret)
     {
     case RMAP_RULE_MISSING:
-      vty_out (vty, "OSPF6 Can't find rule.%s", VNL);
+      vty_out (vty, "OSPF6 Can't find rule.%s", VTYNL);
       break;
     case RMAP_COMPILE_ERROR:
-      vty_out (vty, "OSPF6 Argument is malformed.%s", VNL);
+      vty_out (vty, "OSPF6 Argument is malformed.%s", VTYNL);
       break;
     default:
-      vty_out (vty, "OSPF6 route-map add set failed.%s", VNL);
+      vty_out (vty, "OSPF6 route-map add set failed.%s", VTYNL);
       break;
     }
   return CMD_WARNING;
@@ -1247,35 +1247,35 @@ ospf6_as_external_lsa_show (struct vty *vty, struct ospf6_lsa *lsa)
     (CHECK_FLAG (external->bits_metric, OSPF6_ASBR_BIT_F) ? 'F' : '-'),
     (CHECK_FLAG (external->bits_metric, OSPF6_ASBR_BIT_T) ? 'T' : '-'));
 
-  vty_out (vty, "     Bits: %s%s", buf, VNL);
+  vty_out (vty, "     Bits: %s%s", buf, VTYNL);
   vty_out (vty, "     Metric: %5lu%s", (u_long) OSPF6_ASBR_METRIC (external),
-           VNL);
+           VTYNL);
 
   ospf6_prefix_options_printbuf (external->prefix.prefix_options,
                                  buf, sizeof (buf));
   vty_out (vty, "     Prefix Options: %s%s", buf,
-           VNL);
+           VTYNL);
 
   vty_out (vty, "     Referenced LSType: %d%s",
            ntohs (external->prefix.prefix_refer_lstype),
-           VNL);
+           VTYNL);
 
   vty_out (vty, "     Prefix: %s%s",
-          ospf6_as_external_lsa_get_prefix_str (lsa, buf, sizeof(buf), 0), VNL);
+          ospf6_as_external_lsa_get_prefix_str (lsa, buf, sizeof(buf), 0), VTYNL);
 
   /* Forwarding-Address */
   if (CHECK_FLAG (external->bits_metric, OSPF6_ASBR_BIT_F))
     {
       vty_out (vty, "     Forwarding-Address: %s%s",
               ospf6_as_external_lsa_get_prefix_str (lsa, buf, sizeof(buf), 1),
-              VNL);
+              VTYNL);
     }
 
   /* Tag */
   if (CHECK_FLAG (external->bits_metric, OSPF6_ASBR_BIT_T))
     {
       vty_out (vty, "     Tag: %"ROUTE_TAG_PRI"%s",
-               ospf6_as_external_lsa_get_tag (lsa), VNL);
+               ospf6_as_external_lsa_get_tag (lsa), VTYNL);
     }
 
   return 0;
@@ -1302,7 +1302,7 @@ ospf6_asbr_external_route_show (struct vty *vty, struct ospf6_route *route)
            prefix, id, route->path.metric_type,
            (u_long) (route->path.metric_type == 2 ?
                      route->path.u.cost_e2 : route->path.cost),
-           forwarding, VNL);
+           forwarding, VTYNL);
 }
 
 DEFUN (show_ipv6_ospf6_redistribute,
@@ -1399,7 +1399,7 @@ int
 config_write_ospf6_debug_asbr (struct vty *vty)
 {
   if (IS_OSPF6_DEBUG_ASBR)
-    vty_out (vty, "debug ospf6 asbr%s", VNL);
+    vty_out (vty, "debug ospf6 asbr%s", VTYNL);
   return 0;
 }
 

diff --git a/ospf6d/ospf6_flood.c b/ospf6d/ospf6_flood.c
index 8a8dcfcd20da2c24cd72aed8620ab05159d94171..8434795257fd5e446e01ffbe20c2afa9c12a8042 100644 (file)
--- a/ospf6d/ospf6_flood.c
+++ b/ospf6d/ospf6_flood.c
@@ -1032,7 +1032,7 @@ int
 config_write_ospf6_debug_flood (struct vty *vty)
 {
   if (IS_OSPF6_DEBUG_FLOODING)
-    vty_out (vty, "debug ospf6 flooding%s", VNL);
+    vty_out (vty, "debug ospf6 flooding%s", VTYNL);
   return 0;
 }
 

diff --git a/ospf6d/ospf6_interface.c b/ospf6d/ospf6_interface.c
index 16784ad64ab08b1d11ac052d6df926d5abf19fce..29cfe12c7cf8f0d6a783b2cb6e722b6dabdec0cd 100644 (file)
--- a/ospf6d/ospf6_interface.c
+++ b/ospf6d/ospf6_interface.c
@@ -919,18 +919,18 @@ ospf6_interface_show (struct vty *vty, struct interface *ifp)
 
   vty_out (vty, "%s is %s, type %s%s",
            ifp->name, updown[if_is_operative (ifp)], type,
-          VNL);
-  vty_out (vty, "  Interface ID: %d%s", ifp->ifindex, VNL);
+          VTYNL);
+  vty_out (vty, "  Interface ID: %d%s", ifp->ifindex, VTYNL);
 
   if (ifp->info == NULL)
     {
-      vty_out (vty, "   OSPF not enabled on this interface%s", VNL);
+      vty_out (vty, "   OSPF not enabled on this interface%s", VTYNL);
       return 0;
     }
   else
     oi = (struct ospf6_interface *) ifp->info;
 
-  vty_out (vty, "  Internet Address:%s", VNL);
+  vty_out (vty, "  Internet Address:%s", VTYNL);
 
   for (ALL_LIST_ELEMENTS_RO (ifp->connected, i, c))
     {
@@ -940,15 +940,15 @@ ospf6_interface_show (struct vty *vty, struct interface *ifp)
         {
         case AF_INET:
           vty_out (vty, "    inet : %s%s", strbuf,
-                  VNL);
+                  VTYNL);
           break;
         case AF_INET6:
           vty_out (vty, "    inet6: %s%s", strbuf,
-                  VNL);
+                  VTYNL);
           break;
         default:
           vty_out (vty, "    ???  : %s%s", strbuf,
-                  VNL);
+                  VTYNL);
           break;
         }
     }
@@ -956,32 +956,32 @@ ospf6_interface_show (struct vty *vty, struct interface *ifp)
   if (oi->area)
     {
       vty_out (vty, "  Instance ID %d, Interface MTU %d (autodetect: %d)%s",
-              oi->instance_id, oi->ifmtu, ifp->mtu6, VNL);
+              oi->instance_id, oi->ifmtu, ifp->mtu6, VTYNL);
       vty_out (vty, "  MTU mismatch detection: %s%s", oi->mtu_ignore ?
-              "disabled" : "enabled", VNL);
+              "disabled" : "enabled", VTYNL);
       inet_ntop (AF_INET, &oi->area->area_id,
                  strbuf, sizeof (strbuf));
       vty_out (vty, "  Area ID %s, Cost %u%s", strbuf, oi->cost,
-              VNL);
+              VTYNL);
     }
   else
-    vty_out (vty, "  Not Attached to Area%s", VNL);
+    vty_out (vty, "  Not Attached to Area%s", VTYNL);
 
   vty_out (vty, "  State %s, Transmit Delay %d sec, Priority %d%s",
            ospf6_interface_state_str[oi->state],
            oi->transdelay, oi->priority,
-          VNL);
-  vty_out (vty, "  Timer intervals configured:%s", VNL);
+          VTYNL);
+  vty_out (vty, "  Timer intervals configured:%s", VTYNL);
   vty_out (vty, "   Hello %d, Dead %d, Retransmit %d%s",
            oi->hello_interval, oi->dead_interval, oi->rxmt_interval,
-          VNL);
+          VTYNL);
 
   inet_ntop (AF_INET, &oi->drouter, drouter, sizeof (drouter));
   inet_ntop (AF_INET, &oi->bdrouter, bdrouter, sizeof (bdrouter));
-  vty_out (vty, "  DR: %s BDR: %s%s", drouter, bdrouter, VNL);
+  vty_out (vty, "  DR: %s BDR: %s%s", drouter, bdrouter, VTYNL);
 
   vty_out (vty, "  Number of I/F scoped LSAs is %u%s",
-           oi->lsdb->count, VNL);
+           oi->lsdb->count, VTYNL);
 
   monotime(&now);
 
@@ -992,10 +992,10 @@ ospf6_interface_show (struct vty *vty, struct interface *ifp)
   vty_out (vty, "    %d Pending LSAs for LSUpdate in Time %s [thread %s]%s",
            oi->lsupdate_list->count, duration,
            (oi->thread_send_lsupdate ? "on" : "off"),
-           VNL);
+           VTYNL);
   for (lsa = ospf6_lsdb_head (oi->lsupdate_list); lsa;
        lsa = ospf6_lsdb_next (lsa))
-    vty_out (vty, "      %s%s", lsa->name, VNL);
+    vty_out (vty, "      %s%s", lsa->name, VTYNL);
 
   timerclear (&res);
   if (oi->thread_send_lsack)
@@ -1004,10 +1004,10 @@ ospf6_interface_show (struct vty *vty, struct interface *ifp)
   vty_out (vty, "    %d Pending LSAs for LSAck in Time %s [thread %s]%s",
            oi->lsack_list->count, duration,
            (oi->thread_send_lsack ? "on" : "off"),
-           VNL);
+           VTYNL);
   for (lsa = ospf6_lsdb_head (oi->lsack_list); lsa;
        lsa = ospf6_lsdb_next (lsa))
-    vty_out (vty, "      %s%s", lsa->name, VNL);
+    vty_out (vty, "      %s%s", lsa->name, VTYNL);
   ospf6_bfd_show_info(vty, oi->bfd_info, 1);
   return 0;
 }
@@ -1032,7 +1032,7 @@ DEFUN (show_ipv6_ospf6_interface,
       if (ifp == NULL)
         {
           vty_out (vty, "No such Interface: %s%s", argv[idx_ifname]->arg,
-                   VNL);
+                   VTYNL);
           return CMD_WARNING;
         }
       ospf6_interface_show (vty, ifp);
@@ -1068,14 +1068,14 @@ DEFUN (show_ipv6_ospf6_interface_ifname_prefix,
   ifp = if_lookup_by_name (argv[idx_ifname]->arg, VRF_DEFAULT);
   if (ifp == NULL)
     {
-      vty_out (vty, "No such Interface: %s%s", argv[idx_ifname]->arg, VNL);
+      vty_out (vty, "No such Interface: %s%s", argv[idx_ifname]->arg, VTYNL);
       return CMD_WARNING;
     }
 
   oi = ifp->info;
   if (oi == NULL)
     {
-      vty_out (vty, "OSPFv3 is not enabled on %s%s", argv[idx_ifname]->arg, VNL);
+      vty_out (vty, "OSPFv3 is not enabled on %s%s", argv[idx_ifname]->arg, VTYNL);
       return CMD_WARNING;
     }
 
@@ -1146,7 +1146,7 @@ DEFUN (ipv6_ospf6_ifmtu,
   if (ifp->mtu6 != 0 && ifp->mtu6 < ifmtu)
     {
       vty_out (vty, "%s's ospf6 ifmtu cannot go beyond physical mtu (%d)%s",
-               ifp->name, ifp->mtu6, VNL);
+               ifp->name, ifp->mtu6, VTYNL);
       return CMD_WARNING;
     }
 
@@ -1156,7 +1156,7 @@ DEFUN (ipv6_ospf6_ifmtu,
       if (iobuflen < ifmtu)
         {
           vty_out (vty, "%s's ifmtu is adjusted to I/O buffer size (%d).%s",
-                   ifp->name, iobuflen, VNL);
+                   ifp->name, iobuflen, VTYNL);
           oi->ifmtu = oi->c_ifmtu = iobuflen;
         }
       else
@@ -1204,7 +1204,7 @@ DEFUN (no_ipv6_ospf6_ifmtu,
       if (iobuflen < ifp->mtu)
         {
           vty_out (vty, "%s's ifmtu is adjusted to I/O buffer size (%d).%s",
-                   ifp->name, iobuflen, VNL);
+                   ifp->name, iobuflen, VTYNL);
           oi->ifmtu = iobuflen;
         }
       else
@@ -1250,7 +1250,7 @@ DEFUN (ipv6_ospf6_cost,
 
   if (lcost > UINT32_MAX)
     {
-      vty_out (vty, "Cost %ld is out of range%s", lcost, VNL);
+      vty_out (vty, "Cost %ld is out of range%s", lcost, VTYNL);
       return CMD_WARNING;
     }
   
@@ -1770,62 +1770,62 @@ config_write_ospf6_interface (struct vty *vty)
         continue;
 
       vty_out (vty, "interface %s%s",
-               oi->interface->name, VNL);
+               oi->interface->name, VTYNL);
 
       if (ifp->desc)
-        vty_out (vty, " description %s%s", ifp->desc, VNL);
+        vty_out (vty, " description %s%s", ifp->desc, VTYNL);
       if (oi->c_ifmtu)
-        vty_out (vty, " ipv6 ospf6 ifmtu %d%s", oi->c_ifmtu, VNL);
+        vty_out (vty, " ipv6 ospf6 ifmtu %d%s", oi->c_ifmtu, VTYNL);
 
       if (CHECK_FLAG (oi->flag, OSPF6_INTERFACE_NOAUTOCOST))
         vty_out (vty, " ipv6 ospf6 cost %d%s",
-                 oi->cost, VNL);
+                 oi->cost, VTYNL);
 
       if (oi->hello_interval != OSPF6_INTERFACE_HELLO_INTERVAL)
         vty_out (vty, " ipv6 ospf6 hello-interval %d%s",
-                 oi->hello_interval, VNL);
+                 oi->hello_interval, VTYNL);
 
       if (oi->dead_interval != OSPF6_INTERFACE_DEAD_INTERVAL)
         vty_out (vty, " ipv6 ospf6 dead-interval %d%s",
-                 oi->dead_interval, VNL);
+                 oi->dead_interval, VTYNL);
 
       if (oi->rxmt_interval != OSPF6_INTERFACE_RXMT_INTERVAL)
         vty_out (vty, " ipv6 ospf6 retransmit-interval %d%s",
-                 oi->rxmt_interval, VNL);
+                 oi->rxmt_interval, VTYNL);
 
       if (oi->priority != OSPF6_INTERFACE_PRIORITY)
         vty_out (vty, " ipv6 ospf6 priority %d%s",
-                 oi->priority, VNL);
+                 oi->priority, VTYNL);
 
       if (oi->transdelay != OSPF6_INTERFACE_TRANSDELAY)
         vty_out (vty, " ipv6 ospf6 transmit-delay %d%s",
-                 oi->transdelay, VNL);
+                 oi->transdelay, VTYNL);
 
       if (oi->instance_id != OSPF6_INTERFACE_INSTANCE_ID)
         vty_out (vty, " ipv6 ospf6 instance-id %d%s",
-                 oi->instance_id, VNL);
+                 oi->instance_id, VTYNL);
 
       if (oi->plist_name)
         vty_out (vty, " ipv6 ospf6 advertise prefix-list %s%s",
-                 oi->plist_name, VNL);
+                 oi->plist_name, VTYNL);
 
       if (CHECK_FLAG (oi->flag, OSPF6_INTERFACE_PASSIVE))
-        vty_out (vty, " ipv6 ospf6 passive%s", VNL);
+        vty_out (vty, " ipv6 ospf6 passive%s", VTYNL);
 
       if (oi->mtu_ignore)
-        vty_out (vty, " ipv6 ospf6 mtu-ignore%s", VNL);
+        vty_out (vty, " ipv6 ospf6 mtu-ignore%s", VTYNL);
 
       if (oi->type != ospf6_default_iftype(ifp))
         {
           if (oi->type == OSPF_IFTYPE_POINTOPOINT)
-            vty_out (vty, " ipv6 ospf6 network point-to-point%s", VNL);
+            vty_out (vty, " ipv6 ospf6 network point-to-point%s", VTYNL);
           else if (oi->type == OSPF_IFTYPE_BROADCAST)
-            vty_out (vty, " ipv6 ospf6 network broadcast%s", VNL);
+            vty_out (vty, " ipv6 ospf6 network broadcast%s", VTYNL);
         }
 
       ospf6_bfd_write_config(vty, oi);
 
-      vty_out (vty, "!%s", VNL);
+      vty_out (vty, "!%s", VTYNL);
     }
   return 0;
 }
@@ -1922,7 +1922,7 @@ DEFUN (clear_ipv6_ospf6_interface,
     {
       if ((ifp = if_lookup_by_name (argv[idx_ifname]->arg, VRF_DEFAULT)) == NULL)
         {
-          vty_out (vty, "No such Interface: %s%s", argv[idx_ifname]->arg, VNL);
+          vty_out (vty, "No such Interface: %s%s", argv[idx_ifname]->arg, VTYNL);
           return CMD_WARNING;
         }
       ospf6_interface_clear (vty, ifp);
@@ -1966,7 +1966,7 @@ int
 config_write_ospf6_debug_interface (struct vty *vty)
 {
   if (IS_OSPF6_DEBUG_INTERFACE)
-    vty_out (vty, "debug ospf6 interface%s", VNL);
+    vty_out (vty, "debug ospf6 interface%s", VTYNL);
   return 0;
 }
 

diff --git a/ospf6d/ospf6_intra.c b/ospf6d/ospf6_intra.c
index 6acd45b7c1327b9f0a7800212db56d1b5122387d..a693e8bd04b2fb7adee70678e7febeacbf0350b0 100644 (file)
--- a/ospf6d/ospf6_intra.c
+++ b/ospf6d/ospf6_intra.c
@@ -105,7 +105,7 @@ ospf6_router_lsa_show (struct vty *vty, struct ospf6_lsa *lsa)
 
   ospf6_capability_printbuf (router_lsa->bits, bits, sizeof (bits));
   ospf6_options_printbuf (router_lsa->options, options, sizeof (options));
-  vty_out (vty, "    Bits: %s Options: %s%s", bits, options, VNL);
+  vty_out (vty, "    Bits: %s Options: %s%s", bits, options, VTYNL);
 
   start = (char *) router_lsa + sizeof (struct ospf6_router_lsa);
   end = (char *) lsa->header + ntohs (lsa->header->length);
@@ -126,16 +126,16 @@ ospf6_router_lsa_show (struct vty *vty, struct ospf6_lsa *lsa)
         snprintf (name, sizeof (name), "Unknown (%#x)", lsdesc->type);
 
       vty_out (vty, "    Type: %s Metric: %d%s",
-               name, ntohs (lsdesc->metric), VNL);
+               name, ntohs (lsdesc->metric), VTYNL);
       vty_out (vty, "    Interface ID: %s%s",
                inet_ntop (AF_INET, &lsdesc->interface_id,
-                          buf, sizeof (buf)), VNL);
+                          buf, sizeof (buf)), VTYNL);
       vty_out (vty, "    Neighbor Interface ID: %s%s",
                inet_ntop (AF_INET, &lsdesc->neighbor_interface_id,
-                          buf, sizeof (buf)), VNL);
+                          buf, sizeof (buf)), VTYNL);
       vty_out (vty, "    Neighbor Router ID: %s%s",
                inet_ntop (AF_INET, &lsdesc->neighbor_router_id,
-                          buf, sizeof (buf)), VNL);
+                          buf, sizeof (buf)), VTYNL);
     }
   return 0;
 }
@@ -408,7 +408,7 @@ ospf6_network_lsa_show (struct vty *vty, struct ospf6_lsa *lsa)
     ((caddr_t) lsa->header + sizeof (struct ospf6_lsa_header));
 
   ospf6_options_printbuf (network_lsa->options, options, sizeof (options));
-  vty_out (vty, "     Options: %s%s", options, VNL);
+  vty_out (vty, "     Options: %s%s", options, VTYNL);
 
   start = (char *) network_lsa + sizeof (struct ospf6_network_lsa);
   end = (char *) lsa->header + ntohs (lsa->header->length);
@@ -417,7 +417,7 @@ ospf6_network_lsa_show (struct vty *vty, struct ospf6_lsa *lsa)
     {
       lsdesc = (struct ospf6_network_lsdesc *) current;
       inet_ntop (AF_INET, &lsdesc->router_id, buf, sizeof (buf));
-      vty_out (vty, "     Attached Router: %s%s", buf, VNL);
+      vty_out (vty, "     Attached Router: %s%s", buf, VTYNL);
     }
   return 0;
 }
@@ -624,9 +624,9 @@ ospf6_link_lsa_show (struct vty *vty, struct ospf6_lsa *lsa)
   prefixnum = ntohl (link_lsa->prefix_num);
 
   vty_out (vty, "     Priority: %d Options: %s%s",
-           link_lsa->priority, options, VNL);
-  vty_out (vty, "     LinkLocal Address: %s%s", buf, VNL);
-  vty_out (vty, "     Number of Prefix: %d%s", prefixnum, VNL);
+           link_lsa->priority, options, VTYNL);
+  vty_out (vty, "     LinkLocal Address: %s%s", buf, VTYNL);
+  vty_out (vty, "     Number of Prefix: %d%s", prefixnum, VTYNL);
 
   start = (char *) link_lsa + sizeof (struct ospf6_link_lsa);
   end = (char *) lsa->header + ntohs (lsa->header->length); 
@@ -646,14 +646,14 @@ ospf6_link_lsa_show (struct vty *vty, struct ospf6_lsa *lsa)
       nu = (CHECK_FLAG (prefix->prefix_options, OSPF6_PREFIX_OPTION_NU) ?
            "NU" : "--");
       vty_out (vty, "     Prefix Options: %s|%s|%s|%s%s",
-               p, mc, la, nu, VNL);
+               p, mc, la, nu, VTYNL);
 
       memset (&in6, 0, sizeof (in6));
       memcpy (&in6, OSPF6_PREFIX_BODY (prefix),
               OSPF6_PREFIX_SPACE (prefix->prefix_length));
       inet_ntop (AF_INET6, &in6, buf, sizeof (buf));
       vty_out (vty, "     Prefix: %s/%d%s",
-               buf, prefix->prefix_length, VNL);
+               buf, prefix->prefix_length, VTYNL);
     }
 
   return 0;
@@ -825,14 +825,14 @@ ospf6_intra_prefix_lsa_show (struct vty *vty, struct ospf6_lsa *lsa)
 
   prefixnum = ntohs (intra_prefix_lsa->prefix_num);
 
-  vty_out (vty, "     Number of Prefix: %d%s", prefixnum, VNL);
+  vty_out (vty, "     Number of Prefix: %d%s", prefixnum, VTYNL);
 
   inet_ntop (AF_INET, &intra_prefix_lsa->ref_id, id, sizeof (id));
   inet_ntop (AF_INET, &intra_prefix_lsa->ref_adv_router,
              adv_router, sizeof (adv_router));
   vty_out (vty, "     Reference: %s Id: %s Adv: %s%s",
            ospf6_lstype_name (intra_prefix_lsa->ref_type), id, adv_router,
-           VNL);
+           VTYNL);
 
   start = (char *) intra_prefix_lsa + sizeof (struct ospf6_intra_prefix_lsa);
   end = (char *) lsa->header + ntohs (lsa->header->length); 
@@ -852,14 +852,14 @@ ospf6_intra_prefix_lsa_show (struct vty *vty, struct ospf6_lsa *lsa)
       nu = (CHECK_FLAG (prefix->prefix_options, OSPF6_PREFIX_OPTION_NU) ?
            "NU" : "--");
       vty_out (vty, "     Prefix Options: %s|%s|%s|%s%s",
-               p, mc, la, nu, VNL);
+               p, mc, la, nu, VTYNL);
 
       memset (&in6, 0, sizeof (in6));
       memcpy (&in6, OSPF6_PREFIX_BODY (prefix),
               OSPF6_PREFIX_SPACE (prefix->prefix_length));
       inet_ntop (AF_INET6, &in6, buf, sizeof (buf));
       vty_out (vty, "     Prefix: %s/%d%s",
-               buf, prefix->prefix_length, VNL);
+               buf, prefix->prefix_length, VTYNL);
     }
 
   return 0;
@@ -1793,18 +1793,18 @@ config_write_ospf6_debug_brouter (struct vty *vty)
 {
   char buf[16];
   if (IS_OSPF6_DEBUG_BROUTER)
-    vty_out (vty, "debug ospf6 border-routers%s", VNL);
+    vty_out (vty, "debug ospf6 border-routers%s", VTYNL);
   if (IS_OSPF6_DEBUG_BROUTER_SPECIFIC_ROUTER)
     {
       inet_ntop (AF_INET, &conf_debug_ospf6_brouter_specific_router_id,
                  buf, sizeof (buf));
-      vty_out (vty, "debug ospf6 border-routers router-id %s%s", buf, VNL);
+      vty_out (vty, "debug ospf6 border-routers router-id %s%s", buf, VTYNL);
     }
   if (IS_OSPF6_DEBUG_BROUTER_SPECIFIC_AREA)
     {
       inet_ntop (AF_INET, &conf_debug_ospf6_brouter_specific_area_id,
                  buf, sizeof (buf));
-      vty_out (vty, "debug ospf6 border-routers area-id %s%s", buf, VNL);
+      vty_out (vty, "debug ospf6 border-routers area-id %s%s", buf, VTYNL);
     }
   return 0;
 }

diff --git a/ospf6d/ospf6_lsa.c b/ospf6d/ospf6_lsa.c
index 624acb9c6942f481619b12b6151784ad244f6d0a..401d29c57babd14c68853624cab194905cdef2d1 100644 (file)
--- a/ospf6d/ospf6_lsa.c
+++ b/ospf6d/ospf6_lsa.c
@@ -54,11 +54,11 @@ ospf6_unknown_lsa_show (struct vty *vty, struct ospf6_lsa *lsa)
   start = (u_char *) lsa->header + sizeof (struct ospf6_lsa_header);
   end = (u_char *) lsa->header + ntohs (lsa->header->length);
 
-  vty_out (vty, "        Unknown contents:%s", VNL);
+  vty_out (vty, "        Unknown contents:%s", VTYNL);
   for (current = start; current < end; current ++)
     {
       if ((current - start) % 16 == 0)
-        vty_out (vty, "%s        ", VNL);
+        vty_out (vty, "%s        ", VTYNL);
       else if ((current - start) % 4 == 0)
         vty_out (vty, " ");
 
@@ -66,7 +66,7 @@ ospf6_unknown_lsa_show (struct vty *vty, struct ospf6_lsa *lsa)
       vty_out (vty, "%s", byte);
     }
 
-  vty_out (vty, "%s%s", VNL, VNL);
+  vty_out (vty, "%s%s", VTYNL, VTYNL);
   return 0;
 }
 
@@ -383,7 +383,7 @@ ospf6_lsa_show_summary_header (struct vty *vty)
 {
   vty_out (vty, "%-4s %-15s%-15s%4s %8s %30s%s",
            "Type", "LSId", "AdvRouter", "Age", "SeqNum",
-           "Payload", VNL);
+           "Payload", VTYNL);
 }
 
 void
@@ -412,7 +412,7 @@ ospf6_lsa_show_summary (struct vty *vty, struct ospf6_lsa *lsa)
               ospf6_lstype_short_name (lsa->header->type),
               id, adv_router, ospf6_lsa_age_current (lsa),
               (u_long) ntohl (lsa->header->seqnum),
-              handler->get_prefix_str(lsa, buf, sizeof(buf), 0), VNL);
+              handler->get_prefix_str(lsa, buf, sizeof(buf), 0), VTYNL);
     }
   else if (type != OSPF6_LSTYPE_UNKNOWN)
     {
@@ -423,7 +423,7 @@ ospf6_lsa_show_summary (struct vty *vty, struct ospf6_lsa *lsa)
 
       while (handler->get_prefix_str(lsa, buf, sizeof(buf), cnt) != NULL)
        {
-         vty_out (vty, "%s %30s%s", tmpbuf, buf, VNL);
+         vty_out (vty, "%s %30s%s", tmpbuf, buf, VTYNL);
          cnt++;
        }
     }
@@ -432,7 +432,7 @@ ospf6_lsa_show_summary (struct vty *vty, struct ospf6_lsa *lsa)
       vty_out (vty, "%-4s %-15s%-15s%4hu %8lx%s",
               ospf6_lstype_short_name (lsa->header->type),
               id, adv_router, ospf6_lsa_age_current (lsa),
-              (u_long) ntohl (lsa->header->seqnum), VNL);
+              (u_long) ntohl (lsa->header->seqnum), VTYNL);
     }
 }
 
@@ -445,13 +445,13 @@ ospf6_lsa_show_dump (struct vty *vty, struct ospf6_lsa *lsa)
   start = (u_char *) lsa->header;
   end = (u_char *) lsa->header + ntohs (lsa->header->length);
 
-  vty_out (vty, "%s", VNL);
-  vty_out (vty, "%s:%s", lsa->name, VNL);
+  vty_out (vty, "%s", VTYNL);
+  vty_out (vty, "%s:%s", lsa->name, VTYNL);
 
   for (current = start; current < end; current ++)
     {
       if ((current - start) % 16 == 0)
-        vty_out (vty, "%s        ", VNL);
+        vty_out (vty, "%s        ", VTYNL);
       else if ((current - start) % 4 == 0)
         vty_out (vty, " ");
 
@@ -459,7 +459,7 @@ ospf6_lsa_show_dump (struct vty *vty, struct ospf6_lsa *lsa)
       vty_out (vty, "%s", byte);
     }
 
-  vty_out (vty, "%s%s", VNL, VNL);
+  vty_out (vty, "%s%s", VTYNL, VTYNL);
   return;
 }
 
@@ -474,22 +474,22 @@ ospf6_lsa_show_internal (struct vty *vty, struct ospf6_lsa *lsa)
   inet_ntop (AF_INET, &lsa->header->adv_router,
              adv_router, sizeof (adv_router));
 
-  vty_out (vty, "%s", VNL);
+  vty_out (vty, "%s", VTYNL);
   vty_out (vty, "Age: %4hu Type: %s%s", ospf6_lsa_age_current (lsa),
-           ospf6_lstype_name (lsa->header->type), VNL);
-  vty_out (vty, "Link State ID: %s%s", id, VNL);
-  vty_out (vty, "Advertising Router: %s%s", adv_router, VNL);
+           ospf6_lstype_name (lsa->header->type), VTYNL);
+  vty_out (vty, "Link State ID: %s%s", id, VTYNL);
+  vty_out (vty, "Advertising Router: %s%s", adv_router, VTYNL);
   vty_out (vty, "LS Sequence Number: %#010lx%s",
-           (u_long) ntohl (lsa->header->seqnum), VNL);
+           (u_long) ntohl (lsa->header->seqnum), VTYNL);
   vty_out (vty, "CheckSum: %#06hx Length: %hu%s",
            ntohs (lsa->header->checksum),
-           ntohs (lsa->header->length), VNL);
-  vty_out (vty, "Flag: %x %s", lsa->flag, VNL);
-  vty_out (vty, "Lock: %d %s", lsa->lock, VNL);
-  vty_out (vty, "ReTx Count: %d%s", lsa->retrans_count, VNL);
+           ntohs (lsa->header->length), VTYNL);
+  vty_out (vty, "Flag: %x %s", lsa->flag, VTYNL);
+  vty_out (vty, "Lock: %d %s", lsa->lock, VTYNL);
+  vty_out (vty, "ReTx Count: %d%s", lsa->retrans_count, VTYNL);
   vty_out (vty, "Threads: Expire: 0x%p, Refresh: 0x%p %s",
-           (void *)lsa->expire, (void *)lsa->refresh, VNL);
-  vty_out (vty, "%s", VNL);
+           (void *)lsa->expire, (void *)lsa->refresh, VTYNL);
+  vty_out (vty, "%s", VTYNL);
   return;
 }
 
@@ -512,22 +512,22 @@ ospf6_lsa_show (struct vty *vty, struct ospf6_lsa *lsa)
   timerstring (&res, duration, sizeof (duration));
 
   vty_out (vty, "Age: %4hu Type: %s%s", ospf6_lsa_age_current (lsa),
-           ospf6_lstype_name (lsa->header->type), VNL);
-  vty_out (vty, "Link State ID: %s%s", id, VNL);
-  vty_out (vty, "Advertising Router: %s%s", adv_router, VNL);
+           ospf6_lstype_name (lsa->header->type), VTYNL);
+  vty_out (vty, "Link State ID: %s%s", id, VTYNL);
+  vty_out (vty, "Advertising Router: %s%s", adv_router, VTYNL);
   vty_out (vty, "LS Sequence Number: %#010lx%s",
-           (u_long) ntohl (lsa->header->seqnum), VNL);
+           (u_long) ntohl (lsa->header->seqnum), VTYNL);
   vty_out (vty, "CheckSum: %#06hx Length: %hu%s",
            ntohs (lsa->header->checksum),
-           ntohs (lsa->header->length), VNL);
-  vty_out (vty, "Duration: %s%s", duration, VNL);
+           ntohs (lsa->header->length), VTYNL);
+  vty_out (vty, "Duration: %s%s", duration, VTYNL);
 
   handler = ospf6_get_lsa_handler (lsa->header->type);
   if (handler->show == NULL)
     handler = &unknown_handler;
   (*handler->show) (vty, lsa);
 
-  vty_out (vty, "%s", VNL);
+  vty_out (vty, "%s", VTYNL);
 }
 
 /* OSPFv3 LSA creation/deletion function */
@@ -938,16 +938,16 @@ config_write_ospf6_debug_lsa (struct vty *vty)
         continue;
       if (CHECK_FLAG (handler->debug, OSPF6_LSA_DEBUG))
         vty_out (vty, "debug ospf6 lsa %s%s",
-                 ospf6_lsa_handler_name (handler), VNL);
+                 ospf6_lsa_handler_name (handler), VTYNL);
       if (CHECK_FLAG (handler->debug, OSPF6_LSA_DEBUG_ORIGINATE))
         vty_out (vty, "debug ospf6 lsa %s originate%s",
-                 ospf6_lsa_handler_name (handler), VNL);
+                 ospf6_lsa_handler_name (handler), VTYNL);
       if (CHECK_FLAG (handler->debug, OSPF6_LSA_DEBUG_EXAMIN))
         vty_out (vty, "debug ospf6 lsa %s examine%s",
-                 ospf6_lsa_handler_name (handler), VNL);
+                 ospf6_lsa_handler_name (handler), VTYNL);
       if (CHECK_FLAG (handler->debug, OSPF6_LSA_DEBUG_FLOOD))
         vty_out (vty, "debug ospf6 lsa %s flooding%s",
-                 ospf6_lsa_handler_name (handler), VNL);
+                 ospf6_lsa_handler_name (handler), VTYNL);
     }
 
   return 0;

diff --git a/ospf6d/ospf6_message.c b/ospf6d/ospf6_message.c
index 9bd337ba12dfeb5060adaa9e02cacccdeaeec2f9..adf39de82618de958b19467d7311b5b04cfc01be 100644 (file)
--- a/ospf6d/ospf6_message.c
+++ b/ospf6d/ospf6_message.c
@@ -2459,41 +2459,41 @@ config_write_ospf6_debug_message (struct vty *vty)
 
   if (s == 0x3f && r == 0x3f)
     {
-      vty_out (vty, "debug ospf6 message all%s", VNL);
+      vty_out (vty, "debug ospf6 message all%s", VTYNL);
       return 0;
     }
 
   if (s == 0x3f && r == 0)
     {
-      vty_out (vty, "debug ospf6 message all send%s", VNL);
+      vty_out (vty, "debug ospf6 message all send%s", VTYNL);
       return 0;
     }
   else if (s == 0 && r == 0x3f)
     {
-      vty_out (vty, "debug ospf6 message all recv%s", VNL);
+      vty_out (vty, "debug ospf6 message all recv%s", VTYNL);
       return 0;
     }
 
   /* Unknown message is logged by default */
   if (! IS_OSPF6_DEBUG_MESSAGE (OSPF6_MESSAGE_TYPE_UNKNOWN, SEND) &&
       ! IS_OSPF6_DEBUG_MESSAGE (OSPF6_MESSAGE_TYPE_UNKNOWN, RECV))
-    vty_out (vty, "no debug ospf6 message unknown%s", VNL);
+    vty_out (vty, "no debug ospf6 message unknown%s", VTYNL);
   else if (! IS_OSPF6_DEBUG_MESSAGE (OSPF6_MESSAGE_TYPE_UNKNOWN, SEND))
-    vty_out (vty, "no debug ospf6 message unknown send%s", VNL);
+    vty_out (vty, "no debug ospf6 message unknown send%s", VTYNL);
   else if (! IS_OSPF6_DEBUG_MESSAGE (OSPF6_MESSAGE_TYPE_UNKNOWN, RECV))
-    vty_out (vty, "no debug ospf6 message unknown recv%s", VNL);
+    vty_out (vty, "no debug ospf6 message unknown recv%s", VTYNL);
 
   for (i = 1; i < 6; i++)
     {
       if (IS_OSPF6_DEBUG_MESSAGE (i, SEND) &&
           IS_OSPF6_DEBUG_MESSAGE (i, RECV))
-        vty_out (vty, "debug ospf6 message %s%s", type_str[i], VNL);
+        vty_out (vty, "debug ospf6 message %s%s", type_str[i], VTYNL);
       else if (IS_OSPF6_DEBUG_MESSAGE (i, SEND))
         vty_out (vty, "debug ospf6 message %s send%s", type_str[i],
-                 VNL);
+                 VTYNL);
       else if (IS_OSPF6_DEBUG_MESSAGE (i, RECV))
         vty_out (vty, "debug ospf6 message %s recv%s", type_str[i],
-                 VNL);
+                 VTYNL);
     }
 
   return 0;

diff --git a/ospf6d/ospf6_neighbor.c b/ospf6d/ospf6_neighbor.c
index c58922b0eae1de2fca5779e0153e6f7e26c74021..7e691f091afe079e33ffcca55649787f6b93c768 100644 (file)
--- a/ospf6d/ospf6_neighbor.c
+++ b/ospf6d/ospf6_neighbor.c
@@ -675,14 +675,14 @@ ospf6_neighbor_show (struct vty *vty, struct ospf6_neighbor *on)
   /*
   vty_out (vty, "%-15s %3d %11s %6s/%-12s %11s %s[%s]%s",
            "Neighbor ID", "Pri", "DeadTime", "State", "", "Duration",
-           "I/F", "State", VNL);
+           "I/F", "State", VTYNL);
   */
 
   vty_out (vty, "%-15s %3d %11s %8s/%-12s %11s %s[%s]%s",
            router_id, on->priority, deadtime,
            ospf6_neighbor_state_str[on->state], nstate, duration,
            on->ospf6_if->interface->name,
-           ospf6_interface_state_str[on->ospf6_if->state], VNL);
+           ospf6_interface_state_str[on->ospf6_if->state], VTYNL);
 }
 
 static void
@@ -696,7 +696,7 @@ ospf6_neighbor_show_drchoice (struct vty *vty, struct ospf6_neighbor *on)
 /*
     vty_out (vty, "%-15s %6s/%-11s %-15s %-15s %s[%s]%s",
              "RouterID", "State", "Duration", "DR", "BDR", "I/F",
-             "State", VNL);
+             "State", VTYNL);
 */
 
   inet_ntop (AF_INET, &on->router_id, router_id, sizeof (router_id));
@@ -711,7 +711,7 @@ ospf6_neighbor_show_drchoice (struct vty *vty, struct ospf6_neighbor *on)
            router_id, ospf6_neighbor_state_str[on->state],
            duration, drouter, bdrouter, on->ospf6_if->interface->name,
            ospf6_interface_state_str[on->ospf6_if->state],
-           VNL);
+           VTYNL);
 }
 
 static void
@@ -732,45 +732,45 @@ ospf6_neighbor_show_detail (struct vty *vty, struct ospf6_neighbor *on)
   timerstring (&res, duration, sizeof (duration));
 
   vty_out (vty, " Neighbor %s%s", on->name,
-           VNL);
+           VTYNL);
   vty_out (vty, "    Area %s via interface %s (ifindex %d)%s",
            on->ospf6_if->area->name,
            on->ospf6_if->interface->name,
            on->ospf6_if->interface->ifindex,
-           VNL);
+           VTYNL);
   vty_out (vty, "    His IfIndex: %d Link-local address: %s%s",
            on->ifindex, linklocal_addr,
-           VNL);
+           VTYNL);
   vty_out (vty, "    State %s for a duration of %s%s",
            ospf6_neighbor_state_str[on->state], duration,
-           VNL);
+           VTYNL);
   vty_out (vty, "    His choice of DR/BDR %s/%s, Priority %d%s",
            drouter, bdrouter, on->priority,
-           VNL);
+           VTYNL);
   vty_out (vty, "    DbDesc status: %s%s%s SeqNum: %#lx%s",
            (CHECK_FLAG (on->dbdesc_bits, OSPF6_DBDESC_IBIT) ? "Initial " : ""),
            (CHECK_FLAG (on->dbdesc_bits, OSPF6_DBDESC_MBIT) ? "More " : ""),
            (CHECK_FLAG (on->dbdesc_bits, OSPF6_DBDESC_MSBIT) ?
             "Master" : "Slave"), (u_long) ntohl (on->dbdesc_seqnum),
-           VNL);
+           VTYNL);
 
   vty_out (vty, "    Summary-List: %d LSAs%s", on->summary_list->count,
-           VNL);
+           VTYNL);
   for (lsa = ospf6_lsdb_head (on->summary_list); lsa;
        lsa = ospf6_lsdb_next (lsa))
-    vty_out (vty, "      %s%s", lsa->name, VNL);
+    vty_out (vty, "      %s%s", lsa->name, VTYNL);
 
   vty_out (vty, "    Request-List: %d LSAs%s", on->request_list->count,
-           VNL);
+           VTYNL);
   for (lsa = ospf6_lsdb_head (on->request_list); lsa;
        lsa = ospf6_lsdb_next (lsa))
-    vty_out (vty, "      %s%s", lsa->name, VNL);
+    vty_out (vty, "      %s%s", lsa->name, VTYNL);
 
   vty_out (vty, "    Retrans-List: %d LSAs%s", on->retrans_list->count,
-           VNL);
+           VTYNL);
   for (lsa = ospf6_lsdb_head (on->retrans_list); lsa;
        lsa = ospf6_lsdb_next (lsa))
-    vty_out (vty, "      %s%s", lsa->name, VNL);
+    vty_out (vty, "      %s%s", lsa->name, VTYNL);
 
   timerclear (&res);
   if (on->thread_send_dbdesc)
@@ -779,10 +779,10 @@ ospf6_neighbor_show_detail (struct vty *vty, struct ospf6_neighbor *on)
   vty_out (vty, "    %d Pending LSAs for DbDesc in Time %s [thread %s]%s",
            on->dbdesc_list->count, duration,
            (on->thread_send_dbdesc ? "on" : "off"),
-           VNL);
+           VTYNL);
   for (lsa = ospf6_lsdb_head (on->dbdesc_list); lsa;
        lsa = ospf6_lsdb_next (lsa))
-    vty_out (vty, "      %s%s", lsa->name, VNL);
+    vty_out (vty, "      %s%s", lsa->name, VTYNL);
 
   timerclear (&res);
   if (on->thread_send_lsreq)
@@ -791,10 +791,10 @@ ospf6_neighbor_show_detail (struct vty *vty, struct ospf6_neighbor *on)
   vty_out (vty, "    %d Pending LSAs for LSReq in Time %s [thread %s]%s",
            on->request_list->count, duration,
            (on->thread_send_lsreq ? "on" : "off"),
-           VNL);
+           VTYNL);
   for (lsa = ospf6_lsdb_head (on->request_list); lsa;
        lsa = ospf6_lsdb_next (lsa))
-    vty_out (vty, "      %s%s", lsa->name, VNL);
+    vty_out (vty, "      %s%s", lsa->name, VTYNL);
 
   timerclear (&res);
   if (on->thread_send_lsupdate)
@@ -803,10 +803,10 @@ ospf6_neighbor_show_detail (struct vty *vty, struct ospf6_neighbor *on)
   vty_out (vty, "    %d Pending LSAs for LSUpdate in Time %s [thread %s]%s",
            on->lsupdate_list->count, duration,
            (on->thread_send_lsupdate ? "on" : "off"),
-           VNL);
+           VTYNL);
   for (lsa = ospf6_lsdb_head (on->lsupdate_list); lsa;
        lsa = ospf6_lsdb_next (lsa))
-    vty_out (vty, "      %s%s", lsa->name, VNL);
+    vty_out (vty, "      %s%s", lsa->name, VTYNL);
 
   timerclear (&res);
   if (on->thread_send_lsack)
@@ -815,10 +815,10 @@ ospf6_neighbor_show_detail (struct vty *vty, struct ospf6_neighbor *on)
   vty_out (vty, "    %d Pending LSAs for LSAck in Time %s [thread %s]%s",
            on->lsack_list->count, duration,
            (on->thread_send_lsack ? "on" : "off"),
-           VNL);
+           VTYNL);
   for (lsa = ospf6_lsdb_head (on->lsack_list); lsa;
        lsa = ospf6_lsdb_next (lsa))
-    vty_out (vty, "      %s%s", lsa->name, VNL);
+    vty_out (vty, "      %s%s", lsa->name, VTYNL);
 
   ospf6_bfd_show_info(vty, on->bfd_info, 0);
 }
@@ -854,11 +854,11 @@ DEFUN (show_ipv6_ospf6_neighbor,
   if (showfunc == ospf6_neighbor_show)
     vty_out (vty, "%-15s %3s %11s %8s/%-12s %11s %s[%s]%s",
              "Neighbor ID", "Pri", "DeadTime", "State", "IfState", "Duration",
-             "I/F", "State", VNL);
+             "I/F", "State", VTYNL);
   else if (showfunc == ospf6_neighbor_show_drchoice)
     vty_out (vty, "%-15s %8s/%-11s %-15s %-15s %s[%s]%s",
              "RouterID", "State", "Duration", "DR", "BDR", "I/F",
-             "State", VNL);
+             "State", VTYNL);
 
   for (ALL_LIST_ELEMENTS_RO (ospf6->area_list, i, oa))
     for (ALL_LIST_ELEMENTS_RO (oa->if_list, j, oi))
@@ -893,7 +893,7 @@ DEFUN (show_ipv6_ospf6_neighbor_one,
   if ((inet_pton (AF_INET, argv[idx_ipv4]->arg, &router_id)) != 1)
     {
       vty_out (vty, "Router-ID is not parsable: %s%s", argv[idx_ipv4]->arg,
-               VNL);
+               VTYNL);
       return CMD_SUCCESS;
     }
 
@@ -1016,11 +1016,11 @@ config_write_ospf6_debug_neighbor (struct vty *vty)
 {
   if (IS_OSPF6_DEBUG_NEIGHBOR (STATE) &&
       IS_OSPF6_DEBUG_NEIGHBOR (EVENT))
-    vty_out (vty, "debug ospf6 neighbor%s", VNL);
+    vty_out (vty, "debug ospf6 neighbor%s", VTYNL);
   else if (IS_OSPF6_DEBUG_NEIGHBOR (STATE))
-    vty_out (vty, "debug ospf6 neighbor state%s", VNL);
+    vty_out (vty, "debug ospf6 neighbor state%s", VTYNL);
   else if (IS_OSPF6_DEBUG_NEIGHBOR (EVENT))
-    vty_out (vty, "debug ospf6 neighbor event%s", VNL);
+    vty_out (vty, "debug ospf6 neighbor event%s", VTYNL);
   return 0;
 }
 

diff --git a/ospf6d/ospf6_route.c b/ospf6d/ospf6_route.c
index a6bb099ddd25170b286ec0abd8e251d5fa67f865..3784565a94ee363e4b9a56cf178bf4fc8015f7f0 100644 (file)
--- a/ospf6d/ospf6_route.c
+++ b/ospf6d/ospf6_route.c
@@ -1047,12 +1047,12 @@ ospf6_route_show (struct vty *vty, struct ospf6_route *route)
                   (ospf6_route_is_best (route) ? '*' : ' '),
                   OSPF6_DEST_TYPE_SUBSTR (route->type),
                   OSPF6_PATH_TYPE_SUBSTR (route->path.type),
-                  destination, nexthop, IFNAMSIZ, ifname, duration, VNL);
+                  destination, nexthop, IFNAMSIZ, ifname, duration, VTYNL);
          i++;
        }
       else
        vty_out (vty, "%c%1s %2s %-30s %-25s %6.*s %s%s",
-                ' ', "", "", "", nexthop, IFNAMSIZ, ifname, "", VNL);
+                ' ', "", "", "", nexthop, IFNAMSIZ, ifname, "", VTYNL);
     }
 }
 
@@ -1078,21 +1078,21 @@ ospf6_route_show_detail (struct vty *vty, struct ospf6_route *route)
                destination, sizeof (destination));
   else
     prefix2str (&route->prefix, destination, sizeof (destination));
-  vty_out (vty, "Destination: %s%s", destination, VNL);
+  vty_out (vty, "Destination: %s%s", destination, VTYNL);
 
   /* destination type */
   vty_out (vty, "Destination type: %s%s",
            OSPF6_DEST_TYPE_NAME (route->type),
-           VNL);
+           VTYNL);
 
   /* Time */
   timersub (&now, &route->installed, &res);
   timerstring (&res, duration, sizeof (duration));
-  vty_out (vty, "Installed Time: %s ago%s", duration, VNL);
+  vty_out (vty, "Installed Time: %s ago%s", duration, VTYNL);
 
   timersub (&now, &route->changed, &res);
   timerstring (&res, duration, sizeof (duration));
-  vty_out (vty, "  Changed Time: %s ago%s", duration, VNL);
+  vty_out (vty, "  Changed Time: %s ago%s", duration, VTYNL);
 
   /* Debugging info */
   vty_out (vty, "Lock: %d Flags: %s%s%s%s%s", route->lock,
@@ -1100,19 +1100,19 @@ ospf6_route_show_detail (struct vty *vty, struct ospf6_route *route)
            (CHECK_FLAG (route->flag, OSPF6_ROUTE_ADD)    ? "A" : "-"),
            (CHECK_FLAG (route->flag, OSPF6_ROUTE_REMOVE) ? "R" : "-"),
            (CHECK_FLAG (route->flag, OSPF6_ROUTE_CHANGE) ? "C" : "-"),
-           VNL);
+           VTYNL);
   vty_out (vty, "Memory: prev: %p this: %p next: %p%s",
-           (void *)route->prev, (void *)route, (void *)route->next, VNL);
+           (void *)route->prev, (void *)route, (void *)route->next, VTYNL);
 
   /* Path section */
 
   /* Area-ID */
   inet_ntop (AF_INET, &route->path.area_id, area_id, sizeof (area_id));
-  vty_out (vty, "Associated Area: %s%s", area_id, VNL);
+  vty_out (vty, "Associated Area: %s%s", area_id, VTYNL);
 
   /* Path type */
   vty_out (vty, "Path Type: %s%s",
-           OSPF6_PATH_TYPE_NAME (route->path.type), VNL);
+           OSPF6_PATH_TYPE_NAME (route->path.type), VTYNL);
 
   /* LS Origin */
   inet_ntop (AF_INET, &route->path.origin.id, id, sizeof (id));
@@ -1120,35 +1120,35 @@ ospf6_route_show_detail (struct vty *vty, struct ospf6_route *route)
              sizeof (adv_router));
   vty_out (vty, "LS Origin: %s Id: %s Adv: %s%s",
            ospf6_lstype_name (route->path.origin.type),
-           id, adv_router, VNL);
+           id, adv_router, VTYNL);
 
   /* Options */
   ospf6_options_printbuf (route->path.options, options, sizeof (options));
-  vty_out (vty, "Options: %s%s", options, VNL);
+  vty_out (vty, "Options: %s%s", options, VTYNL);
 
   /* Router Bits */
   ospf6_capability_printbuf (route->path.router_bits, capa, sizeof (capa));
-  vty_out (vty, "Router Bits: %s%s", capa, VNL);
+  vty_out (vty, "Router Bits: %s%s", capa, VTYNL);
 
   /* Prefix Options */
-  vty_out (vty, "Prefix Options: xxx%s", VNL);
+  vty_out (vty, "Prefix Options: xxx%s", VTYNL);
 
   /* Metrics */
   vty_out (vty, "Metric Type: %d%s", route->path.metric_type,
-           VNL);
+           VTYNL);
   vty_out (vty, "Metric: %d (%d)%s",
-           route->path.cost, route->path.u.cost_e2, VNL);
+           route->path.cost, route->path.u.cost_e2, VTYNL);
 
   /* Nexthops */
-  vty_out (vty, "Nexthop:%s", VNL);
+  vty_out (vty, "Nexthop:%s", VTYNL);
   for (ALL_LIST_ELEMENTS_RO (route->nh_list, node, nh))
     {
       /* nexthop */
       inet_ntop (AF_INET6, &nh->address, nexthop, sizeof (nexthop));
       ifname = ifindex2ifname (nh->ifindex, VRF_DEFAULT);
-      vty_out (vty, "  %s %.*s%s", nexthop, IFNAMSIZ, ifname, VNL);
+      vty_out (vty, "  %s %.*s%s", nexthop, IFNAMSIZ, ifname, VTYNL);
     }
-  vty_out (vty, "%s", VNL);
+  vty_out (vty, "%s", VTYNL);
 }
 
 static void
@@ -1184,14 +1184,14 @@ ospf6_route_show_table_summary (struct vty *vty,
 
   assert (number == table->count);
 
-  vty_out (vty, "Number of OSPFv3 routes: %d%s", number, VNL);
-  vty_out (vty, "Number of Destination: %d%s", destination, VNL);
-  vty_out (vty, "Number of Alternative routes: %d%s", alternative, VNL);
-  vty_out (vty, "Number of Equal Cost Multi Path: %d%s", ecmp, VNL);
+  vty_out (vty, "Number of OSPFv3 routes: %d%s", number, VTYNL);
+  vty_out (vty, "Number of Destination: %d%s", destination, VTYNL);
+  vty_out (vty, "Number of Alternative routes: %d%s", alternative, VTYNL);
+  vty_out (vty, "Number of Equal Cost Multi Path: %d%s", ecmp, VTYNL);
   for (i = OSPF6_PATH_TYPE_INTRA; i <= OSPF6_PATH_TYPE_EXTERNAL2; i++)
     {
       vty_out (vty, "Number of %s routes: %d%s",
-               OSPF6_PATH_TYPE_NAME (i), pathtype[i], VNL);
+               OSPF6_PATH_TYPE_NAME (i), pathtype[i], VTYNL);
     }
 }
 
@@ -1364,7 +1364,7 @@ ospf6_route_table_show (struct vty *vty, int argc_start, int argc, struct cmd_to
           continue;
         }
 
-      vty_out (vty, "Malformed argument: %s%s", argv[i]->arg, VNL);
+      vty_out (vty, "Malformed argument: %s%s", argv[i]->arg, VTYNL);
       return CMD_SUCCESS;
     }
 
@@ -1401,7 +1401,7 @@ static void
 ospf6_linkstate_show_header (struct vty *vty)
 {
   vty_out (vty, "%-7s %-15s %-15s %-8s %-14s %s%s",
-           "Type", "Router-ID", "Net-ID", "Rtr-Bits", "Options", "Cost", VNL);
+           "Type", "Router-ID", "Net-ID", "Rtr-Bits", "Options", "Cost", VTYNL);
 }
 
 static void
@@ -1421,11 +1421,11 @@ ospf6_linkstate_show (struct vty *vty, struct ospf6_route *route)
   if (ntohl (id))
     vty_out (vty, "%-7s %-15s %-15s %-8s %-14s %lu%s",
              "Network", routername, idname, rbits, options,
-             (unsigned long) route->path.cost, VNL);
+             (unsigned long) route->path.cost, VTYNL);
   else
     vty_out (vty, "%-7s %-15s %-15s %-8s %-14s %lu%s",
              "Router", routername, idname, rbits, options,
-             (unsigned long) route->path.cost, VNL);
+             (unsigned long) route->path.cost, VTYNL);
 }
 
 
@@ -1502,7 +1502,7 @@ ospf6_linkstate_table_show (struct vty *vty, int idx_ipv4, int argc,
               is_router++;
               continue;
             }
-          vty_out (vty, "Malformed argument: %s%s", argv[i]->arg, VNL);
+          vty_out (vty, "Malformed argument: %s%s", argv[i]->arg, VTYNL);
           return CMD_SUCCESS;
         }
 
@@ -1514,11 +1514,11 @@ ospf6_linkstate_table_show (struct vty *vty, int idx_ipv4, int argc,
               is_id++;
               continue;
             }
-          vty_out (vty, "Malformed argument: %s%s", argv[i]->arg, VNL);
+          vty_out (vty, "Malformed argument: %s%s", argv[i]->arg, VTYNL);
           return CMD_SUCCESS;
         }
 
-      vty_out (vty, "Malformed argument: %s%s", argv[i]->arg, VNL);
+      vty_out (vty, "Malformed argument: %s%s", argv[i]->arg, VTYNL);
       return CMD_SUCCESS;
     }
 
@@ -1539,7 +1539,7 @@ void
 ospf6_brouter_show_header (struct vty *vty)
 {
   vty_out (vty, "%-15s %-8s %-14s %-10s %-15s%s",
-           "Router-ID", "Rtr-Bits", "Options", "Path-Type", "Area", VNL);
+           "Router-ID", "Rtr-Bits", "Options", "Path-Type", "Area", VTYNL);
 }
 
 void
@@ -1555,10 +1555,10 @@ ospf6_brouter_show (struct vty *vty, struct ospf6_route *route)
   inet_ntop (AF_INET, &route->path.area_id, area, sizeof (area));
 
   /* vty_out (vty, "%-15s %-8s %-14s %-10s %-15s%s",
-           "Router-ID", "Rtr-Bits", "Options", "Path-Type", "Area", VNL); */
+           "Router-ID", "Rtr-Bits", "Options", "Path-Type", "Area", VTYNL); */
   vty_out (vty, "%-15s %-8s %-14s %-10s %-15s%s",
            adv, rbits, options, OSPF6_PATH_TYPE_NAME (route->path.type),
-           area, VNL);
+           area, VTYNL);
 }
 
 DEFUN (debug_ospf6_route,
@@ -1619,11 +1619,11 @@ int
 config_write_ospf6_debug_route (struct vty *vty)
 {
   if (IS_OSPF6_DEBUG_ROUTE (TABLE))
-    vty_out (vty, "debug ospf6 route table%s", VNL);
+    vty_out (vty, "debug ospf6 route table%s", VTYNL);
   if (IS_OSPF6_DEBUG_ROUTE (INTRA))
-    vty_out (vty, "debug ospf6 route intra-area%s", VNL);
+    vty_out (vty, "debug ospf6 route intra-area%s", VTYNL);
   if (IS_OSPF6_DEBUG_ROUTE (INTER))
-    vty_out (vty, "debug ospf6 route inter-area%s", VNL);
+    vty_out (vty, "debug ospf6 route inter-area%s", VTYNL);
   return 0;
 }
 

diff --git a/ospf6d/ospf6_spf.c b/ospf6d/ospf6_spf.c
index 35b90f28038e94df47dc25d856fd87bcb33ef89d..6338b06f680fa801c97a15ab61fcb8d018bc2a3f 100644 (file)
--- a/ospf6d/ospf6_spf.c
+++ b/ospf6d/ospf6_spf.c
@@ -742,13 +742,13 @@ ospf6_spf_display_subtree (struct vty *vty, const char *prefix, int rest,
   int restnum;
 
   /* "prefix" is the space prefix of the display line */
-  vty_out (vty, "%s+-%s [%d]%s", prefix, v->name, v->cost, VNL);
+  vty_out (vty, "%s+-%s [%d]%s", prefix, v->name, v->cost, VTYNL);
 
   len = strlen (prefix) + 4;
   next_prefix = (char *) malloc (len);
   if (next_prefix == NULL)
     {
-      vty_out (vty, "malloc failed%s", VNL);
+      vty_out (vty, "malloc failed%s", VTYNL);
       return;
     }
   snprintf (next_prefix, len, "%s%s", prefix, (rest ? "|  " : "   "));
@@ -914,11 +914,11 @@ int
 config_write_ospf6_debug_spf (struct vty *vty)
 {
   if (IS_OSPF6_DEBUG_SPF (PROCESS))
-    vty_out (vty, "debug ospf6 spf process%s", VNL);
+    vty_out (vty, "debug ospf6 spf process%s", VTYNL);
   if (IS_OSPF6_DEBUG_SPF (TIME))
-    vty_out (vty, "debug ospf6 spf time%s", VNL);
+    vty_out (vty, "debug ospf6 spf time%s", VTYNL);
   if (IS_OSPF6_DEBUG_SPF (DATABASE))
-    vty_out (vty, "debug ospf6 spf database%s", VNL);
+    vty_out (vty, "debug ospf6 spf database%s", VTYNL);
   return 0;
 }
 

diff --git a/ospf6d/ospf6_top.c b/ospf6d/ospf6_top.c
index 34af891f1240d80dc3b8610cc56677207d79ea54..f5abead8cf759a6fbc5a73f51fb07c35563dbfef 100644 (file)
--- a/ospf6d/ospf6_top.c
+++ b/ospf6d/ospf6_top.c
@@ -315,7 +315,7 @@ DEFUN (no_router_ospf6,
        OSPF6_STR)
 {
   if (ospf6 == NULL)
-    vty_out (vty, "OSPFv3 is not configured%s", VNL);
+    vty_out (vty, "OSPFv3 is not configured%s", VTYNL);
   else
     {
       ospf6_delete (ospf6);
@@ -343,7 +343,7 @@ DEFUN (ospf6_router_id,
   ret = inet_pton (AF_INET, argv[idx_ipv4]->arg, &router_id);
   if (ret == 0)
     {
-      vty_out (vty, "malformed OSPF Router-ID: %s%s", argv[idx_ipv4]->arg, VNL);
+      vty_out (vty, "malformed OSPF Router-ID: %s%s", argv[idx_ipv4]->arg, VTYNL);
       return CMD_SUCCESS;
     }
 
@@ -589,14 +589,14 @@ DEFUN (ospf6_interface_area,
   if (oi->area)
     {
       vty_out (vty, "%s already attached to Area %s%s",
-               oi->interface->name, oi->area->name, VNL);
+               oi->interface->name, oi->area->name, VTYNL);
       return CMD_SUCCESS;
     }
 
   /* parse Area-ID */
   if (inet_pton (AF_INET, argv[idx_ipv4]->arg, &area_id) != 1)
     {
-      vty_out (vty, "Invalid Area-ID: %s%s", argv[idx_ipv4]->arg, VNL);
+      vty_out (vty, "Invalid Area-ID: %s%s", argv[idx_ipv4]->arg, VTYNL);
       return CMD_SUCCESS;
     }
 
@@ -645,35 +645,35 @@ DEFUN (no_ospf6_interface_area,
   ifp = if_lookup_by_name (argv[idx_ifname]->arg, VRF_DEFAULT);
   if (ifp == NULL)
     {
-      vty_out (vty, "No such interface %s%s", argv[idx_ifname]->arg, VNL);
+      vty_out (vty, "No such interface %s%s", argv[idx_ifname]->arg, VTYNL);
       return CMD_SUCCESS;
     }
 
   oi = (struct ospf6_interface *) ifp->info;
   if (oi == NULL)
     {
-      vty_out (vty, "Interface %s not enabled%s", ifp->name, VNL);
+      vty_out (vty, "Interface %s not enabled%s", ifp->name, VTYNL);
       return CMD_SUCCESS;
     }
 
   /* parse Area-ID */
   if (inet_pton (AF_INET, argv[idx_ipv4]->arg, &area_id) != 1)
     {
-      vty_out (vty, "Invalid Area-ID: %s%s", argv[idx_ipv4]->arg, VNL);
+      vty_out (vty, "Invalid Area-ID: %s%s", argv[idx_ipv4]->arg, VTYNL);
       return CMD_SUCCESS;
     }
 
   /* Verify Area */
   if (oi->area == NULL)
     {
-      vty_out (vty, "No such Area-ID: %s%s", argv[idx_ipv4]->arg, VNL);
+      vty_out (vty, "No such Area-ID: %s%s", argv[idx_ipv4]->arg, VTYNL);
       return CMD_SUCCESS;
     }
 
   if (oi->area->area_id != area_id)
     {
       vty_out (vty, "Wrong Area-ID: %s is attached to area %s%s",
-               oi->interface->name, oi->area->name, VNL);
+               oi->interface->name, oi->area->name, VTYNL);
       return CMD_SUCCESS;
     }
 
@@ -800,13 +800,13 @@ ospf6_show (struct vty *vty, struct ospf6 *o)
   /* process id, router id */
   inet_ntop (AF_INET, &o->router_id, router_id, sizeof (router_id));
   vty_out (vty, " OSPFv3 Routing Process (0) with Router-ID %s%s",
-           router_id, VNL);
+           router_id, VTYNL);
 
   /* running time */
   monotime(&now);
   timersub (&now, &o->starttime, &running);
   timerstring (&running, duration, sizeof (duration));
-  vty_out (vty, " Running %s%s", duration, VNL);
+  vty_out (vty, " Running %s%s", duration, VTYNL);
 
   /* Redistribute configuration */
   /* XXX */
@@ -818,10 +818,10 @@ ospf6_show (struct vty *vty, struct ospf6 *o)
          " Minimum hold time between consecutive SPFs %d millsecond(s)%s"
          " Maximum hold time between consecutive SPFs %d millsecond(s)%s"
          " Hold time multiplier is currently %d%s",
-         o->spf_delay, VNL,
-         o->spf_holdtime, VNL,
-         o->spf_max_holdtime, VNL,
-         o->spf_hold_multiplier, VNL);
+         o->spf_delay, VTYNL,
+         o->spf_holdtime, VTYNL,
+         o->spf_max_holdtime, VTYNL,
+         o->spf_hold_multiplier, VTYNL);
 
   vty_out(vty, " SPF algorithm ");
   if (o->ts_spf.tv_sec || o->ts_spf.tv_usec)
@@ -829,27 +829,27 @@ ospf6_show (struct vty *vty, struct ospf6 *o)
       timersub(&now, &o->ts_spf, &result);
       timerstring(&result, buf, sizeof(buf));
       ospf6_spf_reason_string(o->last_spf_reason, rbuf, sizeof(rbuf));
-      vty_out(vty, "last executed %s ago, reason %s%s", buf, rbuf, VNL);
+      vty_out(vty, "last executed %s ago, reason %s%s", buf, rbuf, VTYNL);
       vty_out (vty, " Last SPF duration %lld sec %lld usec%s",
                (long long)o->ts_spf_duration.tv_sec,
-               (long long)o->ts_spf_duration.tv_usec, VNL);
+               (long long)o->ts_spf_duration.tv_usec, VTYNL);
     }
   else
-    vty_out(vty, "has not been run$%s", VNL);
+    vty_out(vty, "has not been run$%s", VTYNL);
   threadtimer_string(now, o->t_spf_calc, buf, sizeof(buf));
   vty_out (vty, " SPF timer %s%s%s",
-          (o->t_spf_calc ? "due in " : "is "), buf, VNL);
+          (o->t_spf_calc ? "due in " : "is "), buf, VTYNL);
 
   if (CHECK_FLAG (o->flag, OSPF6_STUB_ROUTER))
-    vty_out (vty, " Router Is Stub Router%s", VNL);
+    vty_out (vty, " Router Is Stub Router%s", VTYNL);
 
   /* LSAs */
   vty_out (vty, " Number of AS scoped LSAs is %u%s",
-           o->lsdb->count, VNL);
+           o->lsdb->count, VTYNL);
 
   /* Areas */
   vty_out (vty, " Number of areas in this router is %u%s",
-           listcount (o->area_list), VNL);
+           listcount (o->area_list), VTYNL);
 
   if (CHECK_FLAG(o->config_flags, OSPF6_LOG_ADJACENCY_CHANGES))
     {
@@ -963,7 +963,7 @@ ospf6_stub_router_config_write (struct vty *vty)
 {
   if (CHECK_FLAG (ospf6->flag, OSPF6_STUB_ROUTER))
     {
-      vty_out (vty, " stub-router administrative%s", VNL);
+      vty_out (vty, " stub-router administrative%s", VTYNL);
     }
     return;
 }
@@ -1019,9 +1019,9 @@ config_write_ospf6 (struct vty *vty)
     return CMD_SUCCESS;
 
   inet_ntop (AF_INET, &ospf6->router_id_static, router_id, sizeof (router_id));
-  vty_out (vty, "router ospf6%s", VNL);
+  vty_out (vty, "router ospf6%s", VTYNL);
   if (ospf6->router_id_static != 0)
-    vty_out (vty, " router-id %s%s", router_id, VNL);
+    vty_out (vty, " router-id %s%s", router_id, VTYNL);
 
   /* log-adjacency-changes flag print. */
   if (CHECK_FLAG(ospf6->config_flags, OSPF6_LOG_ADJACENCY_CHANGES))
@@ -1038,7 +1038,7 @@ config_write_ospf6 (struct vty *vty)
 
   if (ospf6->ref_bandwidth != OSPF6_REFERENCE_BANDWIDTH)
     vty_out (vty, " auto-cost reference-bandwidth %d%s", ospf6->ref_bandwidth,
-             VNL);
+             VTYNL);
 
   /* LSA timers print. */
   if (ospf6->lsa_minarrival != OSPF_MIN_LS_ARRIVAL)
@@ -1054,9 +1054,9 @@ config_write_ospf6 (struct vty *vty)
     {
       for (ALL_LIST_ELEMENTS_RO (oa->if_list, k, oi))
         vty_out (vty, " interface %s area %s%s",
-                 oi->interface->name, oa->name, VNL);
+                 oi->interface->name, oa->name, VTYNL);
     }
-  vty_out (vty, "!%s", VNL);
+  vty_out (vty, "!%s", VTYNL);
   return 0;
 }
 

diff --git a/ospf6d/ospf6_zebra.c b/ospf6d/ospf6_zebra.c
index ff00bc7a5a6fdc44510ad0baf95a57065ad83ef1..9a1866139f586463c0a3a853afd18aa4041c3601 100644 (file)
--- a/ospf6d/ospf6_zebra.c
+++ b/ospf6d/ospf6_zebra.c
@@ -315,23 +315,23 @@ DEFUN (show_zebra,
   int i;
   if (zclient == NULL)
     {
-      vty_out (vty, "Not connected to zebra%s", VNL);
+      vty_out (vty, "Not connected to zebra%s", VTYNL);
       return CMD_SUCCESS;
     }
 
-  vty_out (vty, "Zebra Infomation%s", VNL);
+  vty_out (vty, "Zebra Infomation%s", VTYNL);
   vty_out (vty, "  enable: %d fail: %d%s",
-           zclient->enable, zclient->fail, VNL);
+           zclient->enable, zclient->fail, VTYNL);
   vty_out (vty, "  redistribute default: %d%s",
            vrf_bitmap_check (zclient->default_information, VRF_DEFAULT),
-           VNL);
+           VTYNL);
   vty_out (vty, "  redistribute:");
   for (i = 0; i < ZEBRA_ROUTE_MAX; i++)
     {
       if (vrf_bitmap_check (zclient->redist[AFI_IP6][i], VRF_DEFAULT))
         vty_out (vty, " %s", zebra_route_string(i));
     }
-  vty_out (vty, "%s", VNL);
+  vty_out (vty, "%s", VTYNL);
   return CMD_SUCCESS;
 }
 
@@ -341,15 +341,15 @@ config_write_ospf6_zebra (struct vty *vty)
 {
   if (! zclient->enable)
     {
-      vty_out (vty, "no router zebra%s", VNL);
-      vty_out (vty, "!%s", VNL);
+      vty_out (vty, "no router zebra%s", VTYNL);
+      vty_out (vty, "!%s", VTYNL);
     }
   else if (! vrf_bitmap_check (zclient->redist[AFI_IP6][ZEBRA_ROUTE_OSPF6],
                                VRF_DEFAULT))
     {
-      vty_out (vty, "router zebra%s", VNL);
-      vty_out (vty, " no redistribute ospf6%s", VNL);
-      vty_out (vty, "!%s", VNL);
+      vty_out (vty, "router zebra%s", VTYNL);
+      vty_out (vty, " no redistribute ospf6%s", VTYNL);
+      vty_out (vty, "!%s", VTYNL);
     }
   return 0;
 }
@@ -905,13 +905,13 @@ int
 config_write_ospf6_debug_zebra (struct vty *vty)
 {
   if (IS_OSPF6_DEBUG_ZEBRA (SEND) && IS_OSPF6_DEBUG_ZEBRA (RECV))
-    vty_out (vty, "debug ospf6 zebra%s", VNL);
+    vty_out (vty, "debug ospf6 zebra%s", VTYNL);
   else
     {
       if (IS_OSPF6_DEBUG_ZEBRA (SEND))
-        vty_out (vty, "debug ospf6 zebra send%s", VNL);
+        vty_out (vty, "debug ospf6 zebra send%s", VTYNL);
       if (IS_OSPF6_DEBUG_ZEBRA (RECV))
-        vty_out (vty, "debug ospf6 zebra recv%s", VNL);
+        vty_out (vty, "debug ospf6 zebra recv%s", VTYNL);
     }
   return 0;
 }

diff --git a/ospf6d/ospf6d.c b/ospf6d/ospf6d.c
index 1ccf7ce7a9d41cfbfd3e888287df00bde5556714..ce03322f7934cd95ab29c2cd7c68afc1fabb9c19 100644 (file)
--- a/ospf6d/ospf6d.c
+++ b/ospf6d/ospf6d.c
@@ -84,7 +84,7 @@ DEFUN (show_version_ospf6,
       )
 {
   vty_out (vty, "Zebra OSPF6d Version: %s%s",
-           ospf6_daemon_version, VNL);
+           ospf6_daemon_version, VTYNL);
 
   return CMD_SUCCESS;
 }
@@ -110,7 +110,7 @@ config_write_ospf6_debug (struct vty *vty)
   config_write_ospf6_debug_asbr (vty);
   config_write_ospf6_debug_abr (vty);
   config_write_ospf6_debug_flood (vty);
-  vty_out (vty, "!%s", VNL);
+  vty_out (vty, "!%s", VTYNL);
   return 0;
 }
 
@@ -189,7 +189,7 @@ DEFUN (show_ipv6_ospf6_database,
 
   for (ALL_LIST_ELEMENTS_RO (o->area_list, i, oa))
     {
-      vty_out (vty, AREA_LSDB_TITLE_FORMAT, VNL, oa->name, VNL, VNL);
+      vty_out (vty, AREA_LSDB_TITLE_FORMAT, VTYNL, oa->name, VTYNL, VTYNL);
       ospf6_lsdb_show (vty, level, NULL, NULL, NULL, oa->lsdb);
     }
 
@@ -197,16 +197,16 @@ DEFUN (show_ipv6_ospf6_database,
     {
       for (ALL_LIST_ELEMENTS_RO (oa->if_list, j, oi))
         {
-          vty_out (vty, IF_LSDB_TITLE_FORMAT, VNL,
-                   oi->interface->name, oa->name, VNL, VNL);
+          vty_out (vty, IF_LSDB_TITLE_FORMAT, VTYNL,
+                   oi->interface->name, oa->name, VTYNL, VTYNL);
           ospf6_lsdb_show (vty, level, NULL, NULL, NULL, oi->lsdb);
         }
     }
 
-  vty_out (vty, AS_LSDB_TITLE_FORMAT, VNL, VNL, VNL);
+  vty_out (vty, AS_LSDB_TITLE_FORMAT, VTYNL, VTYNL, VTYNL);
   ospf6_lsdb_show (vty, level, NULL, NULL, NULL, o->lsdb);
 
-  vty_out (vty, "%s", VNL);
+  vty_out (vty, "%s", VTYNL);
   return CMD_SUCCESS;
 }
 
@@ -250,7 +250,7 @@ DEFUN (show_ipv6_ospf6_database_type,
       case OSPF6_SCOPE_AREA:
         for (ALL_LIST_ELEMENTS_RO (o->area_list, i, oa))
           {
-            vty_out (vty, AREA_LSDB_TITLE_FORMAT, VNL, oa->name, VNL, VNL);
+            vty_out (vty, AREA_LSDB_TITLE_FORMAT, VTYNL, oa->name, VTYNL, VTYNL);
             ospf6_lsdb_show (vty, level, &type, NULL, NULL, oa->lsdb);
           }
         break;
@@ -260,15 +260,15 @@ DEFUN (show_ipv6_ospf6_database_type,
           {
             for (ALL_LIST_ELEMENTS_RO (oa->if_list, j, oi))
               {
-                vty_out (vty, IF_LSDB_TITLE_FORMAT, VNL,
-                         oi->interface->name, oa->name, VNL, VNL);
+                vty_out (vty, IF_LSDB_TITLE_FORMAT, VTYNL,
+                         oi->interface->name, oa->name, VTYNL, VTYNL);
                 ospf6_lsdb_show (vty, level, &type, NULL, NULL, oi->lsdb);
               }
           }
         break;
 
       case OSPF6_SCOPE_AS:
-        vty_out (vty, AS_LSDB_TITLE_FORMAT, VNL, VNL, VNL);
+        vty_out (vty, AS_LSDB_TITLE_FORMAT, VTYNL, VTYNL, VTYNL);
         ospf6_lsdb_show (vty, level, &type, NULL, NULL, o->lsdb);
         break;
 
@@ -277,7 +277,7 @@ DEFUN (show_ipv6_ospf6_database_type,
         break;
     }
 
-  vty_out (vty, "%s", VNL);
+  vty_out (vty, "%s", VTYNL);
   return CMD_SUCCESS;
 }
 
@@ -313,7 +313,7 @@ DEFUN (show_ipv6_ospf6_database_id,
 
   for (ALL_LIST_ELEMENTS_RO (o->area_list, i, oa))
     {
-      vty_out (vty, AREA_LSDB_TITLE_FORMAT, VNL, oa->name, VNL, VNL);
+      vty_out (vty, AREA_LSDB_TITLE_FORMAT, VTYNL, oa->name, VTYNL, VTYNL);
       ospf6_lsdb_show (vty, level, NULL, &id, NULL, oa->lsdb);
     }
 
@@ -321,16 +321,16 @@ DEFUN (show_ipv6_ospf6_database_id,
     {
       for (ALL_LIST_ELEMENTS_RO (oa->if_list, j, oi))
         {
-          vty_out (vty, IF_LSDB_TITLE_FORMAT, VNL,
-                   oi->interface->name, oa->name, VNL, VNL);
+          vty_out (vty, IF_LSDB_TITLE_FORMAT, VTYNL,
+                   oi->interface->name, oa->name, VTYNL, VTYNL);
           ospf6_lsdb_show (vty, level, NULL, &id, NULL, oi->lsdb);
         }
     }
 
-  vty_out (vty, AS_LSDB_TITLE_FORMAT, VNL, VNL, VNL);
+  vty_out (vty, AS_LSDB_TITLE_FORMAT, VTYNL, VTYNL, VTYNL);
   ospf6_lsdb_show (vty, level, NULL, &id, NULL, o->lsdb);
 
-  vty_out (vty, "%s", VNL);
+  vty_out (vty, "%s", VTYNL);
   return CMD_SUCCESS;
 }
 
@@ -364,7 +364,7 @@ DEFUN (show_ipv6_ospf6_database_router,
 
   for (ALL_LIST_ELEMENTS_RO (o->area_list, i, oa))
     {
-      vty_out (vty, AREA_LSDB_TITLE_FORMAT, VNL, oa->name, VNL, VNL);
+      vty_out (vty, AREA_LSDB_TITLE_FORMAT, VTYNL, oa->name, VTYNL, VTYNL);
       ospf6_lsdb_show (vty, level, NULL, NULL, &adv_router, oa->lsdb);
     }
 
@@ -372,16 +372,16 @@ DEFUN (show_ipv6_ospf6_database_router,
     {
       for (ALL_LIST_ELEMENTS_RO (oa->if_list, j, oi))
         {
-          vty_out (vty, IF_LSDB_TITLE_FORMAT, VNL,
-                   oi->interface->name, oa->name, VNL, VNL);
+          vty_out (vty, IF_LSDB_TITLE_FORMAT, VTYNL,
+                   oi->interface->name, oa->name, VTYNL, VTYNL);
           ospf6_lsdb_show (vty, level, NULL, NULL, &adv_router, oi->lsdb);
         }
     }
 
-  vty_out (vty, AS_LSDB_TITLE_FORMAT, VNL, VNL, VNL);
+  vty_out (vty, AS_LSDB_TITLE_FORMAT, VTYNL, VTYNL, VTYNL);
   ospf6_lsdb_show (vty, level, NULL, NULL, &adv_router, o->lsdb);
 
-  vty_out (vty, "%s", VNL);
+  vty_out (vty, "%s", VTYNL);
   return CMD_SUCCESS;
 }
 
@@ -430,7 +430,7 @@ DEFUN (show_ipv6_ospf6_database_type_id,
       case OSPF6_SCOPE_AREA:
         for (ALL_LIST_ELEMENTS_RO (o->area_list, i, oa))
           {
-            vty_out (vty, AREA_LSDB_TITLE_FORMAT, VNL, oa->name, VNL, VNL);
+            vty_out (vty, AREA_LSDB_TITLE_FORMAT, VTYNL, oa->name, VTYNL, VTYNL);
             ospf6_lsdb_show (vty, level, &type, &id, NULL, oa->lsdb);
           }
         break;
@@ -440,15 +440,15 @@ DEFUN (show_ipv6_ospf6_database_type_id,
           {
             for (ALL_LIST_ELEMENTS_RO (oa->if_list, j, oi))
               {
-                vty_out (vty, IF_LSDB_TITLE_FORMAT, VNL,
-                         oi->interface->name, oa->name, VNL, VNL);
+                vty_out (vty, IF_LSDB_TITLE_FORMAT, VTYNL,
+                         oi->interface->name, oa->name, VTYNL, VTYNL);
                 ospf6_lsdb_show (vty, level, &type, &id, NULL, oi->lsdb);
               }
           }
         break;
 
       case OSPF6_SCOPE_AS:
-        vty_out (vty, AS_LSDB_TITLE_FORMAT, VNL, VNL, VNL);
+        vty_out (vty, AS_LSDB_TITLE_FORMAT, VTYNL, VTYNL, VTYNL);
         ospf6_lsdb_show (vty, level, &type, &id, NULL, o->lsdb);
         break;
 
@@ -457,7 +457,7 @@ DEFUN (show_ipv6_ospf6_database_type_id,
         break;
     }
 
-  vty_out (vty, "%s", VNL);
+  vty_out (vty, "%s", VTYNL);
   return CMD_SUCCESS;
 }
 
@@ -507,7 +507,7 @@ DEFUN (show_ipv6_ospf6_database_type_router,
       case OSPF6_SCOPE_AREA:
         for (ALL_LIST_ELEMENTS_RO (o->area_list, i, oa))
           {
-            vty_out (vty, AREA_LSDB_TITLE_FORMAT, VNL, oa->name, VNL, VNL);
+            vty_out (vty, AREA_LSDB_TITLE_FORMAT, VTYNL, oa->name, VTYNL, VTYNL);
             ospf6_lsdb_show (vty, level, &type, NULL, &adv_router, oa->lsdb);
           }
         break;
@@ -517,15 +517,15 @@ DEFUN (show_ipv6_ospf6_database_type_router,
           {
             for (ALL_LIST_ELEMENTS_RO (oa->if_list, j, oi))
               {
-                vty_out (vty, IF_LSDB_TITLE_FORMAT, VNL,
-                         oi->interface->name, oa->name, VNL, VNL);
+                vty_out (vty, IF_LSDB_TITLE_FORMAT, VTYNL,
+                         oi->interface->name, oa->name, VTYNL, VTYNL);
                 ospf6_lsdb_show (vty, level, &type, NULL, &adv_router, oi->lsdb);
               }
           }
         break;
 
       case OSPF6_SCOPE_AS:
-        vty_out (vty, AS_LSDB_TITLE_FORMAT, VNL, VNL, VNL);
+        vty_out (vty, AS_LSDB_TITLE_FORMAT, VTYNL, VTYNL, VTYNL);
         ospf6_lsdb_show (vty, level, &type, NULL, &adv_router, o->lsdb);
         break;
 
@@ -534,7 +534,7 @@ DEFUN (show_ipv6_ospf6_database_type_router,
         break;
     }
 
-  vty_out (vty, "%s", VNL);
+  vty_out (vty, "%s", VTYNL);
   return CMD_SUCCESS;
 }
 
@@ -572,7 +572,7 @@ DEFUN (show_ipv6_ospf6_database_id_router,
 
   for (ALL_LIST_ELEMENTS_RO (o->area_list, i, oa))
     {
-      vty_out (vty, AREA_LSDB_TITLE_FORMAT, VNL, oa->name, VNL, VNL);
+      vty_out (vty, AREA_LSDB_TITLE_FORMAT, VTYNL, oa->name, VTYNL, VTYNL);
       ospf6_lsdb_show (vty, level, NULL, &id, &adv_router, oa->lsdb);
     }
 
@@ -580,16 +580,16 @@ DEFUN (show_ipv6_ospf6_database_id_router,
     {
       for (ALL_LIST_ELEMENTS_RO (oa->if_list, j, oi))
         {
-          vty_out (vty, IF_LSDB_TITLE_FORMAT, VNL,
-                   oi->interface->name, oa->name, VNL, VNL);
+          vty_out (vty, IF_LSDB_TITLE_FORMAT, VTYNL,
+                   oi->interface->name, oa->name, VTYNL, VTYNL);
           ospf6_lsdb_show (vty, level, NULL, &id, &adv_router, oi->lsdb);
         }
     }
 
-  vty_out (vty, AS_LSDB_TITLE_FORMAT, VNL, VNL, VNL);
+  vty_out (vty, AS_LSDB_TITLE_FORMAT, VTYNL, VTYNL, VTYNL);
   ospf6_lsdb_show (vty, level, NULL, &id, &adv_router, o->lsdb);
 
-  vty_out (vty, "%s", VNL);
+  vty_out (vty, "%s", VTYNL);
   return CMD_SUCCESS;
 }
 
@@ -627,7 +627,7 @@ DEFUN (show_ipv6_ospf6_database_adv_router_linkstate_id,
 
   for (ALL_LIST_ELEMENTS_RO (o->area_list, i, oa))
     {
-      vty_out (vty, AREA_LSDB_TITLE_FORMAT, VNL, oa->name, VNL, VNL);
+      vty_out (vty, AREA_LSDB_TITLE_FORMAT, VTYNL, oa->name, VTYNL, VTYNL);
       ospf6_lsdb_show (vty, level, NULL, &id, &adv_router, oa->lsdb);
     }
 
@@ -635,16 +635,16 @@ DEFUN (show_ipv6_ospf6_database_adv_router_linkstate_id,
     {
       for (ALL_LIST_ELEMENTS_RO (oa->if_list, j, oi))
         {
-          vty_out (vty, IF_LSDB_TITLE_FORMAT, VNL,
-                   oi->interface->name, oa->name, VNL, VNL);
+          vty_out (vty, IF_LSDB_TITLE_FORMAT, VTYNL,
+                   oi->interface->name, oa->name, VTYNL, VTYNL);
           ospf6_lsdb_show (vty, level, NULL, &id, &adv_router, oi->lsdb);
         }
     }
 
-  vty_out (vty, AS_LSDB_TITLE_FORMAT, VNL, VNL, VNL);
+  vty_out (vty, AS_LSDB_TITLE_FORMAT, VTYNL, VTYNL, VTYNL);
   ospf6_lsdb_show (vty, level, NULL, &id, &adv_router, o->lsdb);
 
-  vty_out (vty, "%s", VNL);
+  vty_out (vty, "%s", VTYNL);
   return CMD_SUCCESS;
 }
 
@@ -694,7 +694,7 @@ DEFUN (show_ipv6_ospf6_database_type_id_router,
       case OSPF6_SCOPE_AREA:
         for (ALL_LIST_ELEMENTS_RO (o->area_list, i, oa))
           {
-            vty_out (vty, AREA_LSDB_TITLE_FORMAT, VNL, oa->name, VNL, VNL);
+            vty_out (vty, AREA_LSDB_TITLE_FORMAT, VTYNL, oa->name, VTYNL, VTYNL);
             ospf6_lsdb_show (vty, level, &type, &id, &adv_router, oa->lsdb);
           }
         break;
@@ -704,15 +704,15 @@ DEFUN (show_ipv6_ospf6_database_type_id_router,
           {
             for (ALL_LIST_ELEMENTS_RO (oa->if_list, j, oi))
               {
-                vty_out (vty, IF_LSDB_TITLE_FORMAT, VNL,
-                         oi->interface->name, oa->name, VNL, VNL);
+                vty_out (vty, IF_LSDB_TITLE_FORMAT, VTYNL,
+                         oi->interface->name, oa->name, VTYNL, VTYNL);
                 ospf6_lsdb_show (vty, level, &type, &id, &adv_router, oi->lsdb);
               }
           }
         break;
 
       case OSPF6_SCOPE_AS:
-        vty_out (vty, AS_LSDB_TITLE_FORMAT, VNL, VNL, VNL);
+        vty_out (vty, AS_LSDB_TITLE_FORMAT, VTYNL, VTYNL, VTYNL);
         ospf6_lsdb_show (vty, level, &type, &id, &adv_router, o->lsdb);
         break;
 
@@ -721,7 +721,7 @@ DEFUN (show_ipv6_ospf6_database_type_id_router,
         break;
     }
 
-  vty_out (vty, "%s", VNL);
+  vty_out (vty, "%s", VTYNL);
   return CMD_SUCCESS;
 }
 
@@ -774,7 +774,7 @@ DEFUN (show_ipv6_ospf6_database_type_adv_router_linkstate_id,
       case OSPF6_SCOPE_AREA:
         for (ALL_LIST_ELEMENTS_RO (o->area_list, i, oa))
           {
-            vty_out (vty, AREA_LSDB_TITLE_FORMAT, VNL, oa->name, VNL, VNL);
+            vty_out (vty, AREA_LSDB_TITLE_FORMAT, VTYNL, oa->name, VTYNL, VTYNL);
             ospf6_lsdb_show (vty, level, &type, &id, &adv_router, oa->lsdb);
           }
         break;
@@ -784,15 +784,15 @@ DEFUN (show_ipv6_ospf6_database_type_adv_router_linkstate_id,
           {
             for (ALL_LIST_ELEMENTS_RO (oa->if_list, j, oi))
               {
-                vty_out (vty, IF_LSDB_TITLE_FORMAT, VNL,
-                         oi->interface->name, oa->name, VNL, VNL);
+                vty_out (vty, IF_LSDB_TITLE_FORMAT, VTYNL,
+                         oi->interface->name, oa->name, VTYNL, VTYNL);
                 ospf6_lsdb_show (vty, level, &type, &id, &adv_router, oi->lsdb);
               }
           }
         break;
 
       case OSPF6_SCOPE_AS:
-        vty_out (vty, AS_LSDB_TITLE_FORMAT, VNL, VNL, VNL);
+        vty_out (vty, AS_LSDB_TITLE_FORMAT, VTYNL, VTYNL, VTYNL);
         ospf6_lsdb_show (vty, level, &type, &id, &adv_router, o->lsdb);
         break;
 
@@ -801,7 +801,7 @@ DEFUN (show_ipv6_ospf6_database_type_adv_router_linkstate_id,
         break;
     }
 
-  vty_out (vty, "%s", VNL);
+  vty_out (vty, "%s", VTYNL);
   return CMD_SUCCESS;
 }
 
@@ -831,7 +831,7 @@ DEFUN (show_ipv6_ospf6_database_self_originated,
 
   for (ALL_LIST_ELEMENTS_RO (o->area_list, i, oa))
     {
-      vty_out (vty, AREA_LSDB_TITLE_FORMAT, VNL, oa->name, VNL, VNL);
+      vty_out (vty, AREA_LSDB_TITLE_FORMAT, VTYNL, oa->name, VTYNL, VTYNL);
       ospf6_lsdb_show (vty, level, NULL, NULL, &adv_router, oa->lsdb);
     }
 
@@ -839,16 +839,16 @@ DEFUN (show_ipv6_ospf6_database_self_originated,
     {
       for (ALL_LIST_ELEMENTS_RO (oa->if_list, j, oi))
         {
-          vty_out (vty, IF_LSDB_TITLE_FORMAT, VNL,
-                   oi->interface->name, oa->name, VNL, VNL);
+          vty_out (vty, IF_LSDB_TITLE_FORMAT, VTYNL,
+                   oi->interface->name, oa->name, VTYNL, VTYNL);
           ospf6_lsdb_show (vty, level, NULL, NULL, &adv_router, oi->lsdb);
         }
     }
 
-  vty_out (vty, AS_LSDB_TITLE_FORMAT, VNL, VNL, VNL);
+  vty_out (vty, AS_LSDB_TITLE_FORMAT, VTYNL, VTYNL, VTYNL);
   ospf6_lsdb_show (vty, level, NULL, NULL, &adv_router, o->lsdb);
 
-  vty_out (vty, "%s", VNL);
+  vty_out (vty, "%s", VTYNL);
   return CMD_SUCCESS;
 }
 
@@ -896,7 +896,7 @@ DEFUN (show_ipv6_ospf6_database_type_self_originated,
       case OSPF6_SCOPE_AREA:
         for (ALL_LIST_ELEMENTS_RO (o->area_list, i, oa))
           {
-            vty_out (vty, AREA_LSDB_TITLE_FORMAT, VNL, oa->name, VNL, VNL);
+            vty_out (vty, AREA_LSDB_TITLE_FORMAT, VTYNL, oa->name, VTYNL, VTYNL);
             ospf6_lsdb_show (vty, level, &type, NULL, &adv_router, oa->lsdb);
           }
         break;
@@ -906,15 +906,15 @@ DEFUN (show_ipv6_ospf6_database_type_self_originated,
           {
             for (ALL_LIST_ELEMENTS_RO (oa->if_list, j, oi))
               {
-                vty_out (vty, IF_LSDB_TITLE_FORMAT, VNL,
-                         oi->interface->name, oa->name, VNL, VNL);
+                vty_out (vty, IF_LSDB_TITLE_FORMAT, VTYNL,
+                         oi->interface->name, oa->name, VTYNL, VTYNL);
                 ospf6_lsdb_show (vty, level, &type, NULL, &adv_router, oi->lsdb);
               }
           }
         break;
 
       case OSPF6_SCOPE_AS:
-        vty_out (vty, AS_LSDB_TITLE_FORMAT, VNL, VNL, VNL);
+        vty_out (vty, AS_LSDB_TITLE_FORMAT, VTYNL, VTYNL, VTYNL);
         ospf6_lsdb_show (vty, level, &type, NULL, &adv_router, o->lsdb);
         break;
 
@@ -923,7 +923,7 @@ DEFUN (show_ipv6_ospf6_database_type_self_originated,
         break;
     }
 
-  vty_out (vty, "%s", VNL);
+  vty_out (vty, "%s", VTYNL);
   return CMD_SUCCESS;
 }
 
@@ -974,7 +974,7 @@ DEFUN (show_ipv6_ospf6_database_type_self_originated_linkstate_id,
       case OSPF6_SCOPE_AREA:
         for (ALL_LIST_ELEMENTS_RO (o->area_list, i, oa))
           {
-            vty_out (vty, AREA_LSDB_TITLE_FORMAT, VNL, oa->name, VNL, VNL);
+            vty_out (vty, AREA_LSDB_TITLE_FORMAT, VTYNL, oa->name, VTYNL, VTYNL);
             ospf6_lsdb_show (vty, level, &type, &id, &adv_router, oa->lsdb);
           }
         break;
@@ -984,15 +984,15 @@ DEFUN (show_ipv6_ospf6_database_type_self_originated_linkstate_id,
           {
             for (ALL_LIST_ELEMENTS_RO (oa->if_list, j, oi))
               {
-                vty_out (vty, IF_LSDB_TITLE_FORMAT, VNL,
-                         oi->interface->name, oa->name, VNL, VNL);
+                vty_out (vty, IF_LSDB_TITLE_FORMAT, VTYNL,
+                         oi->interface->name, oa->name, VTYNL, VTYNL);
                 ospf6_lsdb_show (vty, level, &type, &id, &adv_router, oi->lsdb);
               }
           }
         break;
 
       case OSPF6_SCOPE_AS:
-        vty_out (vty, AS_LSDB_TITLE_FORMAT, VNL, VNL, VNL);
+        vty_out (vty, AS_LSDB_TITLE_FORMAT, VTYNL, VTYNL, VTYNL);
         ospf6_lsdb_show (vty, level, &type, &id, &adv_router, o->lsdb);
         break;
 
@@ -1001,7 +1001,7 @@ DEFUN (show_ipv6_ospf6_database_type_self_originated_linkstate_id,
         break;
     }
 
-  vty_out (vty, "%s", VNL);
+  vty_out (vty, "%s", VTYNL);
   return CMD_SUCCESS;
 }
 
@@ -1051,7 +1051,7 @@ DEFUN (show_ipv6_ospf6_database_type_id_self_originated,
       case OSPF6_SCOPE_AREA:
         for (ALL_LIST_ELEMENTS_RO (o->area_list, i, oa))
           {
-            vty_out (vty, AREA_LSDB_TITLE_FORMAT, VNL, oa->name, VNL, VNL);
+            vty_out (vty, AREA_LSDB_TITLE_FORMAT, VTYNL, oa->name, VTYNL, VTYNL);
             ospf6_lsdb_show (vty, level, &type, &id, &adv_router, oa->lsdb);
           }
         break;
@@ -1061,15 +1061,15 @@ DEFUN (show_ipv6_ospf6_database_type_id_self_originated,
           {
             for (ALL_LIST_ELEMENTS_RO (oa->if_list, j, oi))
               {
-                vty_out (vty, IF_LSDB_TITLE_FORMAT, VNL,
-                         oi->interface->name, oa->name, VNL, VNL);
+                vty_out (vty, IF_LSDB_TITLE_FORMAT, VTYNL,
+                         oi->interface->name, oa->name, VTYNL, VTYNL);
                 ospf6_lsdb_show (vty, level, &type, &id, &adv_router, oi->lsdb);
               }
           }
         break;
 
       case OSPF6_SCOPE_AS:
-        vty_out (vty, AS_LSDB_TITLE_FORMAT, VNL, VNL, VNL);
+        vty_out (vty, AS_LSDB_TITLE_FORMAT, VTYNL, VTYNL, VTYNL);
         ospf6_lsdb_show (vty, level, &type, &id, &adv_router, o->lsdb);
         break;
 
@@ -1078,7 +1078,7 @@ DEFUN (show_ipv6_ospf6_database_type_id_self_originated,
         break;
     }
 
-  vty_out (vty, "%s", VNL);
+  vty_out (vty, "%s", VTYNL);
   return CMD_SUCCESS;
 }
 
@@ -1115,7 +1115,7 @@ DEFUN (show_ipv6_ospf6_border_routers,
           ro = ospf6_route_lookup (&prefix, ospf6->brouter_table);
           if (!ro)
             {
-              vty_out (vty, "No Route found for Router ID: %s%s", argv[4]->arg, VNL);
+              vty_out (vty, "No Route found for Router ID: %s%s", argv[4]->arg, VTYNL);
               return CMD_SUCCESS;
             }
 
@@ -1158,11 +1158,11 @@ DEFUN (show_ipv6_ospf6_linkstate,
   for (ALL_LIST_ELEMENTS_RO (ospf6->area_list, node, oa))
     {
       vty_out (vty, "%s        SPF Result in Area %s%s%s",
-               VNL, oa->name, VNL, VNL);
+               VTYNL, oa->name, VTYNL, VTYNL);
       ospf6_linkstate_table_show (vty, idx_ipv4, argc, argv, oa->spf_table);
     }
 
-  vty_out (vty, "%s", VNL);
+  vty_out (vty, "%s", VTYNL);
   return CMD_SUCCESS;
 }
 
@@ -1186,11 +1186,11 @@ DEFUN (show_ipv6_ospf6_linkstate_detail,
   for (ALL_LIST_ELEMENTS_RO (ospf6->area_list, node, oa))
     {
       vty_out (vty, "%s        SPF Result in Area %s%s%s",
-               VNL, oa->name, VNL, VNL);
+               VTYNL, oa->name, VTYNL, VTYNL);
       ospf6_linkstate_table_show (vty, idx_detail, argc, argv, oa->spf_table);
     }
 
-  vty_out (vty, "%s", VNL);
+  vty_out (vty, "%s", VTYNL);
   return CMD_SUCCESS;
 }