Author: glebius
Date: Tue Jul 5 14:50:06 2011
New Revision: 223788
URL: http://svn.freebsd.org/changeset/base/223788
Log:
Rewrite the flowctl utility to add it support for displaying
both IPv4 and IPv4 flows.
Modified:
head/usr.sbin/flowctl/Makefile
head/usr.sbin/flowctl/flowctl.c
Modified: head/usr.sbin/flowctl/Makefile
==
--- head/usr.sbin/flowctl/Makefile Tue Jul 5 14:48:39 2011
(r223787)
+++ head/usr.sbin/flowctl/Makefile Tue Jul 5 14:50:06 2011
(r223788)
@@ -2,6 +2,8 @@
# $FreeBSD$
#
+.include bsd.own.mk
+
PROG= flowctl
MAN= flowctl.8
@@ -9,4 +11,10 @@ WARNS?= 2
DPADD= ${LIBNETGRAPH}
LDADD= -lnetgraph
+.if ${MK_INET6_SUPPORT} != no
+CFLAGS+= -DINET6
+.endif
+
+CFLAGS+= -I.
+
.include bsd.prog.mk
Modified: head/usr.sbin/flowctl/flowctl.c
==
--- head/usr.sbin/flowctl/flowctl.c Tue Jul 5 14:48:39 2011
(r223787)
+++ head/usr.sbin/flowctl/flowctl.c Tue Jul 5 14:50:06 2011
(r223788)
@@ -46,6 +46,7 @@ static const char rcs_id[] =
#include stdio.h
#include stdlib.h
#include string.h
+#include sysexits.h
#include unistd.h
#include netgraph.h
@@ -54,21 +55,32 @@ static const char rcs_id[] =
#defineCISCO_SH_FLOW_HEADERSrcIf SrcIPaddressDstIf
DstIPaddressPr SrcP DstP Pkts\n
#defineCISCO_SH_FLOW %-13s %-15s %-13s %-15s %2u %4.4x %4.4x %6lu\n
+#defineCISCO_SH_FLOW6_HEADER SrcIf SrcIPaddress
DstIf DstIPaddress Pr SrcP DstP Pkts\n
+#defineCISCO_SH_FLOW6 %-13s %-30s %-13s %-30s %2u %4.4x %4.4x %6lu\n
+
#defineCISCO_SH_VERB_FLOW_HEADER SrcIf SrcIPaddressDstIf
DstIPaddressPr TOS Flgs Pkts\n \
Port Msk ASPort Msk ASNextHop B/Pk
Active\n
#defineCISCO_SH_VERB_FLOW %-14s %-15s %-14s %-15s %2u %3x %4x %6lu\n
\
%4.4x /%-2u %-5u %4.4x /%-2u %-5u %-15s %9u %8u\n\n
-static int flow_cache_print(struct ngnf_flows *recs);
-static int flow_cache_print_verbose(struct ngnf_flows *recs);
-static int ctl_show(int, char **);
+#defineCISCO_SH_VERB_FLOW6_HEADER SrcIf SrcIPaddress
DstIf DstIPaddress Pr TOS Flgs Pkts\n \
+Port Msk ASPort Msk ASNextHop
B/Pk Active\n
+
+#defineCISCO_SH_VERB_FLOW6 %-14s %-30s %-14s %-30s %2u %3x %4x
%6lu\n \
+ %4.4x /%-2u %-5u %4.4x /%-2u %-5u %-30s %9u %8u\n\n
+static void flow_cache_print(struct ngnf_show_header *resp);
+static void flow_cache_print6(struct ngnf_show_header *resp);
+static void flow_cache_print_verbose(struct ngnf_show_header *resp);
+static void flow_cache_print6_verbose(struct ngnf_show_header *resp);
+static void ctl_show(int, char **);
+static void do_show(int, void (*func)(struct ngnf_show_header *));
static void help(void);
static void execute_command(int, char **);
struct ip_ctl_cmd {
char*cmd_name;
- int (*cmd_func)(int argc, char **argv);
+ void(*cmd_func)(int argc, char **argv);
};
struct ip_ctl_cmd cmds[] = {
@@ -77,7 +89,7 @@ struct ip_ctl_cmd cmds[] = {
};
intcs;
-char ng_nodename[NG_PATHSIZ];
+char *ng_path;
int
main(int argc, char **argv)
@@ -85,7 +97,6 @@ main(int argc, char **argv)
int c;
char sname[NG_NODESIZ];
int rcvbuf = SORCVBUF_SIZE;
- char*ng_name;
/* parse options */
while ((c = getopt(argc, argv, d:)) != -1) {
@@ -98,14 +109,12 @@ main(int argc, char **argv)
argc -= optind;
argv += optind;
- ng_name = argv[0];
- if (ng_name == NULL)
+ ng_path = argv[0];
+ if (ng_path == NULL || (strlen(ng_path) NG_PATHSIZ))
help();
argc--;
argv++;
- snprintf(ng_nodename, sizeof(ng_nodename), %s:, ng_name);
-
/* create control socket. */
snprintf(sname, sizeof(sname), flowctl%i, getpid());
@@ -145,74 +154,99 @@ execute_command(int argc, char **argv)
(*cmds[cindex].cmd_func)(argc, argv);
}
-static int
+static void
ctl_show(int argc, char **argv)
{
- struct ng_mesg *ng_mesg;
- struct ngnf_flows *data;
- char path[NG_PATHSIZ];
- int token, nread, last = 0;
- int verbose = 0;
+ int ipv4 = 1, ipv6 = 1, verbose = 0;
+
+ if (argc 0 !strncmp(argv[0], ipv4, 4)) {
+ ipv6 = 0;
+ argc--;
+ argv++;
+ }
+ if (argc 0 !strncmp(argv[0], ipv6, 4)) {
+ ipv4 = 0;
+ argc--;
+ argv++;
+ }
if (argc 0 !strncmp(argv[0], verbose, strlen(argv[0])))
verbose = 1;
+ if (ipv4) {
+
