Changeset 494

Show
Ignore:
Timestamp:
03/11/05 21:47:55 (8 years ago)
Author:
minaguib
Message:

Clean up the 2 hooks in nat.PREROUTING to 1

Files:
1 modified

Legend:

Unmodified
Added
Removed

  • trunk/wifidog/src/fw_iptables.c

    r493 r494  
    217217 
    218218                        /* Create new chains */ 
     219                        iptables_do_command("-t nat -N " TABLE_WIFIDOG_OUTGOING); 
    219220                        iptables_do_command("-t nat -N " TABLE_WIFIDOG_WIFI_TO_ROUTER); 
    220221                        iptables_do_command("-t nat -N " TABLE_WIFIDOG_WIFI_TO_INTERNET); 
    … …  
    222223 
    223224                        /* Assign links and rules to these new chains */ 
    224                         iptables_do_command("-t nat -I PREROUTING 1 -i %s -d %s -j " TABLE_WIFIDOG_WIFI_TO_ROUTER, gw_interface, gw_address); 
     225                        iptables_do_command("-t nat -I PREROUTING 1 -i %s -j " TABLE_WIFIDOG_OUTGOING, gw_interface); 
     226 
     227                        iptables_do_command("-t nat -A " TABLE_WIFIDOG_OUTGOING " -d %s -j " TABLE_WIFIDOG_WIFI_TO_ROUTER, gw_address); 
    225228                        iptables_do_command("-t nat -A " TABLE_WIFIDOG_WIFI_TO_ROUTER " -j ACCEPT"); 
    226229 
    227                         iptables_do_command("-t nat -I PREROUTING 2 -i %s -j " TABLE_WIFIDOG_WIFI_TO_INTERNET, gw_interface); 
    228                         iptables_do_command("-t nat -A " TABLE_WIFIDOG_WIFI_TO_INTERNET " -m mark --mark 0x%u -j RETURN", FW_MARK_KNOWN); 
    229                         iptables_do_command("-t nat -A " TABLE_WIFIDOG_WIFI_TO_INTERNET " -m mark --mark 0x%u -j RETURN", FW_MARK_PROBATION); 
     230                        iptables_do_command("-t nat -A " TABLE_WIFIDOG_OUTGOING " -j " TABLE_WIFIDOG_WIFI_TO_INTERNET); 
     231                        iptables_do_command("-t nat -A " TABLE_WIFIDOG_WIFI_TO_INTERNET " -m mark --mark 0x%u -j ACCEPT", FW_MARK_KNOWN); 
     232                        iptables_do_command("-t nat -A " TABLE_WIFIDOG_WIFI_TO_INTERNET " -m mark --mark 0x%u -j ACCEPT", FW_MARK_PROBATION); 
    230233                        iptables_do_command("-t nat -A " TABLE_WIFIDOG_WIFI_TO_INTERNET " -j " TABLE_WIFIDOG_UNKNOWN); 
    231234 
    … …  
    301304          * 
    302305          */ 
    303          iptables_fw_destroy_mention("nat", "PREROUTING", TABLE_WIFIDOG_WIFI_TO_ROUTER); 
    304          iptables_fw_destroy_mention("nat", "PREROUTING", TABLE_WIFIDOG_WIFI_TO_INTERNET); 
     306         iptables_fw_destroy_mention("nat", "PREROUTING", TABLE_WIFIDOG_OUTGOING); 
     307    iptables_do_command("-t nat -F " TABLE_WIFIDOG_OUTGOING); 
    305308    iptables_do_command("-t nat -F " TABLE_WIFIDOG_WIFI_TO_ROUTER); 
    306309    iptables_do_command("-t nat -F " TABLE_WIFIDOG_WIFI_TO_INTERNET); 
    307310    iptables_do_command("-t nat -F " TABLE_WIFIDOG_UNKNOWN); 
     311    iptables_do_command("-t nat -X " TABLE_WIFIDOG_OUTGOING); 
    308312    iptables_do_command("-t nat -X " TABLE_WIFIDOG_WIFI_TO_ROUTER); 
    309313    iptables_do_command("-t nat -X " TABLE_WIFIDOG_WIFI_TO_INTERNET);