From 50f0099645b043277426b2fb4eca119826f81760 Mon Sep 17 00:00:00 2001
From: Jeff Becker <ampernand@gmail.com>
Date: Thu, 24 Nov 2016 13:56:37 -0500
Subject: [PATCH] don't add multiple router addresses
---
RouterContext.cpp | 25 ++++++++++---------------
1 file changed, 10 insertions(+), 15 deletions(-)
diff --git a/RouterContext.cpp b/RouterContext.cpp
index c1341a62..3c37e88c 100644
--- a/RouterContext.cpp
+++ b/RouterContext.cpp
@@ -53,6 +53,8 @@ namespace i2p
bool ipv6; i2p::config::GetOption("ipv6", ipv6);
bool nat; i2p::config::GetOption("nat", nat);
std::string ifname; i2p::config::GetOption("ifname", ifname);
+ std::string ifname4; i2p::config::GetOption("ifname4", ifname4);
+ std::string ifname6; i2p::config::GetOption("ifname6", ifname6);
if (ipv4)
{
std::string host = "127.0.0.1";
@@ -61,6 +63,10 @@ namespace i2p
else if (!nat && !ifname.empty())
/* bind to interface, we have no NAT so set external address too */
host = i2p::util::net::GetInterfaceAddress(ifname, false).to_string(); // v4
+
+ if(ifname4.size())
+ host = i2p::util::net::GetInterfaceAddress(ifname4, false).to_string();
+
routerInfo.AddSSUAddress (host.c_str(), port, routerInfo.GetIdentHash ());
routerInfo.AddNTCPAddress (host.c_str(), port);
}
@@ -71,24 +77,13 @@ namespace i2p
i2p::config::GetOption("host", host);
else if (!ifname.empty())
host = i2p::util::net::GetInterfaceAddress(ifname, true).to_string(); // v6
+
+ if(ifname6.size())
+ host = i2p::util::net::GetInterfaceAddress(ifname6, true).to_string();
+
routerInfo.AddSSUAddress (host.c_str(), port, routerInfo.GetIdentHash ());
routerInfo.AddNTCPAddress (host.c_str(), port);
}
-
- std::string ifname4; i2p::config::GetOption("ifname4", ifname4);
- if(ifname4.size())
- {
- std::string host = i2p::util::net::GetInterfaceAddress(ifname4, false).to_string();
- routerInfo.AddSSUAddress (host.c_str(), port, routerInfo.GetIdentHash());
- routerInfo.AddNTCPAddress (host.c_str(), port);
- }
- std::string ifname6; i2p::config::GetOption("ifname6", ifname6);
- if (ifname6.size())
- {
- std::string host = i2p::util::net::GetInterfaceAddress(ifname6, true).to_string();
- routerInfo.AddSSUAddress (host.c_str(), port, routerInfo.GetIdentHash());
- routerInfo.AddNTCPAddress (host.c_str(), port);
- }
routerInfo.SetCaps (i2p::data::RouterInfo::eReachable |
i2p::data::RouterInfo::eSSUTesting | i2p::data::RouterInfo::eSSUIntroducer); // LR, BC