Changeset 732

Timestamp:

01/19/11 09:27:04 (16 months ago)

Author:

ftx

Message:

ipv6 related patch, contributed by Dan Grünzig

Location:

trunk/webinterface

Files:

• core/mysql.sql (modified) (1 diff)
• mods/super/nodes/node.php (modified) (2 diffs)

trunk/webinterface/core/mysql.sql

@@ -160 +160 @@
   `nodeid` int(4) NOT NULL default '0',
   `used` enum('y','n') NOT NULL default 'y',
-  `netmask` varchar(15) NOT NULL default '',
+  `netmask` varchar(40) NOT NULL default '',
   `broadcast` varchar(15) NOT NULL default '',
   PRIMARY KEY  (`id`)

trunk/webinterface/mods/super/nodes/node.php

@@ -316 +316 @@
                                 {
                                         $ok = true;
-                                        $nextIp = $_POST['startip'];
-                                        $ip = explode(":", $_POST['startip']);
+                                        $nextIp = Net_IPv6::compress($_POST['startip']);                                        
+                                        $endIpCompressed = Net_IPv6::compress($_POST['endip']);
 
                                         while(Net_IPv6::isInNetmask($nextIp.$_POST['netmask'], $netmask))
                                         {
+                                                $ip = explode(":", Net_IPv6::Uncompress($nextIp));
                                                 if(!$DB->select($DB->table_network, NULL, NULL, array('ip' => $nextIp)))
-                                                $DB->insert($DB->table_network, array('id' => '', 'ip' => $nextIp, 'vserver' => '', 'node' => $node->getId(), 'used' => 'n', 'netmask' => $netmask, 'broadcast' => ''));
+                                                $DB->insert($DB->table_network, array('id' => '', 'ip' => $nextIp, 'vserverid' => '', 'nodeid' => $node->getId(), 'used' => 'n', 'netmask' => $netmask, 'broadcast' => '', 'reservation'=>''));
                                                 for($i = 0; $i < count($ip); $i++)
                                                 {
@@ -343 +344 @@
                                                 for($i = 0; $i < count($ip); $i++)
                                                 {
-                                                        if(dechex($ip[$i]) > 0)
+                                                        if($ip[$i] > 0)
                                                         {
                                                                 $nextIp .= dechex($ip[$i]);
                                                         }
+                                                        else {
+                                                                $nextIp .= '0';
+                                                        }
                                                         $nextIp .= ":";
                                                 }
                                                 $nextIp = trim($nextIp, ":");
                                                 $nextIp = Net_IPv6::compress($nextIp);
-                                                if($nextIp == $_POST['endip'])
+                                                if($nextIp == $endIpCompressed)
                                                 {
                                                         break;