Ticket #465: 0001-Add-a-basic-disconnect-command.patch

src/gateway.c

@@ -411 +411 @@
         httpdAddCContent(webserver, "/wifidog", "about", 0, NULL, http_callback_about);
         httpdAddCContent(webserver, "/wifidog", "status", 0, NULL, http_callback_status);
         httpdAddCContent(webserver, "/wifidog", "auth", 0, NULL, http_callback_auth);
+        httpdAddCContent(webserver, "/wifidog", "disconnect", 0, NULL, http_callback_disconnect);
 
         httpdAddC404Content(webserver, http_callback_404);
 

src/http.c

@@ -276 +276 @@
         }
 }
 
+void 
+http_callback_disconnect(httpd *webserver, request *r)
+{
+        /* XXX How do you change the status code for the response?? */
+        httpVar *token  = httpdGetVariableByName(r, "token");
+        httpVar *mac    = httpdGetVariableByName(r, "mac");
+
+        if (token && mac) {
+                t_client *client;
+                
+                LOCK_CLIENT_LIST();
+                client = client_list_find_by_mac(mac->value);
+
+                if (!client || strcmp(client->token, token->value)) {
+                        UNLOCK_CLIENT_LIST();
+                        debug(LOG_INFO, "Disconnect %s with incorrect token %s", mac->value, token->value);
+                        httpdOutput(r, "Invalid token for MAC");
+                        return -1;
+                }
+
+                /* TODO: get current firewall counters, set counters to auth server,
+                 * send disconnect to auth server.
+                 *
+                 * XXX: this should share code with wdctl_reset
+                 */
+                fw_deny(client->ip, client->mac, client->fw_connection_state);
+                client_list_delete(client);
+
+                UNLOCK_CLIENT_LIST();
+
+        } else {
+                debug(LOG_INFO, "Disconnect called without both token and MAC given");
+                httpdOutput(r, "Both the token and MAC need to be specified"); 
+                return -1;
+        }
+
+        return 0;
+}
+
 void send_http_page(request *r, const char *title, const char* message)
 {
     s_config    *config = config_get_config();

src/http.h

@@ -39 +39 @@
 void http_callback_status(httpd *webserver, request *r);
 /**@brief Callback for libhttpd, main entry point post login for auth confirmation */
 void http_callback_auth(httpd *webserver, request *r);
+/**@brief Callback for libhttpd, disconnect user from network */
+void http_callback_disconnect(httpd *webserver, request *r);
 
 /** @brief Sends a HTML page to web browser */
 void send_http_page(request *r, const char *title, const char* message);