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

Sync with ipfw interface change: fw_pts is now part of a union (a

Browse Source 
necessary evil due to the 108 byte setsockopt() limit).
This commit is contained in:
Alexander Langer 1998-01-10 16:14:18 +00:00
parent f8ddb109a4
commit 1e73fe2ae8
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=32396
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/libalias/alias_db.c
View File

@ -2169,21 +2169,21 @@ PunchFWHole(struct alias_link *link) {
/* Build and apply specific part of the rules */
rule.fw_src = GetOriginalAddress(link);
rule.fw_dst = GetDestAddress(link);
rule.fw_pts[0] = ntohs(GetOriginalPort(link));
rule.fw_pts[1] = ntohs(GetDestPort(link));
rule.fw_uar.fw_pts[0] = ntohs(GetOriginalPort(link));
rule.fw_uar.fw_pts[1] = ntohs(GetDestPort(link));
/* Skip non-bound links - XXX should not be strictly necessary,
but seems to leave hole if not done. Leak of non-bound links?
(Code should be left even if the problem is fixed - it is a
clear optimization) */
if (rule.fw_pts[0] != 0 && rule.fw_pts[1] != 0) {
if (rule.fw_uar.fw_pts[0] != 0 && rule.fw_uar.fw_pts[1] != 0) {
r = setsockopt(fireWallFD, IPPROTO_IP, IP_FW_ADD, &rule, sizeof rule);
if (r)
err(1, "alias punch inbound(1) setsockopt(IP_FW_ADD)");
rule.fw_src = GetDestAddress(link);
rule.fw_dst = GetOriginalAddress(link);
rule.fw_pts[0] = ntohs(GetDestPort(link));
rule.fw_pts[1] = ntohs(GetOriginalPort(link));
rule.fw_uar.fw_pts[0] = ntohs(GetDestPort(link));
rule.fw_uar.fw_pts[1] = ntohs(GetOriginalPort(link));
r = setsockopt(fireWallFD, IPPROTO_IP, IP_FW_ADD, &rule, sizeof rule);
if (r)
err(1, "alias punch inbound(2) setsockopt(IP_FW_ADD)");

10
sys/netinet/libalias/alias_db.c
View File

@ -2169,21 +2169,21 @@ PunchFWHole(struct alias_link *link) {
/* Build and apply specific part of the rules */
rule.fw_src = GetOriginalAddress(link);
rule.fw_dst = GetDestAddress(link);
rule.fw_pts[0] = ntohs(GetOriginalPort(link));
rule.fw_pts[1] = ntohs(GetDestPort(link));
rule.fw_uar.fw_pts[0] = ntohs(GetOriginalPort(link));
rule.fw_uar.fw_pts[1] = ntohs(GetDestPort(link));
/* Skip non-bound links - XXX should not be strictly necessary,
but seems to leave hole if not done. Leak of non-bound links?
(Code should be left even if the problem is fixed - it is a
clear optimization) */
if (rule.fw_pts[0] != 0 && rule.fw_pts[1] != 0) {
if (rule.fw_uar.fw_pts[0] != 0 && rule.fw_uar.fw_pts[1] != 0) {
r = setsockopt(fireWallFD, IPPROTO_IP, IP_FW_ADD, &rule, sizeof rule);
if (r)
err(1, "alias punch inbound(1) setsockopt(IP_FW_ADD)");
rule.fw_src = GetDestAddress(link);
rule.fw_dst = GetOriginalAddress(link);
rule.fw_pts[0] = ntohs(GetDestPort(link));
rule.fw_pts[1] = ntohs(GetOriginalPort(link));
rule.fw_uar.fw_pts[0] = ntohs(GetDestPort(link));
rule.fw_uar.fw_pts[1] = ntohs(GetOriginalPort(link));
r = setsockopt(fireWallFD, IPPROTO_IP, IP_FW_ADD, &rule, sizeof rule);
if (r)
err(1, "alias punch inbound(2) setsockopt(IP_FW_ADD)");