From 31db6f8f3687da87391c04cc0c0cd77c6ad888de Mon Sep 17 00:00:00 2001 From: Adam Ierymenko Date: Tue, 12 Apr 2016 12:49:46 -0700 Subject: NetworkConfig refactor almost done. --- node/Multicaster.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'node/Multicaster.cpp') diff --git a/node/Multicaster.cpp b/node/Multicaster.cpp index dafa3d88..250da2eb 100644 --- a/node/Multicaster.cpp +++ b/node/Multicaster.cpp @@ -238,11 +238,8 @@ void Multicaster::send( const CertificateOfMembership *com = (CertificateOfMembership *)0; { SharedPtr nw(RR->node->network(nwid)); - if (nw) { - SharedPtr nconf(nw->config2()); - if ((nconf)&&(nconf->com())&&(nconf->isPrivate())&&(p->needsOurNetworkMembershipCertificate(nwid,now,true))) - com = &(nconf->com()); - } + if ((nw)&&(nw->hasConfig())&&(nw->config().com())&&(nw->config().isPrivate())&&(p->needsOurNetworkMembershipCertificate(nwid,now,true))) + com = &(nw->config().com()); } Packet outp(p->address(),RR->identity.address(),Packet::VERB_MULTICAST_GATHER); -- cgit v1.2.3