aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGert Doering <gert@greenie.muc.de>2010-02-28 23:09:40 +0100
committerDavid Sommerseth <dazo@users.sourceforge.net>2010-04-27 23:07:36 +0200
commitd32a306f4fbe534c35bb487624c55ea5c572daca (patch)
tree0936cc21383639b7990eb4c44e405f8f7fcd295a
parentverb 5 logging wrongly reports received bytes (diff)
downloadopenvpn-d32a306f4fbe534c35bb487624c55ea5c572daca.tar.xz
remove duplicate code in FREEBSD+DRAGONFLY system-dependent ifconfig
(ACKed by Eric F Crist and David Sommerseth) (cherry picked from commit dd66b12647852e3f1267be70b0fb3b11deedf377) Signed-off-by: David Sommerseth <dazo@users.sourceforge.net> Signed-off-by: Gert Doering <gert@greenie.muc.de>
-rw-r--r--tun.c17
1 files changed, 3 insertions, 14 deletions
diff --git a/tun.c b/tun.c
index 725dce4..6f7b13c 100644
--- a/tun.c
+++ b/tun.c
@@ -860,26 +860,15 @@ do_ifconfig (struct tuntap *tt,
ifconfig_remote_netmask,
tun_mtu
);
- else {
- if (tt->topology == TOP_SUBNET)
- argv_printf (&argv,
- "%s %s %s netmask %s mtu %d up",
+ else
+ argv_printf (&argv,
+ "%s %s %s netmask %s mtu %d up",
IFCONFIG_PATH,
actual,
ifconfig_local,
ifconfig_remote_netmask,
tun_mtu
);
- else
- argv_printf (&argv,
- "%s %s %s netmask %s mtu %d up",
- IFCONFIG_PATH,
- actual,
- ifconfig_local,
- ifconfig_remote_netmask,
- tun_mtu
- );
- }
argv_msg (M_INFO, &argv);
openvpn_execve_check (&argv, es, S_FATAL, "FreeBSD ifconfig failed");