summaryrefslogtreecommitdiff
path: root/controller/SqliteNetworkController.hpp
diff options
context:
space:
mode:
authorAdam Ierymenko <adam.ierymenko@gmail.com>2015-09-10 15:56:15 -0700
committerAdam Ierymenko <adam.ierymenko@gmail.com>2015-09-10 15:56:15 -0700
commit8d82ac5cc8826e2352e710c579a173f4b4309cd1 (patch)
treea38a20b9403cee9653393dd22f6a2b9f3e8ac5c0 /controller/SqliteNetworkController.hpp
parentb11d429bc0ea848d5559c9720846c6101d6c2a13 (diff)
parent9dc2ef554997f5598c9cf2c4d3ca041c3152a962 (diff)
downloadinfinitytier-8d82ac5cc8826e2352e710c579a173f4b4309cd1.tar.gz
infinitytier-8d82ac5cc8826e2352e710c579a173f4b4309cd1.zip
Merge branch 'adamierymenko-dev' into netcon
Diffstat (limited to 'controller/SqliteNetworkController.hpp')
-rw-r--r--controller/SqliteNetworkController.hpp9
1 files changed, 8 insertions, 1 deletions
diff --git a/controller/SqliteNetworkController.hpp b/controller/SqliteNetworkController.hpp
index 26a06968..5d995379 100644
--- a/controller/SqliteNetworkController.hpp
+++ b/controller/SqliteNetworkController.hpp
@@ -93,6 +93,13 @@ private:
const std::string &body,
std::string &responseBody,
std::string &responseContentType);
+ NetworkController::ResultCode _doNetworkConfigRequest(
+ const InetAddress &fromAddr,
+ const Identity &signingId,
+ const Identity &identity,
+ uint64_t nwid,
+ const Dictionary &metaData,
+ Dictionary &netconf);
std::string _dbPath;
std::string _instanceId;
@@ -105,7 +112,7 @@ private:
sqlite3_stmt *_sGetMember;
sqlite3_stmt *_sCreateMember;
sqlite3_stmt *_sGetNodeIdentity;
- sqlite3_stmt *_sCreateNode;
+ sqlite3_stmt *_sCreateOrReplaceNode;
sqlite3_stmt *_sUpdateNode;
sqlite3_stmt *_sUpdateNode2;
sqlite3_stmt *_sGetEtherTypesFromRuleTable;