diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2015-04-30 15:16:21 -0700 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2015-04-30 15:16:21 -0700 |
| commit | f3d7c9d681d6badff866c31041ba81e6fc2a882b (patch) | |
| tree | 8403d96a5d531c3cdcb2a5cbb024d358162bd6ac /service/ControlPlane.cpp | |
| parent | 226e0f8722179b3a08eb14ad34fe03d5b0720888 (diff) | |
| download | infinitytier-f3d7c9d681d6badff866c31041ba81e6fc2a882b.tar.gz infinitytier-f3d7c9d681d6badff866c31041ba81e6fc2a882b.zip | |
Helps to index the array when enumerating a C array.
Diffstat (limited to 'service/ControlPlane.cpp')
| -rw-r--r-- | service/ControlPlane.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/service/ControlPlane.cpp b/service/ControlPlane.cpp index e40aad9b..3604dd1e 100644 --- a/service/ControlPlane.cpp +++ b/service/ControlPlane.cpp @@ -71,13 +71,13 @@ static std::string _jsonEnumerate(const ZT1_MulticastGroup *mg,unsigned int coun if (i > 0) buf.push_back(','); Utils::snprintf(tmp,sizeof(tmp),"\"%.2x:%.2x:%.2x:%.2x:%.2x:%.2x\\/%.8lx\"", - (unsigned int)((mg->mac >> 40) & 0xff), - (unsigned int)((mg->mac >> 32) & 0xff), - (unsigned int)((mg->mac >> 24) & 0xff), - (unsigned int)((mg->mac >> 16) & 0xff), - (unsigned int)((mg->mac >> 8) & 0xff), - (unsigned int)(mg->mac & 0xff), - mg->adi); + (unsigned int)((mg[i].mac >> 40) & 0xff), + (unsigned int)((mg[i].mac >> 32) & 0xff), + (unsigned int)((mg[i].mac >> 24) & 0xff), + (unsigned int)((mg[i].mac >> 16) & 0xff), + (unsigned int)((mg[i].mac >> 8) & 0xff), + (unsigned int)(mg[i].mac & 0xff), + (unsigned long)(mg[i].adi)); buf.append(tmp); } buf.push_back(']'); @@ -92,7 +92,7 @@ static std::string _jsonEnumerate(const struct sockaddr_storage *ss,unsigned int if (i > 0) 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(']'); |