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

Allow routing table IDs > 255 when filtering them.

Browse Source
This commit is contained in:
Tobias Brunner
2011-07-29 12:16:18 +02:00
parent 50937e8b80
commit 2e370a300d
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/include/linux/rtnetlink.h
+1
View File
@@ -263,6 +263,7 @@ enum rtattr_type_t
RTA_CACHEINFO, RTA_CACHEINFO,
RTA_SESSION, RTA_SESSION,
RTA_MP_ALGO, RTA_MP_ALGO,
RTA_TABLE,
__RTA_MAX __RTA_MAX
}; };
src/libhydra/plugins/kernel_netlink/kernel_netlink_net.c
+10 -3
View File
@@ -904,7 +904,7 @@ static host_t *get_route(private_kernel_netlink_net_t *this, host_t *dest,
struct rtattr *rta; struct rtattr *rta;
size_t rtasize; size_t rtasize;
chunk_t rta_gtw, rta_src, rta_dst; chunk_t rta_gtw, rta_src, rta_dst;
u_int32_t rta_oif = 0; u_int32_t rta_oif = 0, rta_table;
host_t *new_src, *new_gtw; host_t *new_src, *new_gtw;
bool cont = FALSE; bool cont = FALSE;
uintptr_t table; uintptr_t table;
@@ -913,6 +913,7 @@ static host_t *get_route(private_kernel_netlink_net_t *this, host_t *dest,
msg = (struct rtmsg*)(NLMSG_DATA(current)); msg = (struct rtmsg*)(NLMSG_DATA(current));
rta = RTM_RTA(msg); rta = RTM_RTA(msg);
rtasize = RTM_PAYLOAD(current); rtasize = RTM_PAYLOAD(current);
rta_table = msg->rtm_table;
while (RTA_OK(rta, rtasize)) while (RTA_OK(rta, rtasize))
{ {
switch (rta->rta_type) switch (rta->rta_type)
@@ -932,6 +933,12 @@ static host_t *get_route(private_kernel_netlink_net_t *this, host_t *dest,
rta_oif = *(u_int32_t*)RTA_DATA(rta); rta_oif = *(u_int32_t*)RTA_DATA(rta);
} }
break; break;
case RTA_TABLE:
if (RTA_PAYLOAD(rta) == sizeof(rta_table))
{
rta_table = *(u_int32_t*)RTA_DATA(rta);
}
break;
} }
rta = RTA_NEXT(rta, rtasize); rta = RTA_NEXT(rta, rtasize);
} }
@@ -942,7 +949,7 @@ static host_t *get_route(private_kernel_netlink_net_t *this, host_t *dest,
enumerator = this->rt_exclude->create_enumerator(this->rt_exclude); enumerator = this->rt_exclude->create_enumerator(this->rt_exclude);
while (enumerator->enumerate(enumerator, &table)) while (enumerator->enumerate(enumerator, &table))
{ {
if (table == msg->rtm_table) if (table == rta_table)
{ {
cont = TRUE; cont = TRUE;
break; break;
@@ -954,7 +961,7 @@ static host_t *get_route(private_kernel_netlink_net_t *this, host_t *dest,
continue; continue;
} }
if (this->routing_table != 0 && if (this->routing_table != 0 &&
msg->rtm_table == this->routing_table) rta_table == this->routing_table)
{ /* route is from our own ipsec routing table */ { /* route is from our own ipsec routing table */
continue; continue;
} }