diff options
| author | melifaro <melifaro@FreeBSD.org> | 2012-09-24 17:31:08 +0000 |
|---|---|---|
| committer | melifaro <melifaro@FreeBSD.org> | 2012-09-24 17:31:08 +0000 |
| commit | 095dbb2067f73f3584321ab8ecfdb9692c3b7bab (patch) | |
| tree | 2f71b1a0f93068d2e238249a375c3b305a83868a /sbin/ipfw | |
| parent | 2eed5d6e946b871405317c654c5b82e658751cf6 (diff) | |
| download | FreeBSD-src-095dbb2067f73f3584321ab8ecfdb9692c3b7bab.zip FreeBSD-src-095dbb2067f73f3584321ab8ecfdb9692c3b7bab.tar.gz | |
Permit table to be used as IPv6 address.
Reported by: Serhiy Popov <sergiuspso@ukr.net>
MFC after: 2 weeks
Diffstat (limited to 'sbin/ipfw')
| -rw-r--r-- | sbin/ipfw/ipv6.c | 28 |
1 files changed, 26 insertions, 2 deletions
diff --git a/sbin/ipfw/ipv6.c b/sbin/ipfw/ipv6.c index ee93d98..8271080 100644 --- a/sbin/ipfw/ipv6.c +++ b/sbin/ipfw/ipv6.c @@ -352,6 +352,22 @@ fill_ip6(ipfw_insn_ip6 *cmd, char *av) return (1); } + if (strncmp(av, "table(", 6) == 0) { + char *p = strchr(av + 6, ','); + uint32_t *dm = ((ipfw_insn_u32 *)cmd)->d; + + if (p) + *p++ = '\0'; + cmd->o.opcode = O_IP_DST_LOOKUP; + cmd->o.arg1 = strtoul(av + 6, NULL, 0); + if (p) { + cmd->o.len |= F_INSN_SIZE(ipfw_insn_u32); + dm[0] = strtoul(p, NULL, 0); + } else + cmd->o.len |= F_INSN_SIZE(ipfw_insn); + return (1); + } + av = strdup(av); while (av) { /* @@ -469,7 +485,11 @@ add_srcip6(ipfw_insn *cmd, char *av) { fill_ip6((ipfw_insn_ip6 *)cmd, av); - if (F_LEN(cmd) == 0) { /* any */ + if (cmd->opcode == O_IP_DST_SET) /* set */ + cmd->opcode = O_IP_SRC_SET; + else if (cmd->opcode == O_IP_DST_LOOKUP) /* table */ + cmd->opcode = O_IP_SRC_LOOKUP; + else if (F_LEN(cmd) == 0) { /* any */ } else if (F_LEN(cmd) == F_INSN_SIZE(ipfw_insn)) { /* "me" */ cmd->opcode = O_IP6_SRC_ME; } else if (F_LEN(cmd) == @@ -487,7 +507,11 @@ add_dstip6(ipfw_insn *cmd, char *av) { fill_ip6((ipfw_insn_ip6 *)cmd, av); - if (F_LEN(cmd) == 0) { /* any */ + if (cmd->opcode == O_IP_DST_SET) /* set */ + ; + else if (cmd->opcode == O_IP_DST_LOOKUP) /* table */ + ; + else if (F_LEN(cmd) == 0) { /* any */ } else if (F_LEN(cmd) == F_INSN_SIZE(ipfw_insn)) { /* "me" */ cmd->opcode = O_IP6_DST_ME; } else if (F_LEN(cmd) == |
