gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[libmicrohttpd] branch master updated (2c86e6b2 -> 7999c2d7)


From: gnunet
Subject: [libmicrohttpd] branch master updated (2c86e6b2 -> 7999c2d7)
Date: Sat, 06 Nov 2021 17:42:13 +0100

This is an automated email from the git hooks/post-receive script.

karlson2k pushed a change to branch master
in repository libmicrohttpd.

    from 2c86e6b2 mhd_sockets: cosmetics
     new a507eb93 W32 socket pair: set TCP_NODELAY
     new 148faf72 mhd_sockets.c: fixed code style
     new f6c286d7 tests: fixed copy-paste error in report
     new 7999c2d7 test_{tricky,toolarge}: fixed code style

The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 src/microhttpd/mhd_sockets.c | 26 ++++++++++++++++++--------
 src/testcurl/test_toolarge.c |  4 ++--
 src/testcurl/test_tricky.c   |  4 ++--
 3 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/src/microhttpd/mhd_sockets.c b/src/microhttpd/mhd_sockets.c
index 0d9826a4..064f1aa8 100644
--- a/src/microhttpd/mhd_sockets.c
+++ b/src/microhttpd/mhd_sockets.c
@@ -31,7 +31,7 @@
  * @param err the WinSock error code.
  * @return pointer to string description of specified WinSock error.
  */
-const char*
+const char *
 MHD_W32_strerror_winsock_ (int err)
 {
   switch (err)
@@ -271,12 +271,12 @@ MHD_W32_socket_pair_ (SOCKET sockets_pair[2], int non_blk)
     listen_addr.sin_port = 0;   /* same as htons(0) */
     listen_addr.sin_addr.s_addr = htonl (INADDR_LOOPBACK);
     if ( ((0 == bind (listen_s,
-                      (struct sockaddr*) &listen_addr,
+                      (struct sockaddr *) &listen_addr,
                       c_addinlen)) &&
           (0 == listen (listen_s,
                         1) ) &&
           (0 == getsockname (listen_s,
-                             (struct sockaddr*) &listen_addr,
+                             (struct sockaddr *) &listen_addr,
                              &addr_len))) )
     {
       SOCKET client_s = socket (AF_INET,
@@ -297,7 +297,7 @@ MHD_W32_socket_pair_ (SOCKET sockets_pair[2], int non_blk)
                               (int) FIONBIO,
                               &on_val)) ||
            ( (0 != connect (client_s,
-                            (struct sockaddr*) &listen_addr,
+                            (struct sockaddr *) &listen_addr,
                             c_addinlen)) &&
              (WSAGetLastError () != WSAEWOULDBLOCK)) )
       {
@@ -309,7 +309,7 @@ MHD_W32_socket_pair_ (SOCKET sockets_pair[2], int non_blk)
 
       addr_len = c_addinlen;
       server_s = accept (listen_s,
-                         (struct sockaddr*) &accepted_from_addr,
+                         (struct sockaddr *) &accepted_from_addr,
                          &addr_len);
       if (INVALID_SOCKET == server_s)
       {
@@ -321,19 +321,29 @@ MHD_W32_socket_pair_ (SOCKET sockets_pair[2], int non_blk)
 
       addr_len = c_addinlen;
       if ( (0 == getsockname (client_s,
-                              (struct sockaddr*) &client_addr,
+                              (struct sockaddr *) &client_addr,
                               &addr_len)) &&
-           (accepted_from_addr.sin_family == client_addr.sin_family) &&
            (accepted_from_addr.sin_port == client_addr.sin_port) &&
            (accepted_from_addr.sin_addr.s_addr ==
             client_addr.sin_addr.s_addr) &&
+           (accepted_from_addr.sin_family == client_addr.sin_family) &&
            ( (0 != non_blk) ?
              (0 == ioctlsocket (server_s,
                                 (int) FIONBIO,
                                 &on_val)) :
              (0 == ioctlsocket (client_s,
                                 (int) FIONBIO,
-                                &off_val)) ) )
+                                &off_val)) ) &&
+           (0 == setsockopt (server_s,
+                             IPPROTO_TCP,
+                             TCP_NODELAY,
+                             (const void *) (&on_val),
+                             sizeof (on_val))) &&
+           (0 == setsockopt (client_s,
+                             IPPROTO_TCP,
+                             TCP_NODELAY,
+                             (const void *) (&on_val),
+                             sizeof (on_val))) )
       {
         closesocket (listen_s);
         sockets_pair[0] = server_s;
diff --git a/src/testcurl/test_toolarge.c b/src/testcurl/test_toolarge.c
index e2aaabc4..2cb1f48e 100644
--- a/src/testcurl/test_toolarge.c
+++ b/src/testcurl/test_toolarge.c
@@ -465,7 +465,7 @@ ahcCheck (void *cls,
     mhdErrorExitDesc ("'upload_data' is not NULL");
 
   if (NULL == upload_data_size)
-    mhdErrorExitDesc ("'upload_data_size' pointer is not NULL");
+    mhdErrorExitDesc ("'upload_data_size' pointer is NULL");
 
   if (0 != *upload_data_size)
     mhdErrorExitDesc ("'*upload_data_size' value is not zero");
@@ -489,7 +489,7 @@ ahcCheck (void *cls,
     mhdErrorExitDesc ("Wrong number of headers in the request");
 
   response = MHD_create_response_from_buffer (param->rp_data_size,
-                                              (void*) param->rp_data,
+                                              (void *) param->rp_data,
                                               MHD_RESPMEM_MUST_COPY);
   if (NULL == response)
     mhdErrorExitDesc ("Failed to create response");
diff --git a/src/testcurl/test_tricky.c b/src/testcurl/test_tricky.c
index 039ef009..c0233bda 100644
--- a/src/testcurl/test_tricky.c
+++ b/src/testcurl/test_tricky.c
@@ -393,7 +393,7 @@ ahcCheck (void *cls,
     mhdErrorExitDesc ("'upload_data' is not NULL");
 
   if (NULL == upload_data_size)
-    mhdErrorExitDesc ("'upload_data_size' pointer is not NULL");
+    mhdErrorExitDesc ("'upload_data_size' pointer is NULL");
 
   if (0 != *upload_data_size)
     mhdErrorExitDesc ("'*upload_data_size' value is not zero");
@@ -417,7 +417,7 @@ ahcCheck (void *cls,
     mhdErrorExitDesc ("Wrong number of headers in the request");
 
   response = MHD_create_response_from_buffer (param->rp_data_size,
-                                              (void*) param->rp_data,
+                                              (void *) param->rp_data,
                                               MHD_RESPMEM_MUST_COPY);
   if (NULL == response)
     mhdErrorExitDesc ("Failed to create response");

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.



reply via email to

[Prev in Thread] Current Thread [Next in Thread]