'Generic Commit'

ipdemo/CMakeLists.txt

@@ -72,6 +72,8 @@ target_include_directories(${PROJECT_EXE_NAME} PRIVATE
     ${CMAKE_CURRENT_SOURCE_DIR}/src/autogen
 )
 
+
+
 # Add nlohmann/json
 FetchContent_Declare(
   nlohmann_json
@@ -93,9 +95,20 @@ set(EXTRA_LIBS
     -ldl    # For dladdr
 )
 
+
+##########
+# If you include the drogon source code locally in your project, use this method to add drogon
+# add_subdirectory(external/drogon)
+# target_link_libraries(${PROJECT_NAME} PRIVATE drogon)
+##########
+find_package(Drogon CONFIG REQUIRED)
+target_link_libraries(${PROJECT_NAME} PRIVATE Drogon::Drogon)
+
+
 # Link libraries
 target_link_libraries(${PROJECT_EXE_NAME} PRIVATE
     nlohmann_json::nlohmann_json
+    Drogon::Drogon
     ${EXTRA_LIBS}
 )
 

ipdemo/src/main.cpp

@@ -1,7 +1,7 @@
 #include <iostream>
 #include <nlohmann/json.hpp>
 
-#include "httplib.hpp"
+#include <drogon/HttpClient.h>
 #include "version.hpp"
 #include "assert.hpp"
 
@@ -14,14 +14,30 @@ int main() {
     std::cout << std::endl;
     std::cout << "Retrieving IP address..." << std::endl;
 
-    httplib::Client cli("http://ipinfo.io");
-    auto res = cli.Get("/ip");
+    auto loop = trantor::EventLoop::getEventLoopOfCurrentThread();
+    auto client = drogon::HttpClient::newHttpClient("http://ipinfo.io", loop);
+    auto req = drogon::HttpRequest::newHttpRequest();
+    req->setMethod(drogon::Get);
+    req->setPath("/ip");
+    std::string ip_body;
+    int status = 0;
+    bool done = false;
+    client->sendRequest(req, [&](drogon::ReqResult result, const drogon::HttpResponsePtr &resp) {
+        if (result == drogon::ReqResult::Ok && resp) {
+            ip_body = resp->body();
+            status = resp->statusCode();
+        } else {
+            status = 0;
+        }
+        done = true;
+    });
+    while (!done) loop->loopOnce();
 
-    ASSERT(res->status == 200, "Failed to get IP");
+    ASSERT(status == 200, "Failed to get IP");
 
     nlohmann::json j;
-    j["ip"] = res->body;
-    j["status"] = res->status;
+    j["ip"] = ip_body;
+    j["status"] = status;
 
     std::cout << j.dump(4) << std::endl;