ims-volte-vowifi
/
strongswan
9
0
Fork 0
Code Pull Requests Releases Activity

kernel-pfroute: Return interface to reach destination from get_nexthop()

This commit is contained in:
Tobias Brunner 2016-06-10 17:13:22 +02:00
parent b98afc0a37
commit b52e540f43
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/libcharon/plugins/kernel_pfroute/kernel_pfroute_net.c
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2009-2013 Tobias Brunner * Copyright (C) 2009-2016 Tobias Brunner
* Hochschule fuer Technik Rapperswil * Hochschule fuer Technik Rapperswil
* *
* This program is free software; you can redistribute it and/or modify it * This program is free software; you can redistribute it and/or modify it
@ -1533,7 +1533,7 @@ METHOD(kernel_net_t, del_route, status_t,
* address. * address.
*/ */
static host_t *get_route(private_kernel_pfroute_net_t *this, bool nexthop, static host_t *get_route(private_kernel_pfroute_net_t *this, bool nexthop,
host_t *dest, host_t *src) host_t *dest, host_t *src, char **iface)
{ {
struct { struct {
struct rt_msghdr hdr; struct rt_msghdr hdr;
@ -1612,6 +1612,15 @@ retry:
host = gtw; host = gtw;
} }
} }
if (type == RTAX_IFP && addr->sa_family == AF_LINK)
{
struct sockaddr_dl *sdl = (struct sockaddr_dl*)addr;
if (iface)
{
free(*iface);
*iface = strndup(sdl->sdl_data, sdl->sdl_nlen);
}
}
} }
else else
{ {
@ -1680,7 +1689,7 @@ retry:
METHOD(kernel_net_t, get_source_addr, host_t*, METHOD(kernel_net_t, get_source_addr, host_t*,
private_kernel_pfroute_net_t *this, host_t *dest, host_t *src) private_kernel_pfroute_net_t *this, host_t *dest, host_t *src)
{ {
return get_route(this, FALSE, dest, src); return get_route(this, FALSE, dest, src, NULL);
} }
METHOD(kernel_net_t, get_nexthop, host_t*, METHOD(kernel_net_t, get_nexthop, host_t*,
@ -1691,7 +1700,7 @@ METHOD(kernel_net_t, get_nexthop, host_t*,
{ {
*iface = NULL; *iface = NULL;
} }
return get_route(this, TRUE, dest, src); return get_route(this, TRUE, dest, src, iface);
} }
/** /**