From ca80159707639833f6c0626db5ad7b1dc23eac40 Mon Sep 17 00:00:00 2001
From: staylightblow8 <liudf0716@gmail.com>
Date: Mon, 19 Feb 2024 19:27:44 +0800
Subject: [PATCH] Update the Wi-Fi Dog authentication interface to allow input
 of client IP and MAC addresses, enabling the authentication server to grant
 client access.

Signed-off-by: staylightblow8 <liudf0716@gmail.com>
---
 src/http.c | 27 ++++++++++++++++++++++-----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/src/http.c b/src/http.c
index ca6740534..50c61ed77 100644
--- a/src/http.c
+++ b/src/http.c
@@ -403,12 +403,28 @@ ev_http_callback_auth(struct evhttp_request *req, void *arg)
         return;
     } 
 
-    char *remote_host;
-    uint16_t port;
-    evhttp_connection_get_peer(evhttp_request_get_connection(req), &remote_host, &port);
-    char *mac = arp_get(remote_host);
-    if (!mac) {
+    char *remote_host = NULL;
+    char *mac = NULL;
+    // get remote_host and mac from request if possible
+    // which support auth server side to permit client to login/logout
+    remote_host = ev_http_find_query(req, "client_ip");
+    mac = ev_http_find_query(req, "client_mac");
+    if (!remote_host || !mac) {
+        char *remote_ip = NULL;
+        uint16_t port;
+        if (mac) free(mac);
+        if (remote_host) free(remote_host);
+        mac = NULL;
+        remote_host = NULL;
+        evhttp_connection_get_peer(evhttp_request_get_connection(req), &remote_ip, &port);
+        remote_host = safe_strdup(remote_ip);
+        mac = arp_get(remote_host);
+    }
+    
+    if (!mac || !remote_host) {
         free(token);
+        if (mac) free(mac);
+        if (remote_host) free(remote_host);
         evhttp_send_error(req, 200, "Failed to retrieve your MAC address");
         return;
     }  
@@ -428,6 +444,7 @@ ev_http_callback_auth(struct evhttp_request *req, void *arg)
     }
     UNLOCK_CLIENT_LIST();
     free(mac);
+    free(remote_host);
 
     char *logout = ev_http_find_query(req, "logout");
     if (logout) {