[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [libmicrohttpd] 16/154: mhd_send: Use MHD_SCKT_OPT_BOOL_ fo
From: |
gnunet |
Subject: |
[GNUnet-SVN] [libmicrohttpd] 16/154: mhd_send: Use MHD_SCKT_OPT_BOOL_ for setsockopt optval. |
Date: |
Mon, 19 Aug 2019 10:15:28 +0200 |
This is an automated email from the git hooks/post-receive script.
ng0 pushed a commit to branch master
in repository libmicrohttpd.
commit 09ef9de1ca62bb47fe7cb320fc595275911f6a14
Author: ng0 <address@hidden>
AuthorDate: Tue Jun 25 18:33:48 2019 +0000
mhd_send: Use MHD_SCKT_OPT_BOOL_ for setsockopt optval.
---
src/microhttpd/mhd_send.c | 48 ++++++++++++++++++++++-------------------------
src/microhttpd/mhd_send.h | 3 +--
2 files changed, 23 insertions(+), 28 deletions(-)
diff --git a/src/microhttpd/mhd_send.c b/src/microhttpd/mhd_send.c
index 50013c13..85616e52 100644
--- a/src/microhttpd/mhd_send.c
+++ b/src/microhttpd/mhd_send.c
@@ -82,6 +82,8 @@ MHD_send_on_connection_ (struct MHD_Connection *connection,
/* The socket. */
MHD_socket s = connection->socket_fd;
int eno, ret, optval;
+ const MHD_SCKT_OPT_BOOL_ off_val = 0;
+ const MHD_SCKT_OPT_BOOL_ on_val = 1;
// new code...
/* Get socket options, change/set options if necessary. */
@@ -125,17 +127,16 @@ MHD_send_on_connection_ (struct MHD_Connection
*connection,
{
if (have_cork && ! want_cork)
{
- optval = 1;
setsockopt (connection->socket_fd,
IPPROTO_TCP,
TCP_CORK,
- &optval,
- sizeof (&optval)) ||
+ (const void *) &on_val,
+ sizeof (on_val)) ||
(setsockopt (connection->socket_fd,
IPPROTO_TCP,
TCP_NODELAY,
- &optval,
- sizeof (&optval)) &&
+ (const void *) &on_val,
+ sizeof (on_val)) &&
(connection->sk_tcp_nodelay = true));
//setsockopt (cork-on); // or nodelay on // + update
connection->sk_tcp_nodelay_on
// When we have CORK, we can have NODELAY on the same system,
@@ -153,12 +154,11 @@ MHD_send_on_connection_ (struct MHD_Connection
*connection,
{
if (have_cork && ! want_cork)
{
- optval = 1;
setsockopt (connection->socket_fd,
IPPROTO_TCP,
TCP_NOPUSH,
- &optval,
- sizeof (&optval));
+ (const void *) &on_val,
+ sizeof (on_val));
// TODO: set corknopush to true here?
// connection->sk_tcp_cork_nopush_on = true;
}
@@ -169,13 +169,12 @@ MHD_send_on_connection_ (struct MHD_Connection
*connection,
{
if (! have_cork && want_cork)
{
- optval = 0;
// setsockopt (nodelay-off);
setsockopt (connection->socket_fd,
IPPROTO_TCP,
TCP_NODELAY,
- &optval,
- sizeof (&optval));
+ (const void *) &off_val,
+ sizeof (off_val));
connection->sk_tcp_nodelay_on = false;
}
// ...
@@ -197,18 +196,17 @@ MHD_send_on_connection_ (struct MHD_Connection
*connection,
{
if (! have_cork && want_cork && ! have_more)
{
- optval = 0;
//setsockopt (cork-off); // or nodelay off // + update
connection->sk_tcp_nodelay_on
setsockopt (connection->socket_fd,
IPPROTO_TCP,
TCP_CORK,
- &optval,
- sizeof (&optval)) ||
+ (const void *) &off_val,
+ sizeof (off_val)) ||
(setsockopt (connection->socket_fd,
IPPROTO_TCP,
TCP_NODELAY,
- &optval,
- sizeof (&optval)) &&
+ (const void *) &off_val,
+ sizeof (off_val)) &&
(connection->sk_tcp_nodelay_on = false));
}
}
@@ -225,13 +223,12 @@ MHD_send_on_connection_ (struct MHD_Connection
*connection,
{
if (have_cork && ! want_cork)
{
- optval = 1;
// setsockopt (nodelay - on);
setsockopt (connection->socket_fd,
IPPROTO_TCP,
TCP_NODELAY,
- &optval,
- sizeof (&optval)) &&
+ (const void *) &on_val,
+ sizeof (on_val)) &&
(connection->sk_tcp_nodelay_on = true);
}
// ...
@@ -260,7 +257,8 @@ MHD_send_on_connection2_ (struct MHD_Connection *connection,
#if HAVE_WRITEV
MHD_socket s = connection->socket_fd;
bool have_cork, have_more;
- int iovcnt, optval, eno;
+ int iovcnt, eno;
+ const MHD_SCKT_OPT_BOOL_ off_val = 0;
struct iovec vector[2];
have_cork = ! connection->sk_tcp_nodelay_on;
@@ -277,13 +275,12 @@ MHD_send_on_connection2_ (struct MHD_Connection
*connection,
{
if (! have_cork && want_cork)
{
- optval = 0;
// setsockopt (nodelay-off);
setsockopt (connection->socket_fd,
IPPROTO_TCP,
TCP_NODELAY,
- &optval,
- sizeof (&optval)) &&
+ (const void *) &off_val,
+ sizeof (off_val)) &&
(connection->sk_tcp_nodelay = false);
}
// ...
@@ -304,12 +301,11 @@ MHD_send_on_connection2_ (struct MHD_Connection
*connection,
if ((ret == header_len + buffer_len) && have_cork)
{
// response complete, definitely uncork!
- optval = 0;
setsockopt (connection->socket_fd,
IPPROTO_TCP,
TCP_CORK,
- &optval,
- sizeof (&optval));
+ (const void *) &off_val,
+ sizeof (off_val));
}
errno = eno;
}
diff --git a/src/microhttpd/mhd_send.h b/src/microhttpd/mhd_send.h
index 2ff39a05..11b9bce6 100644
--- a/src/microhttpd/mhd_send.h
+++ b/src/microhttpd/mhd_send.h
@@ -29,12 +29,11 @@
#include "platform.h"
#include "internal.h"
-
#if defined(HAVE_STDBOOL_H)
#include <stdbool.h>
#endif /* HAVE_STDBOOL_H */
-
#include <errno.h>
+#include "mhd_sockets.h"
enum MHD_SendSocketOptions
{
--
To stop receiving notification emails like this one, please contact
address@hidden.
- [GNUnet-SVN] [libmicrohttpd] 19/154: adjust, (continued)
- [GNUnet-SVN] [libmicrohttpd] 19/154: adjust, gnunet, 2019/08/19
- [GNUnet-SVN] [libmicrohttpd] 11/154: restructure a bit to reuse existing send function, gnunet, 2019/08/19
- [GNUnet-SVN] [libmicrohttpd] 23/154: mhd_send: change send_tls_adapter() to non-static and export its prototype, use it in mhd_send.c, gnunet, 2019/08/19
- [GNUnet-SVN] [libmicrohttpd] 22/154: mhd_send.c: call send_tls_adapter() when TLS is used., gnunet, 2019/08/19
- [GNUnet-SVN] [libmicrohttpd] 24/154: move TLS branch to right position, gnunet, 2019/08/19
- [GNUnet-SVN] [libmicrohttpd] 37/154: flatten if statements, add initial TCP_NOPUSH to MHD_send_on_connection2_, gnunet, 2019/08/19
- [GNUnet-SVN] [libmicrohttpd] 39/154: indent, gnunet, 2019/08/19
- [GNUnet-SVN] [libmicrohttpd] 33/154: replace connection->send_cls(), gnunet, 2019/08/19
- [GNUnet-SVN] [libmicrohttpd] 13/154: mhd_send.c: fix compiler error about MSG_MORE when MSG_MORE is undefined., gnunet, 2019/08/19
- [GNUnet-SVN] [libmicrohttpd] 18/154: more from connection.c, without checks so far., gnunet, 2019/08/19
- [GNUnet-SVN] [libmicrohttpd] 16/154: mhd_send: Use MHD_SCKT_OPT_BOOL_ for setsockopt optval.,
gnunet <=
- [GNUnet-SVN] [libmicrohttpd] 28/154: fixes, gnunet, 2019/08/19
- [GNUnet-SVN] [libmicrohttpd] 43/154: move comment above function., gnunet, 2019/08/19
- [GNUnet-SVN] [libmicrohttpd] 25/154: inline TLS logic, gnunet, 2019/08/19
- [GNUnet-SVN] [libmicrohttpd] 15/154: iAdd headerfile for mhd_send., gnunet, 2019/08/19
- [GNUnet-SVN] [libmicrohttpd] 26/154: indentation, comments, issue, gnunet, 2019/08/19
- [GNUnet-SVN] [libmicrohttpd] 29/154: fix err logic, gnunet, 2019/08/19
- [GNUnet-SVN] [libmicrohttpd] 10/154: mhd_send: Restructure., gnunet, 2019/08/19
- [GNUnet-SVN] [libmicrohttpd] 27/154: fixes, gnunet, 2019/08/19
- [GNUnet-SVN] [libmicrohttpd] 32/154: setsockopt(): check return value., gnunet, 2019/08/19
- [GNUnet-SVN] [libmicrohttpd] 21/154: mhd_send.c: Use daemon from connection struct., gnunet, 2019/08/19