diff --git a/main.cpp b/main.cpp index c6a8fc7..2e7e2f1 100644 --- a/main.cpp +++ b/main.cpp @@ -242,6 +242,7 @@ int main() netlib::server_raw server(15000000); server.open_server("0.0.0.0", 8080); std::vector whitelist = load_whitelist("whitelist.txt"); + server.add_whitelist(whitelist); std::println("{} ips found in whitelist", whitelist.size()); while (true) { @@ -249,22 +250,6 @@ int main() //std::this_thread::sleep_for(std::chrono::milliseconds(50)); for (auto user: readable) { - sockaddr_in addr = {0}; - unsigned int addr_size = sizeof(addr); - char str[INET_ADDRSTRLEN]; - getpeername(user, (struct sockaddr *)&addr, &addr_size); - strcpy(str, inet_ntoa(addr.sin_addr)); - bool in_whitelist = false; - for (const auto& x: whitelist) - { - if (x == str) - in_whitelist = true; - } - if (in_whitelist == false) - { - std::println("Ip {} not in whitelist!", str); - server.disconnect_user(user); - } char * data = server.get_line(user); if (data) { diff --git a/netlib b/netlib index 07f574f..5a4d644 160000 --- a/netlib +++ b/netlib @@ -1 +1 @@ -Subproject commit 07f574f5210c3a4ee3e8fcd701a05097743faa8d +Subproject commit 5a4d644261435c9ea6ca40369f55ce849fbab3ae diff --git a/test.html b/test.html index 20c8056..6567d23 100644 --- a/test.html +++ b/test.html @@ -28,6 +28,7 @@ id="drop_zone" ondrop="dropHandler(event);" ondragover="dragOverHandler(event);" + ondragenter="dragEnterHandler(event);" > @@ -64,6 +65,10 @@ { ev.preventDefault(); } + function dragEnterHandler(ev) + { + ev.preventDefault(); + } function uploadFile(file)