Author: ae
Date: Fri Oct 13 11:11:53 2017
New Revision: 324593
URL: https://svnweb.freebsd.org/changeset/base/324593
Log:
Fix regression in handling O_FORWARD_IP opcode after r279948.
To properly handle 'fwd tablearg,port' opcode, copy sin_port value from
sockaddr_in structure stored in the opcode into corresponding hopstore
field.
PR: 222953
MFC after: 1 week
Modified:
head/sys/netpfil/ipfw/ip_fw2.c
Modified: head/sys/netpfil/ipfw/ip_fw2.c
==============================================================================
--- head/sys/netpfil/ipfw/ip_fw2.c Fri Oct 13 11:01:33 2017
(r324592)
+++ head/sys/netpfil/ipfw/ip_fw2.c Fri Oct 13 11:11:53 2017
(r324593)
@@ -2442,6 +2442,7 @@ do {
\
sa6->sin6_len = sizeof(*sa6);
sa6->sin6_addr = TARG_VAL(
chain, tablearg, nh6);
+ sa6->sin6_port = sa->sin_port;
/*
* Set sin6_scope_id only for
* link-local unicast addresses.
@@ -2455,6 +2456,8 @@ do {
\
} else
#endif
{
+ args->hopstore.sin_port =
+ sa->sin_port;
sa = args->next_hop =
&args->hopstore;
sa->sin_family = AF_INET;
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
