update

base/hsocket.c

@@ -36,7 +36,7 @@ bool is_ipv6(const char* host) {
     return inet_pton(AF_INET6, host, &sin6) == 1;
 }
 
-int Resolver(const char* host, sockaddr_u* addr) {
+int ResolveAddr(const char* host, sockaddr_u* addr) {
     if (inet_pton(AF_INET, host, &addr->sin.sin_addr) == 1) {
         addr->sa.sa_family = AF_INET; // host is ipv4, so easy ;)
         return 0;
@@ -98,7 +98,7 @@ int sockaddr_set_ip(sockaddr_u* addr, const char* host) {
         addr->sin.sin_addr.s_addr = htonl(INADDR_ANY);
         return 0;
     }
-    return Resolver(host, addr);
+    return ResolveAddr(host, addr);
 }
 
 void sockaddr_set_port(sockaddr_u* addr, int port) {

base/hsocket.h

@@ -88,7 +88,7 @@ HV_INLINE bool is_ipaddr(const char* host) {
 
 // @param host: domain or ip
 // @retval 0:succeed
-HV_EXPORT int Resolver(const char* host, sockaddr_u* addr);
+HV_EXPORT int ResolveAddr(const char* host, sockaddr_u* addr);
 
 HV_EXPORT const char* sockaddr_ip(sockaddr_u* addr, char *ip, int len);
 HV_EXPORT uint16_t sockaddr_port(sockaddr_u* addr);
@@ -131,7 +131,7 @@ HV_EXPORT int Bind(int port, const char* host DEFAULT(ANYADDR), int type DEFAULT
 HV_EXPORT int Listen(int port, const char* host DEFAULT(ANYADDR));
 
 // @return connfd
-// Resolver -> socket -> nonblocking -> connect
+// ResolveAddr -> socket -> nonblocking -> connect
 HV_EXPORT int Connect(const char* host, int port, int nonblock DEFAULT(0));
 // Connect(host, port, 1)
 HV_EXPORT int ConnectNonblock(const char* host, int port);

docs/API.md

@@ -201,7 +201,7 @@
 - Connect
 - ConnectNonblock
 - ConnectTimeout
-- Resolver
+- ResolveAddr
 - Socketpair
 - socket_errno
 - socket_strerror

docs/PLAN.md

@@ -24,4 +24,5 @@
 - have a taste of io_uring
 - coroutine
 - IM-libhv
+- MediaServer-libhv
 - GameServer-libhv

examples/httpd/handler.cpp

@@ -181,10 +181,10 @@ int Handler::kv(HttpRequest* req, HttpResponse* resp) {
         return response_status(resp, HTTP_STATUS_BAD_REQUEST);
     }
     resp->content_type = APPLICATION_URLENCODED;
-    resp->kv = req->kv;
-    resp->kv["int"] = hv::to_string(123);
-    resp->kv["float"] = hv::to_string(3.14);
-    resp->kv["string"] = "hello";
+    resp->kv = req->GetUrlEncoded();
+    resp->SetUrlEncoded("int", 123);
+    resp->SetUrlEncoded("float", 3.14);
+    resp->SetUrlEncoded("string", "hello");
     return 200;
 }
 
@@ -193,7 +193,7 @@ int Handler::json(HttpRequest* req, HttpResponse* resp) {
         return response_status(resp, HTTP_STATUS_BAD_REQUEST);
     }
     resp->content_type = APPLICATION_JSON;
-    resp->json = req->json;
+    resp->json = req->GetJson();
     resp->json["int"] = 123;
     resp->json["float"] = 3.14;
     resp->json["string"] = "hello";
@@ -205,12 +205,11 @@ int Handler::form(HttpRequest* req, HttpResponse* resp) {
         return response_status(resp, HTTP_STATUS_BAD_REQUEST);
     }
     resp->content_type = MULTIPART_FORM_DATA;
-    resp->form = req->form;
-    resp->form["int"] = 123;
-    resp->form["float"] = 3.14;
-    resp->form["string"] = "hello";
-    // resp->form["file"] = FormFile("test.jpg");
-    // resp->FormFile("file", "test.jpg");
+    resp->form = req->GetForm();
+    resp->SetFormData("int", 123);
+    resp->SetFormData("float", 3.14);
+    resp->SetFormData("string", "hello");
+    // resp->SetFormFile("file", "test.jpg");
     return 200;
 }
 

examples/wrk.cpp

@@ -218,12 +218,12 @@ int main(int argc, char** argv) {
     const char* host = request->host.c_str();
     port = request->port;
 
-    // Resolver
+    // ResolveAddr
     if (is_ipaddr(host)) {
         strcpy(ip, host);
     } else {
         sockaddr_u addr;
-        if (Resolver(host, &addr) != 0) {
+        if (ResolveAddr(host, &addr) != 0) {
             fprintf(stderr, "Could not resolve host: %s\n", host);
             exit(1);
         }

hv.h

@@ -36,7 +36,6 @@
 #include "hpath.h"
 #include "hdir.h"
 #include "hurl.h"
-#include "hscope.h"
 #endif
 
 #endif  // HV_H_

protocol/icmp.c

@@ -32,7 +32,7 @@ int ping(const char* host, int cnt) {
     sockaddr_u peeraddr;
     socklen_t addrlen = sizeof(peeraddr);
     memset(&peeraddr, 0, addrlen);
-    int ret = Resolver(host, &peeraddr);
+    int ret = ResolveAddr(host, &peeraddr);
     if (ret != 0) return ret;
     sockaddr_ip(&peeraddr, ip, sizeof(ip));
     int sockfd = socket(peeraddr.sa.sa_family, SOCK_RAW, IPPROTO_ICMP);