d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MFC ip_fw2.c 1.143, 1.144

Browse Source 
ip_fw.h 1.107, 1.108
    add the capacity to fwd to a table argument.
This commit is contained in:
julian 2007-03-27 23:50:17 +00:00
parent aba7e1a91d
commit 67c764f153
2 changed files with 29 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sys/netinet/ip_fw.h
View File

@ -534,6 +534,7 @@ struct ip_fw_args {
struct inpcb *inp;
struct _ip6dn_args dummypar; /* dummynet->ip6_output */
struct sockaddr_in hopstore; /* store here if cannot use a pointer */
};
/*

36
sys/netinet/ip_fw2.c
View File

@ -794,7 +794,8 @@ static u_int64_t norule_counter; /* counter for ipfw_log(NULL...) */
*/
static void
ipfw_log(struct ip_fw *f, u_int hlen, struct ip_fw_args *args,
struct mbuf *m, struct ifnet *oif, u_short offset, struct ip *ip)
struct mbuf *m, struct ifnet *oif, u_short offset, uint32_t tablearg, struct ip *ip)
>>>>>>> 1.144
{
struct ether_header *eh = args->eh;
char *action;
@ -887,9 +888,15 @@ ipfw_log(struct ip_fw *f, u_int hlen, struct ip_fw_args *args,
case O_FORWARD_IP: {
ipfw_insn_sa *sa = (ipfw_insn_sa *)cmd;
int len;
struct in_addr dummyaddr;
if (sa->sa.sin_addr.s_addr == INADDR_ANY)
dummyaddr.s_addr = htonl(tablearg);
else
dummyaddr.s_addr = sa->sa.sin_addr.s_addr;
len = snprintf(SNPARGS(action2, 0), "Forward to %s",
inet_ntoa(sa->sa.sin_addr));
inet_ntoa(dummyaddr));
if (sa->sa.sin_port)
snprintf(SNPARGS(action2, len), ":%d",
sa->sa.sin_port);
@ -2916,7 +2923,8 @@ check_body:
case O_LOG:
if (fw_verbose)
ipfw_log(f, hlen, args, m, oif, offset, ip);
ipfw_log(f, hlen, args, m,
oif, offset, tablearg, ip);
match = 1;
break;
@ -3276,14 +3284,26 @@ check_body:
retval = IP_FW_DENY;
goto done;
case O_FORWARD_IP:
case O_FORWARD_IP: {
struct sockaddr_in *sa;
sa = &(((ipfw_insn_sa *)cmd)->sa);
if (args->eh) /* not valid on layer2 pkts */
break;
if (!q || dyn_dir == MATCH_FORWARD)
args->next_hop =
&((ipfw_insn_sa *)cmd)->sa;
if (!q || dyn_dir == MATCH_FORWARD) {
if (sa->sin_addr.s_addr == INADDR_ANY) {
bcopy(sa, &args->hopstore,
sizeof(*sa));
args->hopstore.sin_addr.s_addr =
htonl(tablearg);
args->next_hop =
&args->hopstore;
} else {
args->next_hop = sa;
}
}
retval = IP_FW_PASS;
goto done;
}
goto done;
case O_NETGRAPH:
case O_NGTEE: