[Pkg-voip-commits] r1224 - in kphone/trunk/debian: . patches
Mark Purcell
msp at costa.debian.org
Fri Feb 3 22:43:08 UTC 2006
Author: msp
Date: 2006-02-03 22:43:07 +0000 (Fri, 03 Feb 2006)
New Revision: 1224
Added:
kphone/trunk/debian/patches/bug_342555_message_5.mbox
kphone/trunk/debian/patches/udpmessagesocket.diff
Modified:
kphone/trunk/debian/changelog
kphone/trunk/debian/control
Log:
* Switch to cdbs
* Hang on connecting (Closes: #342555)
* FTBFS on GNU/kFreeBSD (Closes: #336854)
Modified: kphone/trunk/debian/changelog
===================================================================
--- kphone/trunk/debian/changelog 2006-02-03 22:27:25 UTC (rev 1223)
+++ kphone/trunk/debian/changelog 2006-02-03 22:43:07 UTC (rev 1224)
@@ -1,10 +1,12 @@
kphone (1:4.2-5) unstable; urgency=low
+ * Switch to cdbs
* Makefile should not strip binaries [patch] (Closes: #322451)
* KPhone: crash after doubleclick (Closes: #309638)
- * Switch to cdbs
+ * Hang on connecting (Closes: #342555)
+ * FTBFS on GNU/kFreeBSD (Closes: #336854)
- -- Mark Purcell <msp at debian.org> Sat, 4 Feb 2006 09:25:47 +1100
+ -- Mark Purcell <msp at debian.org> Sat, 4 Feb 2006 09:42:08 +1100
kphone (1:4.2-4) unstable; urgency=low
Modified: kphone/trunk/debian/control
===================================================================
--- kphone/trunk/debian/control 2006-02-03 22:27:25 UTC (rev 1223)
+++ kphone/trunk/debian/control 2006-02-03 22:43:07 UTC (rev 1224)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
Uploaders: Mark Purcell <msp at debian.org>, Kilian Krause <kilian at debian.org>, Jose Carlos Garcia Sogo <jsogo at debian.org>, Santiago Garcia Mantinan <manty at debian.org>, Simon Richter <sjr at debian.org>
-Build-Depends: debhelper (>> 4.0.0), libssl-dev, autotools-dev, dpatch, libqt3-mt-dev (>= 3:3.3.4-4), libasound2-dev, cdbs
+Build-Depends: debhelper (>> 4.0.0), libssl-dev, autotools-dev, dpatch, libqt3-mt-dev (>= 3:3.3.4-4), libasound2-dev [!kfreebsd-i386 !hurd-i386], cdbs
Standards-Version: 3.5.8
Package: kphone
Added: kphone/trunk/debian/patches/bug_342555_message_5.mbox
===================================================================
--- kphone/trunk/debian/patches/bug_342555_message_5.mbox 2006-02-03 22:27:25 UTC (rev 1223)
+++ kphone/trunk/debian/patches/bug_342555_message_5.mbox 2006-02-03 22:43:07 UTC (rev 1224)
@@ -0,0 +1,150 @@
+From k.vriezen at vgelder.com Thu Dec 08 07:17:53 2005
+Received: (at submit) by bugs.debian.org; 8 Dec 2005 15:17:53 +0000
+Return-path: <k.vriezen at vgelder.com>
+Received: from vge.xs4all.nl ([80.127.85.34] helo=mail.vgelder.com)
+ by spohr.debian.org with esmtp (Exim 4.50)
+ id 1EkNWr-0002At-Ar
+ for submit at bugs.debian.org; Thu, 08 Dec 2005 07:17:53 -0800
+Received: by mail.vgelder.com (Postfix, from userid 106)
+ id 534078C59; Thu, 8 Dec 2005 16:17:32 +0100 (CET)
+Received: from localhost.intern (santiago.dmz [192.168.2.200])by mail.vgelder.com (Postfix) with ESMTP id B7551A53for <submit at bugs.debian.org>; Thu, 8 Dec 2005 16:17:31 +0100 (CET)
+Received: from localhost.intern (localhost [127.0.0.1])by localhost.intern (8.13.5/8.13.5/Debian-3) with ESMTP id jB8FHKIn019449(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT)for <submit at bugs.debian.org>; Thu, 8 Dec 2005 16:17:20 +0100
+Received: (from kv at localhost)by localhost.intern (8.13.5/8.13.5/Submit) id jB8FHKau019446for submit at bugs.debian.org; Thu, 8 Dec 2005 16:17:20 +0100
+X-Authentication-Warning: localhost.intern: kv set sender to k.vriezen at vgelder.com using -f
+Date: Thu, 8 Dec 2005 16:17:20 +0100
+From: Koos Vriezen <k.vriezen at vgelder.com>
+To: submit at bugs.debian.org
+Subject: Hang on connecting
+Message-ID: <20051208151719.GA18126 at vgelder.com>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=us-ascii
+Content-Disposition: inline
+User-Agent: Mutt/1.5.9i
+X-Copyrighted-Material: Please visit http://www.company.com/privacy.htm
+Delivered-To: submit at bugs.debian.org
+X-Spam-Checker-Version: SpamAssassin 2.60-bugs.debian.org_2005_01_02
+ (1.212-2003-09-23-exp) on spohr.debian.org
+X-Spam-Level:
+X-Spam-Status: No, hits=-8.0 required=4.0 tests=BAYES_00,HAS_PACKAGE
+ autolearn=no version=2.60-bugs.debian.org_2005_01_02
+
+Package: kphone
+Version: 4.2-3
+
+Using an asterisk server and kphone as client, kphone hangs when
+connecting to another SIP client on the same internal network. This only
+seem to happen when having extensions written like:
+ exten => 110,1, Dial(SIP/kv,30)
+in asterisk's extensions.conf and not when written as
+ exten => 110,1, Dial(SIP/kv,30,t)
+
+I've tracked down the bug in kphone and kphone opens the input twice
+and then hangs in QThread::Start() in pthread_cond_wait (done when this
+method is called while already running)
+
+#0 CallAudio::audioIn (this=0x824cf28) at callaudio.cpp:199
+#1 0x08092c17 in CallAudio::memberStatusUpdated (this=0x824cf28,
+ member=0x828a968) at callaudio.cpp:663
+#2 0x08093739 in CallAudio::qt_invoke (this=0x824cf28, _id=2, _o=0xbfd127dc)
+ at callaudio.moc.cpp:103
+#3 0xb78271f9 in QObject::activate_signal () from /usr/lib/libqt-mt.so.3
+#4 0x080ca60a in SipCallMember::statusUpdated (this=0x828a968, t0=0x828a968)
+ at sipcall.moc.cpp:103
+#5 0x080c22d0 in SipCallMember::acceptInvite (this=0x828a968,
+ body=@0xbfd128c8, bodytype=@0xbfd128b8) at sipcall.cpp:572
+#6 0x08092a7c in CallAudio::memberStatusUpdated (this=0x824cf28,
+ member=0x828a968) at callaudio.cpp:655
+#7 0x08093739 in CallAudio::qt_invoke (this=0x824cf28, _id=2, _o=0xbfd1297c)
+ at callaudio.moc.cpp:103
+#8 0xb78271f9 in QObject::activate_signal () from /usr/lib/libqt-mt.so.3
+#9 0x080ca60a in SipCallMember::statusUpdated (this=0x828a968, t0=0x828a968)
+ at sipcall.moc.cpp:103
+#10 0x080c2d3f in SipCallMember::incomingTransaction (this=0x828a968,
+ newtrans=0x82e36b8) at sipcall.cpp:663
+#11 0x080c849c in SipCall::incomingRequest (this=0x8240670, message=0x82d8180)
+ at sipcall.cpp:994
+#12 0x080c8b75 in SipCall::incomingMessage (this=0x8240670, message=0x82d8180)
+ at sipcall.cpp:862
+#13 0x080d3884 in SipClient::parseMessage (this=0x821c8b0,
+ fullmessage=@0xbfd151e0) at sipclient.cpp:653
+#14 0x080d5ba4 in SipClient::incomingMessage (this=0x821c8b0, socketfd=8)
+ at sipclient.cpp:484
+#15 0x080d5d83 in SipClient::doSelect (this=0x821c8b0, block=false)
+ at sipclient.cpp:283
+#16 0x0805a476 in KPhone::timerTick (this=0x820f0d8) at kphone.cpp:145
+#17 0x08061364 in KPhone::qt_invoke (this=0x820f0d8, _id=64, _o=0xbfd153d8)
+ at kphone.moc.cpp:122
+
+#0 CallAudio::audioIn (this=0x824cf28) at callaudio.cpp:199
+#1 0x08092c17 in CallAudio::memberStatusUpdated (this=0x824cf28,
+ member=0x828a968) at callaudio.cpp:663
+#2 0x08093739 in CallAudio::qt_invoke (this=0x824cf28, _id=2, _o=0xbfd1297c)
+ at callaudio.moc.cpp:103
+#3 0xb78271f9 in QObject::activate_signal () from /usr/lib/libqt-mt.so.3
+#4 0x080ca60a in SipCallMember::statusUpdated (this=0x828a968, t0=0x828a968)
+ at sipcall.moc.cpp:103
+#5 0x080c2d3f in SipCallMember::incomingTransaction (this=0x828a968,
+ newtrans=0x82e36b8) at sipcall.cpp:663
+#6 0x080c849c in SipCall::incomingRequest (this=0x8240670, message=0x82d8180)
+ at sipcall.cpp:994
+#7 0x080c8b75 in SipCall::incomingMessage (this=0x8240670, message=0x82d8180)
+ at sipcall.cpp:862
+#8 0x080d3884 in SipClient::parseMessage (this=0x821c8b0,
+ fullmessage=@0xbfd151e0) at sipclient.cpp:653
+#9 0x080d5ba4 in SipClient::incomingMessage (this=0x821c8b0, socketfd=8)
+ at sipclient.cpp:484
+#10 0x080d5d83 in SipClient::doSelect (this=0x821c8b0, block=false)
+ at sipclient.cpp:283
+#11 0x0805a476 in KPhone::timerTick (this=0x820f0d8) at kphone.cpp:145
+#12 0x08061364 in KPhone::qt_invoke (this=0x820f0d8, _id=64, _o=0xbfd153d8)
+ at kphone.moc.cpp:122
+
+This patch fixes it for me (and I believe it's either right or there is
+a memory leak in kphone :-)
+
+--- kphone/callaudio.cpp-old 2005-12-08 16:11:02.000000000 +0100
++++ kphone/callaudio.cpp 2005-12-08 16:11:09.000000000 +0100
+@@ -635,9 +635,12 @@
+ if( !sdpm.isOnHold() ) {
+ if( output ) {
+ output->setCodec( getRtpCodec(), getRtpCodecNum() );
+- audioIn();
+- output->start();
+- input->start();
++ if (!input)
++ audioIn();
++ if (!input->running ()) {
++ output->start();
++ input->start();
++ }
+ } else if( jack_audioout ) {
+
+ // jack_audioout->setCodec( getRtpCodec(), getRtpCodecNum() );
+
+
+Thanks,
+
+Koos Vriezen
+
+***************DISCLAIMER***************
+Bewijs van Afstand:
+Dit emailbericht is slechts bestemd voor de personen aan wie het is gericht
+en kan informatie bevatten die persoonlijk of vertrouwelijk is en niet
+openbaar mag worden gemaakt zonder goedkeuring van de auteur.
+Indien u dit bericht per vergissing heeft ontvangen, verzoeken wij u ons op
+de hoogte te stellen en het bericht te vernietigen zonder het te kopiëren of
+te distribueren.
+Ons bedrijf staat niet in voor juiste en volledige overbrenging van de inhoud
+van een verzonden bericht, noch voor de tijdige ontvangst daarvan.
+Disclaimer:
+This E-mail is for use of the intended recipient(s) only and can contain
+information that is personal or confidential. It is prohibited to distribute
+the content of this message without the author's prior permission.
+If you have received it in error, please notify the sender and immediately
+delete this message without distributing or retaining copies hereof.
+Our company is not responsible for the comprehensiveness of this message nor
+it's time of delivery.
+*********************************************
+
+
+
Added: kphone/trunk/debian/patches/udpmessagesocket.diff
===================================================================
--- kphone/trunk/debian/patches/udpmessagesocket.diff 2006-02-03 22:27:25 UTC (rev 1223)
+++ kphone/trunk/debian/patches/udpmessagesocket.diff 2006-02-03 22:43:07 UTC (rev 1224)
@@ -0,0 +1,19 @@
+
+--- kphone-4.2.orig/dissipate2/udpmessagesocket.cpp
++++ kphone-4.2/dissipate2/udpmessagesocket.cpp
+@@ -1,5 +1,6 @@
+ #include <sys/types.h>
+ #include <sys/socket.h>
++#include <netinet/in.h>
+ #include <netinet/ip.h>
+ #include <errno.h>
+ #include <string.h>
+@@ -57,7 +58,7 @@
+ tos=IPTOS_LOWDELAY;
+ #endif
+ optlen=1;
+- if(setsockopt(socketfd,SOL_IP,IP_TOS,&tos,optlen) != 0){
++ if(setsockopt(socketfd,IPPROTO_IP,IP_TOS,&tos,optlen) != 0){
+ perror("UDPMessageSocket::SetTOS");
+ return -1 ;
+ }
More information about the Pkg-voip-commits
mailing list