[Astlinux-commits] SF.net SVN: astlinux:[5509] branches/1.0/package/webinterface/altweb/admin/ firewall.php

[<abe...@us...>]

Revision: 5509
          http://astlinux.svn.sourceforge.net/astlinux/?rev=5509&view=rev
Author:   abelbeck
Date:     2012-04-10 17:47:56 +0000 (Tue, 10 Apr 2012)
Log Message:
-----------
web interface, Firewall tab, allow changes to 'NAT EXT' to create a new rule

Modified Paths:
--------------
    branches/1.0/package/webinterface/altweb/admin/firewall.php

Modified: branches/1.0/package/webinterface/altweb/admin/firewall.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/firewall.php	2012-04-07 19:51:29 UTC (rev 5508)
+++ branches/1.0/package/webinterface/altweb/admin/firewall.php	2012-04-10 17:47:56 UTC (rev 5509)
@@ -395,7 +395,7 @@
 
 // Function: existFWRule
 //
-function existFWRule($db, $action, $proto, $s_addr, $s_lport, $s_uport, $d_addr, $d_lport, $d_uport) {
+function existFWRule($db, $action, $proto, $s_addr, $s_lport, $s_uport, $d_addr, $d_lport, $d_uport, $e_addr) {
 
   if (($n = count($db['data'])) > 0) {
     for ($i = 0; $i < $n; $i++) {
@@ -407,7 +407,8 @@
           $data['s_uport'] === $s_uport &&
           $data['d_addr'] === $d_addr &&
           $data['d_lport'] === $d_lport &&
-          $data['d_uport'] === $d_uport) {
+          $data['d_uport'] === $d_uport &&
+         ($data['e_addr'] === $e_addr || ($data['e_addr'] === '' && $e_addr === '0/0'))) {
         return($i);
       }
     }
@@ -494,9 +495,8 @@
     $d_uport = '';
   }
   
-  if (($eid = existFWRule($db, $action, $proto, $s_addr, $s_lport, $s_uport, $d_addr, $d_lport, $d_uport)) !== FALSE) {
+  if (($eid = existFWRule($db, $action, $proto, $s_addr, $s_lport, $s_uport, $d_addr, $d_lport, $d_uport, $e_addr)) !== FALSE) {
     $db['data'][$eid]['comment'] = $comment;
-    $db['data'][$eid]['e_addr'] = $e_addr;
     return(0);
   }
   

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.