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/route.h | |
| 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/route.h')
| -rw-r--r-- | src/openvpn/route.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/openvpn/route.h b/src/openvpn/route.h index a40de32..fe9b461 100644 --- a/src/openvpn/route.h +++ b/src/openvpn/route.h @@ -110,7 +110,7 @@ struct route_ipv6_option_list { struct route_ipv6_option routes_ipv6[EMPTY_ARRAY_SIZE]; }; -struct route { +struct route_ipv4 { # define RT_DEFINED (1<<0) # define RT_ADDED (1<<1) # define RT_METRIC_DEFINED (1<<2) @@ -190,7 +190,7 @@ struct route_list { unsigned int flags; /* RG_x flags */ int capacity; int n; - struct route routes[EMPTY_ARRAY_SIZE]; + struct route_ipv4 routes[EMPTY_ARRAY_SIZE]; }; #if P2MP @@ -223,7 +223,7 @@ struct route_ipv6_list *new_route_ipv6_list (const int max_routes, struct gc_are void add_route_ipv6 (struct route_ipv6 *r, const struct tuntap *tt, unsigned int flags, const struct env_set *es); void delete_route_ipv6 (const struct route_ipv6 *r, const struct tuntap *tt, unsigned int flags, const struct env_set *es); -void add_route (struct route *r, +void add_route (struct route_ipv4 *r, const struct tuntap *tt, unsigned int flags, const struct route_gateway_info *rgi, @@ -301,8 +301,8 @@ void print_routes (const struct route_list *rl, int level); void show_routes (int msglev); bool test_routes (const struct route_list *rl, const struct tuntap *tt); -bool add_route_ipapi (const struct route *r, const struct tuntap *tt, DWORD adapter_index); -bool del_route_ipapi (const struct route *r, const struct tuntap *tt); +bool add_route_ipapi (const struct route_ipv4 *r, const struct tuntap *tt, DWORD adapter_index); +bool del_route_ipapi (const struct route_ipv4 *r, const struct tuntap *tt); #else static inline bool test_routes (const struct route_list *rl, const struct tuntap *tt) { return true; } |