include default route with missing dst field into route evaluation

This commit is contained in:
Andreas Steffen
2007-07-13 06:13:14 +00:00
parent 0761886051
commit 018219ae3a
+7 -6
View File
@@ -1505,7 +1505,7 @@ static host_t *get_route(private_kernel_interface_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);
while(RTA_OK(rta, rtasize)) while (RTA_OK(rta, rtasize))
{ {
switch (rta->rta_type) switch (rta->rta_type)
{ {
@@ -1533,9 +1533,10 @@ static host_t *get_route(private_kernel_interface_t *this, host_t *dest,
* - its destination net contains our destination * - its destination net contains our destination
* - is better than a previous one * - is better than a previous one
*/ */
if (msg->rtm_table != IPSEC_ROUTING_TABLE && rta_dst.ptr && if (msg->rtm_table != IPSEC_ROUTING_TABLE
addr_in_subnet(chunk, rta_dst, msg->rtm_dst_len) && && msg->rtm_dst_len > best
msg->rtm_dst_len > best) && (msg->rtm_dst_len == 0 || /* default route */
rta_dst.ptr && addr_in_subnet(chunk, rta_dst, msg->rtm_dst_len)))
{ {
iterator_t *ifaces, *addrs; iterator_t *ifaces, *addrs;
iface_entry_t *iface; iface_entry_t *iface;
@@ -1566,8 +1567,8 @@ static host_t *get_route(private_kernel_interface_t *this, host_t *dest,
while (addrs->iterate(addrs, (void**)&addr)) while (addrs->iterate(addrs, (void**)&addr))
{ {
chunk_t ip = addr->ip->get_address(addr->ip); chunk_t ip = addr->ip->get_address(addr->ip);
if (addr_in_subnet(ip, rta_dst, if (rta_dst.ptr
msg->rtm_dst_len)) && addr_in_subnet(ip, rta_dst, msg->rtm_dst_len))
{ {
DESTROY_IF(src); DESTROY_IF(src);
src = addr->ip->clone(addr->ip); src = addr->ip->clone(addr->ip);