denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kernel-netlink: Convert ports in acquires to ICMP[v6] type and code

Browse Source
This commit is contained in:
Tobias Brunner
2013-10-17 16:57:39 +02:00
parent ddc2d3c8e4
commit 406a504ca7
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libhydra/plugins/kernel_netlink/kernel_netlink_ipsec.c
+8 -3
View File
@@ -777,7 +777,7 @@ static traffic_selector_t* selector2ts(struct xfrm_selector *sel, bool src)
prefixlen = sel->prefixlen_s; prefixlen = sel->prefixlen_s;
if (sel->sport_mask) if (sel->sport_mask)
{ {
port = htons(sel->sport); port = ntohs(sel->sport);
} }
} }
else else
@@ -786,10 +786,15 @@ static traffic_selector_t* selector2ts(struct xfrm_selector *sel, bool src)
prefixlen = sel->prefixlen_d; prefixlen = sel->prefixlen_d;
if (sel->dport_mask) if (sel->dport_mask)
{ {
port = htons(sel->dport); port = ntohs(sel->dport);
} }
} }
if (sel->proto == IPPROTO_ICMP || sel->proto == IPPROTO_ICMPV6)
{ /* convert ICMP[v6] message type and code as supplied by the kernel in
* source and destination ports (both in network order) */
port = (sel->sport >> 8) | (sel->dport & 0xff00);
port = ntohs(port);
}
/* The Linux 2.6 kernel does not set the selector's family field, /* The Linux 2.6 kernel does not set the selector's family field,
* so as a kludge we additionally test the prefix length. * so as a kludge we additionally test the prefix length.
*/ */