From owner-svn-src-all@FreeBSD.ORG Wed Jan 11 17:51:57 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 29231106564A; Wed, 11 Jan 2012 17:51:57 +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 0C8808FC17; Wed, 11 Jan 2012 17:51:57 +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 q0BHpugj070159; Wed, 11 Jan 2012 17:51:56 GMT (envelope-from adrian@svn.freebsd.org) Received: (from adrian@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q0BHpuNF070157; Wed, 11 Jan 2012 17:51:56 GMT (envelope-from adrian@svn.freebsd.org) Message-Id: <201201111751.q0BHpuNF070157@svn.freebsd.org> From: Adrian Chadd Date: Wed, 11 Jan 2012 17:51:56 +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: r229972 - in head/tools/tools/wtap: . wtap 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: Wed, 11 Jan 2012 17:51:57 -0000 Author: adrian Date: Wed Jan 11 17:51:56 2012 New Revision: 229972 URL: http://svn.freebsd.org/changeset/base/229972 Log: Bring over a tool to create and destroy wtap instances. Submitted by: Monthadar Al Jaberi Added: head/tools/tools/wtap/ head/tools/tools/wtap/wtap/ head/tools/tools/wtap/wtap/Makefile (contents, props changed) head/tools/tools/wtap/wtap/wtap.c (contents, props changed) Added: head/tools/tools/wtap/wtap/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/tools/tools/wtap/wtap/Makefile Wed Jan 11 17:51:56 2012 (r229972) @@ -0,0 +1,9 @@ +# $FreeBSD$ + +PROG= wtap +SRC= wtap.c +NO_MAN= 1 + +CFLAGS+= -I${.CURDIR}/../../../../sys/dev/wtap/ + +.include Added: head/tools/tools/wtap/wtap/wtap.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/tools/tools/wtap/wtap/wtap.c Wed Jan 11 17:51:56 2012 (r229972) @@ -0,0 +1,82 @@ +/*- + * 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 + +#include "if_wtapioctl.h" + +static int dev = -1; + +static void create(int id) +{ + if(ioctl(dev, WTAPIOCTLCRT, &id) < 0){ + printf("error creating wtap with id=%d\n", id); + } +} + +static void delete(int id) +{ + if(ioctl(dev, WTAPIOCTLDEL, &id) < 0){ + printf("error deleting wtap with id=%d\n", id); + } +} + +int main( int argc, const char* argv[]) +{ + if(argc != 3){ + printf("usage: %s [c | d] wtap_id\n", argv[0]); + return -1; + } + int id = atoi(argv[2]); + if(!(id >= 0 && id < 64)){ + printf("wtap_id must be between 0 and 7\n"); + return -1; + } + dev = open("/dev/wtapctl", O_RDONLY); + if(dev < 0){ + printf("error opening wtapctl cdev\n"); + return -1; + } + switch((char)*argv[1]){ + case 'c': + create(id); + break; + case 'd': + delete(id); + break; + default: + printf("wtap ioctl: unkown command '%c'\n", *argv[1]); + return -1; + } + return 0; +}