From 45d573ab617136670223de5e271f8e7398007c1c Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Mon, 23 Mar 2015 19:04:49 +0100 Subject: Move ifname logic from peer to iface --- src/iface.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'src/iface.c') diff --git a/src/iface.c b/src/iface.c index d7caa30..6cad96d 100644 --- a/src/iface.c +++ b/src/iface.c @@ -33,7 +33,8 @@ Management of the TUN/TAP interface */ -#include "fastd.h" +#include "config.h" +#include "peer.h" #include "poll.h" #include @@ -462,10 +463,19 @@ void fastd_iface_write(fastd_iface_t *iface, fastd_buffer_t buffer) { } /** Opens a new TUN/TAP interface, optionally associated with a specific peer */ -fastd_iface_t * fastd_iface_open(const char *ifname, fastd_peer_t *peer) { +fastd_iface_t * fastd_iface_open(fastd_peer_t *peer) { fastd_iface_t *iface = fastd_new(fastd_iface_t); iface->peer = peer; + const char *ifname = conf.ifname; + + if (peer) { + if (peer->ifname) + ifname = peer->ifname; + else if (!fastd_config_single_iface()) + ifname = NULL; + } + pr_debug("initializing TUN/TAP device..."); open_iface(iface, ifname); -- cgit v1.2.3