Add gre/egre/vtun as encap types in the virt_lans and experiments

tables.

Remove the tunnels table since that stuff is now in the
lan_member_attributes table.

Add node_id to the lan_members table. While its nice having that as an
attribute, it makes joins more difficult and slower.

sql/database-create.sql

@@ -1007,7 +1007,7 @@ CREATE TABLE `experiments` (
   `idx` int(10) unsigned NOT NULL auto_increment,
   `sim_reswap_count` smallint(5) unsigned NOT NULL default '0',
   `veth_encapsulate` tinyint(4) NOT NULL default '1',
-  `encap_style` enum('alias','veth','veth-ne','vlan','default') NOT NULL default 'default',
+  `encap_style` enum('alias','veth','veth-ne','vlan','vtun','egre','gre','default') NOT NULL default 'default',
   `allowfixnode` tinyint(4) NOT NULL default '1',
   `jail_osname` varchar(20) default NULL,
   `delay_osname` varchar(20) default NULL,
@@ -1515,7 +1515,9 @@ DROP TABLE IF EXISTS `lan_members`;
 CREATE TABLE `lan_members` (
   `lanid` int(11) NOT NULL default '0',
   `memberid` int(11) NOT NULL auto_increment,
-  PRIMARY KEY  (`lanid`,`memberid`)
+  `node_id` varchar(32) NOT NULL default '',
+  PRIMARY KEY  (`lanid`,`memberid`),
+  KEY `node_id` (`node_id`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
 
 --
@@ -3000,31 +3002,6 @@ CREATE TABLE `traces` (
   KEY `exptidx` (`exptidx`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
 
---
--- Table structure for table `tunnels`
---
-
-DROP TABLE IF EXISTS `tunnels`;
-CREATE TABLE `tunnels` (
-  `pid` varchar(12) NOT NULL default '',
-  `eid` varchar(32) NOT NULL default '',
-  `exptidx` int(11) NOT NULL default '0',
-  `node_id` varchar(32) NOT NULL default '',
-  `vname` varchar(32) NOT NULL default '',
-  `isserver` tinyint(3) unsigned NOT NULL default '0',
-  `port` int(11) NOT NULL default '0',
-  `peer_ip` varchar(32) NOT NULL default '',
-  `mask` varchar(15) default NULL,
-  `password` varchar(32) NOT NULL default '',
-  `proto` varchar(12) NOT NULL default 'udp',
-  `encrypt` tinyint(3) unsigned NOT NULL default '0',
-  `compress` tinyint(3) unsigned NOT NULL default '0',
-  `assigned_ip` varchar(32) NOT NULL default '',
-  PRIMARY KEY  (`exptidx`,`node_id`,`vname`),
-  UNIQUE KEY `pideid` (`pid`,`eid`,`node_id`,`vname`),
-  KEY `node_id` (`node_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-
 --
 -- Table structure for table `uidnodelastlogin`
 --
@@ -3413,7 +3390,7 @@ CREATE TABLE `virt_lans` (
   `nobwshaping` tinyint(4) default '0',
   `mustdelay` tinyint(1) default '0',
   `usevethiface` tinyint(4) default '0',
-  `encap_style` enum('alias','veth','veth-ne','vlan','tunnel','default') NOT NULL default 'default',
+  `encap_style` enum('alias','veth','veth-ne','vlan','vtun','egre','gre','default') NOT NULL default 'default',
   `trivial_ok` tinyint(4) default '1',
   `protocol` varchar(30) NOT NULL default 'ethernet',
   `is_accesspoint` tinyint(4) default '0',

sql/database-migrate.txt

@@ -4258,7 +4258,7 @@ last_net_act,last_cpu_act,last_ext_act);
 	CREATE TABLE `lan_members` (
 	  `lanid` int(11) NOT NULL default '0',
 	  `memberid` int(11) NOT NULL auto_increment,
-	  PRIMARY KEY  (`lanid`,`memberid`)
+  	  PRIMARY KEY  (`lanid`,`memberid`)
 	) ENGINE=MyISAM DEFAULT CHARSET=latin1;
 	
 	CREATE TABLE `lan_member_attributes` (
@@ -4291,6 +4291,12 @@ last_net_act,last_cpu_act,last_ext_act);
 
 		./newlans.pl
 
+        Run this query to fix a previous problem (after doing an install).
+	
+	update experiment_resources as r left join testbed_stats as s
+	on s.rsrcidx=r.idx set swapin_time=UNIX_TIMESTAMP(tstamp)
+	where action='start' and exitcode=0 and swapin_time=0;
+
 4.141: Bump pnode/vnode duration counters to floats since several
        users/projects have overflowed an unsigned int.
 
@@ -4309,3 +4315,22 @@ last_net_act,last_cpu_act,last_ext_act);
        alter table user_stats change `allexpt_pnode_duration`
          `allexpt_pnode_duration` double(14,0) unsigned default '0';
 
+4.142: GRE and EGRE tunnels.
+
+       ALTER TABLE virt_lans MODIFY encap_style
+        enum('alias','veth','veth-ne','vlan','vtun','egre','gre','default')
+        NOT NULL default 'default'; 
+
+       ALTER TABLE experiments MODIFY encap_style
+        enum('alias','veth','veth-ne','vlan','vtun','egre','gre','default')
+        NOT NULL default 'default'; 
+
+       DROP TABLE IF EXISTS `tunnels`;
+
+       alter table lan_members add `node_id` varchar(32) NOT NULL default '';
+       alter table lan_members add  KEY `node_id` (`node_id`);
+       
+       update lan_members as lm left join lan_member_attributes as lma
+       on lma.lanid=lm.lanid and lma.memberid=lm.memberid and
+       attrkey='node_id' set node_id=attrvalue;
+