Changeset 841

Timestamp:

11/24/05 16:48:34 (3 years ago)

Author:

aprilp

Message:

*** empty log message ***

Files:

• trunk/wifidog/src/http.c (modified) (3 diffs)

trunk/wifidog/src/http.c

@@ -61 +61 @@
-        int             port;
-        s_config        *config = config_get_config();
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -179 +156 @@
-}
-
-void
-http_callback_splash(httpd *webserver, request *r)
-{
-        char * status = NULL;
-        httpVar * url;
-
-        status = get_status_text();
-        http_wifidog_header(r, "Disclaimer");
-        httpdOutput(r, "<p>This hotspot offers Free internet access!</p>");
-        httpdOutput(r, "<p>By clicking ACCEPT, you agree that you will respect these WiFi Do's and Don'ts:</p>");
-    httpdOutput(r, "<ul>\n");
-    httpdOutput(r, "<li>Respect the venue's bandwidth. Don't download too many large files.\n");
-    httpdOutput(r, "<li>Make Purchases and Tip.\n");
-    httpdOutput(r, "<li>If it's a busy place, don't take up too much space.\n");
-    httpdOutput(r, "<li>Turn down your sound or use headphones.\n");
-    httpdOutput(r, "<li>Share a table.\n");
-    httpdOutput(r, "<li>Thank the staff or management - let them know you appreciate the WiFi.\n");
-    httpdOutput(r, "<li>If it's busy - don't overstay your welcome.\n");
-    httpdOutput(r, "<li>Help others who are having trouble getting on the network.\n");
-    httpdOutput(r, "<li>Remember that the WiFi is complimentary. If it doesn't work, let the staff know. Be patient.\n");
-    httpdOutput(r, "</ul>\n");
-        if ((url = httpdGetVariableByName(r, "url"))) {
-            httpdPrintf(r, "<a href=\"/wifidog/auth?url=%s\">ACCEPT</a>", url->value);
-    } else {
-            httpdOutput(r, "<a href=\"/wifidog/auth\">ACCEPT</a>");
-    }
-
-        http_wifidog_footer(r);
-        free(status);
-}
-
-void
-http_callback_portal(httpd *webserver, request *r)
-{
-        char * status = NULL;
-
-        status = get_status_text();
-        http_wifidog_header(r, "Enjoy!");
-        httpdOutput(r, "<p>Don't forget, socialize and discuss with others! (you're not at home, enjoy the place and people!)</p>");
-        http_wifidog_footer(r);
-        free(status);
-}
-
-void 
-http_callback_auth(httpd *webserver, request *r)
-{
-        s_config        *config = config_get_config();
-        t_client        *client;
-        httpVar * token;
-        char    *mac;
-    char    *newlocation;
-
-        if ((token = httpdGetVariableByName(r, "token"))) {
@@ -256 +188 @@
-                        free(mac);
-                }
-        } else if (config->auth_servers == NULL) {
-        /* No authentication server is configured, we do not expect a token
-         * auth right away */
-                if (!(mac = arp_get(r->clientAddr))) {
-                        /* We could not get their MAC address */
-                        debug(LOG_ERR, "Failed to retrieve MAC address for ip %s", r->clientAddr);
-                        http_wifidog_header(r, "WiFiDog Error");
-                        httpdOutput(r, "Failed to retrieve your MAC address");
-                        http_wifidog_footer(r);
-                } else {
-                        /* We have their MAC address */
-
-                        LOCK_CLIENT_LIST();
-                        
-                        if ((client = client_list_find(r->clientAddr, mac)) == NULL) {
-                                debug(LOG_DEBUG, "New client ip=%s mac=%s", r->clientAddr, mac);
-                                client_list_append(r->clientAddr, mac, "SpLaShOnLy");
-                        } else {
-                                debug(LOG_DEBUG, "Node for %s already exists", client->ip);
-                        }
-
-            /* Find the client in the list once it's created (not very useful) */
-                        client = client_list_find(r->clientAddr, mac);
-
-            debug(LOG_INFO, "ALLOWING %s [%s], the user clicked the accept button", client->ip, client->mac);
-            client->fw_connection_state = FW_MARK_KNOWN;
-            fw_allow(client->ip, client->mac, FW_MARK_KNOWN);
-
-                        UNLOCK_CLIENT_LIST();
-
-                        free(mac);
-
-            httpdSetResponse(r, "307 Redirect to portal\n");
-            /* If we have a portal url specified in the configuration,
-               forward to it, otherwise forward to /wifidog/portal */
-            if (config->portal && strncmp(config->portal, "http://", strlen("http://")) == 0) {
-                debug(LOG_INFO, "Redirecting to portal at %s", config->portal);
-                safe_asprintf(&newlocation, "Location: %s",
-                    config->portal
-                );
-
-                httpdAddHeader(r, newlocation);
-                http_wifidog_header(r, "Redirection");
-
-                httpdPrintf(r, "Please <a href='%s'>click here</a> for the portal",
-                    config->portal);
-            } else {
-                safe_asprintf(&newlocation, "Location: http://%s:%d/wifidog/portal",
-                    config->gw_address,
-                    config->gw_port);
-                debug(LOG_INFO, "Redirecting to local portal");
-
-                httpdAddHeader(r, newlocation);
-                http_wifidog_header(r, "Redirection");
-
-                httpdPrintf(r, "Please <a href='http://%s:%d/wifidog/portal'>click here</a> for the portal",
-                    config->gw_address, 
-                    config->gw_port);
-            }
-
-            http_wifidog_footer(r);
-            free(newlocation);
-                }
-        } else {
-                /* They did not supply variable "token" */