Changeset 91

Timestamp:

04/20/04 22:18:02 (9 years ago)

Author:

alexcv

Message:

fixed bug in fw_counter checks for timeout...

Location:

trunk/wifidog

Files:

• ChangeLog (modified) (1 diff)
• src/firewall.c (modified) (2 diffs)

trunk/wifidog/ChangeLog

@@ -1 +1 @@
 # $Header$
-2004-04-19  Philippe April <papril777@yahoo.com>
-    * A lot of changes regarding debugging facilities and added logging
-    to syslog
+2004-04-20  Alexandre Carmel-Veilleux <acv@acv.ca>
+        * fixed expiration time
 
 2004-04-19  Philippe April <papril777@yahoo.com>
-    * Changed some debugging severity
+        * A lot of changes regarding debugging facilities and added logging
+        to syslog
+
+2004-04-19  Philippe April <papril777@yahoo.com>
+        * Changed some debugging severity
 
 2004-04-19  Benoit Gr�goire  <bock@step.polymtl.ca>

trunk/wifidog/src/firewall.c

@@ -245 +245 @@
 
                                 p1 = node_find_by_ip(ip);
-
-                                if (p1->counter == counter) {
+                                
+                                if (!(p1) || (p1->rights->last_checked +
+                                        (config.checkinterval *
+                                         config.clienttimeout)) > time(NULL)) {
+                                        /* Do nothing */
+                                } else if (p1->counter == counter) {
                                         /* expire clients for inactivity */
                                         debug(LOG_INFO, "Client %s was "
@@ -253 +257 @@
                                                 p1->rights->profile);
                                         node_delete(p1);
-                                } else if (!(!(p1) || !(p1->active) ||
-                                        (p1->rights->last_checked +
-                                        (config.checkinterval *
-                                         config.clienttimeout)) > time(NULL))) {
-
+                                } else if (!(p1->active)) {
                                         p1->rights->last_checked = time(NULL);
                                         p1->counter = counter;