Fixed issue #6

Author: Ivan Dudarev

src/Converter.php

@@ -551,6 +551,12 @@ protected function createTmpDb()
         $sql = 'CREATE '.'TABLE `_ips` (`id` INTEGER PRIMARY KEY AUTOINCREMENT, `ip` INTEGER,`action` TEXT, `parameter` TEXT, `value` TEXT, `offset` TEXT); CREATE INDEX `ip` ON `_ips` (`ip`); CREATE INDEX `parameter` ON `_ips` (`parameter`); CREATE INDEX `value` ON `_ips` (`value`);';
         $this->pdo->exec($sql);
         $prepare['insert']['ips'] = $this->pdo->prepare('INSERT '.'INTO `_ips` (`ip`,`action`,`parameter`,`value`) VALUES (:ip,:action,:parameter,:value);');
+        $prepare['insert']['ips']->execute(array(
+            'ip' => 0,
+            'action' => 'add',
+            'parameter' => NULL,
+            'value' => NULL,
+        ));
         foreach ($this->networks as $network) {
             $file = $this->csv[$network['csv']];
             $csv = fopen($file['file'], 'r');
@@ -709,7 +715,7 @@ protected function createTmpRegisters()
      */
     protected function createTmpNetworks()
     {
-        $ip = 0;
+        $ip = -1;
         $fields = array();
         $values = array();
         $format = array();
@@ -725,24 +731,28 @@ protected function createTmpNetworks()
             $values[$register][] = 0;
         }
         $pack = implode('',$format['pack']);
-        $empty = self::packArray($pack,$fields);
-        $bin = pack('N',$ip).$empty;
+        $binaryPrevData = self::packArray($pack,$fields);
+        $empty = pack('N',0).$binaryPrevData;
         $this->meta['networks']['pack'] = implode('/',$format['unpack']);
         $offset = 0;
-        $this->meta['networks']['len'] = strlen($bin);
+        $this->meta['networks']['len'] = strlen($empty);
         $this->meta['index'][0] = 0;
         $file = $this->temporaryDir.DIRECTORY_SEPARATOR.'networks.'.uniqid().'.tmp';
         $tmpFile = fopen($file,'w');
         $ipinfo = $this->pdo->query('SELECT * '.'FROM `_ips` ORDER BY `ip` ASC, `action` DESC, `id` ASC;');
         while ($row = $ipinfo->fetch()) {
             if ($row['ip'] !== $ip) {
                 foreach ($values as $param=>$v) {
-                    $fields[$param] = array_pop($v);
+                    if (!empty($param)) $fields[$param] = array_pop($v);
+                }
+                $binaryData = self::packArray($pack,$fields);
+                if ($binaryData !== $binaryPrevData || empty($ip)) {
+                    fwrite($tmpFile, pack('N', $ip) . $binaryData);
+                    $octet = (int)long2ip($ip);
+                    if (!isset($this->meta['index'][$octet])) $this->meta['index'][$octet] = $offset;
+                    $offset++;
+                    $binaryPrevData = $binaryData;
                 }
-                fwrite($tmpFile,pack('N',$ip).self::packArray($pack,$fields));
-                $octet = (int)long2ip($ip);
-                if (!isset($this->meta['index'][$octet])) $this->meta['index'][$octet] = $offset;
-                $offset++;
                 $ip = $row['ip'];
             }
             if ($row['action'] == 'remove') {
@@ -756,12 +766,15 @@ protected function createTmpNetworks()
         }
         if ($ip < ip2long('255.255.255.255')) {
             foreach ($values as $param => $v) {
-                $fields[$param] = array_pop($v);
+                if (!empty($param)) $fields[$param] = array_pop($v);
+            }
+            $binaryData = self::packArray($pack, $fields);
+            if ($binaryData !== $binaryPrevData) {
+                $octet = (int)long2ip($ip);
+                if (!isset($this->meta['index'][$octet])) $this->meta['index'][$octet] = $offset;
+                $offset++;
+                fwrite($tmpFile, pack('N', $ip) . $binaryData);
             }
-            $octet = (int)long2ip($ip);
-            if (!isset($this->meta['index'][$octet])) $this->meta['index'][$octet] = $offset;
-            $offset++;
-            fwrite($tmpFile, pack('N', $ip) . self::packArray($pack, $fields));
         }
         $this->meta['networks']['items'] = $offset;
         for($i=1;$i<=255;$i++) {

src/Iptool.php

@@ -211,7 +211,7 @@ public function about()
             'author' => '',
             'license' => '',
             'networks' => array(
-                'count' => $this->meta['networks']['items']-1,
+                'count' => $this->meta['networks']['items'],
                 'data' => array(),
             ),
         );