From owner-p4-projects@FreeBSD.ORG Fri Nov 3 15:51:25 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 838E116A4C8; Fri, 3 Nov 2006 15:51:25 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3B5B216A407 for ; Fri, 3 Nov 2006 15:51:25 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0977143D46 for ; Fri, 3 Nov 2006 15:51:25 +0000 (GMT) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA3FpO0P016230 for ; Fri, 3 Nov 2006 15:51:24 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA3FpOIs016222 for perforce@freebsd.org; Fri, 3 Nov 2006 15:51:24 GMT (envelope-from piso@freebsd.org) Date: Fri, 3 Nov 2006 15:51:24 GMT Message-Id: <200611031551.kA3FpOIs016222@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 109128 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Nov 2006 15:51:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=109128 Change 109128 by piso@piso_newluxor on 2006/11/03 15:50:32 POLA: convert redir_* options to redirect_* as in natd. Affected files ... .. //depot/projects/soc2005/libalias/sbin/ipfw/ipfw2.c#13 edit Differences ... ==== //depot/projects/soc2005/libalias/sbin/ipfw/ipfw2.c#13 (text+ko) ==== @@ -377,9 +377,9 @@ { "reset", TOK_RESET_ADDR }, { "reverse", TOK_ALIAS_REV }, { "proxy_only", TOK_PROXY_ONLY }, - { "redir_addr", TOK_REDIR_ADDR }, - { "redir_port", TOK_REDIR_PORT }, - { "redir_proto", TOK_REDIR_PROTO }, + { "redirect_addr", TOK_REDIR_ADDR }, + { "redirect_port", TOK_REDIR_PORT }, + { "redirect_proto", TOK_REDIR_PROTO }, { NULL, 0 } /* terminator */ }; @@ -2669,8 +2669,8 @@ "{pipe|queue} N config PIPE-BODY\n" "[pipe|queue] {zero|delete|show} [N{,N}]\n" "nat N config {ip IPADDR|if IFNAME|log|deny_in|same_ports|unreg_only|reset|\n" -" reverse|proxy_only|redir_addr linkspec| redir_port linkspec|\n" -" redir_proto linkspec}\n" +" reverse|proxy_only|redirect_addr linkspec|\n" +" redirect_port linkspec|redirect_proto linkspec}\n" "set [disable N... enable N...] | move [rule] X to Y | swap X Y | show\n" "table N {add ip[/bits] [value] | delete ip[/bits] | flush | list}\n" "\n" @@ -3520,7 +3520,7 @@ r->mode = REDIR_ADDR; /* Extract local address. */ if (ac == 0) - errx(EX_DATAERR, "redir_addr: missing local address"); + errx(EX_DATAERR, "redirect_addr: missing local address"); sep = strchr(*av, ','); if (sep) { /* LSNAT redirection syntax. */ r->laddr.s_addr = INADDR_NONE; @@ -3533,7 +3533,7 @@ /* Extract public address. */ if (ac == 0) - errx(EX_DATAERR, "redir_addr: missing public address"); + errx(EX_DATAERR, "redirect_addr: missing public address"); StrToAddr(*av, &r->paddr); INC_ARGCV(); @@ -3559,7 +3559,7 @@ } return(space); nospace: - errx(EX_DATAERR, "redir_addr: buf is too small\n"); + errx(EX_DATAERR, "redirect_addr: buf is too small\n"); } static int @@ -3711,7 +3711,7 @@ } return (space); nospace: - errx(EX_DATAERR, "redir_port: buf is too small\n"); + errx(EX_DATAERR, "redirect_port: buf is too small\n"); } static int @@ -3781,7 +3781,7 @@ } return (space); nospace: - errx(EX_DATAERR, "redir_proto: buf is too small\n"); + errx(EX_DATAERR, "redirect_proto: buf is too small\n"); } static void @@ -3832,7 +3832,7 @@ off += sof_redir; switch (t->mode) { case REDIR_ADDR: - printf(" redir_addr"); + printf(" redirect_addr"); if (t->spool_cnt == 0) printf(" %s", inet_ntoa(t->laddr)); else @@ -3849,7 +3849,7 @@ break; case REDIR_PORT: p = getprotobynumber(t->proto); - printf(" redir_port %s ", p->p_name); + printf(" redirect_port %s ", p->p_name); if (!t->spool_cnt) { printf("%s:%u", inet_ntoa(t->laddr), t->lport); if (t->pport_cnt > 1) @@ -3884,7 +3884,7 @@ break; case REDIR_PROTO: p = getprotobynumber(t->proto); - printf(" redir_proto %s %s", p->p_name, + printf(" redirect_proto %s %s", p->p_name, inet_ntoa(t->laddr)); if (t->paddr.s_addr != 0) { printf(" %s", inet_ntoa(t->paddr));