ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-02-21 18:06:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Helps to index the array when enumerating a C array.

Browse Source
This commit is contained in:
Adam Ierymenko 2015-04-30 15:16:21 -07:00
parent 226e0f8722
commit f3d7c9d681
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
service/ControlPlane.cpp
View File

@ -71,13 +71,13 @@ static std::string _jsonEnumerate(const ZT1_MulticastGroup *mg,unsigned int coun
if (i > 0) if (i > 0)
buf.push_back(','); buf.push_back(',');
Utils::snprintf(tmp,sizeof(tmp),"\"%.2x:%.2x:%.2x:%.2x:%.2x:%.2x\\/%.8lx\"", Utils::snprintf(tmp,sizeof(tmp),"\"%.2x:%.2x:%.2x:%.2x:%.2x:%.2x\\/%.8lx\"",
(unsigned int)((mg->mac >> 40) & 0xff), (unsigned int)((mg[i].mac >> 40) & 0xff),
(unsigned int)((mg->mac >> 32) & 0xff), (unsigned int)((mg[i].mac >> 32) & 0xff),
(unsigned int)((mg->mac >> 24) & 0xff), (unsigned int)((mg[i].mac >> 24) & 0xff),
(unsigned int)((mg->mac >> 16) & 0xff), (unsigned int)((mg[i].mac >> 16) & 0xff),
(unsigned int)((mg->mac >> 8) & 0xff), (unsigned int)((mg[i].mac >> 8) & 0xff),
(unsigned int)(mg->mac & 0xff), (unsigned int)(mg[i].mac & 0xff),
mg->adi); (unsigned long)(mg[i].adi));
buf.append(tmp); buf.append(tmp);
} }
buf.push_back(']'); buf.push_back(']');
@ -92,7 +92,7 @@ static std::string _jsonEnumerate(const struct sockaddr_storage *ss,unsigned int
if (i > 0) if (i > 0)
buf.push_back(','); buf.push_back(',');
buf.push_back('"'); buf.push_back('"');
buf.append(_jsonEscape(reinterpret_cast<const InetAddress *>(ss)->toString())); buf.append(_jsonEscape(reinterpret_cast<const InetAddress *>(&(ss[i]))->toString()));
buf.push_back('"'); buf.push_back('"');
} }
buf.push_back(']'); buf.push_back(']');