Merge branch 'master' into DC11

This commit is contained in:
folkert van heusden 2024-05-01 18:58:08 +02:00
commit 6974234d5e
Signed by untrusted user who does not match committer: folkert
GPG key ID: 6B6455EDFEED3BD1

View file

@ -245,11 +245,11 @@ void update_word(uint16_t *const w, const bool msb, const uint8_t v)
void set_nodelay(const int fd) void set_nodelay(const int fd)
{ {
int flags = 1; int flags = 1;
#if defined(__FreeBSD__) || defined(ESP32) #if defined(__FreeBSD__) || defined(ESP32)
if (setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, (void *)&flags, sizeof(flags)) == -1) if (setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, (void *)&flags, sizeof(flags)) == -1)
#else #else
if (setsockopt(fd, SOL_TCP, TCP_NODELAY, (void *)&flags, sizeof(flags)) == -1) if (setsockopt(fd, SOL_TCP, TCP_NODELAY, (void *)&flags, sizeof(flags)) == -1)
#endif #endif
DOLOG(warning, true, "Cannot disable nagle algorithm"); DOLOG(warning, true, "Cannot disable nagle algorithm");
} }