Changeset 1162
- Timestamp:
- 01/06/07 18:51:02 (2 years ago)
- Files:
-
- trunk/wifidog/ChangeLog (modified) (1 diff)
- trunk/wifidog/NEWS (modified) (1 diff)
- trunk/wifidog/configure.in (modified) (1 diff)
- trunk/wifidog/src/centralserver.c (modified) (1 diff)
- trunk/wifidog/src/conf.h (modified) (1 diff)
- trunk/wifidog/src/firewall.c (modified) (2 diffs)
- trunk/wifidog/src/fw_iptables.c (modified) (1 diff)
- trunk/wifidog/src/ping_thread.c (modified) (1 diff)
- trunk/wifidog/src/util.c (modified) (1 diff)
- trunk/wifidog/wifidog.conf (modified) (6 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/wifidog/ChangeLog
r1121 r1162 1 1 # $Id$ 2 2007-01-06 Benoit Gr�ire <bock@step.polymtl.ca> 3 * Documentation update in the code 4 * Released 1.1.3_beta6 5 2 6 2006-10-26 Benoit Gr�ire <bock@step.polymtl.ca> 3 7 * src/conf.h: Fix #238 by using $sysconfdir to compute the default config-file location. trunk/wifidog/NEWS
r936 r1162 1 1 # $Id$ 2 WiFiDog 1.1.3beta6: 3 -Fix bug #238 (config file location was hardcoded) 4 -Fix problem with autodectection of the External interface if the interface isn't fully up yet. wifidog wil now retry for up to two minutes. 5 6 WiFiDog 1.1.3beta4: 7 -Changed ordering in the filter.FORWARD chain 8 -Added TCPMSS rule 9 -Fixed rules bieng left over on shutdown 10 -Fixed wdctl reset problem 11 2 12 WiFiDog 1.1.3beta2: 3 13 -Fix bug #65 (Whitelisted servers would still splash on port 80 trunk/wifidog/configure.in
r1101 r1162 21 21 WIFIDOG_MAJOR_VERSION=1 22 22 WIFIDOG_MINOR_VERSION=1 23 WIFIDOG_MICRO_VERSION=3_beta 5_pre123 WIFIDOG_MICRO_VERSION=3_beta6 24 24 WIFIDOG_VERSION=$WIFIDOG_MAJOR_VERSION.$WIFIDOG_MINOR_VERSION.$WIFIDOG_MICRO_VERSION 25 25 trunk/wifidog/src/centralserver.c
r1104 r1162 53 53 * update the traffic counters at the server 54 54 @param authresponse Returns the information given by the central server 55 @param request_type Use the REQUEST_TYPE_* #defines in centralserver.h55 @param request_type Use the REQUEST_TYPE_* defines in centralserver.h 56 56 @param ip IP adress of the client this request is related to 57 57 @param mac MAC adress of the client this request is related to trunk/wifidog/src/conf.h
r1121 r1162 30 30 /*@{*/ 31 31 /** Defines */ 32 /** How long till we give up detecting the interface with the default route */ 32 33 #define NUM_EXT_INTERFACE_DETECT_RETRY 120 34 /** How often should we try to detect the interface with the default route 35 * if it isn't up yet */ 33 36 #define EXT_INTERFACE_DETECT_RETRY_INTERVAL 1 34 37 trunk/wifidog/src/firewall.c
r935 r1162 26 26 @brief Firewall update functions 27 27 @author Copyright (C) 2004 Philippe April <papril777@yahoo.com> 28 2006 Benoit Grégoire, Technologies Coeus inc. <bock@step.polymtl.ca> 28 29 */ 29 30 … … 239 240 240 241 UNLOCK_CLIENT_LIST(); 241 /* Ping the client, if he responds it'll keep activity on the link */ 242 /* Ping the client, if he responds it'll keep activity on the link. 243 * However, if the firewall blocks it, it will not help. The suggested 244 * way to deal witht his is to keep the DHCP lease time extremely 245 * short: Shorter than config->checkinterval * config->clienttimeout */ 242 246 icmp_ping(ip); 243 247 /* Update the counters on the remote server only if we have an auth server */ trunk/wifidog/src/fw_iptables.c
r968 r1162 442 442 } 443 443 444 /** Set the firewall access for a specific client*/444 /** Set if a specific client has access through the firewall */ 445 445 int 446 446 iptables_fw_access(fw_access_t type, char *ip, char *mac, int tag) trunk/wifidog/src/ping_thread.c
r1104 r1162 21 21 /* $Id$ */ 22 22 /** @file ping_thread.c 23 @brief Periodically checks in with the central auth server to make sure everything is running properly. 23 @brief Periodically checks in with the central auth server so the auth 24 server knows the gateway is still up. Note that this is NOT how the gateway 25 detects that the central server is still up. 24 26 @author Copyright (C) 2004 Alexandre Carmel-Veilleux <acv@miniguru.ca> 25 27 */ trunk/wifidog/src/util.c
r1101 r1162 241 241 fclose(input); 242 242 debug(LOG_ERR, "get_ext_iface(): Failed to detect the external interface after try %d of %d (maybe the interface is not up yet?)", i, NUM_EXT_INTERFACE_DETECT_RETRY); 243 /* Sleep for config.checkinterval seconds...*/243 /* Sleep for EXT_INTERFACE_DETECT_RETRY_INTERVAL seconds */ 244 244 timeout.tv_sec = time(NULL) + EXT_INTERFACE_DETECT_RETRY_INTERVAL; 245 245 timeout.tv_nsec = 0; trunk/wifidog/wifidog.conf
r935 r1162 4 4 # Parameter: GatewayID 5 5 # Default: default 6 # Optional but essential for monitoring purposes6 # Optional 7 7 # 8 # Set this to the template ID on the auth server 9 # this is used to give a customized login page to the clients 10 # If none is supplied, the mac address of the GW interface will be used, 8 # Set this to the node ID on the auth server 9 # this is used to give a customized login page to the clients and for 10 # monitoring/statistics purpose 11 # If none is supplied, the mac address of the GatewayInterface interface will be used, 11 12 # without the : separators 12 13 … … 17 18 # Optional 18 19 # 19 # Set this to the external interface. Typically vlan1 for OpenWrt, and eth0 or ppp0 otherwise 20 # Set this to the external interface. Typically vlan1 for OpenWrt, and eth0 or ppp0 otherwise, 21 # Normally autodetected 20 22 21 23 # ExternalInterface eth0 … … 64 66 #} 65 67 66 #AuthServer {67 # Hostname auth3.ilesansfil.org68 # SSLAvailable yes69 # Path /70 #}71 72 68 # Parameter: Portal 73 69 # Default: none … … 109 105 # Optional 110 106 # 111 # How many seconds should we wait between timeout checks 112 CheckInterval 60 107 # How many seconds should we wait between timeout checks. This is also 108 # how often the gateway will ping the auth server and how often it will 109 # update the traffic counters on the auth server. Setting this too low 110 # wastes bandwidth, setting this too high will cause the gateway to take 111 # a long time to switch to it's backup auth server(s). 112 113 # CheckInterval 60 113 114 114 115 # Parameter: ClientTimeout … … 142 143 # 143 144 # Used for rules to be applied to all other rulesets except locked. 144 # This is the default config for the Teliphone service.145 145 FirewallRuleSet global { 146 FirewallRule allow udp to 69.90.89.192/27 147 FirewallRule allow udp to 69.90.85.0/27 148 FirewallRule allow tcp port 80 to 69.90.89.205 146 # This is the default config for the Teliphone service. 147 #FirewallRule allow udp to 69.90.89.192/27 148 #FirewallRule allow udp to 69.90.85.0/27 149 #FirewallRule allow tcp port 80 to 69.90.89.205 150 # To block SMTP out, as it's a tech support nightmare, and a legal liability 151 #FirewallRule block tcp port 25 149 152 } 150 153 … … 153 156 # Used for new users validating their account 154 157 FirewallRuleSet validating-users { 155 FirewallRule block tcp port 25156 158 FirewallRule allow to 0.0.0.0/0 157 159 }
