diff options
| author | Grant Limberg <glimberg@gmail.com> | 2015-06-30 19:23:23 -0700 |
|---|---|---|
| committer | Grant Limberg <glimberg@gmail.com> | 2015-06-30 19:23:23 -0700 |
| commit | d853dbf2d88d4c7b0016e4416b7d046801e4f65a (patch) | |
| tree | 6e6e859a3da842b6158f04a2b110d0ed735eb9e8 /controller/schema.sql | |
| parent | aee8e95d4961195b3251bcc8581677a8f0c0cdd8 (diff) | |
| parent | 0cbbcf288455b8657134bf5be0861232daa6c7d9 (diff) | |
| download | infinitytier-d853dbf2d88d4c7b0016e4416b7d046801e4f65a.tar.gz infinitytier-d853dbf2d88d4c7b0016e4416b7d046801e4f65a.zip | |
Merge branch 'adamierymenko-dev' into android-jni
Diffstat (limited to 'controller/schema.sql')
| -rw-r--r-- | controller/schema.sql | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/controller/schema.sql b/controller/schema.sql index d2261b2a..94e611b9 100644 --- a/controller/schema.sql +++ b/controller/schema.sql @@ -18,10 +18,7 @@ CREATE TABLE Network ( CREATE TABLE Node ( id char(10) PRIMARY KEY NOT NULL, - identity varchar(4096) NOT NULL, - lastAt varchar(64), - lastSeen integer NOT NULL DEFAULT(0), - firstSeen integer NOT NULL DEFAULT(0) + identity varchar(4096) NOT NULL ); CREATE TABLE Gateway ( @@ -35,7 +32,8 @@ CREATE UNIQUE INDEX Gateway_networkId_ip ON Gateway (networkId, ip); CREATE TABLE IpAssignment ( networkId char(16) NOT NULL REFERENCES Network(id) ON DELETE CASCADE, - nodeId char(10) NOT NULL REFERENCES Node(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) @@ -47,12 +45,12 @@ CREATE INDEX IpAssignment_networkId_nodeId ON IpAssignment (networkId, nodeId); CREATE TABLE IpAssignmentPool ( networkId char(16) NOT NULL REFERENCES Network(id) ON DELETE CASCADE, - ipNetwork blob(16) NOT NULL, - ipNetmaskBits integer NOT NULL, + ipRangeStart blob(16) NOT NULL, + ipRangeEnd blob(16) NOT NULL, ipVersion integer NOT NULL DEFAULT(4) ); -CREATE INDEX IpAssignmentPool_networkId ON IpAssignmentPool (networkId); +CREATE UNIQUE INDEX IpAssignmentPool_networkId_ipRangeStart ON IpAssignmentPool (networkId,ipRangeStart); CREATE TABLE Member ( networkId char(16) NOT NULL REFERENCES Network(id) ON DELETE CASCADE, @@ -76,7 +74,9 @@ CREATE INDEX Relay_networkId ON Relay (networkId); CREATE TABLE Rule ( networkId char(16) NOT NULL REFERENCES Network(id) ON DELETE CASCADE, ruleNo integer NOT NULL, - nodeId char(10) NOT NULL REFERENCES Node(id) ON DELETE CASCADE, + nodeId char(10) REFERENCES Node(id), + sourcePort char(10), + destPort char(10), vlanId integer, vlanPcp integer, etherType integer, |