From owner-svn-src-user@FreeBSD.ORG  Thu Feb 25 20:54:54 2010
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6EACF106566B;
	Thu, 25 Feb 2010 20:54:54 +0000 (UTC)
	(envelope-from luigi@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 5F4FF8FC0A;
	Thu, 25 Feb 2010 20:54:54 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o1PKssCc010333;
	Thu, 25 Feb 2010 20:54:54 GMT (envelope-from luigi@svn.freebsd.org)
Received: (from luigi@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o1PKssYK010331;
	Thu, 25 Feb 2010 20:54:54 GMT (envelope-from luigi@svn.freebsd.org)
Message-Id: <201002252054.o1PKssYK010331@svn.freebsd.org>
From: Luigi Rizzo <luigi@FreeBSD.org>
Date: Thu, 25 Feb 2010 20:54:54 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r204331 - user/luigi/ipfw3-head/sbin/ipfw
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 25 Feb 2010 20:54:54 -0000

Author: luigi
Date: Thu Feb 25 20:54:54 2010
New Revision: 204331
URL: http://svn.freebsd.org/changeset/base/204331

Log:
  implement 'ipfw sysctl ...'

Modified:
  user/luigi/ipfw3-head/sbin/ipfw/main.c

Modified: user/luigi/ipfw3-head/sbin/ipfw/main.c
==============================================================================
--- user/luigi/ipfw3-head/sbin/ipfw/main.c	Thu Feb 25 20:54:14 2010	(r204330)
+++ user/luigi/ipfw3-head/sbin/ipfw/main.c	Thu Feb 25 20:54:54 2010	(r204331)
@@ -230,15 +230,29 @@ ipfw_main(int oldac, char **oldav)
 		co.do_force = !isatty(STDIN_FILENO);
 
 #ifdef EMULATE_SYSCTL /* sysctl emulation */
-	if ( ac == 3 && !strcmp(av[1], "sysctl")) {
-		int err = 0;
-		if (index(av[2], '=') == NULL) {
-			sysctl_w32(SYSCTLGET, NULL, NULL, 0);
+	if ( ac >= 2 && !strcmp(av[1], "sysctl")) {
+		char *s;
+		int i;
+
+		if (ac != 3) {
+			printf(	"sysctl emulation usage:\n"
+				"	ipfw sysctl name[=value]\n"
+				"	ipfw sysctl -a\n");
+			return 0;
+		}
+		s = index(av[2], '=')) {
+		if (s == NULL) {
+			s = !strcmp(av[2], "-a") ? NULL : av[2];
+			sysctlbyname(s, NULL, NULL, NULL, 0);
 		} else {	/* ipfw sysctl x.y.z=value */
 			/* assume an INT value, will extend later */
-			int i;
-			i = strtol(oldav[4], NULL, 10);
-			sysctl_w32(SYSCTLSET, oldav[2], &i, sizeof(int));
+			if (s[1] == '\0') {
+				printf("ipfw sysctl: missing value\n\n");
+				return 0;
+			}
+			*s = '\0';
+			i = strtol(s+1, NULL, 0);
+			sysctlbyname(av[2], NULL, NULL, &i, sizeof(int));
 		}
 		return 0;
 	}