diff options
| author | Gert Doering <gert@greenie.muc.de> | 2014-12-27 21:59:43 +0100 |
|---|---|---|
| committer | Gert Doering <gert@greenie.muc.de> | 2015-03-08 20:18:25 +0100 |
| commit | ec2fbf374f018366c18644d271cd4d793d04244b (patch) | |
| tree | e43d0537b6077d1784d8a4290551988908f053d0 /src/openvpn/route.c | |
| parent | e8562d5531277ee4dd7c517ef68e87af077ac948 (diff) | |
| download | openvpn-ec2fbf374f018366c18644d271cd4d793d04244b.tar.gz openvpn-ec2fbf374f018366c18644d271cd4d793d04244b.tar.xz openvpn-ec2fbf374f018366c18644d271cd4d793d04244b.zip | |
Remove count_netmask_bits(), convert users to use netmask_to_netbits2()
The previous Linux/iproute2 code converted binary netmasks to string
representation (print_in_addr_t()), just to immediately scanf() it back
to binary to count bits. netmask_to_netbits2() directly works on the
in_addr_t.
Signed-off-by: Gert Doering <gert@greenie.muc.de>
Acked-by: Steffan Karger <steffan.karger@fox-it.com>
Message-Id: <1419713983-16272-1-git-send-email-gert@greenie.muc.de>
URL: http://article.gmane.org/gmane.network.openvpn.devel/9360
Diffstat (limited to 'src/openvpn/route.c')
| -rw-r--r-- | src/openvpn/route.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/openvpn/route.c b/src/openvpn/route.c index 7ec482b..a349ac9 100644 --- a/src/openvpn/route.c +++ b/src/openvpn/route.c @@ -1288,7 +1288,7 @@ add_route (struct route_ipv4 *r, argv_printf (&argv, "%s route add %s/%d", iproute_path, network, - count_netmask_bits(netmask)); + netmask_to_netbits2(r->netmask)); if (r->flags & RT_METRIC_DEFINED) argv_printf_cat (&argv, "metric %d", r->metric); @@ -1765,7 +1765,7 @@ delete_route (struct route_ipv4 *r, argv_printf (&argv, "%s route del %s/%d", iproute_path, network, - count_netmask_bits(netmask)); + netmask_to_netbits2(r->netmask)); #else argv_printf (&argv, "%s del -net %s netmask %s", ROUTE_PATH, |