Interface CLI commands moved to a separate file.

This is a preparation both for CLI splitup and for lib splitup.

diff --git a/nest/Makefile b/nest/Makefile
index 17caf63c81409a35f00e25207f330e4ac9e9e7c1..d5a66727181c83d4984c90526a7b520d6a023e2f 100644 (file)
--- a/nest/Makefile
+++ b/nest/Makefile
@@ -1,4 +1,4 @@
-src := cli.c cmds.c iface.c locks.c mpls.c neighbor.c password.c proto.c proto-build.c rt-attr.c rt-dev.c rt-export.c rt-fib.c rt-show.c rt-table.c
+src := cli.c cmds.c iface.c iface-cli.c locks.c mpls.c neighbor.c password.c proto.c proto-build.c rt-attr.c rt-dev.c rt-export.c rt-fib.c rt-show.c rt-table.c
 obj := $(src-o-files)
 $(all-daemon)
 $(cf-local)

diff --git a/nest/iface-cli.c b/nest/iface-cli.c
new file mode 100644 (file)
index 0000000..b33969e
--- /dev/null
+++ b/nest/iface-cli.c
@@ -0,0 +1,106 @@
+/*
+ *     BIRD -- Management of Interfaces and Neighbor Cache
+ *
+ *     (c) 1998--2000 Martin Mares <mj@ucw.cz>
+ *
+ *     Can be freely distributed and used under the terms of the GNU GPL.
+ */
+
+#include "nest/bird.h"
+#include "nest/iface.h"
+#include "nest/protocol.h"
+#include "nest/cli.h"
+#include "lib/resource.h"
+#include "lib/string.h"
+#include "lib/locking.h"
+
+/*
+ *  CLI commands.
+ */
+
+static void
+if_show_addr(struct ifa *a)
+{
+  byte *flg, opp[IPA_MAX_TEXT_LENGTH + 16];
+
+  flg = (a->flags & IA_PRIMARY) ? "Preferred, " : (a->flags & IA_SECONDARY) ? "Secondary, " : "";
+
+  if (ipa_nonzero(a->opposite))
+    bsprintf(opp, "opposite %I, ", a->opposite);
+  else
+    opp[0] = 0;
+
+  cli_msg(-1003, "\t%I/%d (%s%sscope %s)",
+         a->ip, a->prefix.pxlen, flg, opp, ip_scope_text(a->scope));
+}
+
+void
+if_show(void)
+{
+  struct ifa *a;
+  char *type;
+
+  IFACE_WALK(i)
+    {
+      if (i->flags & IF_SHUTDOWN)
+       continue;
+
+      char mbuf[16 + sizeof(i->name)] = {};
+      if (i->master != &default_vrf)
+       bsprintf(mbuf, " master=%s", i->master->name);
+      else if (i->master_index)
+       bsprintf(mbuf, " master=#%u", i->master_index);
+
+      cli_msg(-1001, "%s %s (index=%d%s)", i->name, (i->flags & IF_UP) ? "up" : "down", i->index, mbuf);
+      if (!(i->flags & IF_MULTIACCESS))
+       type = "PtP";
+      else
+       type = "MultiAccess";
+      cli_msg(-1004, "\t%s%s%s Admin%s Link%s%s%s MTU=%d",
+             type,
+             (i->flags & IF_BROADCAST) ? " Broadcast" : "",
+             (i->flags & IF_MULTICAST) ? " Multicast" : "",
+             (i->flags & IF_ADMIN_UP) ? "Up" : "Down",
+             (i->flags & IF_LINK_UP) ? "Up" : "Down",
+             (i->flags & IF_LOOPBACK) ? " Loopback" : "",
+             (i->flags & IF_IGNORE) ? " Ignored" : "",
+             i->mtu);
+
+      WALK_LIST(a, i->addrs)
+       if (a->prefix.type == NET_IP4)
+         if_show_addr(a);
+
+      WALK_LIST(a, i->addrs)
+       if (a->prefix.type == NET_IP6)
+         if_show_addr(a);
+    }
+  cli_msg(0, "");
+}
+
+void
+if_show_summary(void)
+{
+  cli_msg(-2005, "%-10s %-6s %-18s %s", "Interface", "State", "IPv4 address", "IPv6 address");
+  IFACE_WALK(i)
+    {
+      byte a4[IPA_MAX_TEXT_LENGTH + 17];
+      byte a6[IPA_MAX_TEXT_LENGTH + 17];
+
+      if (i->flags & IF_SHUTDOWN)
+       continue;
+
+      if (i->addr4)
+       bsprintf(a4, "%I/%d", i->addr4->ip, i->addr4->prefix.pxlen);
+      else
+       a4[0] = 0;
+
+      if (i->addr6)
+       bsprintf(a6, "%I/%d", i->addr6->ip, i->addr6->prefix.pxlen);
+      else
+       a6[0] = 0;
+
+      cli_msg(-1005, "%-10s %-6s %-18s %s",
+             i->name, (i->flags & IF_UP) ? "up" : "down", a4, a6);
+    }
+  cli_msg(0, "");
+}

diff --git a/nest/iface.c b/nest/iface.c
index 0e8b4df74a022e598bc5fe3518ed2b0cf4446cce..9071809765ac212bdf49cd46caf65310b8866902 100644 (file)
--- a/nest/iface.c
+++ b/nest/iface.c
@@ -28,7 +28,6 @@
 #include "nest/bird.h"
 #include "nest/iface.h"
 #include "nest/protocol.h"
-#include "nest/cli.h"
 #include "lib/resource.h"
 #include "lib/string.h"
 #include "lib/locking.h"
@@ -1136,94 +1135,3 @@ iface_patts_equal(list *a, list *b, int (*comp)(struct iface_patt *, struct ifac
     }
   return (!x->n.next && !y->n.next);
 }
-
-/*
- *  CLI commands.
- */
-
-static void
-if_show_addr(struct ifa *a)
-{
-  byte *flg, opp[IPA_MAX_TEXT_LENGTH + 16];
-
-  flg = (a->flags & IA_PRIMARY) ? "Preferred, " : (a->flags & IA_SECONDARY) ? "Secondary, " : "";
-
-  if (ipa_nonzero(a->opposite))
-    bsprintf(opp, "opposite %I, ", a->opposite);
-  else
-    opp[0] = 0;
-
-  cli_msg(-1003, "\t%I/%d (%s%sscope %s)",
-         a->ip, a->prefix.pxlen, flg, opp, ip_scope_text(a->scope));
-}
-
-void
-if_show(void)
-{
-  struct ifa *a;
-  char *type;
-
-  IFACE_WALK(i)
-    {
-      if (i->flags & IF_SHUTDOWN)
-       continue;
-
-      char mbuf[16 + sizeof(i->name)] = {};
-      if (i->master != &default_vrf)
-       bsprintf(mbuf, " master=%s", i->master->name);
-      else if (i->master_index)
-       bsprintf(mbuf, " master=#%u", i->master_index);
-
-      cli_msg(-1001, "%s %s (index=%d%s)", i->name, (i->flags & IF_UP) ? "up" : "down", i->index, mbuf);
-      if (!(i->flags & IF_MULTIACCESS))
-       type = "PtP";
-      else
-       type = "MultiAccess";
-      cli_msg(-1004, "\t%s%s%s Admin%s Link%s%s%s MTU=%d",
-             type,
-             (i->flags & IF_BROADCAST) ? " Broadcast" : "",
-             (i->flags & IF_MULTICAST) ? " Multicast" : "",
-             (i->flags & IF_ADMIN_UP) ? "Up" : "Down",
-             (i->flags & IF_LINK_UP) ? "Up" : "Down",
-             (i->flags & IF_LOOPBACK) ? " Loopback" : "",
-             (i->flags & IF_IGNORE) ? " Ignored" : "",
-             i->mtu);
-
-      WALK_LIST(a, i->addrs)
-       if (a->prefix.type == NET_IP4)
-         if_show_addr(a);
-
-      WALK_LIST(a, i->addrs)
-       if (a->prefix.type == NET_IP6)
-         if_show_addr(a);
-    }
-  cli_msg(0, "");
-}
-
-void
-if_show_summary(void)
-{
-  cli_msg(-2005, "%-10s %-6s %-18s %s", "Interface", "State", "IPv4 address", "IPv6 address");
-  IFACE_WALK(i)
-    {
-      byte a4[IPA_MAX_TEXT_LENGTH + 17];
-      byte a6[IPA_MAX_TEXT_LENGTH + 17];
-
-      if (i->flags & IF_SHUTDOWN)
-       continue;
-
-      if (i->addr4)
-       bsprintf(a4, "%I/%d", i->addr4->ip, i->addr4->prefix.pxlen);
-      else
-       a4[0] = 0;
-
-      if (i->addr6)
-       bsprintf(a6, "%I/%d", i->addr6->ip, i->addr6->prefix.pxlen);
-      else
-       a6[0] = 0;
-
-      cli_msg(-1005, "%-10s %-6s %-18s %s",
-             i->name, (i->flags & IF_UP) ? "up" : "down", a4, a6);
-    }
-  cli_msg(0, "");
-}