Index: share/man/man4/netmap.4 =================================================================== --- share/man/man4/netmap.4 +++ share/man/man4/netmap.4 @@ -27,7 +27,7 @@ .\" .\" $FreeBSD$ .\" -.Dd November 20, 2018 +.Dd October 26, 2019 .Dt NETMAP 4 .Os .Sh NAME @@ -1087,14 +1087,14 @@ .Pp The following command attaches an interface and the host stack to a switch: -.Dl vale-ctl -h vale2:em0 +.Dl valectl -h vale2:em0 Other .Nm clients attached to the same switch can now communicate with the network card or the host. .Sh SEE ALSO .Xr vale 4 , -.Xr vale-ctl 4 , +.Xr valectl 4 , .Xr bridge 8 , .Xr lb 8 , .Xr nmreplay 8 , Index: sys/dev/netmap/netmap_bdg.c =================================================================== --- sys/dev/netmap/netmap_bdg.c +++ sys/dev/netmap/netmap_bdg.c @@ -1442,7 +1442,7 @@ /* nm_bdg_ctl callback for the bwrap. - * Called on bridge-attach and detach, as an effect of vale-ctl -[ahd]. + * Called on bridge-attach and detach, as an effect of valectl -[ahd]. * On attach, it needs to provide a fake netmap_priv_d structure and * perform a netmap_do_regif() on the bwrap. This will put both the * bwrap and the hwna in netmap mode, with the netmap rings shared Index: sys/net/netmap_legacy.h =================================================================== --- sys/net/netmap_legacy.h +++ sys/net/netmap_legacy.h @@ -116,13 +116,13 @@ * nr_cmd (in) if non-zero indicates a special command: * NETMAP_BDG_ATTACH and nr_name = vale*:ifname * attaches the NIC to the switch; nr_ringid specifies - * which rings to use. Used by vale-ctl -a ... + * which rings to use. Used by valectl -a ... * nr_arg1 = NETMAP_BDG_HOST also attaches the host port - * as in vale-ctl -h ... + * as in valectl -h ... * * NETMAP_BDG_DETACH and nr_name = vale*:ifname * disconnects a previously attached NIC. - * Used by vale-ctl -d ... + * Used by valectl -d ... * * NETMAP_BDG_LIST * list the configuration of VALE switches. @@ -133,10 +133,10 @@ * * NETMAP_BDG_NEWIF * create a persistent VALE port with name nr_name. - * Used by vale-ctl -n ... + * Used by valectl -n ... * * NETMAP_BDG_DELIF - * delete a persistent VALE port. Used by vale-ctl -d ... + * delete a persistent VALE port. Used by valectl -d ... * * nr_arg1, nr_arg2, nr_arg3 (in/out) command specific * Index: tools/tools/netmap/Makefile =================================================================== --- tools/tools/netmap/Makefile +++ tools/tools/netmap/Makefile @@ -3,7 +3,7 @@ # # For multiple programs using a single source file each, # we can just define 'progs' and create custom targets. -PROGS = pkt-gen nmreplay bridge vale-ctl lb +PROGS = pkt-gen nmreplay bridge lb CLEANFILES = $(PROGS) *.o MAN= @@ -32,8 +32,5 @@ nmreplay: nmreplay.o $(CC) $(CFLAGS) -o nmreplay nmreplay.o $(LDFLAGS) -vale-ctl: vale-ctl.o - $(CC) $(CFLAGS) -o vale-ctl vale-ctl.o - lb: lb.o pkt_hash.o $(CC) $(CFLAGS) -o lb lb.o pkt_hash.o $(LDFLAGS) Index: tools/tools/netmap/README =================================================================== --- tools/tools/netmap/README +++ tools/tools/netmap/README @@ -6,8 +6,6 @@ bridge a two-port jumper wire, also using the netmap API - vale-ctl the program to control and inspect VALE switches - lb an L3/L4 load balancer nmreplay a tool to playback a pcap file to a netmap port Index: tools/tools/netmap/lb.8 =================================================================== --- tools/tools/netmap/lb.8 +++ tools/tools/netmap/lb.8 @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd October 28, 2018 +.Dd October 26, 2019 .Dt LB 8 .Os .Sh NAME @@ -111,7 +111,7 @@ .Nm does not exit cleanly the ports will not be removed. Please use -.Xr vale-ctl 4 +.Xr valectl 4 to remove any stale persistent VALE port. .Sh SEE ALSO .Xr netmap 4 , Index: usr.sbin/Makefile =================================================================== --- usr.sbin/Makefile +++ usr.sbin/Makefile @@ -96,6 +96,7 @@ trpt \ tzsetup \ ugidfw \ + valectl \ vigr \ vipw \ wake \ Index: usr.sbin/valectl/Makefile =================================================================== --- /dev/null +++ usr.sbin/valectl/Makefile @@ -0,0 +1,7 @@ +# @(#)Makefile 8.2 (Berkeley) 4/18/94 +# $FreeBSD$ + +PROG= valectl +MAN= valectl.4 + +.include Index: usr.sbin/valectl/Makefile.depend =================================================================== --- /dev/null +++ usr.sbin/valectl/Makefile.depend @@ -0,0 +1,10 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Index: usr.sbin/valectl/valectl.4 =================================================================== --- usr.sbin/valectl/valectl.4 +++ usr.sbin/valectl/valectl.4 @@ -24,15 +24,15 @@ .\" .\" $FreeBSD$ .\" -.Dd October 24, 2018 +.Dd October 26, 2019 .Dt VALE-CTL 4 .Os .Sh NAME -.Nm vale-ctl +.Nm valectl .Nd manage VALE switches provided by netmap .Sh SYNOPSIS .Bk -words -.Bl -tag -width "vale-ctl" +.Bl -tag -width "valectl" .It Nm .Op Fl g Ar valeSSS:PPP .Op Fl a Ar valeSSS:interface Index: usr.sbin/valectl/valectl.c =================================================================== --- usr.sbin/valectl/valectl.c +++ usr.sbin/valectl/valectl.c @@ -42,10 +42,8 @@ #include /* basename */ #include /* atoi, free */ -/* XXX cut and paste from pkt-gen.c because I'm not sure whether this - * program may include nm_util.h - */ -void parse_nmr_config(const char* conf, struct nmreq *nmr) +static void +parse_nmr_config(const char* conf, struct nmreq *nmr) { char *w, *tok; int i, v; @@ -201,7 +199,7 @@ { fprintf(stderr, "Usage:\n" - "vale-ctl arguments\n" + "valectl arguments\n" "\t-g interface interface name to get info\n" "\t-d interface interface name to be detached\n" "\t-a interface interface name to be attached\n"