.

4 files changed, 0 insertions, 239 deletions

diff --git a/controller/SqliteNetworkController.cpp b/controller/SqliteNetworkController.cpp
index 94d2e2e6..cbfa8891 100644
--- a/controller/SqliteNetworkController.cpp
+++ b/controller/SqliteNetworkController.cpp
@@ -53,15 +53,8 @@
 #include "../node/MAC.hpp"
 #include "../node/Address.hpp"
 
-// offbase includes and builds upon nlohmann::json
 using json = nlohmann::json;
 
-// Stored in database as schemaVersion key in Config.
-// If not present, database is assumed to be empty and at the current schema version
-// and this key/value is added automatically.
-//#define ZT_NETCONF_SQLITE_SCHEMA_VERSION 5
-//#define ZT_NETCONF_SQLITE_SCHEMA_VERSION_STR "5"
-
 // API version reported via JSON control plane
 #define ZT_NETCONF_CONTROLLER_API_VERSION 3
 
diff --git a/controller/schema.sql b/controller/schema.sql
deleted file mode 100644
index d1daf8d0..00000000
--- a/controller/schema.sql
+++ /dev/null
@@ -1,112 +0,0 @@
-CREATE TABLE Config (
-  k varchar(16) PRIMARY KEY NOT NULL,
-  v varchar(1024) NOT NULL
-);
-
-CREATE TABLE Network (
-  id char(16) PRIMARY KEY NOT NULL,
-  name varchar(128) NOT NULL,
-  private integer NOT NULL DEFAULT(1),
-  enableBroadcast integer NOT NULL DEFAULT(1),
-  allowPassiveBridging integer NOT NULL DEFAULT(0),
-  multicastLimit integer NOT NULL DEFAULT(32),
-  creationTime integer NOT NULL DEFAULT(0),
-  revision integer NOT NULL DEFAULT(1),
-  memberRevisionCounter integer NOT NULL DEFAULT(1),
-  flags integer NOT NULL DEFAULT(0)
-);
-
-CREATE TABLE AuthToken (
-  id integer PRIMARY KEY NOT NULL,
-  networkId char(16) NOT NULL REFERENCES Network(id) ON DELETE CASCADE,
-  authMode integer NOT NULL DEFAULT(1),
-  useCount integer NOT NULL DEFAULT(0),
-  maxUses integer NOT NULL DEFAULT(0),
-  expiresAt integer NOT NULL DEFAULT(0),
-  token varchar(256) NOT NULL
-);
-
-CREATE INDEX AuthToken_networkId_token ON AuthToken(networkId,token);
-
-CREATE TABLE Node (
-  id char(10) PRIMARY KEY NOT NULL,
-  identity varchar(4096) NOT NULL
-);
-
-CREATE TABLE IpAssignment (
-  networkId char(16) NOT NULL REFERENCES Network(id) ON DELETE CASCADE,
-  nodeId char(10) REFERENCES Node(id) ON DELETE CASCADE,
-  type integer NOT NULL DEFAULT(0),
-  ip blob(16) NOT NULL,
-  ipNetmaskBits integer NOT NULL DEFAULT(0),
-  ipVersion integer NOT NULL DEFAULT(4)
-);
-
-CREATE UNIQUE INDEX IpAssignment_networkId_ip ON IpAssignment (networkId, ip);
-
-CREATE INDEX IpAssignment_networkId_nodeId ON IpAssignment (networkId, nodeId);
-
-CREATE TABLE IpAssignmentPool (
-  networkId char(16) NOT NULL REFERENCES Network(id) ON DELETE CASCADE,
-  ipRangeStart blob(16) NOT NULL,
-  ipRangeEnd blob(16) NOT NULL,
-  ipVersion integer NOT NULL DEFAULT(4)
-);
-
-CREATE UNIQUE INDEX IpAssignmentPool_networkId_ipRangeStart ON IpAssignmentPool (networkId,ipRangeStart);
-
-CREATE TABLE Member (
-  networkId char(16) NOT NULL REFERENCES Network(id) ON DELETE CASCADE,
-  nodeId char(10) NOT NULL REFERENCES Node(id) ON DELETE CASCADE,
-  authorized integer NOT NULL DEFAULT(0),
-  activeBridge integer NOT NULL DEFAULT(0),
-  memberRevision integer NOT NULL DEFAULT(0),
-  flags integer NOT NULL DEFAULT(0),
-  lastRequestTime integer NOT NULL DEFAULT(0),
-  lastPowDifficulty integer NOT NULL DEFAULT(0),
-  lastPowTime integer NOT NULL DEFAULT(0),
-  recentHistory blob,
-  PRIMARY KEY (networkId, nodeId)
-);
-
-CREATE INDEX Member_networkId_nodeId ON Member(networkId,nodeId);
-CREATE INDEX Member_networkId_activeBridge ON Member(networkId, activeBridge);
-CREATE INDEX Member_networkId_memberRevision ON Member(networkId, memberRevision);
-CREATE INDEX Member_networkId_lastRequestTime ON Member(networkId, lastRequestTime);
-
-CREATE TABLE Route (
-  networkId char(16) NOT NULL REFERENCES Network(id) ON DELETE CASCADE,
-  target blob(16) NOT NULL,
-  via blob(16),
-  targetNetmaskBits integer NOT NULL,
-  ipVersion integer NOT NULL,
-  flags integer NOT NULL,
-  metric integer NOT NULL
-);
-
-CREATE INDEX Route_networkId ON Route (networkId);
-
-CREATE TABLE Rule (
-  networkId char(16) NOT NULL REFERENCES Network(id) ON DELETE CASCADE,
-  capId integer,
-  ruleNo integer NOT NULL,
-  ruleType integer NOT NULL DEFAULT(0),
-  "addr" blob(16),
-  "int1" integer,
-  "int2" integer,
-  "int3" integer,
-  "int4" integer
-);
-
-CREATE INDEX Rule_networkId_capId ON Rule (networkId,capId);
-
-CREATE TABLE MemberTC (
-  networkId char(16) NOT NULL REFERENCES Network(id) ON DELETE CASCADE,
-  nodeId char(10) NOT NULL REFERENCES Node(id) ON DELETE CASCADE,
-  tagId integer,
-  tagValue integer,
-  capId integer,
-  capMaxCustodyChainLength integer NOT NULL DEFAULT(1)
-);
-
-CREATE INDEX MemberTC_networkId_nodeId ON MemberTC (networkId,nodeId);
diff --git a/controller/schema.sql.c b/controller/schema.sql.c
deleted file mode 100644
index e84ee766..00000000
--- a/controller/schema.sql.c
+++ /dev/null
@@ -1,112 +0,0 @@
-#define ZT_NETCONF_SCHEMA_SQL \
-"CREATE TABLE Config (\n"\
-"  k varchar(16) PRIMARY KEY NOT NULL,\n"\
-"  v varchar(1024) NOT NULL\n"\
-");\n"\
-"\n"\
-"CREATE TABLE Network (\n"\
-"  id char(16) PRIMARY KEY NOT NULL,\n"\
-"  name varchar(128) NOT NULL,\n"\
-"  private integer NOT NULL DEFAULT(1),\n"\
-"  enableBroadcast integer NOT NULL DEFAULT(1),\n"\
-"  allowPassiveBridging integer NOT NULL DEFAULT(0),\n"\
-"  multicastLimit integer NOT NULL DEFAULT(32),\n"\
-"  creationTime integer NOT NULL DEFAULT(0),\n"\
-"  revision integer NOT NULL DEFAULT(1),\n"\
-"  memberRevisionCounter integer NOT NULL DEFAULT(1),\n"\
-"  flags integer NOT NULL DEFAULT(0)\n"\
-");\n"\
-"\n"\
-"CREATE TABLE AuthToken (\n"\
-"  id integer PRIMARY KEY NOT NULL,\n"\
-"  networkId char(16) NOT NULL REFERENCES Network(id) ON DELETE CASCADE,\n"\
-"  authMode integer NOT NULL DEFAULT(1),\n"\
-"  useCount integer NOT NULL DEFAULT(0),\n"\
-"  maxUses integer NOT NULL DEFAULT(0),\n"\
-"  expiresAt integer NOT NULL DEFAULT(0),\n"\
-"  token varchar(256) NOT NULL\n"\
-");\n"\
-"\n"\
-"CREATE INDEX AuthToken_networkId_token ON AuthToken(networkId,token);\n"\
-"\n"\
-"CREATE TABLE Node (\n"\
-"  id char(10) PRIMARY KEY NOT NULL,\n"\
-"  identity varchar(4096) NOT NULL\n"\
-");\n"\
-"\n"\
-"CREATE TABLE IpAssignment (\n"\
-"  networkId char(16) NOT NULL REFERENCES Network(id) ON DELETE CASCADE,\n"\
-"  nodeId char(10) REFERENCES Node(id) ON DELETE CASCADE,\n"\
-"  type integer NOT NULL DEFAULT(0),\n"\
-"  ip blob(16) NOT NULL,\n"\
-"  ipNetmaskBits integer NOT NULL DEFAULT(0),\n"\
-"  ipVersion integer NOT NULL DEFAULT(4)\n"\
-");\n"\
-"\n"\
-"CREATE UNIQUE INDEX IpAssignment_networkId_ip ON IpAssignment (networkId, ip);\n"\
-"\n"\
-"CREATE INDEX IpAssignment_networkId_nodeId ON IpAssignment (networkId, nodeId);\n"\
-"\n"\
-"CREATE TABLE IpAssignmentPool (\n"\
-"  networkId char(16) NOT NULL REFERENCES Network(id) ON DELETE CASCADE,\n"\
-"  ipRangeStart blob(16) NOT NULL,\n"\
-"  ipRangeEnd blob(16) NOT NULL,\n"\
-"  ipVersion integer NOT NULL DEFAULT(4)\n"\
-");\n"\
-"\n"\
-"CREATE UNIQUE INDEX IpAssignmentPool_networkId_ipRangeStart ON IpAssignmentPool (networkId,ipRangeStart);\n"\
-"\n"\
-"CREATE TABLE Member (\n"\
-"  networkId char(16) NOT NULL REFERENCES Network(id) ON DELETE CASCADE,\n"\
-"  nodeId char(10) NOT NULL REFERENCES Node(id) ON DELETE CASCADE,\n"\
-"  authorized integer NOT NULL DEFAULT(0),\n"\
-"  activeBridge integer NOT NULL DEFAULT(0),\n"\
-"  memberRevision integer NOT NULL DEFAULT(0),\n"\
-"  flags integer NOT NULL DEFAULT(0),\n"\
-"  lastRequestTime integer NOT NULL DEFAULT(0),\n"\
-"  lastPowDifficulty integer NOT NULL DEFAULT(0),\n"\
-"  lastPowTime integer NOT NULL DEFAULT(0),\n"\
-"  recentHistory blob,\n"\
-"  PRIMARY KEY (networkId, nodeId)\n"\
-");\n"\
-"\n"\
-"CREATE INDEX Member_networkId_nodeId ON Member(networkId,nodeId);\n"\
-"CREATE INDEX Member_networkId_activeBridge ON Member(networkId, activeBridge);\n"\
-"CREATE INDEX Member_networkId_memberRevision ON Member(networkId, memberRevision);\n"\
-"CREATE INDEX Member_networkId_lastRequestTime ON Member(networkId, lastRequestTime);\n"\
-"\n"\
-"CREATE TABLE Route (\n"\
-"  networkId char(16) NOT NULL REFERENCES Network(id) ON DELETE CASCADE,\n"\
-"  target blob(16) NOT NULL,\n"\
-"  via blob(16),\n"\
-"  targetNetmaskBits integer NOT NULL,\n"\
-"  ipVersion integer NOT NULL,\n"\
-"  flags integer NOT NULL,\n"\
-"  metric integer NOT NULL\n"\
-");\n"\
-"\n"\
-"CREATE INDEX Route_networkId ON Route (networkId);\n"\
-"\n"\
-"CREATE TABLE Relay (\n"\
-"  networkId char(16) NOT NULL REFERENCES Network(id) ON DELETE CASCADE,\n"\
-"  address char(10) NOT NULL,\n"\
-"  phyAddress varchar(64) NOT NULL\n"\
-");\n"\
-"\n"\
-"CREATE UNIQUE INDEX Relay_networkId_address ON Relay (networkId,address);\n"\
-"\n"\
-"CREATE TABLE Rule (\n"\
-"  networkId char(16) NOT NULL REFERENCES Network(id) ON DELETE CASCADE,\n"\
-"  policyId varchar(32),\n"\
-"  ruleNo integer NOT NULL,\n"\
-"  ruleType integer NOT NULL DEFAULT(0),\n"\
-"  \"addr\" blob(16),\n"\
-"  \"int1\" integer,\n"\
-"  \"int2\" integer,\n"\
-"  \"int3\" integer,\n"\
-"  \"int4\" integer\n"\
-");\n"\
-"\n"\
-"CREATE INDEX Rule_networkId_ruleNo ON Rule (networkId, ruleNo);\n"\
-"CREATE INDEX Rule_networkId_policyId ON Rule (networkId, policyId);\n"\
-""
diff --git a/controller/schema2c.sh b/controller/schema2c.sh
deleted file mode 100755
index 4f4f1647..00000000
--- a/controller/schema2c.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-# Run this file to package the .sql file into a .c file whenever the SQL changes.
-
-rm -f schema.sql.c
-echo '#define ZT_NETCONF_SCHEMA_SQL \' >schema.sql.c
-cat schema.sql | sed 's/"/\\"/g' | sed 's/^/"/' | sed 's/$/\\n"\\/' >>schema.sql.c
-echo '""' >>schema.sql.c