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/peer.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) (limited to 'src/peer.c') diff --git a/src/peer.c b/src/peer.c index 979c074..79a4588 100644 --- a/src/peer.c +++ b/src/peer.c @@ -30,7 +30,6 @@ */ #include "peer.h" -#include "config.h" #include "peer_hashtable.h" #include "poll.h" @@ -411,12 +410,7 @@ static void setup_peer(fastd_peer_t *peer) { peer->iface = ctx.iface; } else if (conf.iface_persist && !peer->iface && !fastd_peer_is_dynamic(peer)) { - const char *ifname = peer->ifname; - - if (!ifname && fastd_config_single_iface()) - ifname = conf.ifname; - - peer->iface = fastd_iface_open(ifname, peer); + peer->iface = fastd_iface_open(peer); if (peer->iface) on_up(peer, true); else if (!peer->config_source_dir) @@ -879,12 +873,7 @@ bool fastd_peer_set_established(fastd_peer_t *peer) { return true; if (!peer->iface) { - const char *ifname = peer->ifname; - - if (!ifname && fastd_config_single_iface()) - ifname = conf.ifname; - - peer->iface = fastd_iface_open(ifname, peer); + peer->iface = fastd_iface_open(peer); if (peer->iface) on_up(peer, false); else -- cgit v1.2.3