fixes for debian lenny (iptables 1.4 netmask format)

fixes for wrong image size calculation

diff --git a/FWcnt2rrd b/FWcnt2rrd
old mode 100755 (executable)
new mode 100644 (file)
index eac2ed3..679c060
--- a/FWcnt2rrd
+++ b/FWcnt2rrd
@@ -29,24 +29,29 @@ Nx2=substr($1,Na+1,length($1)-Na-1)
 if(NF==7){
    if(2==split($(NF-2),N,"/")){
       split(N[2],M,".")
 if(NF==7){
    if(2==split($(NF-2),N,"/")){
       split(N[2],M,".")

-      mask="/"I[256-M[4]]
+      if(4==split(N[2],M,"."))
+          mask=I[256-M[4]]
+      else
+          mask=N[2]

    }else
    }else

-       mask=""
+       mask="32"

    split(N[1],IP,".")
    C[IP[1]"."IP[2]"."IP[3]]=1  
    if($(NF-3)=="-d") {
    split(N[1],IP,".")
    C[IP[1]"."IP[2]"."IP[3]]=1  
    if($(NF-3)=="-d") {

-       IPbi[N[1]""mask]=Nx2
-       IPpi[N[1]""mask]=Nx1
+       IPbi[N[1]"/"mask]=Nx2
+       IPpi[N[1]"/"mask]=Nx1

    }else{
    }else{

-       IPbo[N[1]""mask]=Nx2
-       IPpo[N[1]""mask]=Nx1
+       IPbo[N[1]"/"mask]=Nx2
+       IPpo[N[1]"/"mask]=Nx1

    }
    next
 }
 if(NF==5){
    split($NF,N,"/")
    }
    next
 }
 if(NF==5){
    split($NF,N,"/")

-   split(N[2],M,".")
-   mask=I[256-M[4]]
+   if(4==split(N[2],M,"."))
+          mask=I[256-M[4]]
+   else
+          mask=N[2]

    split(N[1],IP,".")
    C[IP[1]"."IP[2]"."IP[3]]=1  
     if($(NF-1)=="-d"){
    split(N[1],IP,".")
    C[IP[1]"."IP[2]"."IP[3]]=1  
     if($(NF-1)=="-d"){


@@ -71,13 +76,11 @@ for(i in C){
          if(k==2) k=0
          j=0
           while(j<256){
          if(k==2) k=0
          j=0
           while(j<256){

-               mask=""
-               mmask=""
-               if(k!=0){
-                       mask="/"32-k
-                       mmask="_"32-k
-               }
-               #print i"."j""mask
+                mask="/"32-k
+                if(k==0)
+                 mmask=""
+                else
+                 mmask="_"32-k

                if( i"."j""mask in IPbi)
                        CMD=CMD  ":"IPbi[i"."j""mask]
                else
                if( i"."j""mask in IPbi)
                        CMD=CMD  ":"IPbi[i"."j""mask]
                else

diff --git a/debian/changelog b/debian/changelog
index d4d8a0fe0263c21dc9a677ddc997b5ddd3317e25..a1c30a94d64f7b5e6302d4a057a3b9d0871f40c1 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+fwcnt (0.7.1) unstable; urgency=low
+
+  * fixed netmask calculation for iptables > 1.3 
+  * mrtg-rrd: wrong size (0) for images, temp solution - disabling
+    tags for image  width and height 
+
+ -- Peter Popovec <popovec@fei.tuke.sk>  Thu, 05 Feb 2009 14:31:04 +0100
+

 fwcnt (0.7) unstable; urgency=low
 
   * Fixed cron script
 fwcnt (0.7) unstable; urgency=low
 
   * Fixed cron script

diff --git a/mrtg-rrd.fwcnt.cgi.patch b/mrtg-rrd.fwcnt.cgi.patch
index da24d3c556c88098a82a2385bf220a7bd6579310..ba48a8a40819aaf77aed35eee0f99a60ce59ee4f 100644 (file)
--- a/mrtg-rrd.fwcnt.cgi.patch
+++ b/mrtg-rrd.fwcnt.cgi.patch
@@ -1,5 +1,14 @@
---- /usr/lib/cgi-bin/mrtg-rrd.cgi      2005-09-28 21:13:08.000000000 +0200
-+++ /usr/lib/cgi-bin/mrtg-rrd.fwcnt.cgi        2007-12-06 14:50:00.000000000 +0100
+--- mrtg-rrd.cgi       2005-09-28 21:13:08.000000000 +0200
++++ mrtg-rrd.fwcnt.cgi 2009-02-04 10:29:47.000000000 +0100
+@@ -277,7 +277,7 @@
+       print "<HR>\n<B>\`$freq\' Graph ($period Average)</B><BR>\n";
+ 
+       print '<IMG SRC="', $tgt->{url}, '-', $ext, '.' . $imagetype .
+-              '" WIDTH=', $x, ' HEIGHT=', $y, ' ALT="', $freq,
++              '" ALT="', $freq,
+               ' Graph" VSPACE=10 ALIGN=TOP><BR>', "\n";
+       print '<TABLE CELLPADDING=0 CELLSPACING=0>';
+       print <<EOF if $tgt->{legendi} ne '' && !$tgt->{options}{noi};

 @@ -518,7 +518,8 @@
        $dir = $cfg->{logdir}
                if defined $cfg->{logdir};
 @@ -518,7 +518,8 @@
        $dir = $cfg->{logdir}
                if defined $cfg->{logdir};


@@ -56,7 +65,7 @@
  <A HREF="mailto:kas\@fi.muni.cz">&lt;kas\@fi.muni.cz&gt;</A>
  </font></td>
  </tr>
  <A HREF="mailto:kas\@fi.muni.cz">&lt;kas\@fi.muni.cz&gt;</A>
  </font></td>
  </tr>

-+<tr><td></td><td ALIGN=RIGHT><font FACE="Arial,Helvetica" SIZE=2>patched for <A HREF="http://zub.fei.tuke.sk/fwcnt/">fwcnt-0.7</A> by</font></td></tr>
++<tr><td></td><td ALIGN=RIGHT><font FACE="Arial,Helvetica" SIZE=2>patched for <A HREF="http://zub.fei.tuke.sk/fwcnt/">fwcnt-0.7.1</A> by</font></td></tr>

 +<tr><td></td><td ALIGN=RIGHT><font FACE="Arial,Helvetica" SIZE=2>Peter Popovec </font></td></tr>
  </table>
  EOF
 +<tr><td></td><td ALIGN=RIGHT><font FACE="Arial,Helvetica" SIZE=2>Peter Popovec </font></td></tr>
  </table>
  EOF