diff options
| -rw-r--r-- | usr.bin/bgplg/Makefile | 4 | ||||
| -rw-r--r-- | usr.bin/bgplg/bgplg.c | 4 | ||||
| -rw-r--r-- | usr.bin/bgplg/bgplg.h | 6 | ||||
| -rw-r--r-- | usr.bin/bgplg/bgplgsh.c | 4 | ||||
| -rw-r--r-- | usr.bin/bgplg/ping6/Makefile | 14 | ||||
| -rw-r--r-- | usr.bin/bgplg/traceroute6/Makefile | 14 |
6 files changed, 41 insertions, 5 deletions
diff --git a/usr.bin/bgplg/Makefile b/usr.bin/bgplg/Makefile index 8342342ab7a..5e52a775303 100644 --- a/usr.bin/bgplg/Makefile +++ b/usr.bin/bgplg/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.1 2006/12/11 23:10:10 reyk Exp $ +# $OpenBSD: Makefile,v 1.2 2010/04/02 21:20:49 sthen Exp $ .include <bsd.own.mk> -SUBDIR= bgplg bgplgsh bgpctl ping traceroute +SUBDIR= bgplg bgplgsh bgpctl ping traceroute ping6 traceroute6 INCFILES= bgplg.head \ bgplg.foot \ diff --git a/usr.bin/bgplg/bgplg.c b/usr.bin/bgplg/bgplg.c index 3d4d687896c..423a2d3c8e1 100644 --- a/usr.bin/bgplg/bgplg.c +++ b/usr.bin/bgplg/bgplg.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bgplg.c,v 1.8 2010/01/09 02:37:32 claudio Exp $ */ +/* $OpenBSD: bgplg.c,v 1.9 2010/04/02 21:20:49 sthen Exp $ */ /* * Copyright (c) 2005, 2006 Reyk Floeter <reyk@vantronix.net> @@ -39,6 +39,8 @@ #define BGPCTL "/bin/bgpctl", "-s", BGPDSOCK #define PING "/bin/ping" #define TRACEROUTE "/bin/traceroute" +#define PING6 "/bin/ping6" +#define TRACEROUTE6 "/bin/traceroute6" #define CONTENT_TYPE "text/html" static struct cmd cmds[] = CMDS; diff --git a/usr.bin/bgplg/bgplg.h b/usr.bin/bgplg/bgplg.h index 753ddb3ba50..4b3d3802818 100644 --- a/usr.bin/bgplg/bgplg.h +++ b/usr.bin/bgplg/bgplg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: bgplg.h,v 1.5 2009/05/20 09:45:59 sthen Exp $ */ +/* $OpenBSD: bgplg.h,v 1.6 2010/04/02 21:20:49 sthen Exp $ */ /* * Copyright (c) 2005, 2006 Reyk Floeter <reyk@vantronix.net> @@ -64,6 +64,10 @@ struct cmd { { TRACEROUTE, "-Sl", NULL } }, \ { "ping", 1, 1, "<address>", \ { PING, "-c4", "-w2", NULL } }, \ + { "traceroute6", 1, 1, "<address>", \ + { TRACEROUTE6, "-l", NULL } }, \ + { "ping6", 1, 1, "<address>", \ + { PING6, "-c4", "-i2", NULL } }, \ { "help", 0, 0, NULL, { NULL }, lg_help }, \ { NULL } \ } diff --git a/usr.bin/bgplg/bgplgsh.c b/usr.bin/bgplg/bgplgsh.c index 853a4441688..689fe632179 100644 --- a/usr.bin/bgplg/bgplgsh.c +++ b/usr.bin/bgplg/bgplgsh.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bgplgsh.c,v 1.2 2006/12/12 11:43:50 reyk Exp $ */ +/* $OpenBSD: bgplgsh.c,v 1.3 2010/04/02 21:20:49 sthen Exp $ */ /* * Copyright (c) 2005, 2006 Reyk Floeter <reyk@vantronix.net> @@ -38,6 +38,8 @@ #define BGPCTL "/usr/sbin/bgpctl", "-s", BGPDSOCK #define PING "/sbin/ping" #define TRACEROUTE "/usr/sbin/traceroute" +#define PING6 "/sbin/ping6" +#define TRACEROUTE6 "/usr/sbin/traceroute6" static volatile int quit; diff --git a/usr.bin/bgplg/ping6/Makefile b/usr.bin/bgplg/ping6/Makefile new file mode 100644 index 00000000000..837a56d076c --- /dev/null +++ b/usr.bin/bgplg/ping6/Makefile @@ -0,0 +1,14 @@ +# $OpenBSD: Makefile,v 1.1 2010/04/02 21:20:49 sthen Exp $ + +PROGDIR= ${.CURDIR}/../../../sbin/ping6 + +LDSTATIC= -static +CFLAGS+= -I${PROGDIR} +NOMAN= yes + +.include "${PROGDIR}/Makefile" + +BINDIR= /var/www/bin +BINMODE= 000 + +.PATH: ${PROGDIR} diff --git a/usr.bin/bgplg/traceroute6/Makefile b/usr.bin/bgplg/traceroute6/Makefile new file mode 100644 index 00000000000..b62af6cbf2c --- /dev/null +++ b/usr.bin/bgplg/traceroute6/Makefile @@ -0,0 +1,14 @@ +# $OpenBSD: Makefile,v 1.1 2010/04/02 21:20:49 sthen Exp $ + +PROGDIR= ${.CURDIR}/../../../usr.sbin/traceroute6 + +LDSTATIC= -static +CFLAGS+= -I${PROGDIR} +NOMAN= yes + +.include "${PROGDIR}/Makefile" + +BINDIR= /var/www/bin +BINMODE= 000 + +.PATH: ${PROGDIR} |