Date: Sun, 21 Mar 2010 16:34:54 +0000 (UTC) From: Luigi Rizzo <luigi@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r205418 - user/luigi/ipfw3-r8/sbin/ipfw Message-ID: <201003211634.o2LGYsbo056024@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: luigi Date: Sun Mar 21 16:34:54 2010 New Revision: 205418 URL: http://svn.freebsd.org/changeset/base/205418 Log: sync with head: - fix printing of rules with 'OR' options - accept 'm' for 'mega' - sync manpage Modified: user/luigi/ipfw3-r8/sbin/ipfw/dummynet.c user/luigi/ipfw3-r8/sbin/ipfw/ipfw.8 user/luigi/ipfw3-r8/sbin/ipfw/ipfw2.c Modified: user/luigi/ipfw3-r8/sbin/ipfw/dummynet.c ============================================================================== --- user/luigi/ipfw3-r8/sbin/ipfw/dummynet.c Sun Mar 21 16:30:32 2010 (r205417) +++ user/luigi/ipfw3-r8/sbin/ipfw/dummynet.c Sun Mar 21 16:34:54 2010 (r205418) @@ -535,7 +535,7 @@ read_bandwidth(char *arg, int *bandwidth if (*end == 'K' || *end == 'k') { end++; bw *= 1000; - } else if (*end == 'M') { + } else if (*end == 'M' || *end == 'm') { end++; bw *= 1000000; } Modified: user/luigi/ipfw3-r8/sbin/ipfw/ipfw.8 ============================================================================== --- user/luigi/ipfw3-r8/sbin/ipfw/ipfw.8 Sun Mar 21 16:30:32 2010 (r205417) +++ user/luigi/ipfw3-r8/sbin/ipfw/ipfw.8 Sun Mar 21 16:34:54 2010 (r205418) @@ -1501,7 +1501,7 @@ is invalid) whenever .Cm xmit is used. .Pp -A packet may not have a receive or transmit interface: packets +A packet might not have a receive or transmit interface: packets originating from the local host have no receive interface, while packets destined for the local host have no transmit interface. Modified: user/luigi/ipfw3-r8/sbin/ipfw/ipfw2.c ============================================================================== --- user/luigi/ipfw3-r8/sbin/ipfw/ipfw2.c Sun Mar 21 16:30:32 2010 (r205417) +++ user/luigi/ipfw3-r8/sbin/ipfw/ipfw2.c Sun Mar 21 16:34:54 2010 (r205418) @@ -921,9 +921,9 @@ print_icmptypes(ipfw_insn_u32 *cmd) #define HAVE_DSTIP 0x0004 #define HAVE_PROTO4 0x0008 #define HAVE_PROTO6 0x0010 +#define HAVE_IP 0x0100 #define HAVE_OPTIONS 0x8000 -#define HAVE_IP (HAVE_PROTO | HAVE_SRCIP | HAVE_DSTIP) static void show_prerequisites(int *flags, int want, int cmd __unused) { @@ -1024,7 +1024,9 @@ show_ipfw(struct ip_fw *rule, int pcwidt switch(cmd->opcode) { case O_CHECK_STATE: printf("check-state"); - flags = HAVE_IP; /* avoid printing anything else */ + /* avoid printing anything else */ + flags = HAVE_PROTO | HAVE_SRCIP | + HAVE_DSTIP | HAVE_IP; break; case O_ACCEPT: @@ -1164,7 +1166,8 @@ show_ipfw(struct ip_fw *rule, int pcwidt show_prerequisites(&flags, HAVE_PROTO, 0); printf(" from any to any"); } - flags |= HAVE_IP | HAVE_OPTIONS; + flags |= HAVE_IP | HAVE_OPTIONS | HAVE_PROTO | + HAVE_SRCIP | HAVE_DSTIP; } if (co.comment_only) @@ -1253,9 +1256,12 @@ show_ipfw(struct ip_fw *rule, int pcwidt break; case O_IP_DSTPORT: - show_prerequisites(&flags, HAVE_IP, 0); + show_prerequisites(&flags, + HAVE_PROTO | HAVE_SRCIP | + HAVE_DSTIP | HAVE_IP, 0); case O_IP_SRCPORT: - show_prerequisites(&flags, HAVE_PROTO|HAVE_SRCIP, 0); + show_prerequisites(&flags, + HAVE_PROTO | HAVE_SRCIP, 0); if ((cmd->len & F_OR) && !or_block) printf(" {"); if (cmd->len & F_NOT) @@ -1276,7 +1282,8 @@ show_ipfw(struct ip_fw *rule, int pcwidt if ((flags & (HAVE_PROTO4 | HAVE_PROTO6)) && !(flags & HAVE_PROTO)) show_prerequisites(&flags, - HAVE_IP | HAVE_OPTIONS, 0); + HAVE_PROTO | HAVE_IP | HAVE_SRCIP | + HAVE_DSTIP | HAVE_OPTIONS, 0); if (flags & HAVE_OPTIONS) printf(" proto"); if (pe) @@ -1294,7 +1301,8 @@ show_ipfw(struct ip_fw *rule, int pcwidt ((cmd->opcode == O_IP4) && (flags & HAVE_PROTO4))) break; - show_prerequisites(&flags, HAVE_IP | HAVE_OPTIONS, 0); + show_prerequisites(&flags, HAVE_PROTO | HAVE_SRCIP | + HAVE_DSTIP | HAVE_IP | HAVE_OPTIONS, 0); if ((cmd->len & F_OR) && !or_block) printf(" {"); if (cmd->len & F_NOT && cmd->opcode != O_IN) @@ -1548,7 +1556,8 @@ show_ipfw(struct ip_fw *rule, int pcwidt or_block = 0; } } - show_prerequisites(&flags, HAVE_IP, 0); + show_prerequisites(&flags, HAVE_PROTO | HAVE_SRCIP | HAVE_DSTIP + | HAVE_IP, 0); if (comment) printf(" // %s", comment); printf("\n");
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201003211634.o2LGYsbo056024>