20150826

dainok · Aug 26, 2015 · c36e1ba · c36e1ba
1 parent e3ee6b8
commit c36e1ba
Show file tree

Hide file tree

Showing 92 changed files with 187 additions and 187 deletions.
diff --git a/html/api.php b/html/api.php
@@ -27,7 +27,7 @@
  * @copyright 2014-2015 Andrea Dainese
  * @license http://www.gnu.org/licenses/gpl.html
  * @link http://www.unetlab.com/
- * @version 20150527
+ * @version 20150819
  */
 
 /*

diff --git a/html/includes/__interfc.php b/html/includes/__interfc.php
@@ -27,7 +27,7 @@
  * @copyright 2014-2015 Andrea Dainese
  * @license http://www.gnu.org/licenses/gpl.html
  * @link http://www.unetlab.com/
- * @version 20150428
+ * @version 20150715
  * @property type $id Interface ID. It's mandatory and automatically set during contruction phase.
  * @property type $name Name of the interface. It's optional.
  * @property type $network_id Remote network ID for Ethernet interfaces. If not set, it's automatically set to 0.

diff --git a/html/includes/__lab.php b/html/includes/__lab.php
@@ -27,7 +27,7 @@
  * @copyright 2014-2015 Andrea Dainese
  * @license http://www.gnu.org/licenses/gpl.html
  * @link http://www.unetlab.com/
- * @version 20150527
+ * @version 20150807
  * @property type $author Author name of the lab. It's optional.
  * @property type $description Description of the lab. It's optional
  * @property type $filename The filename of the lab (without path). It's mandatory and automatically set.

diff --git a/html/includes/__network.php b/html/includes/__network.php
@@ -27,7 +27,7 @@
  * @copyright 2014-2015 Andrea Dainese
  * @license http://www.gnu.org/licenses/gpl.html
  * @link http://www.unetlab.com/
- * @version 20150428
+ * @version 20150715
  * @property type $count Total of connected nodes to this network. If not set, it's automatically set to 0.
  * @property type $id Network ID. Mandatory and set during construction phase.
  * @property type $left Left margin for visual position. It's optional.

diff --git a/html/includes/__node.php b/html/includes/__node.php
@@ -27,7 +27,7 @@
  * @copyright 2014-2015 Andrea Dainese
  * @license http://www.gnu.org/licenses/gpl.html
  * @link http://www.unetlab.com/
- * @version 20150527
+ * @version 20150825
  * @property type $flags_eth CMD flags related to Ethernet interfaces. It's mandatory and automatically set.
  * @property type $flags_ser CMD flags related to Serial interfaces. It's mandatory and automatically set.
  * @property type $console protocol. It's optional.

diff --git a/html/includes/__picture.php b/html/includes/__picture.php
@@ -27,7 +27,7 @@
  * @copyright 2014-2015 Andrea Dainese
  * @license http://www.gnu.org/licenses/gpl.html
  * @link http://www.unetlab.com/
- * @version 20150428
+ * @version 20150715
  * @property type $data Binary stream of the picture. It's mandatory.
  * @property type $height Width of the picture. It's automatically get from data.
  * @property type $id ID of the picture. It's mandatory and automatically set during contruction phase.

diff --git a/html/includes/api_authentication.php b/html/includes/api_authentication.php
@@ -27,7 +27,7 @@
  * @copyright 2014-2015 Andrea Dainese
  * @license http://www.gnu.org/licenses/gpl.html
  * @link http://www.unetlab.com/
- * @version 20150525
+ * @version 20150804
  */
 
 /*

diff --git a/html/includes/api_folders.php b/html/includes/api_folders.php
@@ -27,7 +27,7 @@
  * @copyright 2014-2015 Andrea Dainese
  * @license http://www.gnu.org/licenses/gpl.html
  * @link http://www.unetlab.com/
- * @version 20150428
+ * @version 20150715
  */
 
 /*

diff --git a/html/includes/api_labs.php b/html/includes/api_labs.php
@@ -27,7 +27,7 @@
  * @copyright 2014-2015 Andrea Dainese
  * @license http://www.gnu.org/licenses/gpl.html
  * @link http://www.unetlab.com/
- * @version 20150428
+ * @version 20150825
  */
 
 /*

diff --git a/html/includes/api_networks.php b/html/includes/api_networks.php
@@ -27,7 +27,7 @@
  * @copyright 2014-2015 Andrea Dainese
  * @license http://www.gnu.org/licenses/gpl.html
  * @link http://www.unetlab.com/
- * @version 20150428
+ * @version 20150715
  */
 
 /**

diff --git a/html/includes/api_nodes.php b/html/includes/api_nodes.php
@@ -27,7 +27,7 @@
  * @copyright 2014-2015 Andrea Dainese
  * @license http://www.gnu.org/licenses/gpl.html
  * @link http://www.unetlab.com/
- * @version 20150527
+ * @version 20150715
  */
 
 /**

diff --git a/html/includes/api_pictures.php b/html/includes/api_pictures.php
@@ -27,7 +27,7 @@
  * @copyright 2014-2015 Andrea Dainese
  * @license http://www.gnu.org/licenses/gpl.html
  * @link http://www.unetlab.com/
- * @version 20150428
+ * @version 20150715
  */
 
 /**

diff --git a/html/includes/api_status.php b/html/includes/api_status.php
@@ -27,7 +27,7 @@
  * @copyright 2014-2015 Andrea Dainese
  * @license http://www.gnu.org/licenses/gpl.html
  * @link http://www.unetlab.com/
- * @version 20150428
+ * @version 20150806
  */
 
 /*

diff --git a/html/includes/api_topology.php b/html/includes/api_topology.php
@@ -27,7 +27,7 @@
  * @copyright 2014-2015 Andrea Dainese
  * @license http://www.gnu.org/licenses/gpl.html
  * @link http://www.unetlab.com/
- * @version 20150515
+ * @version 20150715
  */
 
 /**

diff --git a/html/includes/cli.php b/html/includes/cli.php
@@ -27,7 +27,7 @@
  * @copyright 2014-2015 Andrea Dainese
  * @license http://www.gnu.org/licenses/gpl.html
  * @link http://www.unetlab.com/
- * @version 20150527
+ * @version 20150826
  */
 
 /**
@@ -820,7 +820,7 @@ function start($n, $id, $t, $nets) {
  */
 function stop($n) {
 	if ($n -> getStatus() == 1) {
-		$cmd = 'kill -s TERM $(fuser -n tcp '.$n -> getPort().' 2> /dev/null | sed "s/^.* \([0-9]\+\)$/\1/g")';
+		$cmd = 'fuser -n tcp -k -TERM '.$n -> getPort().' > /dev/null 2>&1';
 		exec($cmd, $o, $rc);
 		error_log('INFO: stopping '.$cmd);
 		sleep(1);  // Need to wait a few

diff --git a/html/includes/functions.php b/html/includes/functions.php
@@ -27,7 +27,7 @@
  * @copyright 2014-2015 Andrea Dainese
  * @license http://www.gnu.org/licenses/gpl.html
  * @link http://www.unetlab.com/
- * @version 20150526
+ * @version 20150817
  */
 
 /**

diff --git a/html/includes/init.php b/html/includes/init.php
@@ -38,7 +38,7 @@
  * @copyright 2014-2015 Andrea Dainese
  * @license http://www.gnu.org/licenses/gpl.html
  * @link http://www.unetlab.com/
- * @version 20150817
+ * @version 20150824
  */
 
 // Include custom configuration

diff --git a/html/includes/messages_en.php b/html/includes/messages_en.php
@@ -27,7 +27,7 @@
  * @copyright 2014-2015 Andrea Dainese
  * @license http://www.gnu.org/licenses/gpl.html
  * @link http://www.unetlab.com/
- * @version 20150527
+ * @version 20150825
  */
 
 /***************************************************************************

diff --git a/html/includes/messages_zh.php b/html/includes/messages_zh.php
@@ -27,7 +27,7 @@
  * @copyright 2014-2015 Andrea Dainese
  * @license http://www.gnu.org/licenses/gpl.html
  * @link http://www.unetlab.com/
- * @version 20150527
+ * @version 20150817
  */
 
 /***************************************************************************

diff --git a/html/templates/a10.php b/html/templates/a10.php
@@ -21,13 +21,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with UNetLab. If not, see <http:
+ * along with UNetLab. If not, see <http://www.gnu.org/licenses/>.
  *
  * @author Andrea Dainese <[email protected]>
  * @copyright 2014-2015 Andrea Dainese
  * @license http://www.gnu.org/licenses/gpl.html
  * @link http://www.unetlab.com/
- * @version 20150521
+ * @version 20150826
  */
 
 $p['type'] = 'qemu';

diff --git a/html/templates/acs.php b/html/templates/acs.php
@@ -21,13 +21,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with UNetLab.If not, see <http:
+ * along with UNetLab.If not, see <http://www.gnu.org/licenses/>.
  *
  * @author Andrea Dainese <[email protected]>
  * @copyright 2014-2015 Andrea Dainese
  * @license http://www.gnu.org/licenses/gpl.html
  * @link http://www.unetlab.com/
- * @version 20150817
+ * @version 20150826
  */
 
 $p['type'] = 'qemu';

diff --git a/html/templates/asa.php b/html/templates/asa.php
@@ -21,13 +21,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with UNetLab. If not, see <http:
+ * along with UNetLab. If not, see <http://www.gnu.org/licenses/>.
  *
  * @author Andrea Dainese <[email protected]>
  * @copyright 2014-2015 Andrea Dainese
  * @license http://www.gnu.org/licenses/gpl.html
  * @link http://www.unetlab.com/
- * @version 20150521
+ * @version 20150826
  */
 
 $p['type'] = 'qemu';

diff --git a/html/templates/asav.php b/html/templates/asav.php
@@ -21,13 +21,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with UNetLab.If not, see <http:
+ * along with UNetLab.If not, see <http://www.gnu.org/licenses/>.
  *
  * @author Andrea Dainese <[email protected]>
  * @copyright 2014-2015 Andrea Dainese
  * @license http://www.gnu.org/licenses/gpl.html
  * @link http://www.unetlab.com/
- * @version 20150521
+ * @version 20150826
  */
 
 $p['type'] = 'qemu';

diff --git a/html/templates/bigip.php b/html/templates/bigip.php
@@ -21,13 +21,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with UNetLab.If not, see <http:
+ * along with UNetLab.If not, see <http://www.gnu.org/licenses/>.
  *
  * @author Andrea Dainese <[email protected]>
  * @copyright 2014-2015 Andrea Dainese
  * @license http://www.gnu.org/licenses/gpl.html
  * @link http://www.unetlab.com/
- * @version 20150521
+ * @version 20150826
  */
 
 $p['type'] = 'qemu'; 

diff --git a/html/templates/brocadevadx.php b/html/templates/brocadevadx.php
@@ -21,13 +21,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with UNetLab.If not, see <http:
+ * along with UNetLab.If not, see <http://www.gnu.org/licenses/>.
  *
  * @author Andrea Dainese <[email protected]>
  * @copyright 2014-2015 Andrea Dainese
  * @license http://www.gnu.org/licenses/gpl.html
  * @link http://www.unetlab.com/
- * @version 20150521
+ * @version 20150826
  */
 
 $p['type'] = 'qemu';

diff --git a/html/templates/c1710.php b/html/templates/c1710.php
@@ -21,13 +21,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with UNetLab.If not, see <http:
+ * along with UNetLab.If not, see <http://www.gnu.org/licenses/>.
  *
  * @author Andrea Dainese <[email protected]>
  * @copyright 2014-2015 Andrea Dainese
  * @license http://www.gnu.org/licenses/gpl.html
  * @link http://www.unetlab.com/
- * @version 20150521
+ * @version 20150826
  */
 
 $p['type'] = 'dynamips';

diff --git a/html/templates/c3725.php b/html/templates/c3725.php
@@ -21,13 +21,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with UNetLab.If not, see <http:
+ * along with UNetLab.If not, see <http://www.gnu.org/licenses/>.
  *
  * @author Andrea Dainese <[email protected]>
  * @copyright 2014-2015 Andrea Dainese
  * @license http://www.gnu.org/licenses/gpl.html
  * @link http://www.unetlab.com/
- * @version 20150521
+ * @version 20150826
  */
 
 $p['type'] = 'dynamips'; 

diff --git a/html/templates/c7200.php b/html/templates/c7200.php
@@ -21,13 +21,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with UNetLab.If not, see <http:
+ * along with UNetLab.If not, see <http://www.gnu.org/licenses/>.
  *
  * @author Andrea Dainese <[email protected]>
  * @copyright 2014-2015 Andrea Dainese
  * @license http://www.gnu.org/licenses/gpl.html
  * @link http://www.unetlab.com/
- * @version 20150521
+ * @version 20150826
  */
 
 $p['type'] = 'dynamips'; 

diff --git a/html/templates/cda.php b/html/templates/cda.php
@@ -2,33 +2,33 @@
 # vim: syntax=php tabstop=4 softtabstop=0 noexpandtab laststatus=1 ruler 
 
 /** 
-* html/templates/cda.php 
-* 
-* Cisco CDA template for UNetLab. 
-* 
-* LICENSE: 
-* 
-* This file is part of UNetLab (Unified Networking Lab). 
-* 
-* UNetLab is free software: you can redistribute it and/or modify 
-* it under the terms of the GNU General Public License as published by 
-* the Free Software Foundation, either version 3 of the License, or 
-* (at your option) any later version. 
-* 
-* UNetLab is distributed in the hope that it will be useful, 
-* but WITHOUT ANY WARRANTY; without even the implied warranty of 
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 
-* GNU General Public License for more details. 
-* 
-* You should have received a copy of the GNU General Public License 
-* along with UNetLab. If not, see <http: 
-* 
-* @author Andrea Dainese <[email protected]> 
-* @copyright 2014-2015 Andrea Dainese 
-* @license http://www.gnu.org/licenses/gpl.html 
-* @link http://www.unetlab.com/ 
-* @version 20150521 
-*/ 
+ * html/templates/cda.php 
+ * 
+ * Cisco CDA template for UNetLab. 
+ * 
+ * LICENSE: 
+ * 
+ * This file is part of UNetLab (Unified Networking Lab). 
+ * 
+ * UNetLab is free software: you can redistribute it and/or modify 
+ * it under the terms of the GNU General Public License as published by 
+ * the Free Software Foundation, either version 3 of the License, or 
+ * (at your option) any later version. 
+ * 
+ * UNetLab is distributed in the hope that it will be useful, 
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 
+ * GNU General Public License for more details. 
+ * 
+ * You should have received a copy of the GNU General Public License 
+ * along with UNetLab. If not, see <http: 
+ * 
+ * @author Andrea Dainese <[email protected]>
+ * @copyright 2014-2015 Andrea Dainese
+ * @license http://www.gnu.org/licenses/gpl.html
+ * @link http://www.unetlab.com/
+ * @version 20150826
+ */ 
 
 $p['type'] = 'qemu'; 
 $p['name'] = 'cda';