diff options
| author | Alon Bar-Lev <alon.barlev@gmail.com> | 2012-03-29 11:16:41 +0200 |
|---|---|---|
| committer | David Sommerseth <davids@redhat.com> | 2012-04-02 11:54:09 +0200 |
| commit | 32e576d270834636e8e8667fcb7e91cdac03b4a4 (patch) | |
| tree | 2a96c5c3c4273be78917612114449c74600f00d9 /src/openvpn/route.c | |
| parent | ffa1184d7fde8262f5c19438a59657e318d5126f (diff) | |
| download | openvpn-32e576d270834636e8e8667fcb7e91cdac03b4a4.tar.gz openvpn-32e576d270834636e8e8667fcb7e91cdac03b4a4.tar.xz openvpn-32e576d270834636e8e8667fcb7e91cdac03b4a4.zip | |
cleanup: avoid using ~0 - netmask
Use IPV4_NETMASK_HOST constant.
Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
Acked-by: Gert Doering <gert@greenie.muc.de>
Signed-off-by: David Sommerseth <davids@redhat.com>
Diffstat (limited to 'src/openvpn/route.c')
| -rw-r--r-- | src/openvpn/route.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/openvpn/route.c b/src/openvpn/route.c index dda71c9..f681a58 100644 --- a/src/openvpn/route.c +++ b/src/openvpn/route.c @@ -268,7 +268,7 @@ init_route (struct route *r, const struct route_option *ro, const struct route_list *rl) { - const in_addr_t default_netmask = ~0; + const in_addr_t default_netmask = IPV4_NETMASK_HOST; bool status; CLEAR (*r); @@ -797,7 +797,7 @@ add_bypass_routes (struct route_bypass *rb, { if (rb->bypass[i]) add_route3 (rb->bypass[i], - ~0, + IPV4_NETMASK_HOST, gateway, tt, flags | ROUTE_REF_GW, @@ -819,7 +819,7 @@ del_bypass_routes (struct route_bypass *rb, { if (rb->bypass[i]) del_route3 (rb->bypass[i], - ~0, + IPV4_NETMASK_HOST, gateway, tt, flags | ROUTE_REF_GW, @@ -870,7 +870,7 @@ redirect_default_route_to_vpn (struct route_list *rl, const struct tuntap *tt, u * adding this special /32 route */ if (rl->spec.remote_host != IPV4_INVALID_ADDR) { add_route3 (rl->spec.remote_host, - ~0, + IPV4_NETMASK_HOST, rl->rgi.gateway.addr, tt, flags | ROUTE_REF_GW, @@ -944,7 +944,7 @@ undo_redirect_default_route_to_vpn (struct route_list *rl, const struct tuntap * if (rl->iflags & RL_DID_LOCAL) { del_route3 (rl->spec.remote_host, - ~0, + IPV4_NETMASK_HOST, rl->rgi.gateway.addr, tt, flags | ROUTE_REF_GW, @@ -3125,7 +3125,7 @@ netmask_to_netbits (const in_addr_t network, const in_addr_t netmask, int *netbi static void add_host_route_if_nonlocal (struct route_bypass *rb, const in_addr_t addr) { - if (test_local_addr(addr, NULL) == TLA_NONLOCAL && addr != 0 && addr != ~0) + if (test_local_addr(addr, NULL) == TLA_NONLOCAL && addr != 0 && addr != IPV4_NETMASK_HOST) add_bypass_address (rb, addr); } |