Changeset 424

Timestamp:

02/03/05 23:05:28 (8 years ago)

Author:

minaguib

Message:

Keep track of whether we're online or not, show user apology if we're not
Fix building ipkg's - didn't work on my openwrt build
Fix memory leak
Misc

Location:

trunk/wifidog

Files:

• ChangeLog (modified) (1 diff)
• ipkg/rules (modified) (2 diffs)
• src/auth.c (modified) (1 diff)
• src/centralserver.c (modified) (2 diffs)
• src/conf.c (modified) (2 diffs)
• src/fw_iptables.c (modified) (1 diff)
• src/http.c (modified) (4 diffs)
• src/ping_thread.c (modified) (1 diff)
• src/util.c (modified) (3 diffs)
• src/util.h (modified) (1 diff)

trunk/wifidog/ChangeLog

@@ -1 +1 @@
 # $Header$
+
+2005-02-03 Mina Naguib <mina@ilesansfil.org>
+        * Keep track of last times we successfully & unsuccessfully spoke to the
+        auth server/used DNS. Then, if we know we're not online, show a little
+        apology to the user instead of re-directing them to the auth server.
+        * ipkg/rules: Added some extra version detection to auto-detect versions
+        of kernel, iptables and ipkg-utils instead of having them hardcoded.  This
+        makes creating ipkg's work with different OpenWRT releases
+        * fw_iptables.c: Fixed memory leak caused by not freeing return from
+        iptables_compile in iptables_load_ruleset
+        * http.c: Deleted unused call to client_list_find
+        * http.c: /about URL now shows wifidog version
+        * Cosmetic typo fixes
+
 2005-02-03 Philippe April <isf_lists@philippeapril.com>
         * Ping the users everytime we check their counters, that way we keep them

trunk/wifidog/ipkg/rules

@@ -15 +15 @@
 TMP_DIR:=$(BUILD_DIR)/tmp
 STAGING_DIR=$(BUILDROOT)/build_$(ARCH)/staging_dir
-IPTABLES_DIR := $(BUILDROOT)/build_$(ARCH)/iptables-1.2.9
-IPKG_DIR := $(BUILDROOT)/build_$(ARCH)/ipkg-utils-1.7
-KERNEL_MODULES_DIR := $(BUILDROOT)/build_$(ARCH)/WRT54GS/release/src/linux/linux/modules/lib/modules/2.4.20
+IPTABLES_DIR := $(wildcard $(BUILDROOT)/build_$(ARCH)/iptables-*/)
+IPKG_DIR := $(wildcard $(BUILDROOT)/build_$(ARCH)/ipkg-utils-*/)
+KERNEL_VERSION := $(shell awk '$$1 == "\#define" && $$2 == "UTS_RELEASE" {gsub(/["]/, "", $$3); print $$3}' $(BUILDROOT)/build_$(ARCH)/WRT54GS/release/src/linux/linux/include/linux/version.h)
+KERNEL_MODULES_DIR := $(BUILDROOT)/build_$(ARCH)/WRT54GS/release/src/linux/linux/modules/lib/modules/$(KERNEL_VERSION)
 UCLIBC_DIR := $(BUILDROOT)/build_$(ARCH)/uClibc
 
@@ -88 +89 @@
 
 install-kernel-modules:
-        mkdir -p $(TMP_DIR)/lib/modules/2.4.20/kernel/net/ipv4/netfilter
-        cp $(KERNEL_MODULES_DIR)/kernel/net/ipv4/netfilter/ipt_mac.o $(TMP_DIR)/lib/modules/2.4.20/kernel/net/ipv4/netfilter
+        mkdir -p $(TMP_DIR)/lib/modules/$(KERNEL_VERSION)/kernel/net/ipv4/netfilter
+        cp $(KERNEL_MODULES_DIR)/kernel/net/ipv4/netfilter/ipt_mac.o $(TMP_DIR)/lib/modules/$(KERNEL_VERSION)/kernel/net/ipv4/netfilter
 
 install-pthread:

trunk/wifidog/src/auth.c

@@ -168 +168 @@
         
         if (client == NULL) {
-                debug(LOG_ERR, "Could not find client client for %s (%s)",
+                debug(LOG_ERR, "Could not find client node for %s (%s)",
                                 r->clientAddr, mac);
                 pthread_mutex_unlock(&client_list_mutex);

trunk/wifidog/src/centralserver.c

@@ -101 +101 @@
                         debug(LOG_ERR, "connect(): %s", strerror(errno));
                         debug(LOG_ERR, "Trying next Auth Server (if any)");
-                        if (num_tries++ < config->authserv_maxtries) {
-                                mark_auth_server_bad(auth_server);
-                        } else {
-                                mark_auth_server_bad(auth_server);
+                        mark_auth_server_bad(auth_server);
+                        if (++num_tries > config->authserv_maxtries) {
                                 debug(LOG_ERR, "Aborting request");
                                 free(h_addr);
@@ -115 +113 @@
                 free(h_addr);
         }
+
+        mark_online();
+
         /**
          * TODO: XXX change the PHP so we can harmonize stage as request_type

trunk/wifidog/src/conf.c

@@ -43 +43 @@
 #include "auth.h"
 #include "firewall.h"
+
+#include "util.h"
 
 /** @internal
@@ -766 +768 @@
         }
 
+        mark_offline();
+
         pthread_mutex_unlock(&config_mutex);
 

trunk/wifidog/src/fw_iptables.c

@@ -140 +140 @@
                 debug(LOG_DEBUG, "Loading rule \"%s\" into %s", cmd, chain);
                 iptables_do_command(cmd);
+                free(cmd);
         }
 

trunk/wifidog/src/http.c

@@ -45 +45 @@
 #include "common.h"
 
+#include "util.h"
+
+#include "../config.h"
+
 extern pthread_mutex_t  client_list_mutex;
 
@@ -58 +62 @@
         t_auth_serv     *auth_server = get_auth_server();
         
+        if (!is_online()) {
+                /* No point re-directing them to the auth server if we haven't been able to talk
+                 * to it for a while */
+                httpdOutput(r, "<html><head><title>Currently unavailable</title></head><body><h1>Uh oh!</h1>");
+                httpdOutput(r, "We apologize, but it seems that we are currently unable to re-direct you to the login screen.");
+                httpdOutput(r, "<p>");
+                httpdOutput(r, "The maintainers of this network are aware of this disruption.  We hope that this situation will be resolved soon.");
+                httpdOutput(r, "<p>");
+                httpdOutput(r, "Please try again another time.");
+                httpdOutput(r, "</body></html>");
+                return;
+        }
+
         if (auth_server->authserv_use_ssl) {
                 strcpy(protocol, "https");
@@ -111 +128 @@
 http_callback_about(httpd *webserver, request *r)
 {
-        httpdOutput(r, "<html><body><h1>About:</h1>");
-        httpdOutput(r, "This is WiFiDog. Copyright (C) 2004 and "
-                        "released under the GNU GPL license.");
+        httpdOutput(r, "<html><head><title>About WiFiDog</title></head><body><h1>About WiFiDog:</h1>");
+        httpdOutput(r, "This is WiFiDog version <b>" VERSION "</b>");
+        httpdOutput(r, "<p>");
+        httpdOutput(r, "Copyright (C) 2004-2005.  This software is released under the GNU GPL license.");
         httpdOutput(r, "<p>");
         httpdOutput(r, "For more information visit <a href='http://"
@@ -150 +168 @@
                         }
 
-                        client = client_list_find(r->clientAddr, mac);
-
                         UNLOCK_CLIENT_LIST();
 

trunk/wifidog/src/ping_thread.c

@@ -165 +165 @@
         free(h_addr);
                 
+        mark_online();
+
         snprintf(request, sizeof(request) - 1, "GET %sping/?gw_id=%s HTTP/1.0\n"
                         "User-Agent: WiFiDog %s\n"

trunk/wifidog/src/util.c

@@ -51 +51 @@
 
 static pthread_mutex_t ghbn_mutex = PTHREAD_MUTEX_INITIALIZER;
+
+/* XXX Do these need to be locked ? */
+static time_t last_online_time = 0;
+static time_t last_offline_time = 0;
 
 /** Fork a child and execute a shell command, the parent
@@ -108 +112 @@
         if (he == NULL) {
                 free(h_addr);
+                mark_offline();
                 UNLOCK_GHBN();
                 return NULL;
         }
+
+        mark_online();
 
         in_addr_temp = (struct in_addr *)he->h_addr_list[0];
@@ -145 +152 @@
     return (char *)inet_ntoa(in);
 }
+
+void mark_online() {
+        time(&last_online_time);
+}
+
+void mark_offline() {
+        time(&last_offline_time);
+}
+
+int is_online() {
+        if (last_online_time == 0 || (last_offline_time - last_online_time) >= (config_get_config()->checkinterval * 2) ) {
+                /* We're probably offline */
+                return (0);
+        }
+        else {
+                /* We're probably online */
+                return (1);
+        }
+}
+

trunk/wifidog/src/util.h

@@ -36 +36 @@
 char *get_iface_ip(char *ifname);
 
+/* @brief Sets hint that an online action (dns/connect/etc using WAN) succeeded */
+void mark_online();
+/* @brief Sets hint that an online action (dns/connect/etc using WAN) failed */
+void mark_offline();
+/* @brief Returns a guess (true or false) on whether we're online or not based on previous calls to mark_online and mark_offline */
+int is_online();
+
 #define LOCK_GHBN() do { \
         debug(LOG_DEBUG, "Locking wd_gethostbyname()"); \