diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2015-08-24 12:44:07 -0700 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2015-08-24 12:44:07 -0700 |
| commit | 2aa1b5d9b78c965ced4390292d9ae60a6314ad2a (patch) | |
| tree | 256550d9f34621f8e324e2ae07a8278fa032bfa5 /controller | |
| parent | 9a5be0a0926d004ee2eb99a6c09f2395e0f7db39 (diff) | |
| download | infinitytier-2aa1b5d9b78c965ced4390292d9ae60a6314ad2a.tar.gz infinitytier-2aa1b5d9b78c965ced4390292d9ae60a6314ad2a.zip | |
Add clock helper field to both member and network to permit time duration calculation easily.
Diffstat (limited to 'controller')
| -rw-r--r-- | controller/SqliteNetworkController.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/controller/SqliteNetworkController.cpp b/controller/SqliteNetworkController.cpp index e1cc2654..2a004bda 100644 --- a/controller/SqliteNetworkController.cpp +++ b/controller/SqliteNetworkController.cpp @@ -1363,6 +1363,7 @@ unsigned int SqliteNetworkController::_doCPGet( "\t\"authorized\": %s,\n" "\t\"activeBridge\": %s,\n" "\t\"memberRevision\": %llu,\n" + "\t\"clock\": %llu,\n" "\t\"identity\": \"%s\",\n" "\t\"ipAssignments\": [", nwids, @@ -1371,6 +1372,7 @@ unsigned int SqliteNetworkController::_doCPGet( (sqlite3_column_int(_sGetMember2,0) > 0) ? "true" : "false", (sqlite3_column_int(_sGetMember2,1) > 0) ? "true" : "false", (unsigned long long)sqlite3_column_int64(_sGetMember2,2), + (unsigned long long)OSUtils::now(), _jsonEscape((const char *)sqlite3_column_text(_sGetMember2,3)).c_str()); responseBody = json; @@ -1457,6 +1459,7 @@ unsigned int SqliteNetworkController::_doCPGet( "{\n" "\t\"nwid\": \"%s\",\n" "\t\"controllerInstanceId\": \"%s\",\n" + "\t\"clock\": %llu,\n" "\t\"name\": \"%s\",\n" "\t\"private\": %s,\n" "\t\"enableBroadcast\": %s,\n" @@ -1471,6 +1474,7 @@ unsigned int SqliteNetworkController::_doCPGet( "\t\"relays\": [", nwids, _instanceId.c_str(), + (unsigned long long)OSUtils::now(), _jsonEscape((const char *)sqlite3_column_text(_sGetNetworkById,0)).c_str(), (sqlite3_column_int(_sGetNetworkById,1) > 0) ? "true" : "false", (sqlite3_column_int(_sGetNetworkById,2) > 0) ? "true" : "false", |