Attachment 170543 Details for Bug 209695 – Remove net/krdc/files/patch-vnc__vncclientthread.cpp

[patch] Remove net/krdc/files/patch-vnc__vncclientthread.cpp

remove-fbsd8-krdc.patch (text/plain), 1.64 KB, created by groot on 2016-05-22 12:03:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: groot

Created: 2016-05-22 12:03:53 UTC

Size: 1.64 KB

patch

obsolete

>diff -Nru -I '$FreeBSD.*$' /zbigone/src/ports-playground/net/krdc/files/patch-vnc__vncclientthread.cpp /zbigone/src/area51/trunk/KDE/net/krdc/files/patch-vnc__vncclientthread.cpp
>--- net/krdc/files/patch-vnc__vncclientthread.cpp	2016-03-30 11:01:57.294119463 +0200
>+++ net/krdc/files/patch-vnc__vncclientthread.cpp	1970-01-01 01:00:00.000000000 +0100
>@@ -1,40 +0,0 @@
>-Only use TCP_KEEPIDLE, TCP_KEEPINTVL and TCP_KEEPCNT if they exist.
>-
>-These options are present only in FreeBSD 9+, so we need this patch to maintain
>-compatibility with FreeBSD 8.
>-
>-Not worth upstreaming, as OS X, Linux, NetBSD, OpenBSD and DragonFlyBSD have
>-had these options for much longer than us.
>---- vnc/vncclientthread.cpp
>-+++ vnc/vncclientthread.cpp
>-@@ -606,23 +606,30 @@ void VncClientThread::clientSetKeepalive()
>-         return;
>-     }
>- 
>-+#ifdef TCP_KEEPIDLE
>-     optval = m_keepalive.intervalSeconds;
>-     if (setsockopt(cl->sock, IPPROTO_TCP, TCP_KEEPIDLE, &optval, optlen) < 0) {
>-         kError(5011) << "setsockopt(TCP_KEEPIDLE)" << strerror(errno);
>-         return;
>-     }
>-+#endif
>- 
>-+#ifdef TCP_KEEPINTVL
>-     optval = m_keepalive.intervalSeconds;
>-     if (setsockopt(cl->sock, IPPROTO_TCP, TCP_KEEPINTVL, &optval, optlen) < 0) {
>-         kError(5011) << "setsockopt(TCP_KEEPINTVL)" << strerror(errno);
>-         return;
>-     }
>-+#endif
>- 
>-+#ifdef TCP_KEEPCNT
>-     optval = m_keepalive.failedProbes;
>-     if(setsockopt(cl->sock, IPPROTO_TCP, TCP_KEEPCNT, &optval, optlen) < 0) {
>-         kError(5011) << "setsockopt(TCP_KEEPCNT)" << strerror(errno);
>-         return;
>-     }
>-+#endif
>-+
>-     m_keepalive.set = true;
>-     kDebug(5011) << "TCP keepalive set";
>- }

Actions: View | Diff

Attachments on bug 209695: 170543