summaryrefslogtreecommitdiff
path: root/netconf
diff options
context:
space:
mode:
authorAdam Ierymenko <adam.ierymenko@gmail.com>2015-03-13 13:53:15 -0700
committerAdam Ierymenko <adam.ierymenko@gmail.com>2015-03-13 13:53:15 -0700
commit278c8fd9f1a36bc7b81cbfd50b93626d5341b8de (patch)
tree05982f038be7be478ae3bd58cae976dcbf01a6d8 /netconf
parent61d89bd1182273fb479a2eb250ce0cc452345d9b (diff)
downloadinfinitytier-278c8fd9f1a36bc7b81cbfd50b93626d5341b8de.tar.gz
infinitytier-278c8fd9f1a36bc7b81cbfd50b93626d5341b8de.zip
Wire up externally specified NetworkConfigMaster
Diffstat (limited to 'netconf')
-rw-r--r--netconf/SqliteNetworkConfigMaster.hpp1
-rw-r--r--netconf/netconf-schema.sql9
2 files changed, 5 insertions, 5 deletions
diff --git a/netconf/SqliteNetworkConfigMaster.hpp b/netconf/SqliteNetworkConfigMaster.hpp
index 514e33dd..829eb4f8 100644
--- a/netconf/SqliteNetworkConfigMaster.hpp
+++ b/netconf/SqliteNetworkConfigMaster.hpp
@@ -47,6 +47,7 @@ class SqliteNetworkConfigMaster : public NetworkConfigMaster
public:
SqliteNetworkConfigMaster(const Identity &signingId,const char *dbPath);
virtual ~SqliteNetworkConfigMaster();
+
virtual NetworkConfigMaster::ResultCode doNetworkConfigRequest(
const InetAddress &fromAddr,
uint64_t packetId,
diff --git a/netconf/netconf-schema.sql b/netconf/netconf-schema.sql
index 4d985562..ccd6de65 100644
--- a/netconf/netconf-schema.sql
+++ b/netconf/netconf-schema.sql
@@ -1,7 +1,7 @@
CREATE TABLE Config (
k varchar(16) PRIMARY KEY NOT NULL,
v varchar(1024) NOT NULL
-) WITHOUT ROWID;
+);
CREATE TABLE IpAssignment (
networkId char(16) NOT NULL,
@@ -30,8 +30,7 @@ CREATE TABLE Member (
nodeId char(10) NOT NULL,
cachedNetconf blob(4096),
cachedNetconfRevision integer(32),
- cachedNetconfTimestamp integer(32),
- clientReportedTimestamp integer(32),
+ clientReportedRevision integer(32),
authorized integer(1) NOT NULL DEFAULT(0),
activeBridge integer(1) NOT NULL DEFAULT(0)
);
@@ -62,7 +61,7 @@ CREATE TABLE Network (
multicastLimit integer(8) NOT NULL DEFAULT(32),
creationTime integer(32) NOT NULL DEFAULT(0),
revision integer(32) NOT NULL DEFAULT(0)
-) WITHOUT ROWID;
+);
CREATE TABLE Node (
id char(10) PRIMARY KEY NOT NULL,
@@ -70,7 +69,7 @@ CREATE TABLE Node (
lastAt varchar(64),
lastSeen integer(32) NOT NULL DEFAULT(0),
firstSeen integer(32) NOT NULL DEFAULT(0)
-) WITHOUT ROWID;
+);
CREATE TABLE Rule (
networkId char(16) NOT NULL,