From d1323de7b0b4bc2ba0c04863aa61295fd0c5d126 Mon Sep 17 00:00:00 2001
From: Mike Hibler <mike@flux.utah.edu>
Date: Tue, 26 Oct 2004 23:01:45 +0000
Subject: [PATCH] More changes for vlan enforced firewall
---
sql/database-create.sql | 4 +++-
sql/database-migrate.txt | 6 ++++++
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/sql/database-create.sql b/sql/database-create.sql
index ff6b62ac69..d063c8df69 100644
--- a/sql/database-create.sql
+++ b/sql/database-create.sql
@@ -399,7 +399,8 @@ CREATE TABLE firewalls (
type enum('ipfw','ipfw2','ipchains','ipfw2-vlan') NOT NULL default 'ipfw',
style enum('open','closed','basic') NOT NULL default 'basic',
vlan int(11) default NULL,
- PRIMARY KEY (pid,eid,fwname)
+ PRIMARY KEY (pid,eid,fwname),
+ KEY vlan (vlan)
) TYPE=MyISAM;
--
@@ -1052,6 +1053,7 @@ CREATE TABLE nodes (
stated_tag varchar(32) default NULL,
rtabid smallint(5) unsigned NOT NULL default '0',
cd_version varchar(32) default NULL,
+ cnet_vlan int(11) default NULL,
PRIMARY KEY (node_id),
KEY phys_nodeid (phys_nodeid),
KEY node_id (node_id,phys_nodeid),
diff --git a/sql/database-migrate.txt b/sql/database-migrate.txt
index dc5ecea517..0656e970a7 100644
--- a/sql/database-migrate.txt
+++ b/sql/database-migrate.txt
@@ -2084,3 +2084,9 @@ last_net_act,last_cpu_act,last_ext_act);
'emulab-ops-FBSD410-IPFW2','root',NULL, \
'FreeBSD 4.10 with IPFW2','FreeBSD','4.10',NULL,NULL,'', \
'ping,ssh,ipod,isup,veths,mlinks',1,1,1,'NORMALv2',NULL,NULL,0);
+
+1.279: Still more VLAN-enforced firewall changes.
+
+ alter table nodes add cnet_vlan int(11) default NULL;
+
+ alter table firewalls add index(vlan);
--
GitLab