[Spice-commits] 3 commits - AUTHORS server/net-utils.c server/red-stream.cpp

[GitLab Mirror]

 AUTHORS               |    1 +
 server/net-utils.c    |    2 +-
 server/red-stream.cpp |    1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 3c1d87ccfe4fb5825dec5f98d488ac46047eab73
Author: Roman Bogorodskiy <bogorodskiy at gmail.com>
Date:   Sat Apr 17 12:52:11 2021 +0400

    Fix setsockopt on FreeBSD
    
    FreeBSD's setsockopt() behaves just like Dawrin, i.e. sets errno to
    EINVAL instead of ENOTSUP, so extend the Darwin workaround to work for
    FreeBSD as well.
    
    Signed-off-by: Roman Bogorodskiy <bogorodskiy at gmail.com>
    Acked-by: Frediano Ziglio <freddy77 at gmail.com>

diff --git a/server/net-utils.c b/server/net-utils.c
index e9778e73..7cad5342 100644
--- a/server/net-utils.c
+++ b/server/net-utils.c
@@ -48,7 +48,7 @@
 static inline bool
 darwin_einval_on_unix_socket(int fd, int err)
 {
-#if defined(__APPLE__)
+#if defined(__APPLE__) || defined(__FreeBSD__)
     if (err == EINVAL) {
         union {
             struct sockaddr sa;
commit 8b03c6fb64711e1ea4369ff99e38feb7648eee2e
Author: Roman Bogorodskiy <bogorodskiy at gmail.com>
Date:   Sat Apr 17 12:52:10 2021 +0400

    red-stream: add missing include
    
    On FreeBSD, netinet/in.h needs to be included to use IPPROTO_TCP.
    
    Signed-off-by: Roman Bogorodskiy <bogorodskiy at gmail.com>
    Acked-by: Frediano Ziglio <freddy77 at gmail.com>

diff --git a/server/red-stream.cpp b/server/red-stream.cpp
index fee45f30..090883f3 100644
--- a/server/red-stream.cpp
+++ b/server/red-stream.cpp
@@ -24,6 +24,7 @@
 #include <netdb.h>
 #include <sys/socket.h>
 #include <netinet/tcp.h>
+#include <netinet/in.h>
 #else
 #include <ws2tcpip.h>
 #endif
commit 9787df2dddadf617c0d4836642b7ba14e405cd53
Author: Frediano Ziglio <freddy77 at gmail.com>
Date:   Sat Apr 17 13:18:49 2021 +0100

    syntax-check: Add missing contributor name to AUTHORS
    
    Signed-off-by: Frediano Ziglio <freddy77 at gmail.com>

diff --git a/AUTHORS b/AUTHORS
index 987a5006..9ef1c20c 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -80,5 +80,6 @@ Patches also contributed by
     James Le Cuirot <chewi at gentoo.org>
     Frediano Ziglio <freddy77 at gmail.com>
     Stefan Weil <sw at weilnetz.de>
+    Roman Bogorodskiy <bogorodskiy at gmail.com>
 
    ....send patches to get your name here...