From owner-svn-src-all@FreeBSD.ORG Sun Jan 22 04:51:01 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A18C3106566B; Sun, 22 Jan 2012 04:51:01 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 8FF528FC0A; Sun, 22 Jan 2012 04:51:01 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q0M4p1hX024526; Sun, 22 Jan 2012 04:51:01 GMT (envelope-from adrian@svn.freebsd.org) Received: (from adrian@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q0M4p1s1024523; Sun, 22 Jan 2012 04:51:01 GMT (envelope-from adrian@svn.freebsd.org) Message-Id: <201201220451.q0M4p1s1024523@svn.freebsd.org> From: Adrian Chadd Date: Sun, 22 Jan 2012 04:51:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r230445 - in head/tools/tools/wtap: . vis_map X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 22 Jan 2012 04:51:01 -0000 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 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 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 +#include +#include +#include + +/* + * From the driver itself + */ +#include + +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); +}