Changeset 276

Show
Ignore:
Timestamp:
11/18/04 14:22:57 (9 years ago)
Author:
alexcv
Message:

Merged in Phil's patch

Location:
trunk/wifidog
Files:
3 modified

Legend:

Unmodified
Added
Removed

  • trunk/wifidog/ChangeLog

    r274 r276  
    11# $Header$ 
     2 
     32004-11-18 Alexandre Carmel-Veilleux <acv@acv.ca> 
     4        * src/fw_iptables.[ch]: Merged in Phil's patch. 
    25 
    362004-11-17 Alexandre Carmel-Veilleux <acv@acv.ca> 

  • trunk/wifidog/src/fw_iptables.c

    r256 r276  
    8484    fw_quiet = 0; 
    8585     
    86     iptables_do_command("-t nat -N " TABLE_WIFIDOG_VALIDATE); 
    87     iptables_do_command("-t nat -A " TABLE_WIFIDOG_VALIDATE " -d %s -j ACCEPT", config->gw_address); 
    88  
    8986    LOCK_CONFIG(); 
    9087     
     88    iptables_do_command("-t nat -N " TABLE_WIFIDOG_AUTHSERVERS); 
    9189    for (auth_server = config->auth_servers; auth_server != NULL; 
    9290                    auth_server = auth_server->next) { 
    93         iptables_do_command("-t nat -A " TABLE_WIFIDOG_VALIDATE " -d %s -j ACCEPT", auth_server->authserv_hostname); 
     91        iptables_do_command("-t nat -A " TABLE_WIFIDOG_AUTHSERVERS " -d %s -j ACCEPT", auth_server->authserv_hostname); 
    9492    } 
    9593 
    9694    UNLOCK_CONFIG(); 
     95 
     96    iptables_do_command("-t nat -N " TABLE_WIFIDOG_VALIDATE); 
     97    iptables_do_command("-t nat -A " TABLE_WIFIDOG_VALIDATE " -j " TABLE_WIFIDOG_AUTHSERVERS); 
     98    iptables_do_command("-t nat -A " TABLE_WIFIDOG_VALIDATE " -d %s -j ACCEPT", config->gw_address); 
    9799 
    98100    /** Insert global rules BEFORE the "defaults" */ 
    … …  
    112114 
    113115    iptables_do_command("-t nat -N " TABLE_WIFIDOG_UNKNOWN); 
     116    iptables_do_command("-t nat -A " TABLE_WIFIDOG_UNKNOWN " -j " TABLE_WIFIDOG_AUTHSERVERS); 
    114117    iptables_do_command("-t nat -A " TABLE_WIFIDOG_UNKNOWN " -d %s -j ACCEPT", config->gw_address); 
    115  
    116     LOCK_CONFIG(); 
    117      
    118     for (auth_server = config->auth_servers; auth_server != NULL; 
    119                     auth_server = auth_server->next) { 
    120         iptables_do_command("-t nat -A " TABLE_WIFIDOG_UNKNOWN " -d %s -j ACCEPT", auth_server->authserv_hostname); 
    121     } 
    122  
    123     UNLOCK_CONFIG(); 
    124118 
    125119    /** Insert global rules BEFORE the "defaults" */ 
    … …  
    171165    iptables_do_command("-t mangle -F " TABLE_WIFIDOG_INCOMING); 
    172166 
     167    iptables_do_command("-t nat -F " TABLE_WIFIDOG_AUTHSERVERS); 
    173168    iptables_do_command("-t nat -F " TABLE_WIFIDOG_VALIDATE); 
    174169    iptables_do_command("-t nat -F " TABLE_WIFIDOG_UNKNOWN); 

  • trunk/wifidog/src/fw_iptables.h

    r170 r276  
    3535#define TABLE_WIFIDOG_OUTGOING  "WiFiDog_Outgoing" 
    3636#define TABLE_WIFIDOG_INCOMING  "WiFiDog_Incoming" 
     37#define TABLE_WIFIDOG_AUTHSERVERS "WiFiDog_AuthServers" 
    3738#define TABLE_WIFIDOG_VALIDATE  "WiFiDog_Validate" 
    3839#define TABLE_WIFIDOG_KNOWN     "WiFiDog_Known"