Changeset 441

Show
Ignore:
Timestamp:
02/11/05 17:56:37 (8 years ago)
Author:
aprilp
Message:

* Fixed a bug in counting the traffic between client and gateway

Location:
trunk/wifidog
Files:
3 modified

Legend:

Unmodified
Added
Removed

  • trunk/wifidog/ChangeLog

    r429 r441  
    11# $Header$ 
     22005-02-11 Philippe April <philippe@ilesansfil.org> 
     3        * Fixed a bug in counting the traffic between client and gateway 
     4        * Alpha8 
    25 
    362005-02-04 Mina Naguib <mina@ilesansfil.org> 

  • trunk/wifidog/configure.in

    r422 r441  
    2121WIFIDOG_MAJOR_VERSION=1 
    2222WIFIDOG_MINOR_VERSION=1 
    23 WIFIDOG_MICRO_VERSION=0_alpha7 
     23WIFIDOG_MICRO_VERSION=0_alpha8 
    2424WIFIDOG_VERSION=$WIFIDOG_MAJOR_VERSION.$WIFIDOG_MINOR_VERSION.$WIFIDOG_MICRO_VERSION 
    2525 

  • trunk/wifidog/src/fw_iptables.c

    r424 r441  
    353353 
    354354    /* Look for outgoing traffic */ 
    355     asprintf(&script, "%s %s", "iptables", "-v -x -t mangle -L " TABLE_WIFIDOG_OUTGOING); 
     355    asprintf(&script, "%s %s", "iptables", "-v -n -x -t mangle -L " TABLE_WIFIDOG_OUTGOING); 
    356356    if (!(output = popen(script, "r"))) { 
    357357        debug(LOG_ERR, "popen(): %s", strerror(errno)); 
    … …  
    385385 
    386386    /* Look for wifi-to-firewall traffic */ 
    387     asprintf(&script, "%s %s", "iptables", "-v -x -t filter -L " TABLE_WIFIDOG_WIFI_TO_GW); 
     387    asprintf(&script, "%s %s", "iptables", "-v -n -x -t filter -L " TABLE_WIFIDOG_WIFI_TO_GW); 
    388388    if (!(output = popen(script, "r"))) { 
    389389        debug(LOG_ERR, "popen(): %s", strerror(errno)); 
    … …  
    398398        ; 
    399399    while (output && !(feof(output))) { 
    400         rc = fscanf(output, "%*s %lu %*s %*s %*s %*s %*s %s %*s %*s %*s %*s %*s 0x%*u", &counter, ip); 
     400        rc = fscanf(output, "%*s %lu %*s %*s %*s %*s %*s %s %*s", &counter, ip); 
    401401        if (2 == rc && EOF != rc) { 
    402402            debug(LOG_DEBUG, "WIFI2FW %s Bytes=%ld", ip, counter); 
    … …  
    417417 
    418418    /* Look for incoming traffic */ 
    419     asprintf(&script, "%s %s", "iptables", "-v -x -t mangle -L " TABLE_WIFIDOG_INCOMING); 
     419    asprintf(&script, "%s %s", "iptables", "-v -n -x -t mangle -L " TABLE_WIFIDOG_INCOMING); 
    420420    if (!(output = popen(script, "r"))) { 
    421421        debug(LOG_ERR, "popen(): %s", strerror(errno));