Changeset 285

Timestamp:

05/02/07 12:52:09 (2 years ago)

Author:

syrus

Message:

Ajout de NodeName?, OwnerMACList

Files:

• wifidog/wifidog-client/src/conf.c (modified) (4 diffs)
• wifidog/wifidog-client/src/conf.h (modified) (1 diff)
• wifidog/wifidog-client/src/fw_iptables.c (modified) (5 diffs)
• wifidog/wifidog-client/src/http.c (modified) (3 diffs)
• wifidog/wifidog-client/src/ping_thread.c (modified) (2 diffs)
• wifidog/wifidog-client/src/util.c (modified) (3 diffs)

wifidog/wifidog-client/src/conf.c

@@ -90 +90 @@
-        oLat,
-        oLon,
-
-
-
+
+
+
+
-} OpCodes;
-
@@ -129 +130 @@
-        { "lat",                oLat },
-        { "lon",                oLon },
-
+
+
+
-        { NULL,                 oBadOption },
-};
@@ -172 +175 @@
-        config.Lat = "0";
-        config.Lon = "0";
-tiny
+
-        config.ownermaclist = NULL;
+        config.NodeName = NULL;
-}
-
@@ -709 +713 @@
-                                        sscanf(p1, "%d", &config.syslog_facility);
-                                        break;
-
-
+
+
+
+
+
-                                        break;
-                                }

wifidog/wifidog-client/src/conf.h

@@ -161 +161 @@
-  char *Lat;
-  char *Lon;
-
+
+
-} s_config;
-

wifidog/wifidog-client/src/fw_iptables.c

@@ -193 +193 @@
-        t_owner_mac *q;
-        t_gateway_interface *gwi;
-tiny
+
-   
-    fw_quiet = 0;
@@ -222 +222 @@
-                        /* Assign links and rules to these new chains */
-                        for (gwi = config->gw_interface ; gwi != NULL ; gwi = gwi->next)
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-            for (p = config->trustedmaclist; p != NULL; p = p->next)
@@ -247 +250 @@
-
-                        /* Assign links and rules to these new chains */
-for (gwi = config->gw_interface ; gwi != NULL ; gwi = gwi->next)
-{
+debug(LOG_DEBUG,"Adding nat PREROUTING");
+for (gwi = config->gw_interface ; gwi != NULL ; gwi = gwi->next)
-                                iptables_do_command("-t nat -A PREROUTING -i %s -j " TABLE_WIFIDOG_OUTGOING, gwi->interface);
-
-
+
+
-                        iptables_do_command("-t nat -A " TABLE_WIFIDOG_OUTGOING " -d %s -j " TABLE_WIFIDOG_WIFI_TO_ROUTER, gw_address);
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                        } else {
-                          iptables_do_command("-t nat -A " TABLE_WIFIDOG_WIFI_TO_INTERNET " -m mark --mark 0x%u -j ACCEPT", FW_MARK_KNOWN);
@@ -271 +280 @@
-                        iptables_do_command("-t nat -A " TABLE_WIFIDOG_UNKNOWN " -j " TABLE_WIFIDOG_AUTHSERVERS);
-                        iptables_do_command("-t nat -A " TABLE_WIFIDOG_UNKNOWN " -j " TABLE_WIFIDOG_GLOBAL);
-
+
+
+
-
-
@@ -335 +346 @@
-
-                        for (q = config->ownermaclist; q != NULL; q = q->next)
+                        {
-                                iptables_do_command("-t filter -A " TABLE_WIFIDOG_GLOBAL " -m mac --mac-source %s -j ACCEPT", q->mac);
+                                iptables_do_command("-t nat -A " TABLE_WIFIDOG_GLOBAL " -m mac --mac-source %s -j ACCEPT", q->mac);
+                        }
-
-        free(gwi);

wifidog/wifidog-client/src/http.c

@@ -89 +89 @@
-                httpdOutput(r, "<p>Nous sommes d&eacute;sol&eacute;s, mais il semble que la connexion internet est temporairement indisponible.</p>");
-                httpdOutput(r, "<p>Si cela est possible, veuillez avertir les propri&eacute;taires de ce point d'acc&egrave;s.</p>");
-grav
-grave
+acut
+circ
-                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);
@@ -98 +98 @@
-                http_wifidog_header(r, "L'&eacute;cran de connexion est indisponible");
-                httpdOutput(r, "<p>Nous sommes d&eacute;sol&eacute;s, mais il semble que nous sommes actuellement incapables de vous rediriger sur la page de connexion.</p>");
-grave;rons que cette situation sera bient&ocirce
-grave
+acute;rons que cette situation sera bient&ocirc
+circ
-                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);
@@ -285 +285 @@
-    httpdOutput(r, "    <li>Version: " VERSION "\n");
-    httpdPrintf(r, "    <li>Node ID: %s\n", config_get_config()->gw_id);
+    httpdPrintf(r, "    <li>Nom du Node: %s\n", config_get_config()->NodeName);
-    httpdPrintf(r, "    <li>R&eacute;seau : %s\n", config_get_config()->Network);
-    httpdPrintf(r, "    <li>Propri&eacute;taire : %s\n", config_get_config()->Proprietary);

wifidog/wifidog-client/src/ping_thread.c

@@ -149 +149 @@
-         */
-        snprintf(request, sizeof(request) - 1,
-
+&nodename=%s
-                        "User-Agent: WiFiDog %s\r\n"
-                        "Host: %s\r\n"
@@ -163 +163 @@
-                        config_get_config()->Lat,
-                        config_get_config()->Lon,
+                        config_get_config()->NodeName,
-                        VERSION,
-                        config_get_config()->auth_servers->authserv_hostname);

wifidog/wifidog-client/src/util.c

@@ -361 +361 @@
-     t_trusted_mac *p;
-     t_owner_mac *q;
-
+
+
-        
-        len = 0;
@@ -402 +403 @@
-        len = strlen(buffer);
-
+        snprintf((buffer + len), (sizeof(buffer) - len), "Node Name: %s\n", config_get_config()->NodeName);
+        len = strlen(buffer);
+
-        snprintf((buffer + len), (sizeof(buffer) - len), "Proprietary: %s\n", config_get_config()->Proprietary);
-        len = strlen(buffer);
@@ -407 +411 @@
-        snprintf((buffer + len), (sizeof(buffer) - len), "Network : %s\n", config_get_config()->Network);
-        len = strlen(buffer);
+
+        for (gwi = config_get_config()->gw_interface ; gwi != NULL ; gwi = gwi->next)
+          {
+                snprintf((buffer + len), (sizeof(buffer) - len), "Interface : %s\n", gwi->interface);
+                len = strlen(buffer);
+          }
-
-        if(showtrusted)
-          {
-tinyproxyport = config_get_config()->tiny
+proxy_port = config_get_config()->
-              {
-TinyproxyPort : %u\n", tinyproxy
+ProxyPort : %u\n", proxy_
-                len = strlen(buffer);
-              }