root/wifidog/patches/patch.20061116-1218

Index: src/conf.c
===================================================================
--- src/conf.c  (revision 112)
+++ src/conf.c  (revision 98)
@@ -84,12 +84,7 @@
        oSyslogFacility,
        oFirewallRule,
        oFirewallRuleSet,
-       oTrustedMACList,
-       oProprietary,
-       oNetwork,
-       oLat,
-       oLon,
-       oTinyproxyPort,
+       oTrustedMACList
 } OpCodes;
 
 /** @internal
@@ -121,11 +116,6 @@
        { "firewallruleset",    oFirewallRuleSet },
        { "firewallrule",           oFirewallRule },
        { "trustedmaclist",         oTrustedMACList },
-       { "proprietary",        oProprietary },
-       { "network",            oNetwork },
-       { "lat",                oLat },
-       { "lon",                oLon },
-       { "tinyproxyport",      oTinyproxyPort },
        { NULL,                 oBadOption },
 };
 
@@ -164,11 +154,6 @@
        config.internal_sock = safe_strdup(DEFAULT_INTERNAL_SOCK);
        config.rulesets = NULL;
        config.trustedmaclist = NULL;
-       config.Proprietary = NULL;
-       config.Network = DEFAULT_NETWORK;
-       config.Lat = "0";
-       config.Lon = "0";
-       config.tinyproxy_port = 0;
 }
 
 /**
@@ -663,18 +648,6 @@
                                case oHTTPDName:
                                        config.httpdname = safe_strdup(p1);
                                        break;
-                               case oProprietary:
-                                 config.Proprietary = safe_strdup(p1);
-                                 break;
-                               case oNetwork:
-                                 config.Network = safe_strdup(p1);
-                                 break;
-                               case oLat:
-                                 config.Lat = safe_strdup(p1);
-                                 break;
-                               case oLon:
-                                 config.Lon = safe_strdup(p1);
-                                 break;
                                case oHTTPDMaxConn:
                                        sscanf(p1, "%d", &config.httpdmaxconn);
                                        break;
@@ -698,9 +671,6 @@
                                case oSyslogFacility:
                                        sscanf(p1, "%d", &config.syslog_facility);
                                        break;
-                               case oTinyproxyPort:
-                                       sscanf(p1, "%d", &config.tinyproxy_port);
-                                       break;
                                }
                        }
                }
Index: src/fw_iptables.c
===================================================================
--- src/fw_iptables.c   (revision 112)
+++ src/fw_iptables.c   (revision 98)
@@ -190,7 +190,6 @@
         char * ext_interface = NULL;
         int gw_port = 0;
      t_trusted_mac *p;
-     int tinyproxy_port;
    
     fw_quiet = 0;
 
@@ -246,14 +245,7 @@
                        iptables_do_command("-t nat -A " TABLE_WIFIDOG_WIFI_TO_ROUTER " -j ACCEPT");
 
                        iptables_do_command("-t nat -A " TABLE_WIFIDOG_OUTGOING " -j " TABLE_WIFIDOG_WIFI_TO_INTERNET);
-                       
-                       if((tinyproxy_port=config_get_config()->tinyproxy_port) != 0){
-                         debug(LOG_INFO,"Tinyproxy port set, setting tinyproxy rule");
-                         iptables_do_command("-t nat -A " TABLE_WIFIDOG_WIFI_TO_INTERNET " -p tcp --dport 80 -m mark --mark 0x%u -j REDIRECT --to-port %u", FW_MARK_KNOWN, tinyproxy_port);
-                       } else {
-                         iptables_do_command("-t nat -A " TABLE_WIFIDOG_WIFI_TO_INTERNET " -m mark --mark 0x%u -j ACCEPT", FW_MARK_KNOWN);
-                       }
-
+                       iptables_do_command("-t nat -A " TABLE_WIFIDOG_WIFI_TO_INTERNET " -m mark --mark 0x%u -j ACCEPT", FW_MARK_KNOWN);
                        iptables_do_command("-t nat -A " TABLE_WIFIDOG_WIFI_TO_INTERNET " -m mark --mark 0x%u -j ACCEPT", FW_MARK_PROBATION);
                        iptables_do_command("-t nat -A " TABLE_WIFIDOG_WIFI_TO_INTERNET " -j " TABLE_WIFIDOG_UNKNOWN);
 
Index: src/http.c
===================================================================
--- src/http.c  (revision 112)
+++ src/http.c  (revision 98)
@@ -22,7 +22,6 @@
 /** @file http.c
   @brief HTTP IO functions
   @author Copyright (C) 2004 Philippe April <papril777@yahoo.com>
-  @author 2006 Pascal Rullier <pascal.rullier@wireless-fr.org>
  */
 
 #define _GNU_SOURCE
@@ -80,20 +79,20 @@
 
        if (!is_online()) {
                /* The internet connection is down at the moment  - apologize and do not redirect anywhere */
-               http_wifidog_header(r, "L'accés internet est indisponible");
-               httpdOutput(r, "<p>Nous sommes désolés, mais il semble que la connexion internet est temporairement indisponible.</p>");
-               httpdOutput(r, "<p>Si cela est possible, veuillez avertir les propriétaires de ce point d'accés.</p>");
-               httpdOutput(r, "<p>Les administrateurs de ce réseau sont au courant de cette interruption. Nous espèrons que cette situation sera résolue bientôt.</p>");
-               httpdPrintf(r, "<p>Dans un moment, veuillez <a href='%s'>cliquer ici</a> pour relancer votre requète.</p>", tmp_url);
+               http_wifidog_header(r, "<h2>Uh oh! Internet access unavailable</h2>");
+               httpdOutput(r, "<p>We apologize, but it seems that the internet connection that powers this hotspot is temporarily unavailable.</p>");
+               httpdOutput(r, "<p>If at all possible, please notify the owners of this hotspot that the internet connection is out of service.</p>");
+               httpdOutput(r, "<p>The maintainers of this network are aware of this disruption.  We hope that this situation will be resolved soon.</p>");
+               httpdPrintf(r, "<p>In a while please <a href='%s'>click here</a> to try your request again.</p>", tmp_url);
                http_wifidog_footer(r);
                debug(LOG_INFO, "Sent %s an apology since I am not online - no point sending them to auth server", r->clientAddr);
        }
        else if (!is_auth_online()) {
                /* The auth server is down at the moment - apologize and do not redirect anywhere */
-               http_wifidog_header(r, "L'écran de connexion est indisponible");
-               httpdOutput(r, "<p>Nous sommes désolés, mais il semble que nous sommes actuellement incapables de vous rediriger sur la page de connexion.</p>");
-               httpdOutput(r, "<p>Les administrateurs de ce réseau sont au courant de cette interruption. Nous espèrons que cette situation sera bientôt résolue.</p>");
-               httpdPrintf(r, "<p>Dans un moment, veuillez <a href='%s'>cliquer ici</a> pour relancer votre requète.</p>", tmp_url);
+               http_wifidog_header(r, "<h2>Uh oh! Login screen unavailable</h2>");
+               httpdOutput(r, "<p>We apologize, but it seems that we are currently unable to re-direct you to the login screen.</p>");
+               httpdOutput(r, "<p>The maintainers of this network are aware of this disruption.  We hope that this situation will be resolved soon.</p>");
+               httpdPrintf(r, "<p>In a couple of minutes please <a href='%s'>click here</a> to try your request again.</p>", tmp_url);
                http_wifidog_footer(r);
                debug(LOG_INFO, "Sent %s an apology since auth server not online - no point sending them to auth server", r->clientAddr);
        }
@@ -139,8 +138,8 @@
 void 
 http_callback_about(httpd *webserver, request *r)
 {
-       http_wifidog_header(r, "A propos de WiFiDog");
-       httpdOutput(r, "WiFiDog version <b>" VERSION "</b>");
+       http_wifidog_header(r, "About WiFiDog");
+       httpdOutput(r, "This is WiFiDog version <b>" VERSION "</b>");
        http_wifidog_footer(r);
 }
 
@@ -148,8 +147,8 @@
 http_callback_status(httpd *webserver, request *r)
 {
        char * status = NULL;
-       status = get_status_text(0);
-       http_wifidog_header(r, "Etat WiFiDog");
+       status = get_status_text();
+       http_wifidog_header(r, "WiFiDog Status");
        httpdOutput(r, "<pre>");
        httpdOutput(r, status);
        httpdOutput(r, "</pre>");
@@ -209,50 +208,49 @@
     httpdOutput(r, "body {\n");
     httpdOutput(r, "  margin: 10px 60px 0 60px; \n");
     httpdOutput(r, "  font-family : bitstream vera sans, sans-serif;\n");
-    // httpdOutput(r, "  color: #46a43a;\n");
-    httpdOutput(r, "  color: #2222ff;\n");
+    httpdOutput(r, "  color: #46a43a;\n");
     httpdOutput(r, "}\n");
 
     httpdOutput(r, "a {\n");
-    httpdOutput(r, "  color: #00f;\n");
+    httpdOutput(r, "  color: #46a43a;\n");
     httpdOutput(r, "}\n");
 
     httpdOutput(r, "a:active {\n");
-    httpdOutput(r, "  color: #00f;\n");
+    httpdOutput(r, "  color: #46a43a;\n");
     httpdOutput(r, "}\n");
 
     httpdOutput(r, "a:link {\n");
-    httpdOutput(r, "  color: #00f;\n");
+    httpdOutput(r, "  color: #46a43a;\n");
     httpdOutput(r, "}\n");
 
     httpdOutput(r, "a:visited {\n");
-    httpdOutput(r, "  color: #00f;\n");
+    httpdOutput(r, "  color: #46a43a;\n");
     httpdOutput(r, "}\n");
 
     httpdOutput(r, "#header {\n");
     httpdOutput(r, "  height: 30px;\n");
-    httpdOutput(r, "  background-color: #eeeeff;\n");
+    httpdOutput(r, "  background-color: #B4F663;\n");
     httpdOutput(r, "  padding: 20px;\n");
     httpdOutput(r, "  font-size: 20pt;\n");
     httpdOutput(r, "  text-align: center;\n");
-    httpdOutput(r, "  border: 2px solid #2481ff;\n");
+    httpdOutput(r, "  border: 2px solid #46a43a;\n");
     httpdOutput(r, "  border-bottom: 0;\n");
     httpdOutput(r, "}\n");
 
     httpdOutput(r, "#menu {\n");
     httpdOutput(r, "  width: 200px;\n");
     httpdOutput(r, "  float: right;\n");
-    httpdOutput(r, "  background-color: #eeeeff;\n");
-    httpdOutput(r, "  border: 2px solid #2481ff;\n");
+    httpdOutput(r, "  background-color: #B4F663;\n");
+    httpdOutput(r, "  border: 2px solid #46a43a;\n");
     httpdOutput(r, "  font-size: 80%;\n");
     httpdOutput(r, "  min-height: 300px;\n");
     httpdOutput(r, "}\n");
 
     httpdOutput(r, "#menu h2 {\n");
     httpdOutput(r, "  margin: 0;\n");
-    httpdOutput(r, "  background-color: #2481ff;\n");
+    httpdOutput(r, "  background-color: #46a43a;\n");
     httpdOutput(r, "  text-align: center;\n");
-    httpdOutput(r, "  color: #fff;\n");
+    httpdOutput(r, "  color: #B4F663;\n");
     httpdOutput(r, "}\n");
 
     httpdOutput(r, "#copyright {\n");
@@ -260,7 +258,7 @@
 
     httpdOutput(r, "#content {\n");
     httpdOutput(r, "  padding: 20px;\n");
-    httpdOutput(r, "  border: 2px solid #2481ff;\n");
+    httpdOutput(r, "  border: 2px solid #46a43a;\n");
     httpdOutput(r, "  min-height: 300px;\n");
     httpdOutput(r, "}\n");
     httpdOutput(r, "</style>\n");
@@ -280,17 +278,14 @@
     httpdOutput(r, "    <ul>\n");
     httpdOutput(r, "    <li>Version: " VERSION "\n");
     httpdPrintf(r, "    <li>Node ID: %s\n", config_get_config()->gw_id);
-    httpdPrintf(r, "    <li>Réseau : %s\n", config_get_config()->Network);
-    httpdPrintf(r, "    <li>Propriétaire : %s\n", config_get_config()->Proprietary);
     httpdOutput(r, "    </ul>\n");
     httpdOutput(r, "    <br>\n");
 
     httpdOutput(r, "    <h2>Menu</h2>\n");
     httpdOutput(r, "    <ul>\n");
-    httpdOutput(r, "    <li><a href='/wifidog/status'>Etat WiFiDog</a>\n");
-    httpdOutput(r, "    <li><a href='/wifidog/about'>A propos de WiFiDog</a>\n");
-    httpdOutput(r, "    <li><a href='http://www.wifidog.org/'>Page d'accueil WiFiDog</a>\n");
-    httpdOutput(r, "    <li><a href='http://www.wireless-fr.org/'>Page d'accueil France Wireless</a>\n");
+    httpdOutput(r, "    <li><a href='/wifidog/status'>WiFiDog Status</a>\n");
+    httpdOutput(r, "    <li><a href='/wifidog/about'>About WiFiDog</a>\n");
+    httpdOutput(r, "    <li><a href='http://www.wifidog.org'>WiFiDog's homepage</a>\n");
     httpdOutput(r, "    </ul>\n");
     httpdOutput(r, "</div>\n");
 
@@ -304,7 +299,7 @@
        httpdOutput(r, "</div>\n");
 
     httpdOutput(r, "<div id=\"copyright\">\n");
-    httpdOutput(r, "Copyright (C) 2004-2006 Wifidog/France Wireless.  Ce logiciel est sous la license GNU GPL.\n");
+    httpdOutput(r, "Copyright (C) 2004-2005.  This software is released under the GNU GPL license.\n");
     httpdOutput(r, "</div>\n");
 
 
Index: src/ping_thread.c
===================================================================
--- src/ping_thread.c   (revision 112)
+++ src/ping_thread.c   (revision 98)
@@ -140,22 +140,18 @@
        /*
         * Prep & send request
         */
-       snprintf(request, sizeof(request) - 1, "GET %sping/?gw_id=%s&sys_uptime=%lu&sys_memfree=%u&sys_load=%.2f&wifidog_uptime=%lu&prop=%s&network_id=%s&lat=%s&lon=%s HTTP/1.0\r\n"
-                "User-Agent: WiFiDog %s\r\n"
-                "Host: %s\r\n"
-                "\r\n",
-                config_get_config()->auth_servers->authserv_path,
-                config_get_config()->gw_id,
-                sys_uptime,
-                sys_memfree,
-                sys_load,
-                (long unsigned int)((long unsigned int)time(NULL) - (long unsigned int)started_time),
-                config_get_config()->Proprietary,
-                config_get_config()->Network,
-                config_get_config()->Lat,
-                config_get_config()->Lon,
-                VERSION,
-                config_get_config()->auth_servers->authserv_hostname);
+       snprintf(request, sizeof(request) - 1, "GET %sping/?gw_id=%s&sys_uptime=%lu&sys_memfree=%u&sys_load=%.2f&wifidog_uptime=%lu HTTP/1.0\r\n"
+                       "User-Agent: WiFiDog %s\r\n"
+                       "Host: %s\r\n"
+                       "\r\n",
+                       config_get_config()->auth_servers->authserv_path,
+                       config_get_config()->gw_id,
+                       sys_uptime,
+                       sys_memfree,
+                       sys_load,
+                       (long unsigned int)((long unsigned int)time(NULL) - (long unsigned int)started_time),
+                       VERSION,
+                       config_get_config()->auth_servers->authserv_hostname);
 
        debug(LOG_DEBUG, "HTTP Request to Server: [%s]", request);
        
Index: src/util.c
===================================================================
--- src/util.c  (revision 112)
+++ src/util.c  (revision 98)
@@ -331,7 +331,7 @@
 /*
  * @return A string containing human-readable status text. MUST BE free()d by caller
  */
-char * get_status_text(int showtrusted) {
+char * get_status_text() {
        char buffer[STATUS_BUF_SIZ];
        ssize_t len;
        s_config *config;
@@ -341,7 +341,6 @@
        unsigned long int uptime = 0;
        unsigned int days = 0, hours = 0, minutes = 0, seconds = 0;
      t_trusted_mac *p;
-     int tinyproxyport;
        
        len = 0;
        snprintf(buffer, (sizeof(buffer) - len), "WiFiDog status\n\n");
@@ -379,34 +378,9 @@
        snprintf((buffer + len), (sizeof(buffer) - len), "Auth server reachable: %s\n", (is_auth_online() ? "yes" : "no"));
        len = strlen(buffer);
 
-       snprintf((buffer + len), (sizeof(buffer) - len), "Node ID: %s\n", config_get_config()->gw_id);
-       len = strlen(buffer);
-
-       snprintf((buffer + len), (sizeof(buffer) - len), "Proprietary: %s\n", config_get_config()->Proprietary);
-       len = strlen(buffer);
-
-       snprintf((buffer + len), (sizeof(buffer) - len), "Network : %s\n", config_get_config()->Network);
-       len = strlen(buffer);
-
-       if(showtrusted)
-         {
-           if((tinyproxyport = config_get_config()->tinyproxy_port) != 0)
-             {
-               snprintf((buffer + len), (sizeof(buffer) - len), "TinyproxyPort : %u\n", tinyproxyport);
-               len = strlen(buffer);
-             }
-
-           snprintf((buffer + len), (sizeof(buffer) - len), "Lat : %s\nLon : %s\n", 
-                    config_get_config()->Lat, config_get_config()->Lon);
-           len = strlen(buffer);
-         }
-       
        snprintf((buffer + len), (sizeof(buffer) - len), "Clients served this session: %lu\n\n", served_this_session);
        len = strlen(buffer);
 
-
-
-
        LOCK_CLIENT_LIST();
        
        first = client_get_first_client();
@@ -447,20 +421,17 @@
 
        UNLOCK_CLIENT_LIST();
 
-       config = config_get_config();
+    config = config_get_config();
+    
+    if (config->trustedmaclist != NULL) {
+        snprintf((buffer + len), (sizeof(buffer) - len), "\nTrusted MAC addresses:\n");
+        len = strlen(buffer);
 
-       if(showtrusted)
-         {
-           if (config->trustedmaclist != NULL) {
-             snprintf((buffer + len), (sizeof(buffer) - len), "\nTrusted MAC addresses:\n");
-             len = strlen(buffer);
-             
-             for (p = config->trustedmaclist; p != NULL; p = p->next) {
-               snprintf((buffer + len), (sizeof(buffer) - len), "  %s\n", p->mac);
-               len = strlen(buffer);
-             }
-           }
-         }
+        for (p = config->trustedmaclist; p != NULL; p = p->next) {
+            snprintf((buffer + len), (sizeof(buffer) - len), "  %s\n", p->mac);
+            len = strlen(buffer);
+        }
+    }
 
     snprintf((buffer + len), (sizeof(buffer) - len), "\nAuthentication servers:\n");
     len = strlen(buffer);
Index: src/wdctl_thread.c
===================================================================
--- src/wdctl_thread.c  (revision 112)
+++ src/wdctl_thread.c  (revision 98)
@@ -209,7 +209,7 @@
        char * status = NULL;
        int len = 0;
 
-       status = get_status_text(1);
+       status = get_status_text();
        len = strlen(status);
 
        write(fd, status, len);
Index: src/conf.h
===================================================================
--- src/conf.h  (revision 112)
+++ src/conf.h  (revision 98)
@@ -48,7 +48,6 @@
 #define DEFAULT_AUTHSERVSSLAVAILABLE 0
 /** Note:  The path must be prefixed by /, and must be suffixed /.  Put / for the server root.*/
 #define DEFAULT_AUTHSERVPATH "/wifidog/"
-#define DEFAULT_NETWORK "default-network"
 /*@}*/ 
 
 /**
@@ -126,11 +125,6 @@
                                     logging */
     t_firewall_ruleset *rulesets;      /**< @brief firewall rules */
     t_trusted_mac *trustedmaclist; /**< @brief list of trusted macs */
-  char *Proprietary;
-  char *Network;       /* Name of network */
-  char *Lat;
-  char *Lon;
-  int tinyproxy_port;
 } s_config;
 
 /** @brief Get the current gateway configuration */
Index: src/util.h
===================================================================
--- src/util.h  (revision 112)
+++ src/util.h  (revision 98)
@@ -60,7 +60,7 @@
 /*
  * @brief Creates a human-readable paragraph of the status of wifidog
  */
-char * get_status_text(int showtrusted);
+char * get_status_text();
 
 #define LOCK_GHBN() do { \
        debug(LOG_DEBUG, "Locking wd_gethostbyname()"); \