Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 22 Jan 2012 04:51:01 +0000 (UTC)
From:      Adrian Chadd <adrian@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r230445 - in head/tools/tools/wtap: . vis_map
Message-ID:  <201201220451.q0M4p1s1024523@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: adrian
Date: Sun Jan 22 04:51:00 2012
New Revision: 230445
URL: http://svn.freebsd.org/changeset/base/230445

Log:
  Bring over the visibility control tool for Monthadar's wtap project.
  
  This allows basic control over which wtap nodes can see which other
  wtap nodes.

Added:
  head/tools/tools/wtap/Makefile   (contents, props changed)
  head/tools/tools/wtap/vis_map/
  head/tools/tools/wtap/vis_map/Makefile   (contents, props changed)
  head/tools/tools/wtap/vis_map/vis_map.c   (contents, props changed)

Added: head/tools/tools/wtap/Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/tools/tools/wtap/Makefile	Sun Jan 22 04:51:00 2012	(r230445)
@@ -0,0 +1,5 @@
+# $FreeBSD$
+
+SUBDIR=	wtap vis_map
+
+.include <bsd.subdir.mk>

Added: head/tools/tools/wtap/vis_map/Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/tools/tools/wtap/vis_map/Makefile	Sun Jan 22 04:51:00 2012	(r230445)
@@ -0,0 +1,9 @@
+# $FreeBSD$
+
+PROG=	vis_map
+SRC=	vis_map.c
+NO_MAN=	1
+
+CFLAGS+=	-I${.CURDIR}/../../../../sys/dev/wtap/
+
+.include <bsd.prog.mk>

Added: head/tools/tools/wtap/vis_map/vis_map.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/tools/tools/wtap/vis_map/vis_map.c	Sun Jan 22 04:51:00 2012	(r230445)
@@ -0,0 +1,117 @@
+/*-
+ * Copyright (c) 2010-2011 Monthadar Al Jaberi, TerraNet AB
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer,
+ *    without modification.
+ * 2. Redistributions in binary form must reproduce at minimum a disclaimer
+ *    similar to the "NO WARRANTY" disclaimer below ("Disclaimer") and any
+ *    redistribution must be conditioned upon including a substantially
+ *    similar Disclaimer requirement for further binary redistribution.
+ *
+ * NO WARRANTY
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF NONINFRINGEMENT, MERCHANTIBILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY,
+ * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+ * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGES.
+ *
+ * $FreeBSD$
+ */
+#include <stdio.h>
+#include <stdlib.h>
+#include <fcntl.h>
+#include <sys/ioctl.h>
+
+/*
+ * From the driver itself
+ */
+#include <plugins/visibility_ioctl.h>
+
+static int dev = -1;
+
+static void
+toggle_medium(int op)
+{
+	if (ioctl(dev, VISIOCTLOPEN, &op) < 0) {
+		printf("error opening/closing medium\n");
+	}
+}
+
+static void
+link_op(struct link *l)
+{
+	if (ioctl(dev, VISIOCTLLINK, l) < 0) {
+		printf("error making a link operation\n");
+	}
+}
+
+static void
+usage(const char *argv[])
+{
+	printf("usage: %s [o | c | [ [a|d]  wtap_id1  wtap_id2]]\n",
+	    argv[0]);
+}
+
+int
+main(int argc, const char* argv[])
+{
+	struct link l;
+	char cmd;
+
+	if (argc < 2) {
+		usage(argv);
+		exit(1);
+	}
+
+	dev = open("/dev/visctl", O_RDONLY);
+		if (dev < 0) {
+			printf("error opening visctl cdev\n");
+			exit(1);
+	}
+
+	cmd = (char)*argv[1];
+
+	switch (cmd) {
+	case 'o':
+		toggle_medium(1);
+		break;
+	case 'c':
+		toggle_medium(0);
+		break;
+	case 'a':
+		if (argc < 4) {
+			usage(argv);
+			exit(1);
+		}
+		l.op = 1;
+		l.id1 = atoi(argv[2]);
+		l.id2 = atoi(argv[3]);
+		link_op(&l);
+		break;
+	case 'd':
+		if (argc < 4) {
+			usage(argv);
+			exit(1);
+		}
+		l.op = 0;
+		l.id1 = atoi(argv[2]);
+		l.id2 = atoi(argv[3]);
+		link_op(&l);
+		break;
+	default:
+		printf("wtap ioctl: unkown command '%c'\n", *argv[1]);
+		exit(1);
+	}
+	exit(0);
+}



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201201220451.q0M4p1s1024523>