- register via bonjour by default

OBS-URL: https://build.opensuse.org/package/show/games:tools/mumble?expand=0&rev=9
This commit is contained in:
Ludwig Nussel 2011-03-23 17:27:05 +00:00 committed by Git OBS Bridge
parent 27a02b00c3
commit 0a7ef68020
3 changed files with 38 additions and 0 deletions

View File

@ -0,0 +1,31 @@
From e05c7781954601d81da1770235d99e5f25b85393 Mon Sep 17 00:00:00 2001
From: Ludwig Nussel <ludwig.nussel@suse.de>
Date: Wed, 23 Mar 2011 18:23:47 +0100
Subject: [PATCH mumble] register the local host name instead of qsRegName via bonjour
no qsRegName means not registering via bonjour. Setting qsRegName
causes a warning wrt public registration. So just use the local host
name instead.
---
src/murmur/Server.cpp | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/murmur/Server.cpp b/src/murmur/Server.cpp
index d173e9e..b52d576 100644
--- a/src/murmur/Server.cpp
+++ b/src/murmur/Server.cpp
@@ -467,8 +467,9 @@ void Server::setLiveConf(const QString &key, const QString &value) {
void Server::initBonjour() {
bsRegistration = new BonjourServer();
if (bsRegistration->bsrRegister) {
- log("Announcing server via bonjour");
- bsRegistration->bsrRegister->registerService(BonjourRecord(qsRegName, "_mumble._tcp", ""),
+ QString name = QHostInfo::localHostName();
+ log(QString("Announcing %1 via bonjour").arg(name));
+ bsRegistration->bsrRegister->registerService(BonjourRecord(name, "_mumble._tcp", ""),
usPort);
}
}
--
1.7.3.4

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Mar 23 17:26:38 UTC 2011 - lnussel@suse.de
- register via bonjour by default
-------------------------------------------------------------------
Tue Mar 8 16:07:54 UTC 2011 - lnussel@suse.de

View File

@ -81,6 +81,7 @@ Source2: mumble-server.init
Patch0: 0001-fix-build-error-with-capability.h.diff
Patch1: 0001-fix-user-switching.diff
Patch2: 0001-open-log-file-early-so-log-dir-can-be-root-owned.diff
Patch3: 0001-register-the-local-host-name-instead-of-qsRegName-via.diff
Patch50: mumble-1.2.2-buildcompare.diff
# hack, no clue about glx so no idea to fix this properly
Patch99: mumble-1.1.4-sle10glx.diff
@ -146,6 +147,7 @@ won't be audible to other players.
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
#
%patch50 -p1
%if 0%{?suse_version} && 0%{?suse_version} < 1020