Commit d1323de7 authored by Mike Hibler's avatar Mike Hibler

More changes for vlan enforced firewall

parent 55c48cdf
......@@ -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),
......
......@@ -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);
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment