[SCM] kdeconnect packaging branch, master, updated. debian/0.9g-1-1183-g9d69498
Maximiliano Curia
maxy at moszumanska.debian.org
Fri Oct 14 14:26:58 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kdeconnect.git;a=commitdiff;h=006a0b8
The following commit has been merged in the master branch:
commit 006a0b8dadaa7c0ed595b26b953d76179720bd6d
Author: Tim Creech <dezgotspam at gmail.com>
Date: Thu Sep 12 20:49:32 2013 +0200
Didn't build on FreeBSD because it does not define SOL_TCP
Replaced SOL_TCP with getprotobyname("TCP")->p_proto
BUG: 324766
---
kded/devicelinks/landevicelink.cpp | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/kded/devicelinks/landevicelink.cpp b/kded/devicelinks/landevicelink.cpp
index 38fa110..c10d599 100644
--- a/kded/devicelinks/landevicelink.cpp
+++ b/kded/devicelinks/landevicelink.cpp
@@ -23,6 +23,7 @@
#include <sys/socket.h>
#include <netinet/in.h>
#include <netinet/tcp.h>
+#include <netdb.h>
#include "linkproviders/linkprovider.h"
#include "networkpackage.h"
@@ -40,10 +41,10 @@ LanDeviceLink::LanDeviceLink(const QString& d, LinkProvider* a, QTcpSocket* sock
setsockopt(fd, IPPROTO_TCP, TCP_KEEPIDLE, &maxIdle, sizeof(maxIdle));
int count = 3; // send up to 3 keepalive packets out, then disconnect if no response
- setsockopt(fd, SOL_TCP, TCP_KEEPCNT, &count, sizeof(count));
+ setsockopt(fd, getprotobyname("TCP")->p_proto, TCP_KEEPCNT, &count, sizeof(count));
int interval = 5; // send a keepalive packet out every 2 seconds (after the 5 second idle period)
- setsockopt(fd, SOL_TCP, TCP_KEEPINTVL, &interval, sizeof(interval));
+ setsockopt(fd, getprotobyname("TCP")->p_proto, TCP_KEEPINTVL, &interval, sizeof(interval));
connect(mSocket, SIGNAL(disconnected()),
this, SLOT(deleteLater()));
--
kdeconnect packaging
More information about the pkg-kde-commits
mailing list