diff options
| author | Gert Doering <gert@greenie.muc.de> | 2014-01-13 22:54:33 +0100 |
|---|---|---|
| committer | Gert Doering <gert@greenie.muc.de> | 2014-01-16 21:29:23 +0100 |
| commit | b57e005b8f232760081875937a53e8e7d235faa6 (patch) | |
| tree | 2859a85d0aa25449302280bb79dcae4ff86d27c7 /src/openvpn/tun.c | |
| parent | 860d4d06cd66ed1fcbaea41c239962ab9316832d (diff) | |
| download | openvpn-b57e005b8f232760081875937a53e8e7d235faa6.tar.gz openvpn-b57e005b8f232760081875937a53e8e7d235faa6.tar.xz openvpn-b57e005b8f232760081875937a53e8e7d235faa6.zip | |
Rename 'struct route' to 'struct route_ipv4'
To fix trac #340, we need to rename our "struct route" to avoid a
collision with "struct route" from <net/route.h> on *BSD.
No functional changes.
Signed-off-by: Gert Doering <gert@greenie.muc.de>
Acked-by: Arne Schwabe <arne@rfc2549.org>
Message-Id: <1389650074-18455-1-git-send-email-gert@greenie.muc.de>
URL: http://article.gmane.org/gmane.network.openvpn.devel/8231
Diffstat (limited to 'src/openvpn/tun.c')
| -rw-r--r-- | src/openvpn/tun.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/openvpn/tun.c b/src/openvpn/tun.c index a300275..672486e 100644 --- a/src/openvpn/tun.c +++ b/src/openvpn/tun.c @@ -909,7 +909,7 @@ do_ifconfig (struct tuntap *tt, if (!tun && tt->topology == TOP_SUBNET) { /* Add a network route for the local tun interface */ - struct route r; + struct route_ipv4 r; CLEAR (r); r.flags = RT_DEFINED | RT_METRIC_DEFINED; r.network = tt->local & tt->remote_netmask; @@ -1106,7 +1106,7 @@ do_ifconfig (struct tuntap *tt, /* Add a network route for the local tun interface */ if (!tun && tt->topology == TOP_SUBNET) { - struct route r; + struct route_ipv4 r; CLEAR (r); r.flags = RT_DEFINED; r.network = tt->local & tt->remote_netmask; @@ -1172,7 +1172,7 @@ do_ifconfig (struct tuntap *tt, /* Add a network route for the local tun interface */ if (!tun && tt->topology == TOP_SUBNET) { - struct route r; + struct route_ipv4 r; CLEAR (r); r.flags = RT_DEFINED; r.network = tt->local & tt->remote_netmask; |