diff options
author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2015-06-19 09:08:06 -0700 |
---|---|---|
committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2015-06-19 09:08:06 -0700 |
commit | f89f02ce9ed8f8d8a49fd881c55ad9d615cbefe4 (patch) | |
tree | 05e8398b1d9cadaa8ed3a09be7dc58e898781708 | |
parent | be4f08a548556bd6e7f22bc48035d11aa319fae8 (diff) | |
parent | 16eae132faf19ffa74a591c92bf0d6972aa1bc01 (diff) | |
download | infinitytier-f89f02ce9ed8f8d8a49fd881c55ad9d615cbefe4.tar.gz infinitytier-f89f02ce9ed8f8d8a49fd881c55ad9d615cbefe4.zip |
Merge pull request #187 from keesbos/fix-ipv4-assignment
Fix for ipv4 assignment
-rw-r--r-- | controller/SqliteNetworkController.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/controller/SqliteNetworkController.cpp b/controller/SqliteNetworkController.cpp index 50927722..398b6991 100644 --- a/controller/SqliteNetworkController.cpp +++ b/controller/SqliteNetworkController.cpp @@ -519,7 +519,7 @@ NetworkController::ResultCode SqliteNetworkController::doNetworkConfigRequest(co int ipNetmaskBits = sqlite3_column_int(_sGetIpAssignmentsForNode,1); if ((ip)&&(sqlite3_column_bytes(_sGetIpAssignmentsForNode,0) >= 4)&&(ipNetmaskBits > 0)&&(ipNetmaskBits <= 32)) { char tmp[32]; - Utils::snprintf(tmp,sizeof(tmp),"%d.%d.%d.%d/%d",(int)ip[0],(int)ip[1],(int)ip[2],(int)ip[3],ipNetmaskBits); + Utils::snprintf(tmp,sizeof(tmp),"%d.%d.%d.%d/%d",(int)ip[12+0],(int)ip[12+1],(int)ip[12+2],(int)ip[12+3],ipNetmaskBits); if (v4s.length()) v4s.push_back(','); v4s.append(tmp); |