diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2014-05-23 14:32:31 -0700 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2014-05-23 14:32:31 -0700 |
| commit | beb7b5bbe578035efdf8ebbb521065b15e40f9b0 (patch) | |
| tree | 8e61d70c11af4adfd392cfbf902cf599d6993957 /node/MulticastGroup.hpp | |
| parent | 05f5755bb193003852f725d2e0aae41c2ac1cd26 (diff) | |
| download | infinitytier-beb7b5bbe578035efdf8ebbb521065b15e40f9b0.tar.gz infinitytier-beb7b5bbe578035efdf8ebbb521065b15e40f9b0.zip | |
GitHub Issue #69 - make MAC assignment schema differ between virtual networks.
Diffstat (limited to 'node/MulticastGroup.hpp')
| -rw-r--r-- | node/MulticastGroup.hpp | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/node/MulticastGroup.hpp b/node/MulticastGroup.hpp index 7bbeb9bc..659b05d8 100644 --- a/node/MulticastGroup.hpp +++ b/node/MulticastGroup.hpp @@ -100,14 +100,7 @@ public: // 24 bits of uniqueness. Collisions aren't likely to be common enough // to care about. const unsigned char *a = (const unsigned char *)ip.rawIpData(); - MAC m; - m.data[0] = 0x33; - m.data[1] = 0x33; - m.data[2] = 0xff; - m.data[3] = a[13]; - m.data[4] = a[14]; - m.data[5] = a[15]; - return MulticastGroup(m,0); + return MulticastGroup(MAC(0x33,0x33,0xff,a[13],a[14],a[15]),0); } return MulticastGroup(); } @@ -118,7 +111,7 @@ public: inline std::string toString() const { char buf[64]; - Utils::snprintf(buf,sizeof(buf),"%.2x%.2x%.2x%.2x%.2x%.2x/%lx",(unsigned int)_mac.data[0],(unsigned int)_mac.data[1],(unsigned int)_mac.data[2],(unsigned int)_mac.data[3],(unsigned int)_mac.data[4],(unsigned int)_mac.data[5],(unsigned long)_adi); + Utils::snprintf(buf,sizeof(buf),"%.2x%.2x%.2x%.2x%.2x%.2x/%lx",(unsigned int)_mac[0],(unsigned int)_mac[1],(unsigned int)_mac[2],(unsigned int)_mac[3],(unsigned int)_mac[4],(unsigned int)_mac[5],(unsigned long)_adi); return std::string(buf); } |