From 278c8fd9f1a36bc7b81cbfd50b93626d5341b8de Mon Sep 17 00:00:00 2001 From: Adam Ierymenko Date: Fri, 13 Mar 2015 13:53:15 -0700 Subject: Wire up externally specified NetworkConfigMaster --- netconf/SqliteNetworkConfigMaster.hpp | 1 + netconf/netconf-schema.sql | 9 ++++----- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'netconf') 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, -- cgit v1.2.3