From owner-svn-src-user@FreeBSD.ORG Wed Feb 17 08:40:54 2010 Return-Path: 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 99B81106566B; Wed, 17 Feb 2010 08:40: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 89D9A8FC08; Wed, 17 Feb 2010 08:40: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 o1H8esVT089106; Wed, 17 Feb 2010 08:40:54 GMT (envelope-from luigi@svn.freebsd.org) Received: (from luigi@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o1H8esJG089104; Wed, 17 Feb 2010 08:40:54 GMT (envelope-from luigi@svn.freebsd.org) Message-Id: <201002170840.o1H8esJG089104@svn.freebsd.org> From: Luigi Rizzo Date: Wed, 17 Feb 2010 08:40: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: r203987 - 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 " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 Feb 2010 08:40:54 -0000 Author: luigi Date: Wed Feb 17 08:40:54 2010 New Revision: 203987 URL: http://svn.freebsd.org/changeset/base/203987 Log: permit building without altq (-DNO_ALTQ) Modified: user/luigi/ipfw3-head/sbin/ipfw/ipfw2.c Modified: user/luigi/ipfw3-head/sbin/ipfw/ipfw2.c ============================================================================== --- user/luigi/ipfw3-head/sbin/ipfw/ipfw2.c Wed Feb 17 08:37:56 2010 (r203986) +++ user/luigi/ipfw3-head/sbin/ipfw/ipfw2.c Wed Feb 17 08:40:54 2010 (r203987) @@ -1131,9 +1131,11 @@ show_ipfw(struct ip_fw *rule, int pcwidt else printf(" log"); } +#ifndef NO_ALTQ if (altqptr) { print_altq_cmd(altqptr); } +#endif if (tagptr) { if (tagptr->len & F_NOT) PRINT_UINT_ARG(" untag ", tagptr->arg1); @@ -1733,8 +1735,10 @@ ipfw_sysctl_handler(int ac, char *av[], } else if (_substrcmp(*av, "dyn_keepalive") == 0) { sysctlbyname("net.inet.ip.fw.dyn_keepalive", NULL, 0, &which, sizeof(which)); +#ifndef NO_ALTQ } else if (_substrcmp(*av, "altq") == 0) { altq_set_enabled(which); +#endif } else { warnx("unrecognize enable/disable keyword: %s\n", *av); } @@ -2863,6 +2867,7 @@ chkarg: } break; +#ifndef NO_ALTQ case TOK_ALTQ: { ipfw_insn_altq *a = (ipfw_insn_altq *)cmd; @@ -2878,6 +2883,7 @@ chkarg: ac--; av++; } break; +#endif case TOK_TAG: case TOK_UNTAG: {