From owner-svn-src-all@FreeBSD.ORG Tue Oct 14 17:59:40 2008 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 32A271065678; Tue, 14 Oct 2008 17:59:40 +0000 (UTC) (envelope-from maxim@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 201768FC26; Tue, 14 Oct 2008 17:59:40 +0000 (UTC) (envelope-from maxim@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id m9EHxeBw012626; Tue, 14 Oct 2008 17:59:40 GMT (envelope-from maxim@svn.freebsd.org) Received: (from maxim@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id m9EHxdhc012624; Tue, 14 Oct 2008 17:59:39 GMT (envelope-from maxim@svn.freebsd.org) Message-Id: <200810141759.m9EHxdhc012624@svn.freebsd.org> From: Maxim Konovalov Date: Tue, 14 Oct 2008 17:59:39 +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: r183890 - head/sbin/ipfw 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: Tue, 14 Oct 2008 17:59:40 -0000 Author: maxim Date: Tue Oct 14 17:59:39 2008 New Revision: 183890 URL: http://svn.freebsd.org/changeset/base/183890 Log: o Remove a debug code and restore an accidentally deleted code in a previous commit. Modified: head/sbin/ipfw/ipfw2.c Modified: head/sbin/ipfw/ipfw2.c ============================================================================== --- head/sbin/ipfw/ipfw2.c Tue Oct 14 17:53:26 2008 (r183889) +++ head/sbin/ipfw/ipfw2.c Tue Oct 14 17:59:39 2008 (r183890) @@ -3856,6 +3856,9 @@ nospace: } static void +show_nat(int ac, char **av); + +static void print_nat_config(char *buf) { struct cfg_nat *n; int i, cnt, flag, off; @@ -4063,6 +4066,11 @@ config_nat(int ac, char **av) i = do_cmd(IP_FW_NAT_CFG, buf, off); if (i) err(1, "setsockopt(%s)", "IP_FW_NAT_CFG"); + + /* After every modification, we show the resultant rule. */ + int _ac = 3; + char *_av[] = {"show", "config", id}; + show_nat(_ac, _av); } static void @@ -6054,7 +6062,6 @@ show_nat(int ac, char **av) if (do_cmd(cmd, data, (uintptr_t)&nbytes) < 0) err(EX_OSERR, "getsockopt(IP_FW_GET_%s)", (cmd == IP_FW_NAT_GET_LOG) ? "LOG" : "CONFIG"); - printf("nbytes %b\n", nbytes); } if (nbytes == 0) exit(0);