|
 |
c7eb99 |
From e49456ae361f5fee765625e2eb3d7439a560cc84 Mon Sep 17 00:00:00 2001
|
|
|
c7eb99 |
From: Ondrej Holy <oholy@redhat.com>
|
|
|
c7eb99 |
Date: Fri, 24 Aug 2018 14:37:11 +0200
|
|
|
c7eb99 |
Subject: [PATCH] Prevent monitoring all interfaces after change of other props
|
|
|
c7eb99 |
|
|
|
c7eb99 |
Commit bfa1432 prevents monitoring all interfaces if invalid interface
|
|
|
c7eb99 |
is provided, but it works only in some cases, because the invalid
|
|
|
c7eb99 |
interface is not remembered and for example consequent change of port
|
|
|
c7eb99 |
will cause that all interfaces are monitored again. Remember the invalid
|
|
|
c7eb99 |
interface to prevent monitoring all interfaces even after change of
|
|
|
c7eb99 |
other properties...
|
|
|
c7eb99 |
|
|
|
c7eb99 |
https://bugzilla.gnome.org/show_bug.cgi?id=796349
|
|
|
c7eb99 |
---
|
|
|
c7eb99 |
server/libvncserver/sockets.c | 9 +++------
|
|
|
c7eb99 |
1 file changed, 3 insertions(+), 6 deletions(-)
|
|
|
c7eb99 |
|
|
|
c7eb99 |
diff --git a/server/libvncserver/sockets.c b/server/libvncserver/sockets.c
|
|
|
c7eb99 |
index 45df6d5..ee755eb 100644
|
|
|
c7eb99 |
--- a/server/libvncserver/sockets.c
|
|
|
c7eb99 |
+++ b/server/libvncserver/sockets.c
|
|
|
c7eb99 |
@@ -748,12 +748,9 @@ rfbSetNetworkInterface(rfbScreenInfoPtr rfbScreen, const char *netIface)
|
|
|
c7eb99 |
rfbScreen->rfbListenSockTotal = 0;
|
|
|
c7eb99 |
}
|
|
|
c7eb99 |
|
|
|
c7eb99 |
- if(netIface != NULL && strlen(netIface) > 0 && if_nametoindex(netIface) > 0) {
|
|
|
c7eb99 |
- rfbScreen->netIface = netIface;
|
|
|
c7eb99 |
- }
|
|
|
c7eb99 |
- else {
|
|
|
c7eb99 |
- rfbScreen->netIface = NULL;
|
|
|
c7eb99 |
- if(netIface != NULL && strlen(netIface) > 0) {
|
|
|
c7eb99 |
+ if(netIface != NULL && strlen(netIface) > 0) {
|
|
|
c7eb99 |
+ rfbScreen->netIface = netIface;
|
|
|
c7eb99 |
+ if (if_nametoindex(netIface) == 0) {
|
|
|
c7eb99 |
rfbLog("(%s) is an invalid network interface\n", netIface);
|
|
|
c7eb99 |
return FALSE;
|
|
|
c7eb99 |
}
|
|
|
c7eb99 |
--
|
|
|
c7eb99 |
2.19.0
|
|
|
c7eb99 |
|