This commit is contained in:
Adam Ierymenko 2014-06-21 11:47:26 -04:00
parent 2f8936181c
commit 35aa0921ee

View File

@ -243,8 +243,10 @@ void Switch::onLocalEthernet(const SharedPtr<Network> &network,const MAC &from,c
bridges[0] = network->findBridgeTo(to);
if ((bridges[0])&&(bridges[0] != _r->identity.address())&&(network->isAllowed(bridges[0]))&&(network->permitsBridging(bridges[0]))) {
printf("got known bridge for %s at %s\n",to.toString().c_str(),bridges[0].toString().c_str());
++numBridges;
} else if (!nconf->activeBridges().empty()) {
printf("bridge spamming for %s\n",to.toString().c_str());
// If there is no known route, spam to up to ZT_MAX_BRIDGE_SPAM active bridges
std::set<Address>::const_iterator ab(nconf->activeBridges().begin());
if (nconf->activeBridges().size() <= ZT_MAX_BRIDGE_SPAM) {
@ -264,7 +266,6 @@ void Switch::onLocalEthernet(const SharedPtr<Network> &network,const MAC &from,c
}
for(unsigned int b=0;b<numBridges;++b) {
printf("EXT_FRAME %s@%s > %s@%s\n",from.toString().c_str(),_r->identity.address().toString().c_str(),to.toString().c_str(),bridges[b].toString().c_str());
Packet outp(bridges[b],_r->identity.address(),Packet::VERB_EXT_FRAME);
outp.append(network->id());
outp.append((unsigned char)0);