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

display protoport in dynamic/32 traffic selectors

Browse Source
This commit is contained in:
Andreas Steffen
2008-07-21 19:08:03 +00:00
parent ee93541783
commit af18c84ffb
1 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/charon/config/traffic_selector.c
+12 -11
View File
@@ -195,21 +195,22 @@ static int print(FILE *stream, const struct printf_info *info,
memeq(this->from, from, this->type == TS_IPV4_ADDR_RANGE ? 4 : 16) && memeq(this->from, from, this->type == TS_IPV4_ADDR_RANGE ? 4 : 16) &&
memeq(this->to, to, this->type == TS_IPV4_ADDR_RANGE ? 4 : 16)) memeq(this->to, to, this->type == TS_IPV4_ADDR_RANGE ? 4 : 16))
{ {
return fprintf(stream, "dynamic/%d", written += fprintf(stream, "dynamic/%d",
this->type == TS_IPV4_ADDR_RANGE ? 32 : 128); this->type == TS_IPV4_ADDR_RANGE ? 32 : 128);
}
if (this->type == TS_IPV4_ADDR_RANGE)
{
inet_ntop(AF_INET, &this->from4, addr_str, sizeof(addr_str));
} }
else else
{ {
inet_ntop(AF_INET6, &this->from6, addr_str, sizeof(addr_str)); if (this->type == TS_IPV4_ADDR_RANGE)
{
inet_ntop(AF_INET, &this->from4, addr_str, sizeof(addr_str));
}
else
{
inet_ntop(AF_INET6, &this->from6, addr_str, sizeof(addr_str));
}
mask = calc_netbits(this);
written += fprintf(stream, "%s/%d", addr_str, mask);
} }
mask = calc_netbits(this);
written += fprintf(stream, "%s/%d", addr_str, mask);
/* check if we have protocol and/or port selectors */ /* check if we have protocol and/or port selectors */
has_proto = this->protocol != 0; has_proto = this->protocol != 0;