You can subscribe to this list here.
2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(1) |
Jun
(21) |
Jul
(10) |
Aug
(2) |
Sep
(16) |
Oct
(33) |
Nov
(15) |
Dec
(10) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2006 |
Jan
(21) |
Feb
(22) |
Mar
(14) |
Apr
(11) |
May
(33) |
Jun
(26) |
Jul
(9) |
Aug
(7) |
Sep
(9) |
Oct
(7) |
Nov
(1) |
Dec
(2) |
2007 |
Jan
(30) |
Feb
(19) |
Mar
(14) |
Apr
(10) |
May
(13) |
Jun
(10) |
Jul
(12) |
Aug
(4) |
Sep
(3) |
Oct
(6) |
Nov
(4) |
Dec
|
2008 |
Jan
(2) |
Feb
(1) |
Mar
(1) |
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
(1) |
Sep
(1) |
Oct
|
Nov
(1) |
Dec
|
2009 |
Jan
(2) |
Feb
|
Mar
|
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
|
Sep
(1) |
Oct
|
Nov
|
Dec
|
2010 |
Jan
(6) |
Feb
|
Mar
(3) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
From: klaus f. <kgf...@us...> - 2010-03-14 10:42:33
|
kgfleischmann 2010/03/14 10:42:26 UTC Kphone CVS Repository Added files: utility audioinfo kpsiuser Log: new tools Revision Changes Path 1.1 +12 -0 kphoneSI/utility/audioinfo (new) http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/utility/audioinfo?rev=1.1&content-type=text/plain 1.1 +4 -0 kphoneSI/utility/kpsiuser (new) http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/utility/kpsiuser?rev=1.1&content-type=text/plain Index: audioinfo ==================================================================== #!/bin/sh amixer -c 0 info amixer -c 0 scontrols sleep 1 amixer -c 1 info amixer -c 1 scontrols sleep 1 amixer -c 2 info amixer -c 2 scontrols sleep 1 amixer -c 3 info amixer -c 3 scontrols Index: kpsiuser ==================================================================== #!/bin/bash echo "grep -A 5 $1.*_Reg $HOME/.qt/kpsirc" grep -A 5 $1.*_Reg $HOME/.qt/kpsirc|less |
From: klaus f. <kgf...@us...> - 2010-03-14 10:41:15
|
kgfleischmann 2010/03/14 10:41:08 UTC Kphone CVS Repository kphoneSI/utility - New directory |
From: klaus f. <kgf...@us...> - 2010-03-14 10:38:43
|
kgfleischmann 2010/03/14 10:38:36 UTC Kphone CVS Repository Modified files: . CHANGES KPhoneSI.kdevelop.filelist kphone Makefile.in kphone.cpp ksippreferences.cpp ksippreferences.h ksipregistrations.cpp ksipregistrations.h Revision Changes Path 1.60 +3 -0 kphoneSI/CHANGES http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/CHANGES?r1=1.59&r2=1.60 1.15 +77 -71 kphoneSI/KPhoneSI.kdevelop.filelist http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/KPhoneSI.kdevelop.filelist?r1=1.14&r2=1.15 1.23 +1 -0 kphoneSI/kphone/Makefile.in http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/Makefile.in?r1=1.22&r2=1.23 1.31 +3 -1 kphoneSI/kphone/kphone.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/kphone.cpp?r1=1.30&r2=1.31 1.21 +29 -4 kphoneSI/kphone/ksippreferences.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/ksippreferences.cpp?r1=1.20&r2=1.21 1.13 +6 -1 kphoneSI/kphone/ksippreferences.h http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/ksippreferences.h?r1=1.12&r2=1.13 1.17 +7 -163 kphoneSI/kphone/ksipregistrations.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/ksipregistrations.cpp?r1=1.16&r2=1.17 1.8 +1 -140 kphoneSI/kphone/ksipregistrations.h http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/ksipregistrations.h?r1=1.7&r2=1.8 Index: CHANGES =================================================================== RCS file: /cvsroot/kphone/kphoneSI/CHANGES,v retrieving revision 1.59 retrieving revision 1.60 diff -u -r1.59 -r1.60 --- CHANGES 27 Sep 2009 05:52:12 -0000 1.59 +++ CHANGES 14 Mar 2010 10:38:35 -0000 1.60 @@ -1,5 +1,8 @@ CVS Version: KPhoneSI 1.54 ========================================= + - Menue, added identity menue to the pulldowns +CVS Version: KPhoneSI 1.54 +========================================= - TCP: don't waste UDP ports for TCP calls - TCP: use of STUN is disabled (our implementation works for UDP only) Index: KPhoneSI.kdevelop.filelist =================================================================== RCS file: /cvsroot/kphone/kphoneSI/KPhoneSI.kdevelop.filelist,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- KPhoneSI.kdevelop.filelist 12 Sep 2008 09:51:00 -0000 1.14 +++ KPhoneSI.kdevelop.filelist 14 Mar 2010 10:38:35 -0000 1.15 @@ -1,4 +1,61 @@ # KDevelop Custom Project File List +Makefile +Speex +Speex/bits.cpp +Speex/cb_search.cpp +Speex/cb_search.h +Speex/exc_10_16_table.cpp +Speex/exc_10_32_table.cpp +Speex/exc_20_32_table.cpp +Speex/exc_5_256_table.cpp +Speex/exc_5_64_table.cpp +Speex/exc_8_128_table.cpp +Speex/filters.cpp +Speex/filters.h +Speex/filters_sse.h +Speex/gain_table.cpp +Speex/gain_table_lbr.cpp +Speex/hexc_10_32_table.cpp +Speex/hexc_table.cpp +Speex/high_lsp_tables.cpp +Speex/lpc.h +Speex/lpc1.cpp +Speex/lsp.cpp +Speex/lsp.h +Speex/lsp_tables_nb.cpp +Speex/ltp.cpp +Speex/ltp.h +Speex/ltp_sse.h +Speex/math_approx.cpp +Speex/math_approx.h +Speex/misc.cpp +Speex/misc.h +Speex/modes.cpp +Speex/modes.h +Speex/nb_celp.cpp +Speex/nb_celp.h +Speex/quant_lsp.cpp +Speex/quant_lsp.h +Speex/sb_celp.cpp +Speex/sb_celp.h +Speex/speex.h +Speex/speex_bits.h +Speex/speex_callbacks.cpp +Speex/speex_callbacks.h +Speex/speex_decode.cpp +Speex/speex_define.h +Speex/speex_encode.cpp +Speex/speex_header.cpp +Speex/speex_header.h +Speex/speex_stereo.h +Speex/stack_alloc.h +Speex/stereo.cpp +Speex/vbr.cpp +Speex/vbr.h +Speex/vq.cpp +Speex/vq.h +Speex/xx-stack_alloc.h +config.h dissipate2 dissipate2/base64.c dissipate2/base64.h @@ -54,12 +111,12 @@ gsm/config.h gsm/debug.cpp gsm/decode.cpp +gsm/gsm.h gsm/gsm_create.cpp gsm/gsm_decode.cpp gsm/gsm_destroy.cpp gsm/gsm_encode.cpp gsm/gsm_explode.cpp -gsm/gsm.h gsm/gsm_implode.cpp gsm/gsm_option.cpp gsm/gsm_print.cpp @@ -76,6 +133,16 @@ gsm/unproto.h icons ilbc +ilbc/FrameClassify.cpp +ilbc/FrameClassify.h +ilbc/LPCdecode.cpp +ilbc/LPCdecode.h +ilbc/LPCencode.cpp +ilbc/LPCencode.h +ilbc/StateConstructW.cpp +ilbc/StateConstructW.h +ilbc/StateSearchW.cpp +ilbc/StateSearchW.h ilbc/anaFilter.cpp ilbc/anaFilter.h ilbc/constants.cpp @@ -88,8 +155,6 @@ ilbc/enhancer.h ilbc/filter.cpp ilbc/filter.h -ilbc/FrameClassify.cpp -ilbc/FrameClassify.h ilbc/gainquant.cpp ilbc/gainquant.h ilbc/getCBvec.cpp @@ -110,18 +175,10 @@ ilbc/iLBC_encode.cpp ilbc/iLBC_encode.h ilbc/iLBC_test.cpp -ilbc/LPCdecode.cpp -ilbc/LPCdecode.h -ilbc/LPCencode.cpp -ilbc/LPCencode.h ilbc/lsf.cpp ilbc/lsf.h ilbc/packing.cpp ilbc/packing.h -ilbc/StateConstructW.cpp -ilbc/StateConstructW.h -ilbc/StateSearchW.cpp -ilbc/StateSearchW.h ilbc/syntFilter.cpp ilbc/syntFilter.h kaudio @@ -136,10 +193,10 @@ kaudio/dspaudioout.h kaudio/dspearly.cpp kaudio/dspearly.h -kaudio/dspoutalsa.cpp -kaudio/dspoutalsa.h kaudio/dspout.cpp kaudio/dspout.h +kaudio/dspoutalsa.cpp +kaudio/dspoutalsa.h kaudio/dspoutoss.cpp kaudio/dspoutoss.h kaudio/dspoutrtp.cpp @@ -174,16 +231,18 @@ kphone/khelp.h kphone/kinstantmessagewidget.cpp kphone/kinstantmessagewidget.h -kphone/kphonebook.cpp -kphone/kphonebook.h kphone/kphone.cpp kphone/kphone.h +kphone/kphonebook.cpp +kphone/kphonebook.h kphone/kphoneview.cpp kphone/kphoneview.h kphone/kreferdialog.cpp kphone/kreferdialog.h kphone/ksipauthentication.cpp kphone/ksipauthentication.h +kphone/ksipidentity.cpp +kphone/ksipidentity.h kphone/ksipoptions.cpp kphone/ksipoptions.h kphone/ksippreferences.cpp @@ -205,59 +264,6 @@ kphone/watcherlist.h ringing ringing/kphonering.cpp -Speex -Speex/bits.cpp -Speex/cb_search.cpp -Speex/cb_search.h -Speex/exc_10_16_table.cpp -Speex/exc_10_32_table.cpp -Speex/exc_20_32_table.cpp -Speex/exc_5_256_table.cpp -Speex/exc_5_64_table.cpp -Speex/exc_8_128_table.cpp -Speex/filters.cpp -Speex/filters.h -Speex/filters_sse.h -Speex/gain_table.cpp -Speex/gain_table_lbr.cpp ---------------------------------------------- Diff block truncated. (Max lines = 200) ---------------------------------------------- |
From: 朱文佳 <wen...@ne...> - 2010-01-22 08:46:08
|
Hello, I used SER(SIP Express Router) as the sip server. My OS is ReaHat8.0. And I have set the SER to listen in IPv6. My problem is how to use KPhone over IPv6? I installed Kphone3.0 which is said to be support IPv6 only. But when I set the SIP server address with ,for example [2001:da8:207::3333],then restart the Kphone, There's no register packet be sent from the PC which Kphone is installed. (Actually there's nothing be sent from it.) And then I try to use Kphone3.11 which seems to support both IPv4 and IPv6. It works nice in IPv4.But when I set the SIP server as IPv6(the same like above [2001:da8:207::3333]), and restart the Kphone ,it was broken.I can't restart it anymore. And finally I tried with Kphone SI.It also works well in IPv4.But seems can not be used in IPv6. I want to make the Kphone performance in IPv6.But I don't how to set it. I'll be glad if I can hear some advice from you. Thank you very much. >From ZWJ |
From: 朱文佳 <wen...@ne...> - 2010-01-22 08:36:35
|
Hello, I used SER(SIP Express Router) as the sip server. My OS is ReaHat8.0. And I have set the SER to listen in IPv6. My problem is how to use KPhone over IPv6? I installed Kphone3.0 which is said to be support IPv6 only. But when I set the SIP server address with ,for example [2001:da8:207::3333],then restart the Kphone, There's no register packet be sent from the PC which Kphone is installed. (Actually there's nothing be sent from it.) And then I try to use Kphone3.11 which seems to support both IPv4 and IPv6. It works nice in IPv4.But when I set the SIP server as IPv6(the same like above [2001:da8:207::3333]), and restart the Kphone ,it was broken.I can't restart it anymore. And finally I tried with Kphone SI.It also works well in IPv4.But seems can not be used in IPv6. I want to make the Kphone performance in IPv6.But I don't how to set it. I'll be glad if I can hear some advice from you. Thank you very much. >From ZWJ |
From: 朱文佳 <wen...@ne...> - 2010-01-22 08:31:00
|
Hello, I used SER(SIP Express Router) as the sip server. My OS is ReaHat8.0. And I have set the SER to listen in IPv6. My problem is how to use KPhone over IPv6? I installed Kphone3.0 which is said to be support IPv6 only. But when I set the SIP server address with ,for example [2001:da8:207::3333],then restart the Kphone, There's no register packet be sent from the PC which Kphone is installed. (Actually there's nothing be sent from it.) And then I try to use Kphone3.11 which seems to support both IPv4 and IPv6. It works nice in IPv4.But when I set the SIP server as IPv6(the same like above [2001:da8:207::3333]), and restart the Kphone ,it was broken.I can't restart it anymore. And finally I tried with Kphone SI.It also works well in IPv4.But seems can not be used in IPv6. I want to make the Kphone performance in IPv6.But I don't how to set it. I'll be glad if I can hear some advice from you. Thank you very much. >From ZWJ |
From: klaus f. <kgf...@us...> - 2010-01-11 14:34:51
|
kgfleischmann 2010/01/11 14:34:44 UTC Kphone CVS Repository Modified files: dissipate2 sipmessage.cpp sipmessage.h Log: sipmessage error Revision Changes Path 1.15 +22 -0 kphoneSI/dissipate2/sipmessage.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/dissipate2/sipmessage.cpp?r1=1.14&r2=1.15 1.7 +1 -0 kphoneSI/dissipate2/sipmessage.h http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/dissipate2/sipmessage.h?r1=1.6&r2=1.7 Index: sipmessage.h =================================================================== RCS file: /cvsroot/kphone/kphoneSI/dissipate2/sipmessage.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sipmessage.h 1 Mar 2008 16:56:56 -0000 1.6 +++ sipmessage.h 11 Jan 2010 14:34:44 -0000 1.7 @@ -139,6 +139,7 @@ * Returns the data contained in the specified header. */ QString getHeaderData( SipHeader::SipHeaderId id ); + QString findHeaderData( SipHeader::SipHeaderId id, QString searchData ); /** * Sets the request URI for the message. Relevant only if it is a SIP Index: sipmessage.cpp =================================================================== RCS file: /cvsroot/kphone/kphoneSI/dissipate2/sipmessage.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sipmessage.cpp 12 Sep 2008 09:50:59 -0000 1.14 +++ sipmessage.cpp 11 Jan 2010 14:34:44 -0000 1.15 @@ -221,6 +221,28 @@ } } +QString SipMessage::findHeaderData( SipHeader::SipHeaderId id, QString searchData ) +{ + SipHeader *curheader; + + // quick optimization + if ( headerlist.current() != 0 ) { + curheader=headerlist.current(); + if ( curheader->id == id && curheader->data.lower().contains(searchData)) { + return curheader->data; + } + } + for ( curheader = headerlist.first(); curheader != 0; curheader = headerlist.next() ) { + + if ( curheader->id == id && curheader->data.lower().contains(searchData) ) { + + return curheader->data; + } + } + + return QString::null; +} + void SipMessage::parseHeaders( const QString &inbuf ) { int headerend, bodystart, bodylength; |
From: Klaus F. <kgf...@t-...> - 2010-01-09 21:44:49
|
Hi sarah, which kphone did you try to install? Both kphone versions maintained by this project do not use kdb2html. I just tested it. Brgds Klaus sarah yassines wrote: > hello, > > i was installing KPhone on Centos 5 but an error occured telling me that > i must download "kdb2html" ..... where can i find this file because the > link www.ipv6.org.eg <http://www.ipv6.org.eg> doesn't exist anymore.. > > thank you > > Sara > > ------------------------------------------------------------------------ > Windows Live Hotmail: Your friends can get your Facebook updates, right > from Hotmail®. > <http://www.microsoft.com/middleeast/windows/windowslive/see-it-in-action/social-network-basics.aspx?ocid=PID23461::T:WLMTAGL:ON:WL:en-xm:SI_SB_4:092009> > > > ------------------------------------------------------------------------ > > ------------------------------------------------------------------------------ > This SF.Net email is sponsored by the Verizon Developer Community > Take advantage of Verizon's best-in-class app development support > A streamlined, 14 day to market process makes app distribution fast and easy > Join now and get one step closer to millions of Verizon customers > http://p.sf.net/sfu/verizon-dev2dev > > > ------------------------------------------------------------------------ > > _______________________________________________ > kphone-devel mailing list > kph...@li... > https://lists.sourceforge.net/lists/listinfo/kphone-devel |
From: sarah y. <sar...@ho...> - 2010-01-08 17:42:51
|
hello, i was installing KPhone on Centos 5 but an error occured telling me that i must download "kdb2html" ..... where can i find this file because the link www.ipv6.org.eg doesn't exist anymore.. thank you Sara _________________________________________________________________ Windows Live Hotmail: Your friends can get your Facebook updates, right from Hotmail®. http://www.microsoft.com/middleeast/windows/windowslive/see-it-in-action/social-network-basics.aspx?ocid=PID23461::T:WLMTAGL:ON:WL:en-xm:SI_SB_4:092009 |
From: klaus f. <kgf...@us...> - 2009-09-27 05:52:21
|
kgfleischmann 2009/09/27 05:52:12 UTC Kphone CVS Repository Modified files: . CHANGES dissipate2 sipclient.cpp sipclient.h tcpmessagesocket.cpp kphone kphone.cpp ksipregistrations.cpp ksipregistrations.h Log: changes for TCP-processing Revision Changes Path 1.59 +6 -1 kphoneSI/CHANGES http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/CHANGES?r1=1.58&r2=1.59 1.39 +38 -24 kphoneSI/dissipate2/sipclient.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/dissipate2/sipclient.cpp?r1=1.38&r2=1.39 1.19 +5 -1 kphoneSI/dissipate2/sipclient.h http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/dissipate2/sipclient.h?r1=1.18&r2=1.19 1.10 +15 -0 kphoneSI/dissipate2/tcpmessagesocket.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/dissipate2/tcpmessagesocket.cpp?r1=1.9&r2=1.10 1.30 +5 -2 kphoneSI/kphone/kphone.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/kphone.cpp?r1=1.29&r2=1.30 1.16 +19 -16 kphoneSI/kphone/ksipregistrations.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/ksipregistrations.cpp?r1=1.15&r2=1.16 1.7 +1 -1 kphoneSI/kphone/ksipregistrations.h http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/ksipregistrations.h?r1=1.6&r2=1.7 Index: CHANGES =================================================================== RCS file: /cvsroot/kphone/kphoneSI/CHANGES,v retrieving revision 1.58 retrieving revision 1.59 diff -u -r1.58 -r1.59 --- CHANGES 24 May 2009 09:20:01 -0000 1.58 +++ CHANGES 27 Sep 2009 05:52:12 -0000 1.59 @@ -1,7 +1,12 @@ +CVS Version: KPhoneSI 1.54 +========================================= + - TCP: don't waste UDP ports for TCP calls + - TCP: use of STUN is disabled (our implementation works for UDP only) + CVS Version: KPhoneSI 1.53 ========================================= - MessageSocket::lookupHostname: strip the port before consulting getaddrinfo - - Patches from Petr Cisar, thanks + - Patches from Petr Cisar, thanks Petr CVS Version: KPhoneSI 1.52 ========================================= Index: sipclient.cpp =================================================================== RCS file: /cvsroot/kphone/kphoneSI/dissipate2/sipclient.cpp,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- sipclient.cpp 24 May 2009 09:20:01 -0000 1.38 +++ sipclient.cpp 27 Sep 2009 05:52:12 -0000 1.39 @@ -410,15 +410,16 @@ listenport = TCP_listener.listen( listenport, lpRep ); if( !listenport ) { return false; } TCP_listener.forcePortNumber( listenport ); - } - //else { + if(debug >= 2) cout << "=====SipClient: Listening TCP on port:" << TCP_listener.getPortNumber() << endl; + + } else { listener = new UDPMessageSocket(useIPv6); listenport = listener->listen( listenport, lpRep ); if( !listenport ) { return false; } nlp=listenport; listener->forcePortNumber( listenport ); if(debug >= 2) cout << "=====SipClient: Listening UDP on port:" << listener->getPortNumber() << endl; -// } + } return true; } @@ -429,32 +430,43 @@ int highest_fd; timeout.tv_sec = 0; timeout.tv_usec = 8; + +if( isUdpSocket() ) { + FD_ZERO( &read_fds ); FD_SET( listener->getFileDescriptor(), &read_fds ); highest_fd = listener->getFileDescriptor() + 1; -retry: - if( select( highest_fd, &read_fds, NULL, NULL, block ? NULL : &timeout ) == -1 ) { - if( errno == EINTR ) goto retry; - cout << "=====SipClient::doSelect(): select() punted" << endl; - } - if( FD_ISSET( listener->getFileDescriptor(), &read_fds ) ) { - incomingMessage( listener->getFileDescriptor(),false ); +//retry: + while(1) { + if( select( highest_fd, &read_fds, NULL, NULL, block ? NULL : &timeout ) == -1 ) { + if( errno == EINTR ) { + cout << "=====SipClient::doSelect(): select() punted" << endl; + continue; //goto retry; + } + } + if( FD_ISSET( listener->getFileDescriptor(), &read_fds ) ) { + incomingMessage( listener->getFileDescriptor(),false ); + } + break; } -if( isTcpSocket() ) { +} else if( isTcpSocket() ) { FD_ZERO( &read_fds ); FD_SET( TCP_listener.getFileDescriptor(), &read_fds ); highest_fd = TCP_listener.getFileDescriptor() + 1; - -retry2: - if( select( highest_fd, &read_fds, NULL, NULL, block ? NULL : &timeout ) == -1 ) { - if( errno == EINTR ) goto retry2; - cout << "====SipClient::doSelect(): select() punted\n"; + + while (1) { +//retry2: + if( select( highest_fd, &read_fds, NULL, NULL, block ? NULL : &timeout ) == -1 ) { + if( errno == EINTR ) continue; //goto retry2; + cout << "====SipClient::doSelect(): select() punted\n"; + } + break; } - if( FD_ISSET( TCP_listener.getFileDescriptor(), &read_fds ) ) { clilen = sizeof(cli_addr); - newsockfd = ::accept( TCP_listener.getFileDescriptor(), (struct sockaddr *) &cli_addr, (socklen_t*)&clilen); + // newsockfd = ::accept( TCP_listener.getFileDescriptor(), (struct sockaddr *) &cli_addr, (socklen_t*)&clilen); + newsockfd = TCP_listener.accept(); //mark socket to be closed immediately after reading incomingMessage( newsockfd,true ); @@ -467,11 +479,13 @@ FD_ZERO( &read_fds ); FD_SET( tcpSocket->getFileDescriptor(), &read_fds ); highest_fd = tcpSocket->getFileDescriptor() + 1; - -retry3: - if( select( highest_fd, &read_fds, NULL, NULL, block ? NULL : &timeout ) == -1 ) { - if( errno == EINTR ) goto retry3; - cout << "====SipClient::doSelect(): select() punted\n" ; + while (1) { +//retry3: + if( select( highest_fd, &read_fds, NULL, NULL, block ? NULL : &timeout ) == -1 ) { + if( errno == EINTR ) continue; //goto retry3; + cout << "====SipClient::doSelect(): select() punted\n" ; + } + break; } if( FD_ISSET( tcpSocket->getFileDescriptor(), &read_fds ) ) { incomingMessage( tcpSocket->getFileDescriptor(),false ); @@ -1286,7 +1300,7 @@ msg->getRequestUri().setPortNumber( port ); sendtoaddr = sendtoaddr.left( sendtoaddr.find( ']' )+1 ); - } else if( sendtoaddr.contains( ':') && !sendtoaddr.contains(']') ) {//ÃÂÃÂÃÂç && !useIPv6 + } else if( sendtoaddr.contains( ':') && !sendtoaddr.contains(']') ) { port = sendtoaddr.mid( sendtoaddr.find( ':' ) + 1 ).toUInt(); msg->getRequestUri().setPortNumber( port ); sendtoaddr = sendtoaddr.left( sendtoaddr.find( ':' ) ); Index: sipclient.h =================================================================== RCS file: /cvsroot/kphone/kphoneSI/dissipate2/sipclient.h,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- sipclient.h 21 Aug 2008 14:51:40 -0000 1.18 +++ sipclient.h 27 Sep 2009 05:52:12 -0000 1.19 @@ -367,7 +367,11 @@ * UDP or TCP requested ? */ enum Socket { UDP, TCP }; - +/** +* should we use TCP? +*/ + bool isUdpSocket( void ) const { return SocketMode == UDP; } + /** * should we use TCP? */ Index: tcpmessagesocket.cpp =================================================================== RCS file: /cvsroot/kphone/kphoneSI/dissipate2/tcpmessagesocket.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- tcpmessagesocket.cpp 21 Aug 2008 14:51:42 -0000 1.9 +++ tcpmessagesocket.cpp 27 Sep 2009 05:52:12 -0000 1.10 @@ -43,6 +43,7 @@ TCPMessageSocket::TCPMessageSocket( void ) { +cout << "===============>TCP constructor" << endl; type = SocketTCP; if ( ( socketfd = socket( AF_INET, SOCK_STREAM, 0 ) ) == -1 ) { cerr << "TCPMessageSocket(): socket() failed" ; @@ -53,6 +54,8 @@ TCPMessageSocket::TCPMessageSocket( int newfd ) { +cout << "===============>TCP new sochetfd" << endl; + type = SocketTCP; socketfd = newfd; @@ -65,6 +68,8 @@ int TCPMessageSocket::connect( unsigned int portnum ) { +cout << "===============>TCP connnect " << portnum << endl; + socketaddress.soa4.sin_family = AF_INET; socketaddress.soa4.sin_port = htons( portnum ); socketaddress.soa4.sin_addr = ip_addr.in4_addr; @@ -79,6 +84,8 @@ int TCPMessageSocket::send( const char *sendbuffer, unsigned int length ) { +cout << "===============>TCP send" << endl; ---------------------------------------------- Diff block truncated. (Max lines = 200) ---------------------------------------------- |
From: klaus f. <kgf...@us...> - 2009-05-24 09:20:07
|
kgfleischmann 2009/05/24 09:20:01 UTC Kphone CVS Repository Modified files: . CHANGES dissipate2 messagesocket.cpp sipclient.cpp Log: Error corrections, see CHANGES for more Revision Changes Path 1.58 +5 -0 kphoneSI/CHANGES http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/CHANGES?r1=1.57&r2=1.58 1.8 +6 -2 kphoneSI/dissipate2/messagesocket.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/dissipate2/messagesocket.cpp?r1=1.7&r2=1.8 1.38 +11 -9 kphoneSI/dissipate2/sipclient.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/dissipate2/sipclient.cpp?r1=1.37&r2=1.38 Index: CHANGES =================================================================== RCS file: /cvsroot/kphone/kphoneSI/CHANGES,v retrieving revision 1.57 retrieving revision 1.58 diff -u -r1.57 -r1.58 --- CHANGES 4 Jan 2009 13:52:50 -0000 1.57 +++ CHANGES 24 May 2009 09:20:01 -0000 1.58 @@ -1,3 +1,8 @@ +CVS Version: KPhoneSI 1.53 +========================================= + - MessageSocket::lookupHostname: strip the port before consulting getaddrinfo + - Patches from Petr Cisar, thanks + CVS Version: KPhoneSI 1.52 ========================================= - Patches from Mandriva (Thanks folks) Index: messagesocket.cpp =================================================================== RCS file: /cvsroot/kphone/kphoneSI/dissipate2/messagesocket.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- messagesocket.cpp 21 Aug 2008 14:51:39 -0000 1.7 +++ messagesocket.cpp 24 May 2009 09:20:01 -0000 1.8 @@ -77,7 +77,10 @@ if (!cb) return 0; *cb=0; } - + + char *cb=strchr(hostname,':'); + if (cb) *cb = 0; + memset (&hints, 0, sizeof (hints)); hints.ai_family = PF_UNSPEC; @@ -90,9 +93,10 @@ KStatics::noLine=1; } if (errcode != 0) { - cout << "MessageSocket::lookupHostname getaddrinfo " << errcode << endl; + cout << "MessageSocket::lookupHostname for " << hostname << " getaddrinfo: " << errcode << endl; return -1; } + cout << "MessageSocket::lookupHostname for " << hostname << " getaddrinfo: ok" << endl; switch (res->ai_family) { Index: sipclient.cpp =================================================================== RCS file: /cvsroot/kphone/kphoneSI/dissipate2/sipclient.cpp,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- sipclient.cpp 12 Sep 2008 09:50:58 -0000 1.37 +++ sipclient.cpp 24 May 2009 09:20:01 -0000 1.38 @@ -262,7 +262,7 @@ } if(dhost != "") Sip::setLocalAddress(dhost); if( Sip::getLocalAddress().isEmpty() ) { - if(KStatics::debugLevel>=2) cout << "====SipClient::neither IPv6 nor IPv4\n"; + cout << "====SipClient::neither IPv6 nor IPv4\n"; exit(0); } } @@ -272,7 +272,7 @@ nlp=newListenport; portRepeater = lpRep; if( !setupSocketStuff( newListenport, lpRep, socketStr, (int)useIPv6 ) ) { - if(KStatics::debugLevel>=2) cout << "====SipClient::setupSocketStuff() Failed.\n"; + cout << "====SipClient::setupSocketStuff() Failed.\n"; exit( 1 ); } myProxy = ""; @@ -687,7 +687,7 @@ time_t timeStamp; if(debug >0) { timeStamp = time(0); - if(debug > 0) cout << "<<<<< \nSipClient Received message of len = " << fullmessage.length() << " at: " << ctime(&timeStamp); + cout << "<<<<< \nSipClient Received message of len = " << fullmessage.length() << " at: " << ctime(&timeStamp); if( ( debug == 1) || (debug == 3) ) cout << fullmessage.latin1() << "<<<<< \n"; } if(fullmessage.length() <=4) { //T ONLINE sends such stuff! @@ -946,13 +946,15 @@ } if( curmessage->hasHeader( SipHeader::Accept ) ) { if( curmessage->getMethod() == Sip::INVITE ) { - if( !curmessage->getHeaderData( SipHeader::Accept ).lower().contains( "application/sdp" ) ) { + //if( !curmessage->getHeaderData( SipHeader::Accept ).lower().contains( "application/sdp" ) ) { + if( curmessage->findHeaderData( SipHeader::Accept, QString("application/sdp") ) == QString::null ) { sendQuickResponse( curmessage, SipStatus( 406 ) ); delete curmessage; return; } } else if( curmessage->getMethod() == Sip::SUBSCRIBE ) { - if( !curmessage->getHeaderData( SipHeader::Accept ).lower().contains( "application/xpidf+xml" ) ) { + //if( !curmessage->getHeaderData( SipHeader::Accept ).lower().contains( "application/xpidf+xml" ) ) { + if( curmessage->findHeaderData( SipHeader::Accept, QString("application/xpidf+xml") ) == QString::null ) { sendQuickResponse( curmessage, SipStatus( 406 ) ); delete curmessage; return; @@ -1139,9 +1141,9 @@ if(debug > 0) { timeStamp = time(0); - if(debug > 0) cout << "<<<<< \nSipClient send Request at: " << ctime(&timeStamp); + cout << "<<<<< \nSipClient send Request at: " << ctime(&timeStamp); if( ( debug == 1) || (debug == 3) ) cout << msg->message().data(); - if(debug > 0) cout << "<<<<<"; + cout << "<<<<<"; } // Send the message TCPMessageSocket *tcpSocket = 0; @@ -1395,11 +1397,11 @@ } // Announce what we're sending if( debug > 0) { - if(debug > 0) cout << "<<<<<\nSipClient sendMessage "; + cout << "<<<<<\nSipClient sendMessage "; timeStamp = time(0); cout << " at: " << ctime(&timeStamp); if( ( debug == 1) || (debug == 3) ) cout << msg->message().data(); - if(debug > 0) cout << "<<<<<" << endl; + cout << "<<<<<" << endl; } // Send it QString m = msg->message(); |
From: Petr C. <pc...@si...> - 2009-01-07 14:06:13
|
Hi According to my opinion, the way how kphone checks content of SIP headers doesn't work properly if the header is present in the message multiple times. I found this out when troubleshooting incoming calls to kphone that were rejected with response code 406. I figured out that kphone believes that there is no Accept header containing "application/sdp" in INVITE request. The request looked like this: INVITE sip:420241420217@159.107.117.98:5062;transport=udp SIP/2.0\r\n Via: SIP/2.0/UDP 88.103.242.244:5060;branch=z9hG4bK40vsesn4c474nulks41l6aoep0\r\n To: "Ericsson 27"<sip:420...@im...;transport=udp>;cscf\r\n From: <sip:224...@im...;user=phone>;tag=1532581713-1231332392347-\r\n Call-ID: BW1...@bs...\r\n CSeq: 412131022 INVITE\r\n Max-Forwards: 68\r\n Content-Length: 161\r\n Contact: <sip:88.103.242.244:5060;transport=udp>\r\n Content-Type: application/sdp\r\n Allow: ACK, BYE, CANCEL, INFO, INVITE, OPTIONS, PRACK, REFER, NOTIFY\r\n Accept: multipart/mixed\r\n Accept: application/media_control+xml\r\n Accept: application/sdp\r\n Supported: timer\r\n P-Asserted-Identity: <sip:224...@im...:5060;user=phone>\r\n Privacy: none\r\n P-Charging-Vector: icid-value="4964a42833239200003849";icid-generated-at=172.30.0.2;ericsson-imt=1;oaid="test"\r\n Min-SE: 1800\r\n Session-Expires: 1800\r\n P-Called-Party-ID: <sip:420...@im...>\r\n \r\n v=0\r\n o=BroadWorks 10634 1 IN IP4 88.103.242.244\r\n s=-\r\n c=IN IP4 88.103.242.244\r\n t=0 0\r\n m=audio 16410 RTP/AVP 96 18 8\r\n a=rtpmap:96 iLBC/8000/1\r\n a=fmtp:96 mode=30\r\n I have made for myself a fix (see the diff below) that works, but I am not sure whether it can possibly be called a clean solution. Best Regards Petr Cisar diff -x '*.[oa]' -Naur kphoneSI/dissipate2/sipclient.cpp kphoneSI-1.2/dissipate2/sipclient.cpp --- kphoneSI/dissipate2/sipclient.cpp 2008-09-01 06:17:01.000000000 +0200 +++ kphoneSI-1.2/dissipate2/sipclient.cpp 2009-01-07 14:21:03.000000000 +0100 @@ -946,13 +946,13 @@ } if( curmessage->hasHeader( SipHeader::Accept ) ) { if( curmessage->getMethod() == Sip::INVITE ) { - if( !curmessage->getHeaderData( SipHeader::Accept ).lower().contains( "application/sdp" ) ) { + if( curmessage->findHeaderData( SipHeader::Accept, QString("application/sdp") )==QString::null ) { sendQuickResponse( curmessage, SipStatus( 406 ) ); delete curmessage; return; } } else if( curmessage->getMethod() == Sip::SUBSCRIBE ) { - if( !curmessage->getHeaderData( SipHeader::Accept ).lower().contains( "application/xpidf+xml" ) ) { + if( curmessage->findHeaderData( SipHeader::Accept, QString("application/xpidf+xml") )==QString::null ) { sendQuickResponse( curmessage, SipStatus( 406 ) ); delete curmessage; return; diff -x '*.[oa]' -Naur kphoneSI/dissipate2/sipmessage.cpp kphoneSI-1.2/dissipate2/sipmessage.cpp --- kphoneSI/dissipate2/sipmessage.cpp 2008-09-01 06:17:01.000000000 +0200 +++ kphoneSI-1.2/dissipate2/sipmessage.cpp 2009-01-07 14:16:26.000000000 +0100 @@ -460,6 +460,36 @@ return QString::null; } +QString SipMessage::findHeaderData( SipHeader::SipHeaderId id, QString searchData ) +{ + SipHeader *curheader; +#if 0 + printf("Searching headers for %s\n",searchData.latin1()); +#endif + // quick optimization + if ( headerlist.current() != 0 ) { + curheader=headerlist.current(); + if ( curheader->id == id && curheader->data.lower().contains(searchData)) { + return curheader->data; + } + } + for ( curheader = headerlist.first(); curheader != 0; curheader = headerlist.next() ) { +#if 0 + printf("Checking header \"%s\": \"%s\"\n",SipHeader::getHeaderString( curheader->id ).latin1(),curheader->data.latin1()); +#endif + if ( curheader->id == id && curheader->data.lower().contains(searchData) ) { +#if 0 + puts("*** Found ***"); +#endif + return curheader->data; + } + } +#if 0 + puts("*** Not found ***"); +#endif + return QString::null; +} + void SipMessage::setRequestUri( const SipUri &newrequri ) { requesturi = newrequri; diff -x '*.[oa]' -Naur kphoneSI/dissipate2/sipmessage.h kphoneSI-1.2/dissipate2/sipmessage.h --- kphoneSI/dissipate2/sipmessage.h 2008-03-01 10:31:41.000000000 +0100 +++ kphoneSI-1.2/dissipate2/sipmessage.h 2009-01-07 14:17:39.000000000 +0100 @@ -139,6 +139,7 @@ * Returns the data contained in the specified header. */ QString getHeaderData( SipHeader::SipHeaderId id ); + QString findHeaderData( SipHeader::SipHeaderId id, QString searchData ); /** * Sets the request URI for the message. Relevant only if it is a SIP |
From: klaus f. <kgf...@us...> - 2009-01-04 13:52:55
|
kgfleischmann 2009/01/04 13:52:50 UTC Kphone CVS Repository Modified files: . CHANGES dissipate2 mimecontenttype.cpp sdpbuild.cpp sdpbuild.h sipcall.cpp sipcall.h sippublish.cpp sipregister.cpp sipregister.h siptransaction.cpp siptransaction.h sipuser.cpp kaudio rtpdataheader.h kdial Makefile.in kphone audiocontrol.cpp callaudio.cpp callaudio.h calllistview.cpp calllistview.h kcallwidget.cpp kcallwidget.h kphone.cpp kphoneview.cpp kreferdialog.h ksippreferences.cpp Makefile.in sessioncontrol.cpp sessioncontrol.h trayicon.cpp videocontrol.cpp watcherlist.cpp po kphone_pt_BR.ts Makefile.in ringing Makefile.in Added files: . patched-configure.in Log: - Patches from Mandriva (Thanks folks) - local variable initialisaton - SessionControl: array bound security Revision Changes Path 1.57 +8 -1 kphoneSI/CHANGES http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/CHANGES?r1=1.56&r2=1.57 1.4 +3 -3 kphoneSI/dissipate2/mimecontenttype.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/dissipate2/mimecontenttype.cpp?r1=1.3&r2=1.4 1.16 +6 -5 kphoneSI/dissipate2/sdpbuild.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/dissipate2/sdpbuild.cpp?r1=1.15&r2=1.16 1.8 +1 -1 kphoneSI/dissipate2/sdpbuild.h http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/dissipate2/sdpbuild.h?r1=1.7&r2=1.8 1.34 +11 -10 kphoneSI/dissipate2/sipcall.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/dissipate2/sipcall.cpp?r1=1.33&r2=1.34 1.22 +1 -1 kphoneSI/dissipate2/sipcall.h http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/dissipate2/sipcall.h?r1=1.21&r2=1.22 1.18 +5 -3 kphoneSI/dissipate2/sippublish.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/dissipate2/sippublish.cpp?r1=1.17&r2=1.18 1.23 +9 -3 kphoneSI/dissipate2/sipregister.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/dissipate2/sipregister.cpp?r1=1.22&r2=1.23 1.7 +1 -1 kphoneSI/dissipate2/sipregister.h http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/dissipate2/sipregister.h?r1=1.6&r2=1.7 1.32 +3 -3 kphoneSI/dissipate2/siptransaction.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/dissipate2/siptransaction.cpp?r1=1.31&r2=1.32 1.14 +1 -1 kphoneSI/dissipate2/siptransaction.h http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/dissipate2/siptransaction.h?r1=1.13&r2=1.14 1.4 +3 -3 kphoneSI/dissipate2/sipuser.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/dissipate2/sipuser.cpp?r1=1.3&r2=1.4 1.3 +1 -1 kphoneSI/kaudio/rtpdataheader.h http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kaudio/rtpdataheader.h?r1=1.2&r2=1.3 1.2 +3 -3 kphoneSI/kdial/Makefile.in http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kdial/Makefile.in?r1=1.1&r2=1.2 1.22 +8 -8 kphoneSI/kphone/Makefile.in http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/Makefile.in?r1=1.21&r2=1.22 1.17 +6 -4 kphoneSI/kphone/audiocontrol.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/audiocontrol.cpp?r1=1.16&r2=1.17 1.23 +4 -13 kphoneSI/kphone/callaudio.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/callaudio.cpp?r1=1.22&r2=1.23 1.12 +1 -1 kphoneSI/kphone/callaudio.h http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/callaudio.h?r1=1.11&r2=1.12 1.15 +2 -2 kphoneSI/kphone/calllistview.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/calllistview.cpp?r1=1.14&r2=1.15 1.6 +2 -1 kphoneSI/kphone/calllistview.h http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/calllistview.h?r1=1.5&r2=1.6 1.33 +9 -11 kphoneSI/kphone/kcallwidget.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/kcallwidget.cpp?r1=1.32&r2=1.33 1.16 +13 -7 kphoneSI/kphone/kcallwidget.h http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/kcallwidget.h?r1=1.15&r2=1.16 1.29 +6 -4 kphoneSI/kphone/kphone.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/kphone.cpp?r1=1.28&r2=1.29 1.40 +3 -3 kphoneSI/kphone/kphoneview.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/kphoneview.cpp?r1=1.39&r2=1.40 1.7 +1 -1 kphoneSI/kphone/kreferdialog.h http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/kreferdialog.h?r1=1.6&r2=1.7 1.20 +3 -3 kphoneSI/kphone/ksippreferences.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/ksippreferences.cpp?r1=1.19&r2=1.20 1.28 +1 -1 kphoneSI/kphone/sessioncontrol.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/sessioncontrol.cpp?r1=1.27&r2=1.28 1.21 +33 -27 kphoneSI/kphone/sessioncontrol.h http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/sessioncontrol.h?r1=1.20&r2=1.21 1.2 +2 -0 kphoneSI/kphone/trayicon.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/trayicon.cpp?r1=1.1&r2=1.2 1.6 +2 -2 kphoneSI/kphone/videocontrol.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/videocontrol.cpp?r1=1.5&r2=1.6 1.6 +2 -2 kphoneSI/kphone/watcherlist.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/watcherlist.cpp?r1=1.5&r2=1.6 1.1 +303 -0 kphoneSI/patched-configure.in (new) http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/patched-configure.in?rev=1.1&content-type=text/plain 1.4 +4 -4 kphoneSI/po/Makefile.in http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/po/Makefile.in?r1=1.3&r2=1.4 1.2 +257 -240 kphoneSI/po/kphone_pt_BR.ts http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/po/kphone_pt_BR.ts?r1=1.1&r2=1.2 1.6 +8 -8 kphoneSI/ringing/Makefile.in http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/ringing/Makefile.in?r1=1.5&r2=1.6 Index: patched-configure.in ==================================================================== dnl Process this file with autoconf to produce a configure script. AC_INIT AC_CONFIG_SRCDIR([README]) AC_CONFIG_HEADER(config.h) dnl Checks for programs. AC_PROG_CC AC_PROG_CPP AC_PROG_CXX AC_PROG_CXXCPP AC_PROG_GCC_TRADITIONAL AC_PROG_INSTALL AC_PROG_MAKE_SET dnl Check for lib64 dir name AC_DEFUN([KPHONE_CHECK_LIBNAME], [ AC_REQUIRE([AC_CANONICAL_HOST])dnl AC_REQUIRE([AC_CANONICAL_BUILD])dnl AC_MSG_CHECKING([libdir name]) case $host in *-*-linux*) # Test if the compiler is 64bit echo 'int i;' > conftest.$ac_ext kphone_cv_cc_64bit_output=no if AC_TRY_EVAL(ac_compile); then case `/usr/bin/file conftest.$ac_objext` in *"ELF 64"*) kphone_cv_cc_64bit_output=yes ;; esac fi rm -rf conftest* ;; esac case $host_cpu:$kphone_cv_cc_64bit_output in powerpc64:yes | s390x:yes | sparc64:yes | x86_64:yes) LIB="lib64" ;; *:*) LIB="lib" ;; esac AC_MSG_RESULT([$LIB]) ]) KPHONE_CHECK_LIBNAME dnl Check for Qt preprocessor 'moc' AC_PATH_PROG(MOC, moc, /usr/local/bin/moc, $QTDIR/bin:$PATH:/usr/bin:/usr/X11R6/bin:/usr/lib/qt/bin::/usr/lib/qt3/bin:/usr/local/qt/bin:/usr/share/qt3/bin) dnl Check for Qt GUI compiler 'uic' AC_PATH_PROG(UIC, uic, /usr/local/bin/uic, $QTDIR/bin:$PATH:/usr/bin:/usr/X11R6/bin:/usr/lib/qt/bin:/usr/lib/qt3/bin:/usr/local/qt/bin:/usr/share/qt3/bin) dnl Look in various places for Qt header files and libraries AC_CACHE_CHECK(location of Qt header files, ac_cv_qt_inc, [ if test -f $QTDIR/include/qglobal.h; then ac_cv_qt_inc=$QTDIR/include elif test -f /usr/lib/qt-3.1/include/qglobal.h; then ac_cv_qt_inc=/usr/lib/qt-3.1/include elif test -f /usr/lib/qt3/include/qglobal.h; then ac_cv_qt_inc=/usr/lib/qt3/include elif test -f /usr/local/include/qt/qglobal.h; then ac_cv_qt_inc=/usr/local/include/qt elif test -f /usr/include/qt/qglobal.h; then ac_cv_qt_inc=/usr/include/qt elif test -f /usr/share/qt3/include/qglobal.h; then ac_cv_qt_inc=/usr/share/qt3/include elif test -f /usr/include/qglobal.h; then ac_cv_qt_inc=/usr/include fi ]); if test "$ac_cv_qt_inc" = ""; then echo "not found. Giving up." exit fi dnl Look for Qt library files AC_CACHE_CHECK(location of Qt library, ac_cv_qt_lib, [ for T in $QTDIR/lib $QTDIR /usr/lib/qt3 /usr/lib/qt3/$LIB /usr/lib/qt-3.1/lib /usr/lib/qt3/lib /usr/local/lib/qt /usr/share/qt3/lib /usr/$LIB; do if test "x$ac_cv_qt_lib" = "x"; then if test -f $T/libqt-mt.so -o -f $T/libqt-mt.a; then ac_cv_qt_lib=$T; qt_mt=yes; qt_libname="qt-mt"; elif test -f $T/libqt-mt3.a; then ac_cv_qt_lib=$T; qt_mt=yes; qt_libname="qt-mt3"; elif test -f $T/libqt-mt2.a; then ac_cv_qt_lib=$T; qt_mt=yes; qt_libname="qt-mt2"; elif test -f $T/libqt.so -o -f $T/libqt.a; then ac_cv_qt_lib=$T; qt_mt=no; qt_libname="qt"; elif test -f $T/libqt3.a; then ac_cv_qt_lib=$T; qt_mt=no; qt_libname="qt3"; fi fi done ]); if test "x$ac_cv_qt_lib" = "x"; then echo "not found. Giving up." exit fi AC_CACHE_VAL(ac_cv_qt_libname, ac_cv_qt_libname="$qt_libname" ) AC_CACHE_CHECK(if Qt is multi-threaded, ac_cv_qt_mt, ac_cv_qt_mt=$qt_mt; ) AC_MSG_CHECKING(whether to enable thread) thread_default="yes" AC_ARG_ENABLE(thread, [ --enable-thread=[no/yes] turn on threads [default=yes]],, enable_thread=$thread_default) AC_SUBST(AUDIO_MOC) AUDIO_MOC="dspaudioout.moc.o dspaudioin.moc.o" if test "$ac_cv_qt_mt" = "yes"; then if test "$enable_thread" = "yes"; then AC_DEFINE(QT_THREAD_SUPPORT) THREAD_FLAG="-DQT_THREAD_SUPPORT" AC_SUBST(THREAD_FLAG) AUDIO_MOC="" AC_MSG_RESULT(yes) else THREAD_FLAG="" AC_SUBST(THREAD_FLAG) AC_MSG_RESULT(no) fi fi AC_MSG_CHECKING(whether to enable speex) speex_default="yes" AC_ARG_ENABLE(speex, [ --enable-speex=[no/yes] use SPEEX [default=yes]],, enable_speex=$speex_default) if test "$enable_speex" = "yes"; then AC_DEFINE(SPEEX) ENABLE_SPEEX="yes" AC_SUBST(ENABLE_SPEEX) AC_MSG_RESULT(yes) else AC_MSG_RESULT(no) fi AC_MSG_CHECKING(whether to enable language internationalisation - incomplete! -) lipo_default="no" AC_ARG_ENABLE(lipo, [ --enable-lipo=[no/yes] use language internationalisation - incomplete! - [default=no]],, enable_lipo=$lipo_default) if test "$enable_lipo" = "yes"; then AC_DEFINE(LIPO) ENABLE_LIPO="yes" AC_SUBST(ENABLE_LIPO) AC_MSG_RESULT(yes) else AC_MSG_RESULT(no) fi AC_MSG_CHECKING(whether to enable srtp) srtp_default="no" AC_ARG_ENABLE(srtp, [ --enable-srtp=[no/yes] use SRTP [default=no]],, enable_srtp=$srtp_default) if test "$enable_srtp" = "yes"; then AC_DEFINE(SRTP) ENABLE_SRTP="yes" AC_SUBST(ENABLE_SRTP) AC_MSG_RESULT(yes) else AC_MSG_RESULT(no) fi AC_MSG_CHECKING(whether to activity check for presence -) presact_default="no" AC_ARG_ENABLE(presact, [ --enable-presact=[no/yes] activity check for presence - [default=no]],, enable_presact=$presact_default) if test "$enable_presact" = "yes"; then AC_DEFINE(PRESACT) ENABLE_PRESACT="yes" AC_SUBST(ENABLE_PRESACT) ---------------------------------------------- Diff block truncated. (Max lines = 200) ---------------------------------------------- |
From: klaus f. <kgf...@us...> - 2008-11-22 08:30:38
|
kgfleischmann 2008/11/22 08:30:33 UTC Kphone CVS Repository Modified files: . KPhoneSI.kdevelop dissipate2 siptransaction.cpp siputil.cpp udpmessagesocket.cpp kaudio dspoutalsa.cpp dspoutalsa.h kphone kcallwidget.cpp Log: some error corrections, see CHANGES for more Revision Changes Path 1.13 +1 -5 kphoneSI/KPhoneSI.kdevelop http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/KPhoneSI.kdevelop?r1=1.12&r2=1.13 1.31 +5 -4 kphoneSI/dissipate2/siptransaction.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/dissipate2/siptransaction.cpp?r1=1.30&r2=1.31 1.9 +1 -1 kphoneSI/dissipate2/siputil.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/dissipate2/siputil.cpp?r1=1.8&r2=1.9 1.17 +1 -1 kphoneSI/dissipate2/udpmessagesocket.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/dissipate2/udpmessagesocket.cpp?r1=1.16&r2=1.17 1.17 +5 -2 kphoneSI/kaudio/dspoutalsa.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kaudio/dspoutalsa.cpp?r1=1.16&r2=1.17 1.7 +3 -1 kphoneSI/kaudio/dspoutalsa.h http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kaudio/dspoutalsa.h?r1=1.6&r2=1.7 1.32 +7 -14 kphoneSI/kphone/kcallwidget.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/kcallwidget.cpp?r1=1.31&r2=1.32 Index: KPhoneSI.kdevelop =================================================================== RCS file: /cvsroot/kphone/kphoneSI/KPhoneSI.kdevelop,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- KPhoneSI.kdevelop 12 Sep 2008 09:51:00 -0000 1.12 +++ KPhoneSI.kdevelop 22 Nov 2008 08:30:32 -0000 1.13 @@ -57,11 +57,7 @@ <filetype>Makefile</filetype> <filetype>CMakeLists.txt</filetype> </filetypes> - <blacklist> - <path>srtp</path> - <path>srtp/SRTPWrapper.cpp</path> - <path>srtp/SRTPWrapper.h</path> - </blacklist> + <blacklist/> </kdevcustomproject> <kdevdebugger> <general> Index: siptransaction.cpp =================================================================== RCS file: /cvsroot/kphone/kphoneSI/dissipate2/siptransaction.cpp,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- siptransaction.cpp 12 Sep 2008 09:50:59 -0000 1.30 +++ siptransaction.cpp 22 Nov 2008 08:30:32 -0000 1.31 @@ -902,10 +902,10 @@ // First status node wins. QDomNodeList nl2 = qde.elementsByTagName("status"); if (nl2.length() > 0) { - if(KStatics::debugLevel>= 2) cout << "=====SipTransaction::getpidfxml found" << nl2.length() << "status node\n"; + if(KStatics::debugLevel>= 2) cout << "=====SipTransaction::getpidfxml found " << nl2.length() << " status node\n"; QDomNodeList nl3 = nl2.item(0).toElement().elementsByTagName("basic"); if (nl3.length() > 0) { - if(KStatics::debugLevel>= 2) cout << "=====SipTransaction::getpidfxml found" << nl3.length() << "basic node\n", nl3.length(); + if(KStatics::debugLevel>= 2) cout << "=====SipTransaction::getpidfxml found " << nl3.length() << " basic node\n", nl3.length(); QDomElement qde2 = nl3.item(0).toElement(); if(KStatics::debugLevel>= 2) cout << "=====SipTransaction::getpidfxml status node text is: " << qde2.text() << endl; if (!qde2.isNull()) { @@ -940,11 +940,11 @@ if(KStatics::debugLevel>= 2) cout << "=====SipTransaction::getpidfxml using activity node "; if(gok.localName() == "activity") { // we have <activity>text</activity> parent->setPresenceStatus(gok.toElement().text()); - cout << "toElement " << gok.toElement().text() << endl; + if(KStatics::debugLevel>= 2) cout << "toElement " << gok.toElement().text() << endl; } else { parent->setPresenceStatus( gok.localName()); - cout << " localName " << gok.localName() << endl; + if(KStatics::debugLevel>= 2) cout << " localName " << gok.localName() << endl; } parent->setBasePresenceStatus( bc ); return; @@ -953,6 +953,7 @@ } } //post processing for minimalist's UA + cout << "=====SipTransaction::getpidfxml minimalist\n"; if (!bc) { int idx = m.find("basic>closed");//a closed not tied to a person, openSER sends this if an UA goes offline int idxo =m.find("basic>open"); //some phones only know this Index: siputil.cpp =================================================================== RCS file: /cvsroot/kphone/kphoneSI/dissipate2/siputil.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- siputil.cpp 12 Sep 2008 09:50:59 -0000 1.8 +++ siputil.cpp 22 Nov 2008 08:30:32 -0000 1.9 @@ -249,7 +249,7 @@ for (i=0; i<if_count; i++) { QString afs; if(af==AF_INET) afs = "v4"; else afs="v6"; - cout << "!!!!!IP" << afs << " Device: " << ifaces[i].name << " " <<ifaces[i].addr << endl; + if (KStatics::debugLevel >= 2) cout << "!!!!!IP" << afs << " Device: " << ifaces[i].name << " " <<ifaces[i].addr << endl; } if (if_count>0) *fqdn = IPdialog ( ifaces, if_count ); Index: udpmessagesocket.cpp =================================================================== RCS file: /cvsroot/kphone/kphoneSI/dissipate2/udpmessagesocket.cpp,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- udpmessagesocket.cpp 12 Sep 2008 09:50:59 -0000 1.16 +++ udpmessagesocket.cpp 22 Nov 2008 08:30:32 -0000 1.17 @@ -330,7 +330,7 @@ */ ourport = min; - cout << "=====UDPMessageSocket::listen(): found " << min << endl; + //cout << "=====UDPMessageSocket::listen(): found " << min << endl; return 0; error: Index: dspoutalsa.cpp =================================================================== RCS file: /cvsroot/kphone/kphoneSI/kaudio/dspoutalsa.cpp,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- dspoutalsa.cpp 12 Sep 2008 09:50:59 -0000 1.16 +++ dspoutalsa.cpp 22 Nov 2008 08:30:33 -0000 1.17 @@ -36,6 +36,8 @@ //#define DBGW #include "dspoutalsa.h" #include <iostream> +#include <../kphone/kstatics.h> + using namespace std; static snd_pcm_uframes_t chunk_size = 0; @@ -45,6 +47,7 @@ DspOutAlsa::DspOutAlsa( const QString &devName ) : DspOut() { + debug=KStatics::debugLevel; devname = devName; setDeviceName( "alsa" ); rate = 8000; @@ -77,14 +80,14 @@ //static snd_pcm_sframes_t period_size; // set nonblock and leave, if device blocked if( mode == ReadOnly ) { - cout << "=====DspOutAlsa::openDevice CAPTURE " << devname.latin1() << endl; + if (debug >= 2) cout << "=====DspOutAlsa::openDevice CAPTURE " << devname.latin1() << endl; if ((err = snd_pcm_open( &handle, devname, SND_PCM_STREAM_CAPTURE,1)) < 0) { cout << "=====DspOutAlsa::openDevice cannot open audio device " << snd_strerror (err) << endl; return false; } } else { - cout << "=====DspOutAlsa::openDevice PLAYBACK " << devname.latin1(); + if (debug >= 2) cout << "=====DspOutAlsa::openDevice PLAYBACK " << devname.latin1(); if ((err = snd_pcm_open( &handle, devname, SND_PCM_STREAM_PLAYBACK,1)) < 0) { cout << "=====DspOutAlsa::openDevice cannot open audio device " << snd_strerror (err) << endl; return false; Index: dspoutalsa.h =================================================================== RCS file: /cvsroot/kphone/kphoneSI/kaudio/dspoutalsa.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- dspoutalsa.h 1 Mar 2008 16:56:58 -0000 1.6 +++ dspoutalsa.h 22 Nov 2008 08:30:33 -0000 1.7 @@ -73,7 +73,9 @@ snd_pcm_uframes_t buffer_size; QString devname; // device filename unsigned int rate; - sigset_t set; + sigset_t set; + int debug; + /** * drops the buffer and reinitialises ALSA for further use */ Index: kcallwidget.cpp =================================================================== RCS file: /cvsroot/kphone/kphoneSI/kphone/kcallwidget.cpp,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- kcallwidget.cpp 12 Sep 2008 09:50:59 -0000 1.31 +++ kcallwidget.cpp 22 Nov 2008 08:30:33 -0000 1.32 @@ -840,6 +840,7 @@ if(st) { //short transfer requested if(sessionC->getIsb()) { shortTransfer=false; // if not provided do nothing + return; } else { shortTransfer=true; @@ -1392,7 +1393,7 @@ void KCallWidget::setRemote( QString newremote ) { -cout << "=====KCallWidget setRemote " << newremote << endl; + if(debug >= 2) cout << "=====KCallWidget setRemote " << newremote << endl; remote = newremote; } @@ -1702,29 +1703,21 @@ void KCallWidget::hangupCall( void ) { informPhoneView(UPDATEWLIST,myNumber); - if(debug >= 2) cout << "=====KCallWidget hangupCall: begin \n"; - -// if( !hangup->isEnabled() ) { -// return; -// } - ---------------------------------------------- Diff block truncated. (Max lines = 200) ---------------------------------------------- |
From: klaus f. <kgf...@us...> - 2008-09-12 09:50:54
|
kgfleischmann 2008/09/12 02:51:00 PDT Kphone CVS Repository Modified files: dissipate2 sipcall.cpp sipclient.cpp sipmessage.cpp sipprotocol.cpp sippublish.cpp sipregister.cpp siptransaction.cpp siputil.cpp udpmessagesocket.cpp kaudio dspaudioin.cpp dspaudioout.cpp dspoutalsa.cpp kphone callaudio.cpp kcallwidget.cpp kinstantmessagewidget.cpp kphoneview.cpp ksipoptions.cpp . CHANGES KPhoneSI.kdevelop KPhoneSI.kdevelop.filelist Log: - logfile clean up + error correction - presence issues Revision Changes Path 1.56 +7 -1 kphoneSI/CHANGES http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/CHANGES?r1=1.55&r2=1.56 1.12 +9 -9 kphoneSI/KPhoneSI.kdevelop http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/KPhoneSI.kdevelop?r1=1.11&r2=1.12 1.14 +0 -4 kphoneSI/KPhoneSI.kdevelop.filelist http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/KPhoneSI.kdevelop.filelist?r1=1.13&r2=1.14 1.33 +4 -35 kphoneSI/dissipate2/sipcall.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/dissipate2/sipcall.cpp?r1=1.32&r2=1.33 1.37 +7 -7 kphoneSI/dissipate2/sipclient.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/dissipate2/sipclient.cpp?r1=1.36&r2=1.37 1.14 +1 -1 kphoneSI/dissipate2/sipmessage.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/dissipate2/sipmessage.cpp?r1=1.13&r2=1.14 1.14 +0 -1 kphoneSI/dissipate2/sipprotocol.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/dissipate2/sipprotocol.cpp?r1=1.13&r2=1.14 1.17 +3 -4 kphoneSI/dissipate2/sippublish.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/dissipate2/sippublish.cpp?r1=1.16&r2=1.17 1.22 +0 -7 kphoneSI/dissipate2/sipregister.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/dissipate2/sipregister.cpp?r1=1.21&r2=1.22 1.30 +11 -6 kphoneSI/dissipate2/siptransaction.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/dissipate2/siptransaction.cpp?r1=1.29&r2=1.30 1.8 +1 -1 kphoneSI/dissipate2/siputil.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/dissipate2/siputil.cpp?r1=1.7&r2=1.8 1.16 +0 -1 kphoneSI/dissipate2/udpmessagesocket.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/dissipate2/udpmessagesocket.cpp?r1=1.15&r2=1.16 1.8 +0 -1 kphoneSI/kaudio/dspaudioin.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kaudio/dspaudioin.cpp?r1=1.7&r2=1.8 1.12 +0 -2 kphoneSI/kaudio/dspaudioout.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kaudio/dspaudioout.cpp?r1=1.11&r2=1.12 1.16 +3 -3 kphoneSI/kaudio/dspoutalsa.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kaudio/dspoutalsa.cpp?r1=1.15&r2=1.16 1.22 +12 -9 kphoneSI/kphone/callaudio.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/callaudio.cpp?r1=1.21&r2=1.22 1.31 +17 -13 kphoneSI/kphone/kcallwidget.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/kcallwidget.cpp?r1=1.30&r2=1.31 1.10 +0 -1 kphoneSI/kphone/kinstantmessagewidget.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/kinstantmessagewidget.cpp?r1=1.9&r2=1.10 1.39 +0 -4 kphoneSI/kphone/kphoneview.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/kphoneview.cpp?r1=1.38&r2=1.39 1.7 +0 -1 kphoneSI/kphone/ksipoptions.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/ksipoptions.cpp?r1=1.6&r2=1.7 Index: sipcall.cpp =================================================================== RCS file: /cvsroot/kphone/kphoneSI/dissipate2/sipcall.cpp,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- sipcall.cpp 21 Aug 2008 14:51:39 -0000 1.32 +++ sipcall.cpp 12 Sep 2008 09:50:58 -0000 1.33 @@ -139,9 +139,7 @@ void SipCallMember::requestAuthSubscribe( void ) { - //cout << "OLD challengeCounter " << challengeCounter << endl; - challengeCounter++; - //cout << "challengeCounter " << challengeCounter << endl; + challengeCounter++; statusUpdated( this ); } @@ -184,7 +182,6 @@ } if( (authstate == authState_AuthenticationTryingWithPassword) && !authstrtemp.contains("stale=true")) { authstate = authState_AuthenticationRequiredWithNewPassword; - //cout << << "++++++++++++++++++++ 0 authState_AuthenticationRequiredWithNewPassword" << endl; } else { authstate = authState_AuthenticationRequired; } @@ -202,7 +199,6 @@ } if( (authstate == authState_AuthenticationTryingWithPassword) && !authstrtemp.contains("stale=true")) { authstate = authState_AuthenticationRequiredWithNewPassword; - //cout << << "++++++++++++++++++++ 1 authState_AuthenticationRequiredWithNewPassword" << endl; } else { authstate = authState_AuthenticationRequired; } @@ -323,9 +319,7 @@ void SipCallMember::requestAuthNotify( void ) { - //cout << << "OLD challengeCounter " << challengeCounter << endl; challengeCounter++; - //cout << << "challengeCounter " << challengeCounter << endl; statusUpdated( this ); } @@ -361,7 +355,6 @@ } if( (authstate == authState_AuthenticationTryingWithPassword) && !authstrtemp.contains("stale=true")) { authstate = authState_AuthenticationRequiredWithNewPassword; - //cout << << "++++++++++++++++++++ 2 authState_AuthenticationRequiredWithNewPassword" << endl; } else { authstate = authState_AuthenticationRequired; } @@ -380,7 +373,6 @@ } if( (authstate == authState_AuthenticationTryingWithPassword) && !authstrtemp.contains("stale=true")) { authstate = authState_AuthenticationRequiredWithNewPassword; - //cout << << "++++++++++++++++++++ 3 authState_AuthenticationRequiredWithNewPassword" << endl; } else { authstate = authState_AuthenticationRequired; } @@ -431,7 +423,6 @@ } if( (authstate == authState_AuthenticationTryingWithPassword) && !authstrtemp.contains("stale=true")) { authstate = authState_AuthenticationRequiredWithNewPassword; - //cout << << "++++++++++++++++++++ 4 authState_AuthenticationRequiredWithNewPassword" << endl; } else { authstate = authState_AuthenticationRequired; } @@ -449,7 +440,6 @@ } if( (authstate == authState_AuthenticationTryingWithPassword) && !authstrtemp.contains("stale=true")) { authstate = authState_AuthenticationRequiredWithNewPassword; - //cout << << "++++++++++++++++++++ 5 authState_AuthenticationRequiredWithNewPassword" << endl; } else { authstate = authState_AuthenticationRequired; } @@ -528,9 +518,7 @@ void SipCallMember::requestAuthMessage( void ) { - //cout << << "OLD challengeCounter " << challengeCounter << endl; challengeCounter++; - //cout << << "challengeCounter " << challengeCounter << endl;; statusUpdated( this ); } @@ -555,7 +543,6 @@ } if( (authstate == authState_AuthenticationTryingWithPassword) && !authstrtemp.contains("stale=true")) { authstate = authState_AuthenticationRequiredWithNewPassword; - //cout << << "++++++++++++++++++++ 6 authState_AuthenticationRequiredWithNewPassword" << endl; } else { authstate = authState_AuthenticationRequired; } @@ -572,7 +559,6 @@ } if( (authstate == authState_AuthenticationTryingWithPassword) && !authstrtemp.contains("stale=true")) { authstate = authState_AuthenticationRequiredWithNewPassword; - //cout << << "++++++++++++++++++++ 7 authState_AuthenticationRequiredWithNewPassword" << endl; } else { authstate = authState_AuthenticationRequired; } @@ -662,9 +648,7 @@ void SipCallMember::requestAuthInvite( void ) { - //cout << << "OLD challengeCounter " << challengeCounter << endl; challengeCounter++; - //cout << << "challengeCounter " << challengeCounter << endl; nonceCounter=0; statusUpdated( this ); } @@ -792,7 +776,6 @@ if( authstate == authState_AuthenticationTryingWithPassword || authstate == authState_AuthenticationRequiredWithNewPassword ) { authstate = authState_AuthenticationRequiredWithNewPassword; - //cout << << "++++++++++++++++++++ 8 authState_AuthenticationRequiredWithNewPassword" << endl; } else { authstate = authState_AuthenticationRequired; } @@ -810,7 +793,6 @@ if( authstate == authState_AuthenticationTryingWithPassword || authstate == authState_AuthenticationRequiredWithNewPassword ) { authstate = authState_AuthenticationRequiredWithNewPassword; - //cout << << "++++++++++++++++++++ 9 authState_AuthenticationRequiredWithNewPassword" << endl; } else { authstate = authState_AuthenticationRequired; } @@ -980,9 +962,7 @@ } void SipCallMember::requestAuthPrack( void ) { - //cout << << "OLD challengeCounter " << challengeCounter << endl; challengeCounter++; - //cout << << "challengeCounter " << challengeCounter << endl; statusUpdated( this ); } @@ -1010,7 +990,6 @@ } if( authstate == authState_AuthenticationTryingWithPassword ) { authstate = authState_AuthenticationRequiredWithNewPassword; - //cout << << "++++++++++++++++++++ 10 authState_AuthenticationRequiredWithNewPassword" << endl; } else { authstate = authState_AuthenticationRequired; } @@ -1029,7 +1008,6 @@ } if( authstate == authState_AuthenticationTryingWithPassword ) { authstate = authState_AuthenticationRequiredWithNewPassword; - //cout << << "++++++++++++++++++++ 11 authState_AuthenticationRequiredWithNewPassword" << endl; } else { authstate = authState_AuthenticationRequired; } @@ -1192,9 +1170,7 @@ void SipCallMember::requestAuthOptions( void ) { - //cout << << "OLD challengeCounter " << challengeCounter << endl; challengeCounter++; - //cout << << "challengeCounter " << challengeCounter << endl; statusUpdated( this ); } @@ -1226,7 +1202,6 @@ } if( authstate == authState_AuthenticationTryingWithPassword ) { authstate = authState_AuthenticationRequiredWithNewPassword; - //cout << << "++++++++++++++++++++ 12 authState_AuthenticationRequiredWithNewPassword" << endl; } else { authstate = authState_AuthenticationRequired; } @@ -1245,7 +1220,6 @@ } if( authstate == authState_AuthenticationTryingWithPassword ) { authstate = authState_AuthenticationRequiredWithNewPassword; - //cout << << "++++++++++++++++++++ 13 authState_AuthenticationRequiredWithNewPassword" << endl; } else { authstate = authState_AuthenticationRequired; } @@ -1469,7 +1443,7 @@ bool SipCallMember::isShortTrans(void) { - return call->getIsb(); + return !call->getIsb(); } bool SipCallMember::isPPrack(void) { @@ -1574,23 +1548,19 @@ wa->event = event; wa->state = state; found = true; - cout << "wa " << wa->uri << endl;; break; } } if (!found) { wa = new WatcherInfo(uri,event,state); ---------------------------------------------- Diff block truncated. (Max lines = 200) ---------------------------------------------- |
From: klaus f. <kgf...@us...> - 2008-08-21 14:52:20
|
kgfleischmann 2008/08/21 07:52:29 PDT Kphone CVS Repository Modified files: dissipate2 messagesocket.cpp messagesocket.h sdpbuild.cpp sdpbuild.h sipcall.cpp sipcall.h sipclient.cpp sipclient.h sipheader.h sipmessage.cpp sipprotocol.cpp sipprotocol.h sippublish.cpp sipregister.cpp sipstatus.h siptransaction.cpp siptransaction.h siputil.cpp tcpmessagesocket.cpp udpmessagesocket.cpp kaudio audiobuffer.h dspaudio.cpp dspaudio.h dspaudioin.cpp dspaudioin.h dspaudioout.cpp dspaudioout.h dspearly.cpp dspearly.h dspoutalsa.cpp dspoutoss.cpp dspoutrtp.cpp dspoutrtp.h dspouttone.cpp dtmfgenerator.h kphone audiocontrol.h callaudio.cpp callaudio.h calllistview.cpp calllistview.h extcontrol.h idletimedetector.cpp kcallview.h kcallwidget.cpp kcallwidget.h kdtmf.h khelp.h kinstantmessagewidget.cpp kinstantmessagewidget.h kphonebook.cpp kphonebook.h kphone.cpp kphone.h kphoneview.cpp kphoneview.h kreferdialog.h ksipauthentication.cpp ksipauthentication.h ksipoptions.cpp ksippreferences.h ksipregistrations.cpp ksipregistrations.h kstatics.h sessioncontrol.cpp sessioncontrol.h trayicon.h videocontrol.h watcherlist.h . CHANGES KPhoneSI.kdevelop Log: presence, authentication, printf->cout Revision Changes Path 1.55 +8 -1 kphoneSI/CHANGES http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/CHANGES?r1=1.54&r2=1.55 1.11 +9 -9 kphoneSI/KPhoneSI.kdevelop http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/KPhoneSI.kdevelop?r1=1.10&r2=1.11 1.7 +4 -2 kphoneSI/dissipate2/messagesocket.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/dissipate2/messagesocket.cpp?r1=1.6&r2=1.7 1.6 +2 -0 kphoneSI/dissipate2/messagesocket.h http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/dissipate2/messagesocket.h?r1=1.5&r2=1.6 1.15 +1 -1 kphoneSI/dissipate2/sdpbuild.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/dissipate2/sdpbuild.cpp?r1=1.14&r2=1.15 1.7 +3 -0 kphoneSI/dissipate2/sdpbuild.h http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/dissipate2/sdpbuild.h?r1=1.6&r2=1.7 1.32 +58 -24 kphoneSI/dissipate2/sipcall.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/dissipate2/sipcall.cpp?r1=1.31&r2=1.32 1.21 +2 -1 kphoneSI/dissipate2/sipcall.h http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/dissipate2/sipcall.h?r1=1.20&r2=1.21 1.36 +122 -99 kphoneSI/dissipate2/sipclient.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/dissipate2/sipclient.cpp?r1=1.35&r2=1.36 1.18 +6 -3 kphoneSI/dissipate2/sipclient.h http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/dissipate2/sipclient.h?r1=1.17&r2=1.18 1.8 +1 -0 kphoneSI/dissipate2/sipheader.h http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/dissipate2/sipheader.h?r1=1.7&r2=1.8 1.13 +4 -6 kphoneSI/dissipate2/sipmessage.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/dissipate2/sipmessage.cpp?r1=1.12&r2=1.13 1.13 +3 -0 kphoneSI/dissipate2/sipprotocol.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/dissipate2/sipprotocol.cpp?r1=1.12&r2=1.13 1.7 +1 -0 kphoneSI/dissipate2/sipprotocol.h http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/dissipate2/sipprotocol.h?r1=1.6&r2=1.7 1.16 +13 -9 kphoneSI/dissipate2/sippublish.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/dissipate2/sippublish.cpp?r1=1.15&r2=1.16 1.21 +19 -12 kphoneSI/dissipate2/sipregister.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/dissipate2/sipregister.cpp?r1=1.20&r2=1.21 1.5 +2 -1 kphoneSI/dissipate2/sipstatus.h http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/dissipate2/sipstatus.h?r1=1.4&r2=1.5 1.29 +30 -18 kphoneSI/dissipate2/siptransaction.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/dissipate2/siptransaction.cpp?r1=1.28&r2=1.29 1.13 +2 -1 kphoneSI/dissipate2/siptransaction.h http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/dissipate2/siptransaction.h?r1=1.12&r2=1.13 1.7 +16 -12 kphoneSI/dissipate2/siputil.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/dissipate2/siputil.cpp?r1=1.6&r2=1.7 1.9 +18 -16 kphoneSI/dissipate2/tcpmessagesocket.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/dissipate2/tcpmessagesocket.cpp?r1=1.8&r2=1.9 1.15 +35 -49 kphoneSI/dissipate2/udpmessagesocket.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/dissipate2/udpmessagesocket.cpp?r1=1.14&r2=1.15 1.4 +1 -0 kphoneSI/kaudio/audiobuffer.h http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kaudio/audiobuffer.h?r1=1.3&r2=1.4 1.9 +6 -4 kphoneSI/kaudio/dspaudio.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kaudio/dspaudio.cpp?r1=1.8&r2=1.9 1.6 +1 -0 kphoneSI/kaudio/dspaudio.h http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kaudio/dspaudio.h?r1=1.5&r2=1.6 1.7 +8 -6 kphoneSI/kaudio/dspaudioin.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kaudio/dspaudioin.cpp?r1=1.6&r2=1.7 1.4 +1 -0 kphoneSI/kaudio/dspaudioin.h http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kaudio/dspaudioin.h?r1=1.3&r2=1.4 1.11 +6 -4 kphoneSI/kaudio/dspaudioout.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kaudio/dspaudioout.cpp?r1=1.10&r2=1.11 1.5 +1 -0 kphoneSI/kaudio/dspaudioout.h http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kaudio/dspaudioout.h?r1=1.4&r2=1.5 1.6 +7 -157 kphoneSI/kaudio/dspearly.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kaudio/dspearly.cpp?r1=1.5&r2=1.6 1.4 +1 -0 kphoneSI/kaudio/dspearly.h http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kaudio/dspearly.h?r1=1.3&r2=1.4 1.15 +46 -46 kphoneSI/kaudio/dspoutalsa.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kaudio/dspoutalsa.cpp?r1=1.14&r2=1.15 1.3 +20 -22 kphoneSI/kaudio/dspoutoss.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kaudio/dspoutoss.cpp?r1=1.2&r2=1.3 1.14 +32 -30 kphoneSI/kaudio/dspoutrtp.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kaudio/dspoutrtp.cpp?r1=1.13&r2=1.14 1.7 +5 -0 kphoneSI/kaudio/dspoutrtp.h http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kaudio/dspoutrtp.h?r1=1.6&r2=1.7 1.6 +0 -1 kphoneSI/kaudio/dspouttone.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kaudio/dspouttone.cpp?r1=1.5&r2=1.6 1.3 +1 -0 kphoneSI/kaudio/dtmfgenerator.h http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kaudio/dtmfgenerator.h?r1=1.2&r2=1.3 1.6 +2 -0 kphoneSI/kphone/audiocontrol.h http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/audiocontrol.h?r1=1.5&r2=1.6 1.21 +52 -49 kphoneSI/kphone/callaudio.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/callaudio.cpp?r1=1.20&r2=1.21 1.11 +5 -3 kphoneSI/kphone/callaudio.h http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/callaudio.h?r1=1.10&r2=1.11 1.14 +0 -1 kphoneSI/kphone/calllistview.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/calllistview.cpp?r1=1.13&r2=1.14 1.5 +6 -3 kphoneSI/kphone/calllistview.h http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/calllistview.h?r1=1.4&r2=1.5 1.4 +2 -1 kphoneSI/kphone/extcontrol.h http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/extcontrol.h?r1=1.3&r2=1.4 1.3 +7 -5 kphoneSI/kphone/idletimedetector.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/idletimedetector.cpp?r1=1.2&r2=1.3 1.4 +6 -4 kphoneSI/kphone/kcallview.h http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/kcallview.h?r1=1.3&r2=1.4 1.30 +112 -112 kphoneSI/kphone/kcallwidget.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/kcallwidget.cpp?r1=1.29&r2=1.30 1.15 +1 -0 kphoneSI/kphone/kcallwidget.h http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/kcallwidget.h?r1=1.14&r2=1.15 1.4 +1 -0 kphoneSI/kphone/kdtmf.h http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/kdtmf.h?r1=1.3&r2=1.4 1.4 +1 -0 kphoneSI/kphone/khelp.h http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/khelp.h?r1=1.3&r2=1.4 1.9 +3 -1 kphoneSI/kphone/kinstantmessagewidget.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/kinstantmessagewidget.cpp?r1=1.8&r2=1.9 1.6 +2 -1 kphoneSI/kphone/kinstantmessagewidget.h http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/kinstantmessagewidget.h?r1=1.5&r2=1.6 1.28 +8 -6 kphoneSI/kphone/kphone.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/kphone.cpp?r1=1.27&r2=1.28 1.14 +8 -3 kphoneSI/kphone/kphone.h http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/kphone.h?r1=1.13&r2=1.14 1.12 +2 -18 kphoneSI/kphone/kphonebook.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/kphonebook.cpp?r1=1.11&r2=1.12 1.6 +4 -0 kphoneSI/kphone/kphonebook.h http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/kphonebook.h?r1=1.5&r2=1.6 1.38 +35 -29 kphoneSI/kphone/kphoneview.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/kphoneview.cpp?r1=1.37&r2=1.38 1.17 +8 -5 kphoneSI/kphone/kphoneview.h http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/kphoneview.h?r1=1.16&r2=1.17 1.6 +2 -1 kphoneSI/kphone/kreferdialog.h http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/kreferdialog.h?r1=1.5&r2=1.6 1.8 +3 -3 kphoneSI/kphone/ksipauthentication.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/ksipauthentication.cpp?r1=1.7&r2=1.8 1.5 +1 -0 kphoneSI/kphone/ksipauthentication.h http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/ksipauthentication.h?r1=1.4&r2=1.5 1.6 +4 -2 kphoneSI/kphone/ksipoptions.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/ksipoptions.cpp?r1=1.5&r2=1.6 1.12 +6 -0 kphoneSI/kphone/ksippreferences.h http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/ksippreferences.h?r1=1.11&r2=1.12 1.15 +2 -0 kphoneSI/kphone/ksipregistrations.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/ksipregistrations.cpp?r1=1.14&r2=1.15 1.6 +12 -1 kphoneSI/kphone/ksipregistrations.h http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/ksipregistrations.h?r1=1.5&r2=1.6 1.12 +4 -3 kphoneSI/kphone/kstatics.h http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/kstatics.h?r1=1.11&r2=1.12 1.27 +24 -15 kphoneSI/kphone/sessioncontrol.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/sessioncontrol.cpp?r1=1.26&r2=1.27 1.20 +19 -7 kphoneSI/kphone/sessioncontrol.h http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/sessioncontrol.h?r1=1.19&r2=1.20 1.3 +1 -0 kphoneSI/kphone/trayicon.h http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/trayicon.h?r1=1.2&r2=1.3 1.4 +1 -0 kphoneSI/kphone/videocontrol.h http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/videocontrol.h?r1=1.3&r2=1.4 1.5 +1 -0 kphoneSI/kphone/watcherlist.h http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/watcherlist.h?r1=1.4&r2=1.5 Index: messagesocket.cpp =================================================================== RCS file: /cvsroot/kphone/kphoneSI/dissipate2/messagesocket.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- messagesocket.cpp 19 Jul 2007 17:44:58 -0000 1.6 +++ messagesocket.cpp 21 Aug 2008 14:51:39 -0000 1.7 @@ -31,6 +31,8 @@ #include <time.h> #include "../kphone/kstatics.h" #include "messagesocket.h" +#include <iostream> +using namespace std; MessageSocket::MessageSocket( void ) { @@ -84,11 +86,11 @@ time(&end); gaidiff=difftime(end,begin); if (gaidiff > 1.50E1) { - printf ("MessageSocket::lookupHostname noLine \n"); + cout << "MessageSocket::lookupHostname noLine \n"; KStatics::noLine=1; } if (errcode != 0) { - perror ("MessageSocket::lookupHostname getaddrinfo"); + cout << "MessageSocket::lookupHostname getaddrinfo " << errcode << endl; return -1; } Index: messagesocket.h =================================================================== RCS file: /cvsroot/kphone/kphoneSI/dissipate2/messagesocket.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- messagesocket.h 1 Mar 2008 16:56:56 -0000 1.5 +++ messagesocket.h 21 Aug 2008 14:51:39 -0000 1.6 @@ -33,8 +33,10 @@ /** * @short Base Class for UDPMessageSocket and TCPMessageSocket +* This Class contains the routines to access socket related date and the voids for UDPMessageSocket and TCPMessageSocket +* The Class was parially rewritten for IPv6 */ class MessageSocket Index: sdpbuild.cpp =================================================================== RCS file: /cvsroot/kphone/kphoneSI/dissipate2/sdpbuild.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sdpbuild.cpp 25 Sep 2007 05:58:15 -0000 1.14 +++ sdpbuild.cpp 21 Aug 2008 14:51:39 -0000 1.15 @@ -22,6 +22,7 @@ #include "sdpbuild.h" #include "../kphone/sessioncontrol.h" #include "../kphone/kstatics.h" + SdpBuild::SdpBuild ( SessionControl *sco, SipCall *scall) { tempresponsepay=160; @@ -381,7 +382,6 @@ evaluateA=true; } if ( ( curline.contains("RTP/SAVP") && (sessionC->getSrtpMode() != 1) )|| ( curline.contains("RTP/AVP") && (sessionC->getSrtpMode() != 0) ) ) { - //printf (" SdpBuild::checkCodec srtp error\n"); *srtpErr = true; } setAudioPort(curline.section(' ',1,1)); Index: sdpbuild.h =================================================================== RCS file: /cvsroot/kphone/kphoneSI/dissipate2/sdpbuild.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sdpbuild.h 1 Mar 2008 16:56:56 -0000 1.6 +++ sdpbuild.h 21 Aug 2008 14:51:39 -0000 1.7 @@ -27,9 +27,12 @@ /** * @short construct and parse sdpmessages +* * Used to construct SDP Messages and to store the payload * data into the SipCall incarnation +* * performs codec checks and security tasks +* * CAVE!! if you change the m= line, you have to adapt SipClient::parseMessage, too */ class SdpBuild Index: sipcall.cpp =================================================================== RCS file: /cvsroot/kphone/kphoneSI/dissipate2/sipcall.cpp,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- sipcall.cpp 4 May 2008 09:55:49 -0000 1.31 +++ sipcall.cpp 21 Aug 2008 14:51:39 -0000 1.32 @@ -30,7 +30,8 @@ #include "siptransaction.h" #include "sipcall.h" #include "../kphone/kstatics.h" - + #include <iostream> +using namespace std; SipCallMember::SipCallMember( SipCall *parent, const SipUri &uri ) { @@ -49,7 +50,7 @@ holdRefused=false; statuscode=0; - if(KStatics::debugLevel>=2) printf(":::::SipCallMember start\n"); + if(KStatics::debugLevel>=2) cout << "SipCallMember start " << contacturi.nameAddr() << endl; ourUsername=""; ourPassword=""; nonceCounter=0; @@ -64,7 +65,7 @@ SipCallMember::~SipCallMember( void ) { delete timer; - if(KStatics::debugLevel>=2) printf(":::::SipCallMember stop\n"); + if(KStatics::debugLevel>=2) cout <<":::::SipCallMember stop\n"; } @@ -138,7 +139,9 @@ void SipCallMember::requestAuthSubscribe( void ) { - challengeCounter++; + //cout << "OLD challengeCounter " << challengeCounter << endl; + challengeCounter++; + //cout << "challengeCounter " << challengeCounter << endl; statusUpdated( this ); } @@ -181,6 +184,7 @@ } if( (authstate == authState_AuthenticationTryingWithPassword) && !authstrtemp.contains("stale=true")) { authstate = authState_AuthenticationRequiredWithNewPassword; + //cout << << "++++++++++++++++++++ 0 authState_AuthenticationRequiredWithNewPassword" << endl; } else { authstate = authState_AuthenticationRequired; } @@ -198,6 +202,7 @@ } if( (authstate == authState_AuthenticationTryingWithPassword) && !authstrtemp.contains("stale=true")) { authstate = authState_AuthenticationRequiredWithNewPassword; + //cout << << "++++++++++++++++++++ 1 authState_AuthenticationRequiredWithNewPassword" << endl; } else { authstate = authState_AuthenticationRequired; } @@ -318,7 +323,9 @@ void SipCallMember::requestAuthNotify( void ) { + //cout << << "OLD challengeCounter " << challengeCounter << endl; challengeCounter++; + //cout << << "challengeCounter " << challengeCounter << endl; statusUpdated( this ); } @@ -354,6 +361,7 @@ } if( (authstate == authState_AuthenticationTryingWithPassword) && !authstrtemp.contains("stale=true")) { authstate = authState_AuthenticationRequiredWithNewPassword; + //cout << << "++++++++++++++++++++ 2 authState_AuthenticationRequiredWithNewPassword" << endl; } else { authstate = authState_AuthenticationRequired; } @@ -372,6 +380,7 @@ } if( (authstate == authState_AuthenticationTryingWithPassword) && !authstrtemp.contains("stale=true")) { authstate = authState_AuthenticationRequiredWithNewPassword; + //cout << << "++++++++++++++++++++ 3 authState_AuthenticationRequiredWithNewPassword" << endl; } else { authstate = authState_AuthenticationRequired; } @@ -405,7 +414,7 @@ local = 0; } else if( local->getStatus().getCode() >= 200 ) { // final response if( local->getStatus().getCode() < 300 ) { - if(KStatics::debugLevel>=2)printf("SipCall::Member::handlingRNotifyResponse 2xx\n"); + if(KStatics::debugLevel>=2)cout <<"SipCall::Member::handlingRNotifyResponse 2xx\n"; state = state_r202; //back to the original type callMemberType=Invite; @@ -422,6 +431,7 @@ } if( (authstate == authState_AuthenticationTryingWithPassword) && !authstrtemp.contains("stale=true")) { ---------------------------------------------- Diff block truncated. (Max lines = 200) ---------------------------------------------- |
From: klaus f. <kgf...@us...> - 2008-05-04 09:56:38
|
kgfleischmann 2008/05/04 02:56:43 PDT Kphone CVS Repository Modified files: dissipate2 base64.c sipcall.cpp sipcall.h sipclient.cpp sipregister.cpp sipregister.h siptransaction.cpp sipvialist.h document dial1.png dial2.png dial3.png hold0.png kphoneSI.png subscribe4.png subscribe5.png subscribe6.png subscribe.png tr0.png tr1.png usermanual2.html usermanual5.html usermanual6.html usermanual8.html usermanual9.html kaudio dspaudio.cpp dspaudio.h dspaudioin.cpp dspaudioout.cpp dspearly.cpp dspoutalsa.cpp dspout.cpp dspoutrtp.cpp dspouttone.cpp kphone callaudio.cpp callaudio.h calllistview.cpp calllistview.h kcallview.cpp kcallwidget.cpp kcallwidget.h khelp.cpp kphone.cpp kphoneview.cpp kphoneview.h kpsi.1 sessioncontrol.cpp sessioncontrol.h . CHANGES Doxyfile KPhoneSI.kdevelop KPhoneSI.kdevelop.filelist README Log: changes in the user interface (see documentation) the docs some error corrections (see CHANGES) Revision Changes Path 1.54 +11 -0 kphoneSI/CHANGES http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/CHANGES?r1=1.53&r2=1.54 1.6 +2 -2 kphoneSI/Doxyfile http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/Doxyfile?r1=1.5&r2=1.6 1.10 +8 -4 kphoneSI/KPhoneSI.kdevelop http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/KPhoneSI.kdevelop?r1=1.9&r2=1.10 1.13 +2 -4 kphoneSI/KPhoneSI.kdevelop.filelist http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/KPhoneSI.kdevelop.filelist?r1=1.12&r2=1.13 1.8 +47 -13 kphoneSI/README http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/README?r1=1.7&r2=1.8 1.2 +1 -1 kphoneSI/dissipate2/base64.c http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/dissipate2/base64.c?r1=1.1&r2=1.2 1.31 +16 -8 kphoneSI/dissipate2/sipcall.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/dissipate2/sipcall.cpp?r1=1.30&r2=1.31 1.20 +1 -1 kphoneSI/dissipate2/sipcall.h http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/dissipate2/sipcall.h?r1=1.19&r2=1.20 1.35 +2 -3 kphoneSI/dissipate2/sipclient.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/dissipate2/sipclient.cpp?r1=1.34&r2=1.35 1.20 +11 -11 kphoneSI/dissipate2/sipregister.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/dissipate2/sipregister.cpp?r1=1.19&r2=1.20 1.6 +5 -0 kphoneSI/dissipate2/sipregister.h http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/dissipate2/sipregister.h?r1=1.5&r2=1.6 1.28 +4 -3 kphoneSI/dissipate2/siptransaction.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/dissipate2/siptransaction.cpp?r1=1.27&r2=1.28 1.3 +6 -1 kphoneSI/dissipate2/sipvialist.h http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/dissipate2/sipvialist.h?r1=1.2&r2=1.3 1.4 +138 -73 kphoneSI/document/dial1.png http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/document/dial1.png?r1=1.3&r2=1.4 1.4 +169 -76 kphoneSI/document/dial2.png http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/document/dial2.png?r1=1.3&r2=1.4 1.3 +161 -63 kphoneSI/document/dial3.png http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/document/dial3.png?r1=1.2&r2=1.3 1.3 +219 -37 kphoneSI/document/hold0.png http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/document/hold0.png?r1=1.2&r2=1.3 1.5 +88 -71 kphoneSI/document/kphoneSI.png http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/document/kphoneSI.png?r1=1.4&r2=1.5 1.3 +110 -59 kphoneSI/document/subscribe.png http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/document/subscribe.png?r1=1.2&r2=1.3 1.2 +109 -52 kphoneSI/document/subscribe4.png http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/document/subscribe4.png?r1=1.1&r2=1.2 1.2 +18 -14 kphoneSI/document/subscribe5.png http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/document/subscribe5.png?r1=1.1&r2=1.2 1.2 +24 -16 kphoneSI/document/subscribe6.png http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/document/subscribe6.png?r1=1.1&r2=1.2 1.3 +150 -76 kphoneSI/document/tr0.png http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/document/tr0.png?r1=1.2&r2=1.3 1.3 +129 -72 kphoneSI/document/tr1.png http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/document/tr1.png?r1=1.2&r2=1.3 1.11 +40 -50 kphoneSI/document/usermanual2.html http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/document/usermanual2.html?r1=1.10&r2=1.11 1.8 +5 -44 kphoneSI/document/usermanual5.html http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/document/usermanual5.html?r1=1.7&r2=1.8 1.7 +19 -13 kphoneSI/document/usermanual6.html http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/document/usermanual6.html?r1=1.6&r2=1.7 1.8 +30 -12 kphoneSI/document/usermanual8.html http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/document/usermanual8.html?r1=1.7&r2=1.8 1.6 +5 -5 kphoneSI/document/usermanual9.html http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/document/usermanual9.html?r1=1.5&r2=1.6 1.8 +9 -5 kphoneSI/kaudio/dspaudio.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kaudio/dspaudio.cpp?r1=1.7&r2=1.8 1.5 +10 -5 kphoneSI/kaudio/dspaudio.h http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kaudio/dspaudio.h?r1=1.4&r2=1.5 1.6 +2 -2 kphoneSI/kaudio/dspaudioin.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kaudio/dspaudioin.cpp?r1=1.5&r2=1.6 1.10 +3 -3 kphoneSI/kaudio/dspaudioout.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kaudio/dspaudioout.cpp?r1=1.9&r2=1.10 1.5 +2 -2 kphoneSI/kaudio/dspearly.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kaudio/dspearly.cpp?r1=1.4&r2=1.5 1.3 +2 -0 kphoneSI/kaudio/dspout.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kaudio/dspout.cpp?r1=1.2&r2=1.3 1.14 +4 -5 kphoneSI/kaudio/dspoutalsa.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kaudio/dspoutalsa.cpp?r1=1.13&r2=1.14 1.13 +7 -8 kphoneSI/kaudio/dspoutrtp.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kaudio/dspoutrtp.cpp?r1=1.12&r2=1.13 1.5 +2 -2 kphoneSI/kaudio/dspouttone.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kaudio/dspouttone.cpp?r1=1.4&r2=1.5 1.20 +136 -77 kphoneSI/kphone/callaudio.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/callaudio.cpp?r1=1.19&r2=1.20 1.10 +6 -1 kphoneSI/kphone/callaudio.h http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/callaudio.h?r1=1.9&r2=1.10 1.13 +9 -21 kphoneSI/kphone/calllistview.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/calllistview.cpp?r1=1.12&r2=1.13 1.4 +5 -2 kphoneSI/kphone/calllistview.h http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/calllistview.h?r1=1.3&r2=1.4 1.8 +9 -0 kphoneSI/kphone/kcallview.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/kcallview.cpp?r1=1.7&r2=1.8 1.29 +97 -185 kphoneSI/kphone/kcallwidget.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/kcallwidget.cpp?r1=1.28&r2=1.29 1.14 +20 -22 kphoneSI/kphone/kcallwidget.h http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/kcallwidget.h?r1=1.13&r2=1.14 1.3 +2 -5 kphoneSI/kphone/khelp.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/khelp.cpp?r1=1.2&r2=1.3 1.27 +17 -51 kphoneSI/kphone/kphone.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/kphone.cpp?r1=1.26&r2=1.27 1.37 +268 -260 kphoneSI/kphone/kphoneview.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/kphoneview.cpp?r1=1.36&r2=1.37 1.16 +36 -2 kphoneSI/kphone/kphoneview.h http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/kphoneview.h?r1=1.15&r2=1.16 1.7 +5 -5 kphoneSI/kphone/kpsi.1 http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/kpsi.1?r1=1.6&r2=1.7 1.26 +2 -24 kphoneSI/kphone/sessioncontrol.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/sessioncontrol.cpp?r1=1.25&r2=1.26 1.19 +3 -2 kphoneSI/kphone/sessioncontrol.h http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/sessioncontrol.h?r1=1.18&r2=1.19 Index: base64.c =================================================================== RCS file: /cvsroot/kphone/kphoneSI/dissipate2/base64.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- base64.c 12 Oct 2005 18:18:04 -0000 1.1 +++ base64.c 4 May 2008 09:55:48 -0000 1.2 @@ -1,4 +1,5 @@ #include <sys/types.h> +#include <stdio.h> #include "string.h" #include "stdlib.h" #include "base64.h" @@ -34,7 +35,6 @@ int outPos = 0; int c1, c2, c3; unsigned int i; - out = (char *)malloc( ( len * 4/3 ) + 8 ); /* Get three characters at a time and encode them. */ Index: sipcall.cpp =================================================================== RCS file: /cvsroot/kphone/kphoneSI/dissipate2/sipcall.cpp,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- sipcall.cpp 19 Feb 2008 20:55:21 -0000 1.30 +++ sipcall.cpp 4 May 2008 09:55:49 -0000 1.31 @@ -146,7 +146,7 @@ void SipCallMember::requestClearSubscribe( bool setTimer ) { localExpiresTime = 0; - call->setCallStatus( SipCall::callDisconneting ); + call->setCallStatus( SipCall::callDisconnecting ); sendRequestSubscribe(ourUsername, ourPassword); if (setTimer) { call->setPresState(SipCall::PsTerminated); @@ -164,7 +164,7 @@ local = 0; } else if( local->getStatus().getCode() >= 200 ) { // final response if( local->getStatus().getCode() < 300 ) { - if( call->getCallStatus() == SipCall::callDisconneting ) { + if( call->getCallStatus() == SipCall::callDisconnecting ) { call->setCallStatus( SipCall::callUnconnected ); } else { call->setCallStatus( SipCall::callInProgress ); @@ -1185,7 +1185,7 @@ } else if( local->getStatus().getCode() >= 200 ) { // final response if( local->getStatus().getCode() < 300 ) { challengeCounter = 0; - if( call->getCallStatus() == SipCall::callDisconneting ) { + if( call->getCallStatus() == SipCall::callDisconnecting ) { call->setCallStatus( SipCall::callUnconnected ); } else { call->setCallStatus( SipCall::callInProgress ); @@ -1412,7 +1412,6 @@ void SipCallMember::call_timeout() { if( (call->getCallType() == SipCall::outSubscribeCall) || (call->getCallType() == SipCall::winfoSubscribeCall) ) { -// printf("requestSubscribe SipCallMember::call_timeout\n"); requestSubscribe(); } else if( call->getCallType() == SipCall::inSubscribeCall ) { contactUpdate ( false ); @@ -1876,13 +1875,11 @@ } else if ( message->getMethod() == Sip::UPDATE ) { -// if ( member->state != SipCallMember::state_Connected) { updateST = 1; member->local = transaction; member->savestate = member->state; if ( member->state == SipCallMember::state_Connected){ member->state = SipCallMember::state_Update; - /// member->local = 0; } else { connect( transaction, SIGNAL( statusUpdated() ), member, SLOT(UpdateStatusUpdated() ) ); @@ -1891,6 +1888,16 @@ } } updateST = 0; + + /* + //Cave Canem, will not work + if(transaction->wasCancelled()) { + printf("---------ir1 duud\n"); + } else { + printf("---------ir1 nit duud\n"); + member->setState(SipCallMember::state_Idle); + } + */ transaction->incomingRequest( message,this->getHoldMaster() ); // Update member status based on this transaction @@ -1960,7 +1967,7 @@ } } -//hallo + QString SipCall::getHostname( void ) { SipUser *u = parent->getUser( localuri ); @@ -2101,6 +2108,8 @@ state = "Working"; } else if( presenceStatus == "worship" ) { state = "At Worship"; + } else if( presenceStatus == "" ) { + state = "Offline"; } else { state = presenceStatus; } @@ -2260,7 +2269,6 @@ } void SipCall::noti_timeout() { -// printf("SipCallMember::noti_timeout\n"); parent->updateSubscribes(); } Index: sipcall.h =================================================================== RCS file: /cvsroot/kphone/kphoneSI/dissipate2/sipcall.h,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- sipcall.h 1 Mar 2008 16:56:56 -0000 1.19 +++ sipcall.h 4 May 2008 09:55:49 -0000 1.20 @@ -833,7 +833,7 @@ bool getAck (void) { return isAck; } enum CallStatus { - callDisconneting, + callDisconnecting, callUnconnected, callInProgress, callDead }; Index: sipclient.cpp =================================================================== RCS file: /cvsroot/kphone/kphoneSI/dissipate2/sipclient.cpp,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- sipclient.cpp 1 Mar 2008 16:56:56 -0000 1.34 +++ sipclient.cpp 4 May 2008 09:55:49 -0000 1.35 @@ -468,7 +468,7 @@ retry3: if( select( highest_fd, &read_fds, NULL, NULL, block ? NULL : &timeout ) == -1 ) { if( errno == EINTR ) goto retry3; - printf( "====SipCient::doSelect(): select() punted\n" ); + printf( "====SipClient::doSelect(): select() punted\n" ); } if( FD_ISSET( tcpSocket->getFileDescriptor(), &read_fds ) ) { incomingMessage( tcpSocket->getFileDescriptor(),false ); @@ -738,7 +738,6 @@ sendQuickResponse( curmessage, SipStatus( 200 ) ); } if( curmessage->getMethod() == Sip::SUBSCRIBE ) { -// printf("------------> got SUBSRIBE\n"); if ( fullmessage.contains("Event: presence.presencelist") ) { sendQuickResponse( curmessage, SipStatus( 488 ) ); if(debug) printf( "=====SipClient: We dont support this\n" ); @@ -1191,7 +1190,7 @@ msg->getRequestUri().setPortNumber( port ); sendtoaddr = sendtoaddr.left( sendtoaddr.find( ']' )+1 ); - } else if( sendtoaddr.contains( ':') && !sendtoaddr.contains(']') ) {//ÃÂÃÂÃÂç && !useIPv6 + } else if( sendtoaddr.contains( ':') && !sendtoaddr.contains(']') ) { port = sendtoaddr.mid( sendtoaddr.find( ':' ) + 1 ).toUInt(); msg->getRequestUri().setPortNumber( port ); sendtoaddr = sendtoaddr.left( sendtoaddr.find( ':' ) ); Index: sipregister.cpp =================================================================== RCS file: /cvsroot/kphone/kphoneSI/dissipate2/sipregister.cpp,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- sipregister.cpp 19 Feb 2008 20:55:22 -0000 1.19 +++ sipregister.cpp 4 May 2008 09:55:49 -0000 1.20 @@ -67,6 +67,7 @@ regCallMember = new SipCallMember(regcall,regserver ); regreval=5; mobilitysupp=false; //set to true to support the feature; + regfailure = "none"; } SipRegister::~SipRegister( void ) @@ -159,6 +160,7 @@ SipStatus status; bool rereg = false; int validTime, exTime=expiresTime*900; + regfailure = "none"; if( !curtrans ) { if (KStatics::debugLevel >1) printf( "!!!!!SipRegister: Received what was likely a retransmission, badly ignoring...\n" ); ---------------------------------------------- Diff block truncated. (Max lines = 200) ---------------------------------------------- |
From: klaus f. <kgf...@us...> - 2008-03-01 16:57:05
|
kgfleischmann 2008/03/01 08:57:01 PST Kphone CVS Repository Modified files: dissipate2 messagesocket.h mimecontenttype.cpp mimecontenttype.h parameterlist.h sdpbuild.h sipcall.h sipclient.cpp sipclient.h sipheader.h sipmessage.h sippublish.h sipregister.h sipstatus.cpp sipstatus.h siptransaction.cpp siptransaction.h sipurilist.cpp siputil.h tcpmessagesocket.h udpmessagesocket.cpp udpmessagesocket.h kaudio audiobuffer.h codec.h dspaudio.h dspaudioin.h dspaudioout.h dspearly.cpp dspearly.h dspoutalsa.h dspout.h dspoutrtp.cpp dspoutrtp.h dspouttone.h dtmfgenerator.h kphone callaudio.h extcontrol.h idletimedetector.cpp idletimedetector.h kcallview.h kcallwidget.h kdtmf.h khelp.h kinstantmessagewidget.h kphone.cpp kphone.h kphoneview.cpp kphoneview.h kreferdialog.h ksipauthentication.h ksippreferences.cpp ksippreferences.h ksipregistrations.h kstatics.h sessioncontrol.cpp sessioncontrol.h trayicon.h videocontrol.h watcherlist.h . CHANGES README README.FIRST Log: New inline docs Revision Changes Path 1.53 +4 -0 kphoneSI/CHANGES http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/CHANGES?r1=1.52&r2=1.53 1.7 +1 -1 kphoneSI/README http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/README?r1=1.6&r2=1.7 1.8 +18 -13 kphoneSI/README.FIRST http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/README.FIRST?r1=1.7&r2=1.8 1.5 +23 -10 kphoneSI/dissipate2/messagesocket.h http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/dissipate2/messagesocket.h?r1=1.4&r2=1.5 1.3 +2 -2 kphoneSI/dissipate2/mimecontenttype.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/dissipate2/mimecontenttype.cpp?r1=1.2&r2=1.3 1.3 +54 -8 kphoneSI/dissipate2/mimecontenttype.h http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/dissipate2/mimecontenttype.h?r1=1.2&r2=1.3 1.3 +32 -3 kphoneSI/dissipate2/parameterlist.h http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/dissipate2/parameterlist.h?r1=1.2&r2=1.3 1.6 +15 -3 kphoneSI/dissipate2/sdpbuild.h http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/dissipate2/sdpbuild.h?r1=1.5&r2=1.6 1.19 +254 -41 kphoneSI/dissipate2/sipcall.h http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/dissipate2/sipcall.h?r1=1.18&r2=1.19 1.34 +2 -1 kphoneSI/dissipate2/sipclient.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/dissipate2/sipclient.cpp?r1=1.33&r2=1.34 1.17 +97 -19 kphoneSI/dissipate2/sipclient.h http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/dissipate2/sipclient.h?r1=1.16&r2=1.17 1.7 +10 -1 kphoneSI/dissipate2/sipheader.h http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/dissipate2/sipheader.h?r1=1.6&r2=1.7 1.6 +9 -0 kphoneSI/dissipate2/sipmessage.h http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/dissipate2/sipmessage.h?r1=1.5&r2=1.6 1.9 +30 -5 kphoneSI/dissipate2/sippublish.h http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/dissipate2/sippublish.h?r1=1.8&r2=1.9 1.5 +28 -1 kphoneSI/dissipate2/sipregister.h http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/dissipate2/sipregister.h?r1=1.4&r2=1.5 1.7 +2 -0 kphoneSI/dissipate2/sipstatus.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/dissipate2/sipstatus.cpp?r1=1.6&r2=1.7 1.4 +47 -1 kphoneSI/dissipate2/sipstatus.h http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/dissipate2/sipstatus.h?r1=1.3&r2=1.4 1.27 +2 -0 kphoneSI/dissipate2/siptransaction.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/dissipate2/siptransaction.cpp?r1=1.26&r2=1.27 1.12 +74 -19 kphoneSI/dissipate2/siptransaction.h http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/dissipate2/siptransaction.h?r1=1.11&r2=1.12 1.3 +4 -0 kphoneSI/dissipate2/sipurilist.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/dissipate2/sipurilist.cpp?r1=1.2&r2=1.3 1.5 +16 -4 kphoneSI/dissipate2/siputil.h http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/dissipate2/siputil.h?r1=1.4&r2=1.5 1.5 +26 -1 kphoneSI/dissipate2/tcpmessagesocket.h http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/dissipate2/tcpmessagesocket.h?r1=1.4&r2=1.5 1.14 +3 -2 kphoneSI/dissipate2/udpmessagesocket.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/dissipate2/udpmessagesocket.cpp?r1=1.13&r2=1.14 1.7 +32 -1 kphoneSI/dissipate2/udpmessagesocket.h http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/dissipate2/udpmessagesocket.h?r1=1.6&r2=1.7 1.3 +1 -0 kphoneSI/kaudio/audiobuffer.h http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kaudio/audiobuffer.h?r1=1.2&r2=1.3 1.2 +19 -19 kphoneSI/kaudio/codec.h http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kaudio/codec.h?r1=1.1&r2=1.2 1.4 +38 -5 kphoneSI/kaudio/dspaudio.h http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kaudio/dspaudio.h?r1=1.3&r2=1.4 1.3 +8 -1 kphoneSI/kaudio/dspaudioin.h http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kaudio/dspaudioin.h?r1=1.2&r2=1.3 1.4 +11 -1 kphoneSI/kaudio/dspaudioout.h http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kaudio/dspaudioout.h?r1=1.3&r2=1.4 1.4 +9 -6 kphoneSI/kaudio/dspearly.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kaudio/dspearly.cpp?r1=1.3&r2=1.4 1.3 +50 -13 kphoneSI/kaudio/dspearly.h http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kaudio/dspearly.h?r1=1.2&r2=1.3 1.3 +3 -2 kphoneSI/kaudio/dspout.h http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kaudio/dspout.h?r1=1.2&r2=1.3 1.6 +24 -1 kphoneSI/kaudio/dspoutalsa.h http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kaudio/dspoutalsa.h?r1=1.5&r2=1.6 1.12 +10 -2 kphoneSI/kaudio/dspoutrtp.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kaudio/dspoutrtp.cpp?r1=1.11&r2=1.12 1.6 +73 -7 kphoneSI/kaudio/dspoutrtp.h http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kaudio/dspoutrtp.h?r1=1.5&r2=1.6 1.3 +16 -2 kphoneSI/kaudio/dspouttone.h http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kaudio/dspouttone.h?r1=1.2&r2=1.3 1.2 +10 -5 kphoneSI/kaudio/dtmfgenerator.h http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kaudio/dtmfgenerator.h?r1=1.1&r2=1.2 1.9 +30 -18 kphoneSI/kphone/callaudio.h http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/callaudio.h?r1=1.8&r2=1.9 1.3 +2 -1 kphoneSI/kphone/extcontrol.h http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/extcontrol.h?r1=1.2&r2=1.3 1.2 +1 -1 kphoneSI/kphone/idletimedetector.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/idletimedetector.cpp?r1=1.1&r2=1.2 1.3 +59 -4 kphoneSI/kphone/idletimedetector.h http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/idletimedetector.h?r1=1.2&r2=1.3 1.3 +2 -0 kphoneSI/kphone/kcallview.h http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/kcallview.h?r1=1.2&r2=1.3 1.13 +2 -2 kphoneSI/kphone/kcallwidget.h http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/kcallwidget.h?r1=1.12&r2=1.13 1.3 +8 -1 kphoneSI/kphone/kdtmf.h http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/kdtmf.h?r1=1.2&r2=1.3 1.3 +2 -1 kphoneSI/kphone/khelp.h http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/khelp.h?r1=1.2&r2=1.3 1.5 +29 -2 kphoneSI/kphone/kinstantmessagewidget.h http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/kinstantmessagewidget.h?r1=1.4&r2=1.5 1.26 +14 -11 kphoneSI/kphone/kphone.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/kphone.cpp?r1=1.25&r2=1.26 1.13 +103 -10 kphoneSI/kphone/kphone.h http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/kphone.h?r1=1.12&r2=1.13 1.36 +26 -27 kphoneSI/kphone/kphoneview.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/kphoneview.cpp?r1=1.35&r2=1.36 1.15 +108 -8 kphoneSI/kphone/kphoneview.h http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/kphoneview.h?r1=1.14&r2=1.15 1.5 +1 -0 kphoneSI/kphone/kreferdialog.h http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/kreferdialog.h?r1=1.4&r2=1.5 1.4 +37 -4 kphoneSI/kphone/ksipauthentication.h http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/ksipauthentication.h?r1=1.3&r2=1.4 1.19 +1 -0 kphoneSI/kphone/ksippreferences.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/ksippreferences.cpp?r1=1.18&r2=1.19 1.11 +0 -5 kphoneSI/kphone/ksippreferences.h http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/ksippreferences.h?r1=1.10&r2=1.11 1.5 +118 -3 kphoneSI/kphone/ksipregistrations.h http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/ksipregistrations.h?r1=1.4&r2=1.5 1.11 +48 -0 kphoneSI/kphone/kstatics.h http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/kstatics.h?r1=1.10&r2=1.11 1.25 +2 -2 kphoneSI/kphone/sessioncontrol.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/sessioncontrol.cpp?r1=1.24&r2=1.25 1.18 +118 -79 kphoneSI/kphone/sessioncontrol.h http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/sessioncontrol.h?r1=1.17&r2=1.18 1.2 +16 -11 kphoneSI/kphone/trayicon.h http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/trayicon.h?r1=1.1&r2=1.2 1.3 +1 -0 kphoneSI/kphone/videocontrol.h http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/videocontrol.h?r1=1.2&r2=1.3 1.4 +2 -0 kphoneSI/kphone/watcherlist.h http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/watcherlist.h?r1=1.3&r2=1.4 Index: messagesocket.h =================================================================== RCS file: /cvsroot/kphone/kphoneSI/dissipate2/messagesocket.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- messagesocket.h 14 Jan 2008 21:59:07 -0000 1.4 +++ messagesocket.h 1 Mar 2008 16:56:56 -0000 1.5 @@ -70,7 +70,7 @@ virtual int accept( void ) = 0; /** - * For RTP badness. + * Open up the socket for listening on the given port.(mostly used for RTP) */ virtual int listenOnEvenPort( int min = 0, int max = 0 ) = 0; @@ -79,9 +79,22 @@ * currently calls gethostbyname. */ // bool setHostname( const char *hostname ); -int setHostname( const char *hostname ); + /** + * resolves the hostname, sets the socket structures and returns the IP-Type: + returns 0: failure + 4: remote address is IPv4 + 6: remote address is IPv6 + */ + int setHostname( const char *hostname ); + /** + * used by setHostname to resolve the hostname + */ static int lookupHostname( const char *hostname, unsigned char *store, const int len); + /** + * return the IP-Type actually used + */ static int getHostIpType( const char *hostname ); + enum SocketType { None, SocketTCP, @@ -108,17 +121,17 @@ * Forces our local port number to be something specific. */ void forcePortNumber( unsigned int newport ); - + /** + * used? + */ static void disableIpv6Lookups( void ); - + /** + *returns 4: numeric IPv4 + * 6: numeric IPv6 + * 0: none of both, probalby a hostname + */ static int getSocketIpVersion( void ); - // returns 4: numeric IPv4 - // 6: numeric IPv6 - // 0: none of both, probalby a hostname -// static int getAddressVersion( const char *addr ); - - protected: // Socket Info struct hostent *he; Index: mimecontenttype.cpp =================================================================== RCS file: /cvsroot/kphone/kphoneSI/dissipate2/mimecontenttype.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- mimecontenttype.cpp 19 Jul 2007 17:44:58 -0000 1.2 +++ mimecontenttype.cpp 1 Mar 2008 16:56:56 -0000 1.3 @@ -28,13 +28,13 @@ } MimeContentType::MimeContentType( const QString& initialtype, const QString& initialsubtype ) -{ +{ m_type = initialtype; m_subtype = initialsubtype; } MimeContentType::MimeContentType( const QString& parseinput ) -{ +{ parseContentType( parseinput ); } Index: mimecontenttype.h =================================================================== RCS file: /cvsroot/kphone/kphoneSI/dissipate2/mimecontenttype.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- mimecontenttype.h 19 Jul 2007 17:44:58 -0000 1.2 +++ mimecontenttype.h 1 Mar 2008 16:56:56 -0000 1.3 @@ -32,31 +32,77 @@ class MimeContentType { public: +/** +* Constructor +*/ MimeContentType( void ); +/** +* Constructor enter mimetype +*/ MimeContentType( const QString &initialtype, const QString &initialsubtype ); +/** +* Constructor parses Mimetype given as string +*/ MimeContentType( const QString &parseinput ); +/** +* +*/ ~MimeContentType( void ); - +/** +* get the mime type +*/ QString getType( void ) const { return m_type; } +/** +* get the mime sub type +*/ QString getSubType( void ) const { return m_subtype; } - +/** +* set the mime type +*/ void setType( QString newtype ); +/** +* set the mime type +*/ void setSubType( QString newsubtype ); - +/** +* set a parameter +*/ void setParameter( const QString ¶m, const QString &value ); +/** +* get a parameter +*/ QString queryParameter( const QString ¶m ); - +/** +* parse a strinn, format mime header +*/ void parseContentType( const QString ¶m ); - +/** +* - +*/ QString type( void ) const; - +/** +* null m t +*/ static const MimeContentType null; - +/** +* set operator +*/ MimeContentType &operator=( const MimeContentType &t ); - +/** +* euql operator +*/ bool operator==( const MimeContentType &t ) const; +/** +* not equal operator +*/ bool operator!=( const MimeContentType &t ) const; +/** +* equal operator with parsing +*/ bool operator==( const QString &t ) const; +/** +* not equal operator with parsing +*/ bool operator!=( const QString &t ) const; private: Index: parameterlist.h =================================================================== RCS file: /cvsroot/kphone/kphoneSI/dissipate2/parameterlist.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- parameterlist.h 19 Jul 2007 17:44:58 -0000 1.2 +++ parameterlist.h 1 Mar 2008 16:56:56 -0000 1.3 @@ -24,21 +24,50 @@ #define PARAMETERLIST_H_INCLUDED #include <qvaluelist.h> ---------------------------------------------- Diff block truncated. (Max lines = 200) ---------------------------------------------- |
From: klaus f. <kgf...@us...> - 2008-02-19 20:55:24
|
kgfleischmann 2008/02/19 12:55:24 PST Kphone CVS Repository Modified files: dissipate2 sipcall.cpp sipclient.cpp sipregister.cpp tcpmessagesocket.cpp udpmessagesocket.cpp gsm gsm_create.cpp ilbc iCBSearch.cpp kphone kphone.cpp kphoneview.cpp kphoneview.h po kphone_de.ts Speex speex_decode.cpp speex_define.h . CHANGES Doxyfile KPhoneSI.kdevelop KPhoneSI.kdevelop.filelist Log: see "CHANGES" Revision Changes Path 1.52 +4 -0 kphoneSI/CHANGES http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/CHANGES?r1=1.51&r2=1.52 1.5 +2 -2 kphoneSI/Doxyfile http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/Doxyfile?r1=1.4&r2=1.5 1.9 +3 -8 kphoneSI/KPhoneSI.kdevelop http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/KPhoneSI.kdevelop?r1=1.8&r2=1.9 1.12 +195 -183 kphoneSI/KPhoneSI.kdevelop.filelist http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/KPhoneSI.kdevelop.filelist?r1=1.11&r2=1.12 1.4 +17 -9 kphoneSI/Speex/speex_decode.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/Speex/speex_decode.cpp?r1=1.3&r2=1.4 1.4 +2 -1 kphoneSI/Speex/speex_define.h http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/Speex/speex_define.h?r1=1.3&r2=1.4 1.30 +1 -0 kphoneSI/dissipate2/sipcall.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/dissipate2/sipcall.cpp?r1=1.29&r2=1.30 1.33 +5 -3 kphoneSI/dissipate2/sipclient.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/dissipate2/sipclient.cpp?r1=1.32&r2=1.33 1.19 +1 -5 kphoneSI/dissipate2/sipregister.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/dissipate2/sipregister.cpp?r1=1.18&r2=1.19 1.8 +9 -0 kphoneSI/dissipate2/tcpmessagesocket.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/dissipate2/tcpmessagesocket.cpp?r1=1.7&r2=1.8 1.13 +10 -1 kphoneSI/dissipate2/udpmessagesocket.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/dissipate2/udpmessagesocket.cpp?r1=1.12&r2=1.13 1.3 +2 -2 kphoneSI/gsm/gsm_create.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/gsm/gsm_create.cpp?r1=1.2&r2=1.3 1.2 +1 -1 kphoneSI/ilbc/iCBSearch.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/ilbc/iCBSearch.cpp?r1=1.1&r2=1.2 1.25 +5 -2 kphoneSI/kphone/kphone.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/kphone.cpp?r1=1.24&r2=1.25 1.35 +81 -73 kphoneSI/kphone/kphoneview.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/kphoneview.cpp?r1=1.34&r2=1.35 1.14 +65 -20 kphoneSI/kphone/kphoneview.h http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/kphoneview.h?r1=1.13&r2=1.14 1.8 +2 -2 kphoneSI/po/kphone_de.ts http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/po/kphone_de.ts?r1=1.7&r2=1.8 Index: sipcall.cpp =================================================================== RCS file: /cvsroot/kphone/kphoneSI/dissipate2/sipcall.cpp,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- sipcall.cpp 27 Nov 2007 08:34:46 -0000 1.29 +++ sipcall.cpp 19 Feb 2008 20:55:21 -0000 1.30 @@ -1412,6 +1412,7 @@ void SipCallMember::call_timeout() { if( (call->getCallType() == SipCall::outSubscribeCall) || (call->getCallType() == SipCall::winfoSubscribeCall) ) { +// printf("requestSubscribe SipCallMember::call_timeout\n"); requestSubscribe(); } else if( call->getCallType() == SipCall::inSubscribeCall ) { contactUpdate ( false ); Index: sipclient.cpp =================================================================== RCS file: /cvsroot/kphone/kphoneSI/dissipate2/sipclient.cpp,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- sipclient.cpp 14 Jan 2008 21:59:07 -0000 1.32 +++ sipclient.cpp 19 Feb 2008 20:55:22 -0000 1.33 @@ -797,6 +797,7 @@ } } if( touri.hasTag() ) { + if(debug >= 2) printf( "=====SipClient: Wrong turi\n" ); sendQuickResponse( curmessage, SipStatus( 481 ) ); delete curmessage; return; @@ -805,11 +806,11 @@ SipCallMember *member; bool sendSubscribe = true; if( touri == user->getUri() ) { - newcall = new SipCall( user, curmessage->getHeaderData( SipHeader::Call_ID ), SipCall::inSubscribeCall ); + if(debug >= 2) printf( "=====SipClient: New subscription\n" ); + newcall = new SipCall( user, curmessage->getHeaderData( SipHeader::Call_ID ), SipCall::inSubscribeCall ); member = newcall->incomingMessage( curmessage ); } else { - newcall = new SipCall( user, curmessage->getHeaderData( SipHeader::Call_ID ), - SipCall::inSubscribeCall_2 ); + newcall = new SipCall( user, curmessage->getHeaderData( SipHeader::Call_ID ),SipCall::inSubscribeCall_2 ); newcall->incomingMessage( curmessage ); if(debug >= 2) printf("===== delete \n"); delete newcall; @@ -818,6 +819,7 @@ SipUri remoteuri( curmessage->getHeaderData( SipHeader::From ) ); if( curmessage->getHeaderData( SipHeader::Expires ) == "0" || remoteuri.reqUri() == user->getMyUri()->reqUri() ) { + if(debug >= 2) printf("===== delete expired \n"); delete newcall; } else { for( SipCall *curcall = calls.first(); curcall != 0; curcall = calls.next() ) { Index: sipregister.cpp =================================================================== RCS file: /cvsroot/kphone/kphoneSI/dissipate2/sipregister.cpp,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- sipregister.cpp 26 Oct 2007 13:35:57 -0000 1.18 +++ sipregister.cpp 19 Feb 2008 20:55:22 -0000 1.19 @@ -33,7 +33,7 @@ SipRegister::SipRegister( SipUser *user, const SipUri &serveruri, int expires, QString qvalue ) { - if (KStatics::debugLevel >=2) printf (":::::SipRegister start\n"); + if (KStatics::debugLevel >=2) printf (":::::SipRegister start %d %d \n",expires,minValidTime); qValue = qvalue; autoregister = false; if( expires > 0 && expires < minValidTime ) { @@ -304,8 +304,6 @@ void SipRegister::mob_timeout() { -//printf("------------------------>mob_timeout\n"); -//??? const char *regsrv=regcall->getSipClient()->getTargetAddress( regserver ).latin1(); if ( SipUtil::checkForAddressChange2( AF_INET, regserver.getHostname().latin1() ) ) { printf ("mob_timeout(): address changed\n"); @@ -325,13 +323,11 @@ if (!mobilitysupp && supp) { // switch on mobilitysupp=supp; mtimer_triggered=false; - //printf("------------------------>mtimer start\n"); mtimer->start( regreval * 1000, TRUE ); } if (mobilitysupp && !supp) { // switch off mobilitysupp=supp; mtimer_triggered=false; - //printf("------------------------>mtimer stop\n"); mtimer->stop(); } } Index: tcpmessagesocket.cpp =================================================================== RCS file: /cvsroot/kphone/kphoneSI/dissipate2/tcpmessagesocket.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- tcpmessagesocket.cpp 14 Jan 2008 21:59:08 -0000 1.7 +++ tcpmessagesocket.cpp 19 Feb 2008 20:55:22 -0000 1.8 @@ -44,6 +44,7 @@ type = SocketTCP; if ( ( socketfd = socket( AF_INET, SOCK_STREAM, 0 ) ) == -1 ) { perror( "TCPMessageSocket(): socket() failed" ); + printf( "TCPMessageSocket(): socket() failed" ); } } @@ -68,6 +69,7 @@ bzero( &( socketaddress.soa4.sin_zero ), 8 ); if( ::connect( socketfd, &socketaddress.soa, sizeof( struct sockaddr ) ) == -1 ) { perror ( "TCPMessageSocket::connect(): \n" ); + printf ( "TCPMessageSocket::connect(): \n" ); return -1; } return 0; @@ -77,6 +79,7 @@ { if ( ::send( socketfd, sendbuffer, length, 0 ) == -1 ) { perror( "TCPMessageSocket::send(): send() failed" ); + printf( "TCPMessageSocket::send(): send() failed" ); return -1; } @@ -88,6 +91,7 @@ int numbytes; if ( ( numbytes = recv( socketfd, recvbuffer, maxlength, 0 ) ) == -1 ) { + printf( "TCPMessageSocket::recieve(): recv() failed" ); perror( "TCPMessageSocket::recieve(): recv() failed" ); return -1; } @@ -110,10 +114,12 @@ } if ( count > 10 ) { perror( "TCPMessageSocket::listen(): bind() failed" ); + printf( "TCPMessageSocket::listen(): bind() failed" ); return 0; } if ( ::listen( socketfd, 10 ) == -1 ) { perror( "TCPMessageSocket::listen(): listen() failed" ); + printf( "TCPMessageSocket::listen(): listen() failed" ); return 0; } @@ -130,6 +136,7 @@ if ( ( connectfd = ::accept( socketfd, (struct sockaddr *) &socketaddress, \ &sockaddr_in_size ) ) == -1 ) { perror( "TCPMessageSocket::accept(): accept() failed" ); + printf( "TCPMessageSocket::accept(): accept() failed" ); return -1; } @@ -166,6 +173,7 @@ if (errcode != 0) { perror ("TCPMessageSocket::setHostnamePort getaddrinfo"); + printf ("TCPMessageSocket::setHostnamePort getaddrinfo"); return false; } @@ -212,6 +220,7 @@ if (errcode != 0) { perror ("TCPMessageSocket::cmpSocket getaddrinfo"); + printf ("TCPMessageSocket::cmpSocket getaddrinfo"); return false; } inet_ntop (res->ai_family, res->ai_addr->sa_data, lAddr, 100); Index: udpmessagesocket.cpp =================================================================== RCS file: /cvsroot/kphone/kphoneSI/dissipate2/udpmessagesocket.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- udpmessagesocket.cpp 14 Jan 2008 21:59:08 -0000 1.12 +++ udpmessagesocket.cpp 19 Feb 2008 20:55:22 -0000 1.13 @@ -47,7 +47,8 @@ if (socketfd!=-1) close(socketfd); type = SocketUDP; if ( ( socketfd = socket( AF_INET6, SOCK_DGRAM, 0 ) ) == -1 ) { - perror( "=====UDPMessageSocket::UDPMessageSocket(): socket() failed" ); + printf ("=====UDPMessageSocket:::UDPMessageSocket(): socket() failed" ); + perror( "=====UDPMessageSocket::UDPMessageSocket(): socket() failed" ); intype=InetNone; } else { intype=Inet6; @@ -55,6 +56,7 @@ } else { if ( ( socketfd = socket( AF_INET, SOCK_DGRAM, 0 ) ) == -1 ) { perror( "=====UDPMessageSocket::UDPMessageSocket(): socket() failed" ); + printf( "=====UDPMessageSocket::UDPMessageSocket(): socket() failed" ); intype=InetNone; ---------------------------------------------- Diff block truncated. (Max lines = 200) ---------------------------------------------- |
kgfleischmann 2008/01/14 13:59:14 PST Kphone CVS Repository Modified files: . CHANGES dissipate2 messagesocket.h sipclient.cpp sipclient.h tcpmessagesocket.cpp tcpmessagesocket.h udpmessagesocket.cpp udpmessagesocket.h document hold2.png usermanual2.html usermanual8.html kaudio dspoutrtp.cpp kphone Makefile.in kphone.cpp kphone.h kphoneview.cpp kpsi.1 main.cpp Added files: document trh.png trk.png trs.png usermanual5a.html Log: - Bug report #1869428 (decode multiple speex frames in RTP packet), patch inserted - Extension of -p flag, see man page and doc for more - documentation update Revision Changes Path 1.51 +9 -2 kphoneSI/CHANGES http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/CHANGES?r1=1.50&r2=1.51 1.4 +3 -3 kphoneSI/dissipate2/messagesocket.h http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/dissipate2/messagesocket.h?r1=1.3&r2=1.4 1.32 +8 -7 kphoneSI/dissipate2/sipclient.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/dissipate2/sipclient.cpp?r1=1.31&r2=1.32 1.16 +3 -3 kphoneSI/dissipate2/sipclient.h http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/dissipate2/sipclient.h?r1=1.15&r2=1.16 1.7 +3 -3 kphoneSI/dissipate2/tcpmessagesocket.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/dissipate2/tcpmessagesocket.cpp?r1=1.6&r2=1.7 1.4 +1 -1 kphoneSI/dissipate2/tcpmessagesocket.h http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/dissipate2/tcpmessagesocket.h?r1=1.3&r2=1.4 1.12 +3 -4 kphoneSI/dissipate2/udpmessagesocket.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/dissipate2/udpmessagesocket.cpp?r1=1.11&r2=1.12 1.6 +1 -1 kphoneSI/dissipate2/udpmessagesocket.h http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/dissipate2/udpmessagesocket.h?r1=1.5&r2=1.6 1.2 +17 -3 kphoneSI/document/hold2.png http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/document/hold2.png?r1=1.1&r2=1.2 1.1 +31 -0 kphoneSI/document/trh.png (new) http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/document/trh.png?rev=1.1&content-type=text/plain 1.1 +23 -0 kphoneSI/document/trk.png (new) http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/document/trk.png?rev=1.1&content-type=text/plain 1.1 +31 -0 kphoneSI/document/trs.png (new) http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/document/trs.png?rev=1.1&content-type=text/plain 1.10 +19 -18 kphoneSI/document/usermanual2.html http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/document/usermanual2.html?r1=1.9&r2=1.10 1.1 +74 -0 kphoneSI/document/usermanual5a.html (new) http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/document/usermanual5a.html?rev=1.1&content-type=text/plain 1.7 +16 -15 kphoneSI/document/usermanual8.html http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/document/usermanual8.html?r1=1.6&r2=1.7 1.11 +21 -27 kphoneSI/kaudio/dspoutrtp.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kaudio/dspoutrtp.cpp?r1=1.10&r2=1.11 1.21 +1 -1 kphoneSI/kphone/Makefile.in http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/Makefile.in?r1=1.20&r2=1.21 1.24 +11 -4 kphoneSI/kphone/kphone.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/kphone.cpp?r1=1.23&r2=1.24 1.12 +1 -0 kphoneSI/kphone/kphone.h http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/kphone.h?r1=1.11&r2=1.12 1.34 +2 -2 kphoneSI/kphone/kphoneview.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/kphoneview.cpp?r1=1.33&r2=1.34 1.6 +4 -3 kphoneSI/kphone/kpsi.1 http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/kpsi.1?r1=1.5&r2=1.6 1.11 +2 -2 kphoneSI/kphone/main.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/main.cpp?r1=1.10&r2=1.11 Index: CHANGES =================================================================== RCS file: /cvsroot/kphone/kphoneSI/CHANGES,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- CHANGES 6 Jan 2008 14:22:56 -0000 1.50 +++ CHANGES 14 Jan 2008 21:59:07 -0000 1.51 @@ -1,8 +1,15 @@ -CVS Version: KPhoneSI 1.44 +CVS Version: KPhoneSI 1.46 +========================================= + - Bug report #1869428 (decode multiple speex frames in RTP packet), + patch inserted + - Extension of -p flag, see man page and doc for more + - documentation update + +CVS Version: KPhoneSI 1.45 ========================================= - documentation update -CVS Version: KPhoneSI 1.43 +CVS Version: KPhoneSI 1.44 ========================================= - Cleanups - Documentation Index: messagesocket.h =================================================================== RCS file: /cvsroot/kphone/kphoneSI/dissipate2/messagesocket.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- messagesocket.h 19 Jul 2007 17:44:58 -0000 1.3 +++ messagesocket.h 14 Jan 2008 21:59:07 -0000 1.4 @@ -34,8 +34,8 @@ /** * @short Base Class for UDPMessageSocket and TCPMessageSocket This Class contains the routines to access socket related date -and the voids for UDPMessageSocket, TSTMessageSocket and TCPMessageSocket -The Class is parially rewritten for IPv6 +and the voids for UDPMessageSocket and TCPMessageSocket +The Class was parially rewritten for IPv6 */ class MessageSocket { @@ -62,7 +62,7 @@ /** * Open up the socket for listening on the given port. */ - virtual unsigned int listen( unsigned int portnum ) = 0; + virtual unsigned int listen( unsigned int portnum, unsigned int retry ) = 0; /** * Accept the incoming connection. Index: sipclient.cpp =================================================================== RCS file: /cvsroot/kphone/kphoneSI/dissipate2/sipclient.cpp,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- sipclient.cpp 27 Nov 2007 08:34:46 -0000 1.31 +++ sipclient.cpp 14 Jan 2008 21:59:07 -0000 1.32 @@ -226,7 +226,7 @@ /** The SipClient */ -SipClient::SipClient( QObject *parent, const char *name, unsigned int newListenport, +SipClient::SipClient( QObject *parent, const char *name, unsigned int newListenport, unsigned int lpRep, bool newLooseRoute, bool newStrictRoute, QString socketStr, QString uristr,QString dhost, int ipv6, bool d2U, QString locServ ) : QObject( parent, name ) { @@ -267,7 +267,8 @@ direct2URI = d2U; debug = KStatics::debugLevel; nlp=newListenport; - if( !setupSocketStuff( newListenport, socketStr, (int)useIPv6 ) ) { + portRepeater = lpRep; + if( !setupSocketStuff( newListenport, lpRep, socketStr, (int)useIPv6 ) ) { printf("====SipClient::setupSocketStuff() Failed.\n"); exit( 1 ); } @@ -384,10 +385,10 @@ } } -bool SipClient::setupSocketStuff( unsigned int newListenport, QString socketStr, bool useIPv6 ) +bool SipClient::setupSocketStuff( unsigned int newListenport, unsigned int lpRep, QString socketStr, bool useIPv6 ) { unsigned int listenport = 0; - + portRepeater = lpRep; if( socketStr == "UDP" ) { SocketMode = UDP; } else { @@ -403,13 +404,13 @@ listenport = 5060; } if( isTcpSocket() ) { - listenport = TCP_listener.listen( listenport ); + listenport = TCP_listener.listen( listenport, lpRep ); if( !listenport ) { return false; } TCP_listener.forcePortNumber( listenport ); } //else { listener = new UDPMessageSocket(useIPv6); - listenport = listener->listen( listenport ); + listenport = listener->listen( listenport, lpRep ); if( !listenport ) { return false; } nlp=listenport; listener->forcePortNumber( listenport ); @@ -582,7 +583,7 @@ foundStun=false; SipRegister *current; Sip::setLocalAddress( 0 ); - int listenport = listener->listen( nlp ); + int listenport = listener->listen( nlp,portRepeater ); nlp=listenport; listener->forcePortNumber( listenport ); setupContactUri(); Index: sipclient.h =================================================================== RCS file: /cvsroot/kphone/kphoneSI/dissipate2/sipclient.h,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sipclient.h 27 Nov 2007 08:34:47 -0000 1.15 +++ sipclient.h 14 Jan 2008 21:59:08 -0000 1.16 @@ -147,7 +147,7 @@ friend class SipUser; friend class SipCall; public: - SipClient( QObject *parent = 0, const char *name = 0, unsigned int newListenport = 0, + SipClient( QObject *parent = 0, const char *name = 0, unsigned int newListenport = 0, unsigned int lpRep = 10, bool newLooseRoute = true, bool newStrictRoute = true, QString socketStr = QString::null,QString uristr = QString::null, QString dhost = QString::null,int ipv6=0, bool d2U=false,QString locServ = "NAPTR"); ~SipClient( void ); QString getContactText(void); @@ -456,7 +456,7 @@ Socket SocketMode; int clilen, newsockfd; struct sockaddr_in cli_addr; - + unsigned int portRepeater; // Our proxy, if applicable. QString proxy; unsigned int proxyport; @@ -496,7 +496,7 @@ // Audit pending messages (retransmissions). void auditPending( void ); - bool setupSocketStuff( unsigned int newListenport, QString socketStr, bool useL4 ); + bool setupSocketStuff( unsigned int newListenport, unsigned int lpRep, QString socketStr, bool useL4 ); void incomingMessage( int socketfd, bool closeS ); void parseMessage( QString fullmessage ); void sendQuickResponse( SipMessage *origmessage, const SipStatus &status, Index: tcpmessagesocket.cpp =================================================================== RCS file: /cvsroot/kphone/kphoneSI/dissipate2/tcpmessagesocket.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- tcpmessagesocket.cpp 19 Jul 2007 17:44:59 -0000 1.6 +++ tcpmessagesocket.cpp 14 Jan 2008 21:59:08 -0000 1.7 @@ -95,15 +95,15 @@ return numbytes; } -unsigned int TCPMessageSocket::listen( unsigned int portnum ) +unsigned int TCPMessageSocket::listen( unsigned int portnum, unsigned int retry ) { socketaddress.soa4.sin_family = AF_INET; socketaddress.soa4.sin_port = htons( portnum ); socketaddress.soa4.sin_addr.s_addr = INADDR_ANY; bzero( &( socketaddress.soa4.sin_zero ), 8 ); // is this portable? - int count = 0; - while ( ::bind( socketfd, (struct sockaddr *) &socketaddress, sizeof( struct sockaddr ) ) == -1 && count <= 10 ) { + unsigned int count = 0; + while ( (::bind( socketfd, (struct sockaddr *) &socketaddress, sizeof( struct sockaddr ) ) == -1) && (count < retry) ) { count++; portnum += 2; socketaddress.soa4.sin_port = htons( portnum ); Index: tcpmessagesocket.h =================================================================== RCS file: /cvsroot/kphone/kphoneSI/dissipate2/tcpmessagesocket.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- tcpmessagesocket.h 19 Jul 2007 17:44:59 -0000 1.3 +++ tcpmessagesocket.h 14 Jan 2008 21:59:08 -0000 1.4 @@ -44,7 +44,7 @@ int connect( unsigned int portnum ); int send( const char *sendbuffer, unsigned int length ); int receive( char *recvbuffer, unsigned int maxlength ); - unsigned int listen( unsigned int portnum ); + unsigned int listen( unsigned int portnum, unsigned int retry ); ---------------------------------------------- Diff block truncated. (Max lines = 200) ---------------------------------------------- |
From: klaus f. <kgf...@us...> - 2008-01-06 14:23:05
|
kgfleischmann 2008/01/06 06:23:09 PST Kphone CVS Repository Modified files: . CHANGES configure.in Doxyfile document index.html usermanual2.html usermanual3.html usermanual4.html usermanual5.html usermanual6.html usermanual6p.html usermanual7.html kaudio dspaudio.cpp kphone kphone.cpp kphoneview.cpp kpsi.1 kstatics.cpp kstatics.h Log: doc update Revision Changes Path 1.50 +6 -2 kphoneSI/CHANGES http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/CHANGES?r1=1.49&r2=1.50 1.4 +9 -4 kphoneSI/Doxyfile http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/Doxyfile?r1=1.3&r2=1.4 1.15 +2 -2 kphoneSI/configure.in http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/configure.in?r1=1.14&r2=1.15 1.9 +4 -1 kphoneSI/document/index.html http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/document/index.html?r1=1.8&r2=1.9 1.9 +5 -4 kphoneSI/document/usermanual2.html http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/document/usermanual2.html?r1=1.8&r2=1.9 1.15 +16 -8 kphoneSI/document/usermanual3.html http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/document/usermanual3.html?r1=1.14&r2=1.15 1.6 +25 -8 kphoneSI/document/usermanual4.html http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/document/usermanual4.html?r1=1.5&r2=1.6 1.7 +3 -6 kphoneSI/document/usermanual5.html http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/document/usermanual5.html?r1=1.6&r2=1.7 1.6 +24 -22 kphoneSI/document/usermanual6.html http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/document/usermanual6.html?r1=1.5&r2=1.6 1.6 +8 -10 kphoneSI/document/usermanual6p.html http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/document/usermanual6p.html?r1=1.5&r2=1.6 1.3 +2 -1 kphoneSI/document/usermanual7.html http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/document/usermanual7.html?r1=1.2&r2=1.3 1.7 +21 -10 kphoneSI/kaudio/dspaudio.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kaudio/dspaudio.cpp?r1=1.6&r2=1.7 1.23 +2 -2 kphoneSI/kphone/kphone.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/kphone.cpp?r1=1.22&r2=1.23 1.33 +2 -7 kphoneSI/kphone/kphoneview.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/kphoneview.cpp?r1=1.32&r2=1.33 1.5 +1 -1 kphoneSI/kphone/kpsi.1 http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/kpsi.1?r1=1.4&r2=1.5 1.9 +0 -3 kphoneSI/kphone/kstatics.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/kstatics.cpp?r1=1.8&r2=1.9 1.10 +2 -3 kphoneSI/kphone/kstatics.h http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/kstatics.h?r1=1.9&r2=1.10 Index: CHANGES =================================================================== RCS file: /cvsroot/kphone/kphoneSI/CHANGES,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- CHANGES 27 Nov 2007 08:34:46 -0000 1.49 +++ CHANGES 6 Jan 2008 14:22:56 -0000 1.50 @@ -1,3 +1,7 @@ +CVS Version: KPhoneSI 1.44 +========================================= + - documentation update + CVS Version: KPhoneSI 1.43 ========================================= - Cleanups @@ -8,7 +12,7 @@ CVS Version: KPhoneSI 1.43 ========================================= - Command line flag -p writes its contents into the settings - See docs for more! + See docs/man page for more! - Cleanups CVS Version: KPhoneSI 1.42 @@ -26,7 +30,7 @@ CVS Version: KPhoneSI 1.40 ========================================= - documentation update - - cmd-line: flag -n, startup w.o. registration + - cmd-line: flag -n, startup w.o. registration - SipUtil: AMD64 patch, numper of interfaces increased CVS Version: KPhoneSI 1.39 Index: configure.in =================================================================== RCS file: /cvsroot/kphone/kphoneSI/configure.in,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- configure.in 9 Nov 2007 23:42:59 -0000 1.14 +++ configure.in 6 Jan 2008 14:22:56 -0000 1.15 @@ -112,9 +112,9 @@ AC_MSG_CHECKING(whether to enable speex) -speex_default="no" +speex_default="yes" AC_ARG_ENABLE(speex, [ --enable-speex=[no/yes] use SPEEX - [default=no]],, enable_speex=$speex_default) + [default=yes]],, enable_speex=$speex_default) if test "$enable_speex" = "yes"; then AC_DEFINE(SPEEX) Index: Doxyfile =================================================================== RCS file: /cvsroot/kphone/kphoneSI/Doxyfile,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- Doxyfile 19 Jul 2007 17:45:08 -0000 1.3 +++ Doxyfile 6 Jan 2008 14:22:56 -0000 1.4 @@ -1,4 +1,4 @@ -# Doxyfile 1.4.1-KDevelop +# Doxyfile 1.5.1-KDevelop #--------------------------------------------------------------------------- # Project related configuration options @@ -25,18 +25,20 @@ ALWAYS_DETAILED_SEC = YES INLINE_INHERITED_MEMB = YES FULL_PATH_NAMES = NO -STRIP_FROM_PATH = /usr/local/src/kphoneSI/ +STRIP_FROM_PATH = /home/kfl/KPhone-WorkkphoneSI/ STRIP_FROM_INC_PATH = SHORT_NAMES = NO JAVADOC_AUTOBRIEF = NO MULTILINE_CPP_IS_BRIEF = NO DETAILS_AT_TOP = NO INHERIT_DOCS = YES -DISTRIBUTE_GROUP_DOC = NO +SEPARATE_MEMBER_PAGES = NO TAB_SIZE = 8 ALIASES = OPTIMIZE_OUTPUT_FOR_C = NO OPTIMIZE_OUTPUT_JAVA = NO +BUILTIN_STL_SUPPORT = NO +DISTRIBUTE_GROUP_DOC = NO SUBGROUPING = YES #--------------------------------------------------------------------------- # Build related configuration options @@ -80,7 +82,7 @@ #--------------------------------------------------------------------------- # configuration options related to the input files #--------------------------------------------------------------------------- -INPUT = /usr/local/src/kphoneSI +INPUT = /home/kfl/KPhone-Work/kphoneSI FILE_PATTERNS = *.c \ *.cc \ *.cxx \ @@ -130,6 +132,8 @@ STRIP_CODE_COMMENTS = NO REFERENCED_BY_RELATION = YES REFERENCES_RELATION = YES +REFERENCES_LINK_SOURCE = YES +USE_HTAGS = NO VERBATIM_HEADERS = YES #--------------------------------------------------------------------------- # configuration options related to the alphabetical class index @@ -241,6 +245,7 @@ INCLUDE_GRAPH = YES INCLUDED_BY_GRAPH = YES CALL_GRAPH = YES +CALLER_GRAPH = NO GRAPHICAL_HIERARCHY = YES DIRECTORY_GRAPH = YES DOT_IMAGE_FORMAT = png Index: index.html =================================================================== RCS file: /cvsroot/kphone/kphoneSI/document/index.html,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- index.html 20 Jan 2007 06:54:50 -0000 1.8 +++ index.html 6 Jan 2008 14:22:58 -0000 1.9 @@ -14,7 +14,10 @@ configure the Phone</a></p> <p style="margin-left: 120px;"><a href="usermanual4.html">Phonebook</a></p> <p style="margin-left: 120px;"> -<a href="usermanual5.html">The Phone</a></p> +<a href="usermanual5.html">The Phone</a><br> +</p> +<p style="margin-left: 120px;"><a href="usermanual5a.html">Shortcuts</a><br> +</p> <p style="margin-left: 120px;"><a href="usermanual6.html"> How to Call</a></p> <p style="margin-left: 120px;"><a href="usermanual6p.html"> How to Call Point to Point</a> Index: usermanual2.html =================================================================== RCS file: /cvsroot/kphone/kphoneSI/document/usermanual2.html,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- usermanual2.html 27 Nov 2007 08:34:48 -0000 1.8 +++ usermanual2.html 6 Jan 2008 14:22:58 -0000 1.9 @@ -42,10 +42,9 @@ the UA from outside. Your value is stored in the settings. The value 0 resets the port to 5060,<br> -what is also the -default, if the setting is not set. If -your value is in use KPhoneSI -finds a new + default value. If +your input value (or the default) is in use KPhoneSI +tries to find a new one greater then your value.<br> </div> <br> @@ -70,6 +69,8 @@ </div> <br> <span style="font-weight: bold;">-n</span> do NOT register after startup<br> + The parameter is usefull if you +want to configure the phone and to avoid startup with unknown parameters<br> <br> <br> <br> Index: usermanual3.html =================================================================== RCS file: /cvsroot/kphone/kphoneSI/document/usermanual3.html,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- usermanual3.html 26 Oct 2007 13:35:58 -0000 1.14 +++ usermanual3.html 6 Jan 2008 14:22:58 -0000 1.15 @@ -89,6 +89,9 @@ <li>Publish expire time, if 0 no presence server will be used. A low value may flood the network, 300 sec or more are a good choice.</li> +</ul> +The next parameters are used, if you use a central presence server<br> +<ul> <li>User activity check time (scaled in minutes). If you use presence and have a timer value > 0 , your presence subscriber will know, if you are active on your PC</li> @@ -104,12 +107,14 @@ </span> <br> <ul> - <li>Remote Dialler, set only if you plan to use this tool</li> + <li>Remote Dialer, set only if you plan to use this tool</li> <li>RFC 3262 implementation<br> </li> <li>A REFER Sip Command implicitely creates a subscription for ---------------------------------------------- Diff block truncated. (Max lines = 200) ---------------------------------------------- |
From: klaus f. <kgf...@us...> - 2007-11-27 08:36:23
|
kgfleischmann 2007/11/27 00:36:26 PST Kphone CVS Repository Added files: document mozex-ff.png mozex.png Log: two new pictures for the documentation Revision Changes Path 1.1 +214 -0 kphoneSI/document/mozex-ff.png (new) http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/document/mozex-ff.png?rev=1.1&content-type=text/plain 1.1 +147 -0 kphoneSI/document/mozex.png (new) http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/document/mozex.png?rev=1.1&content-type=text/plain Index: mozex-ff.png =================================================================== <<Binary file>> Index: mozex.png =================================================================== <<Binary file>> |
From: klaus f. <kgf...@us...> - 2007-11-27 08:34:49
|
kgfleischmann 2007/11/27 00:34:50 PST Kphone CVS Repository Modified files: . CHANGES HOWTO-SRTP KPhoneSI.kdevelop KPhoneSI.kdevelop.filelist MISSING README dissipate2 headerparser.h sipcall.cpp sipclient.cpp sipclient.h sipmessage.cpp sippublish.cpp siptransaction.cpp siptransaction.h siputil.cpp udpmessagesocket.cpp document usermanual10.html usermanual11.html usermanual12.html usermanual13.html usermanual14.html usermanual15.html usermanual2.html usermanual4.html usermanual5.html usermanual6.html usermanual6p.html usermanual8.html usermanual9.html kaudio dspoutalsa.cpp dspoutrtp.cpp dspouttone.cpp kphone Makefile.in callaudio.cpp kphone.cpp kphone.h kpsi.1 ksipregistrations.cpp kstatics.cpp kstatics.h main.cpp watcherlist.cpp watcherlist.h Log: - Cleanups - Documentation - extended kpsidial to be used with mozex (see documents for more) Revision Changes Path 1.49 +13 -0 kphoneSI/CHANGES http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/CHANGES?r1=1.48&r2=1.49 1.2 +5 -1 kphoneSI/HOWTO-SRTP http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/HOWTO-SRTP?r1=1.1&r2=1.2 1.8 +52 -4 kphoneSI/KPhoneSI.kdevelop http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/KPhoneSI.kdevelop?r1=1.7&r2=1.8 1.11 +2 -0 kphoneSI/KPhoneSI.kdevelop.filelist http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/KPhoneSI.kdevelop.filelist?r1=1.10&r2=1.11 1.7 +2 -2 kphoneSI/MISSING http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/MISSING?r1=1.6&r2=1.7 1.6 +62 -17 kphoneSI/README http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/README?r1=1.5&r2=1.6 1.3 +1 -2 kphoneSI/dissipate2/headerparser.h http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/dissipate2/headerparser.h?r1=1.2&r2=1.3 1.29 +2 -4 kphoneSI/dissipate2/sipcall.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/dissipate2/sipcall.cpp?r1=1.28&r2=1.29 1.31 +2 -3 kphoneSI/dissipate2/sipclient.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/dissipate2/sipclient.cpp?r1=1.30&r2=1.31 1.15 +163 -12 kphoneSI/dissipate2/sipclient.h http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/dissipate2/sipclient.h?r1=1.14&r2=1.15 1.12 +1 -4 kphoneSI/dissipate2/sipmessage.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/dissipate2/sipmessage.cpp?r1=1.11&r2=1.12 1.15 +4 -8 kphoneSI/dissipate2/sippublish.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/dissipate2/sippublish.cpp?r1=1.14&r2=1.15 1.26 +2 -3 kphoneSI/dissipate2/siptransaction.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/dissipate2/siptransaction.cpp?r1=1.25&r2=1.26 1.11 +0 -1 kphoneSI/dissipate2/siptransaction.h http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/dissipate2/siptransaction.h?r1=1.10&r2=1.11 1.6 +3 -2 kphoneSI/dissipate2/siputil.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/dissipate2/siputil.cpp?r1=1.5&r2=1.6 1.11 +3 -3 kphoneSI/dissipate2/udpmessagesocket.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/dissipate2/udpmessagesocket.cpp?r1=1.10&r2=1.11 1.6 +17 -5 kphoneSI/document/usermanual10.html http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/document/usermanual10.html?r1=1.5&r2=1.6 1.3 +84 -18 kphoneSI/document/usermanual11.html http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/document/usermanual11.html?r1=1.2&r2=1.3 1.3 +32 -8 kphoneSI/document/usermanual12.html http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/document/usermanual12.html?r1=1.2&r2=1.3 1.2 +21 -5 kphoneSI/document/usermanual13.html http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/document/usermanual13.html?r1=1.1&r2=1.2 1.5 +62 -27 kphoneSI/document/usermanual14.html http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/document/usermanual14.html?r1=1.4&r2=1.5 1.2 +13 -9 kphoneSI/document/usermanual15.html http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/document/usermanual15.html?r1=1.1&r2=1.2 1.8 +55 -45 kphoneSI/document/usermanual2.html http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/document/usermanual2.html?r1=1.7&r2=1.8 1.5 +15 -5 kphoneSI/document/usermanual4.html http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/document/usermanual4.html?r1=1.4&r2=1.5 1.6 +42 -15 kphoneSI/document/usermanual5.html http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/document/usermanual5.html?r1=1.5&r2=1.6 1.5 +39 -9 kphoneSI/document/usermanual6.html http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/document/usermanual6.html?r1=1.4&r2=1.5 1.5 +31 -7 kphoneSI/document/usermanual6p.html http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/document/usermanual6p.html?r1=1.4&r2=1.5 1.6 +16 -9 kphoneSI/document/usermanual8.html http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/document/usermanual8.html?r1=1.5&r2=1.6 1.5 +21 -17 kphoneSI/document/usermanual9.html http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/document/usermanual9.html?r1=1.4&r2=1.5 1.13 +4 -11 kphoneSI/kaudio/dspoutalsa.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kaudio/dspoutalsa.cpp?r1=1.12&r2=1.13 1.10 +2 -3 kphoneSI/kaudio/dspoutrtp.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kaudio/dspoutrtp.cpp?r1=1.9&r2=1.10 1.4 +1 -1 kphoneSI/kaudio/dspouttone.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kaudio/dspouttone.cpp?r1=1.3&r2=1.4 1.20 +1 -1 kphoneSI/kphone/Makefile.in http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/Makefile.in?r1=1.19&r2=1.20 1.19 +2 -2 kphoneSI/kphone/callaudio.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/callaudio.cpp?r1=1.18&r2=1.19 1.22 +27 -8 kphoneSI/kphone/kphone.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/kphone.cpp?r1=1.21&r2=1.22 1.11 +2 -1 kphoneSI/kphone/kphone.h http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/kphone.h?r1=1.10&r2=1.11 1.4 +1 -2 kphoneSI/kphone/kpsi.1 http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/kpsi.1?r1=1.3&r2=1.4 1.14 +1 -1 kphoneSI/kphone/ksipregistrations.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/ksipregistrations.cpp?r1=1.13&r2=1.14 1.8 +1 -0 kphoneSI/kphone/kstatics.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/kstatics.cpp?r1=1.7&r2=1.8 1.9 +1 -0 kphoneSI/kphone/kstatics.h http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/kstatics.h?r1=1.8&r2=1.9 1.10 +1 -3 kphoneSI/kphone/main.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/main.cpp?r1=1.9&r2=1.10 1.5 +1 -1 kphoneSI/kphone/watcherlist.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/watcherlist.cpp?r1=1.4&r2=1.5 1.3 +2 -0 kphoneSI/kphone/watcherlist.h http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/watcherlist.h?r1=1.2&r2=1.3 Index: CHANGES =================================================================== RCS file: /cvsroot/kphone/kphoneSI/CHANGES,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- CHANGES 14 Nov 2007 14:30:32 -0000 1.48 +++ CHANGES 27 Nov 2007 08:34:46 -0000 1.49 @@ -1,3 +1,16 @@ +CVS Version: KPhoneSI 1.43 +========================================= + - Cleanups + - Documentation + - extended kpsidial to be used with mozex + (see documents for more) + +CVS Version: KPhoneSI 1.43 +========================================= + - Command line flag -p writes its contents into the settings + See docs for more! + - Cleanups + CVS Version: KPhoneSI 1.42 ========================================= - Speex for 64 bit Index: HOWTO-SRTP =================================================================== RCS file: /cvsroot/kphone/kphoneSI/HOWTO-SRTP,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- HOWTO-SRTP 28 May 2006 12:55:06 -0000 1.1 +++ HOWTO-SRTP 27 Nov 2007 08:34:46 -0000 1.2 @@ -20,4 +20,8 @@ Security features: ================= The RTP Data is encrypted with a AES counter mode 128 bit cipher. - \ No newline at end of file + + +Limitations: +============ +Currently this code may not run on all 64-bit CPUs \ No newline at end of file Index: KPhoneSI.kdevelop =================================================================== RCS file: /cvsroot/kphone/kphoneSI/KPhoneSI.kdevelop,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- KPhoneSI.kdevelop 28 May 2006 12:55:07 -0000 1.7 +++ KPhoneSI.kdevelop 27 Nov 2007 08:34:46 -0000 1.8 @@ -12,14 +12,15 @@ <description>This KPhoneSI is based on and extends the KPhone. It serves as a linux SIP-UA. Beside audio and video four aditional call types may be used at the callers choice.</description> <secondaryLanguages/> + <projectname>KPhoneSI</projectname> </general> <kdevcustomproject> <run> <mainprogram>/usr/local/src/kphoneSI/kphone/kpsi</mainprogram> <directoryradio>custom</directoryradio> <customdirectory>/usr/local/src/kphoneSI/kphone/</customdirectory> - <programargs/> - <terminal>false</terminal> + <programargs>-u pulvern -v 3</programargs> + <terminal>true</terminal> <autocompile>true</autocompile> <envvars/> </run> @@ -40,12 +41,34 @@ <defaulttarget/> <makeoptions/> </make> + <filetypes> + <filetype>*.java</filetype> + <filetype>*.h</filetype> + <filetype>*.H</filetype> + <filetype>*.hh</filetype> + <filetype>*.hxx</filetype> + <filetype>*.hpp</filetype> + <filetype>*.c</filetype> + <filetype>*.C</filetype> + <filetype>*.cc</filetype> + <filetype>*.cpp</filetype> + <filetype>*.c++</filetype> + <filetype>*.cxx</filetype> + <filetype>Makefile</filetype> + <filetype>CMakeLists.txt</filetype> + </filetypes> + <blacklist> + <path>config.h</path> + <path>icons</path> + <path>icons/Makefile</path> + <path>Makefile</path> + </blacklist> </kdevcustomproject> <kdevdebugger> <general> <dbgshell/> - <programargs>-u fit21 -v 3</programargs> - <gdbpath/> + <programargs>-u default -v 3</programargs> + <gdbpath>/usr/local/src/kphoneSI/kphone/kpsi</gdbpath> <configGdbScript/> <runShellScript/> <runGdbScript/> @@ -137,6 +160,21 @@ <codeCompletionDelay>250</codeCompletionDelay> <argumentsHintDelay>400</argumentsHintDelay> <headerCompletionDelay>250</headerCompletionDelay> + <showOnlyAccessibleItems>false</showOnlyAccessibleItems> + <completionBoxItemOrder>0</completionBoxItemOrder> + <howEvaluationContextMenu>true</howEvaluationContextMenu> + <showCommentWithArgumentHint>true</showCommentWithArgumentHint> + <statusBarTypeEvaluation>false</statusBarTypeEvaluation> + <namespaceAliases>std=_GLIBCXX_STD;__gnu_cxx=std</namespaceAliases> + <processPrimaryTypes>true</processPrimaryTypes> + <processFunctionArguments>false</processFunctionArguments> + <preProcessAllHeaders>false</preProcessAllHeaders> + <parseMissingHeadersExperimental>false</parseMissingHeadersExperimental> + <resolveIncludePathsUsingMakeExperimental>false</resolveIncludePathsUsingMakeExperimental> + <alwaysParseInBackground>true</alwaysParseInBackground> + <usePermanentCaching>true</usePermanentCaching> + <alwaysIncludeNamespaces>false</alwaysIncludeNamespaces> + <includePaths>.;</includePaths> </codecompletion> <references/> <creategettersetter> @@ -147,6 +185,16 @@ <inlineGet>true</inlineGet> <inlineSet>true</inlineSet> </creategettersetter> + <qt> + <used>false</used> + <version>3</version> + <includestyle>3</includestyle> + <root>/usr/lib/qt3</root> + <designerintegration>EmbeddedKDevDesigner</designerintegration> + <qmake>/usr/lib/qt3/bin/qmake</qmake> + <designer>/usr/lib/qt3/bin/designer</designer> + <designerpluginpaths/> + </qt> </kdevcppsupport> <kdevfileview> <groups> Index: KPhoneSI.kdevelop.filelist =================================================================== RCS file: /cvsroot/kphone/kphoneSI/KPhoneSI.kdevelop.filelist,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- KPhoneSI.kdevelop.filelist 4 Oct 2007 11:57:04 -0000 1.10 +++ KPhoneSI.kdevelop.filelist 27 Nov 2007 08:34:46 -0000 1.11 @@ -253,3 +253,5 @@ kaudio/dspaudio.h kaudio/dspoutalsa.h kaudio/rtpdataheader.h +dissipate2/base64.c +dissipate2/extern_md5.c Index: MISSING =================================================================== RCS file: /cvsroot/kphone/kphoneSI/MISSING,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- MISSING 20 Jan 2007 15:45:19 -0000 1.6 +++ MISSING 27 Nov 2007 08:34:46 -0000 1.7 @@ -1,10 +1,10 @@ What's still missing in kphoneSI? - Language internationalisation may be compiled into kphoneSI, but - the existing po/*.ts files schould be adapted! + the existing po/*.ts files should be adapted! Volunteers wanted!!! -- Full 64 bit support +- Full 64 bit support for srtp - support for Bluetooth headsets; patches/code exist for kphone 4.2 and should be upgraded to KPhone SI. I personally own no HW to test with. Index: README =================================================================== RCS file: /cvsroot/kphone/kphoneSI/README,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- README 6 May 2007 11:48:55 -0000 1.5 +++ README 27 Nov 2007 08:34:46 -0000 1.6 @@ -1,5 +1,5 @@ ---------------------------------------------------------------------- -KphoneSI (kpsi) 1.0 +KphoneSI (kpsi) 1.1 ---------------------------------------------------------------------- ---------------------------------------------- Diff block truncated. (Max lines = 200) ---------------------------------------------- |
From: klaus f. <kgf...@us...> - 2007-11-14 14:30:32
|
kgfleischmann 2007/11/14 06:30:34 PST Kphone CVS Repository Modified files: . CHANGES dissipate2 sipcall.cpp sipclient.cpp Speex misc.cpp misc.h stack_alloc.h Log: Speex should be 64-bit ready now Revision Changes Path 1.48 +5 -0 kphoneSI/CHANGES http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/CHANGES?r1=1.47&r2=1.48 1.4 +8 -6 kphoneSI/Speex/misc.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/Speex/misc.cpp?r1=1.3&r2=1.4 1.3 +5 -3 kphoneSI/Speex/misc.h http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/Speex/misc.h?r1=1.2&r2=1.3 1.3 +4 -4 kphoneSI/Speex/stack_alloc.h http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/Speex/stack_alloc.h?r1=1.2&r2=1.3 1.28 +226 -202 kphoneSI/dissipate2/sipcall.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/dissipate2/sipcall.cpp?r1=1.27&r2=1.28 1.30 +3 -6 kphoneSI/dissipate2/sipclient.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/dissipate2/sipclient.cpp?r1=1.29&r2=1.30 Index: CHANGES =================================================================== RCS file: /cvsroot/kphone/kphoneSI/CHANGES,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- CHANGES 9 Nov 2007 23:42:59 -0000 1.47 +++ CHANGES 14 Nov 2007 14:30:32 -0000 1.48 @@ -1,3 +1,8 @@ +CVS Version: KPhoneSI 1.42 +========================================= + - Speex for 64 bit + - Cleanups + CVS Version: KPhoneSI 1.41 ========================================= - documentation update Index: sipcall.cpp =================================================================== RCS file: /cvsroot/kphone/kphoneSI/dissipate2/sipcall.cpp,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- sipcall.cpp 26 Oct 2007 13:35:57 -0000 1.27 +++ sipcall.cpp 14 Nov 2007 14:30:33 -0000 1.28 @@ -78,7 +78,9 @@ memberuri = newuri; } -// Subscribe +//+++++++++++++++++++++++++ +// SUCBSCRIBE +//+++++++++++++++++++++++++ void SipCallMember::requestSubscribe( int expiresTime, const QString &body, const MimeContentType &bodytype ) { @@ -226,9 +228,9 @@ state = state_EarlyDialog; } } - -// Notify - +//+++++++++++++++++++++++++ +// NOTIFY +//+++++++++++++++++++++++++ void SipCallMember::requestRNotify( const QString &body, const MimeContentType &bodytype,QString username, QString password ) { callMemberType = RNotify; @@ -463,7 +465,9 @@ } +//+++++++++++++++++++++++++ // Message +//+++++++++++++++++++++++++ void SipCallMember::requestMessage( const QString &body, const MimeContentType &bodytype ) { callMemberType = Message; @@ -574,7 +578,9 @@ } } +//+++++++++++++++++++++++++ // Invite +//+++++++++++++++++++++++++ bool SipCallMember::requestInvite( const QString &body, const MimeContentType &bodytype ) { @@ -815,197 +821,6 @@ } - - -void SipCallMember::sendRequestBye( QString username, QString password ) { - - if( !username.isEmpty() && !password.isEmpty() && ( authstate == authState_AuthenticationRequired || authstate == authState_AuthenticationRequiredWithNewPassword || authstate == SipCallMember::authState_AuthenticationOK ) ) { - ourUsername=username; - ourPassword=password; - proxyauthresponse=QString::null; - authresponse=QString::null; - if( authtype == DigestAuthenticationRequired ) { - authresponse = Sip::getDigestResponse( - username, password, "BYE", getContactUri().theUri(), proxyauthstr, ++nonceCounter); - } else if( authtype == ProxyDigestAuthenticationRequired ) { - proxyauthresponse = Sip::getDigestResponse( - username, password, "BYE", getContactUri().theUri(), proxyauthstr, ++nonceCounter); - } else if( authtype == ProxyBasicAuthenticationRequired ) { - proxyauthresponse = Sip::getBasicResponse( username, password ); - } - local = call->newRequest( this, Sip::BYE, QString::null,(MimeContentType) 0, - SipUri::null, proxyauthresponse, authresponse,localExpiresTime ); - } else { - local = call->newRequest( this, Sip::BYE,QString::null,(MimeContentType) 0, - SipUri::null, QString::null, QString::null,localExpiresTime ); - } - if( localExpiresTime > 0 ) { - timer->start( localExpiresTime * 900, TRUE ); - } - if( local ) { - - op = opRequest; - if( authstate == authState_AuthenticationRequired || - authstate == authState_AuthenticationRequiredWithNewPassword ) { - authstate = authState_AuthenticationTryingWithPassword; - } else { - authstate = authState_AuthenticationTrying; - } - connect( local, SIGNAL( statusUpdated() ), this, SLOT( localStatusUpdated() ) ); - } else { - } -} -// Bye -void SipCallMember::requestDisconnect( void ) -{ - if ( (call->updateST == 2) && (state != state_Connected) ) {//we had an "inside" Tr, go back to INVITES's one - local = saveinvite; - call->updateST = 0; - } else {//we had an "inside" Tr, clean the stuff - local = 0; - call->updateST = 0; - saveinvite = 0; - } - - if( local ) {//hanging Request??? - if( state != state_r202 ) local->cancelRequest(); - disconnect( local, 0, this, 0 ); - } - state = state_Disconnecting; - statusdesc = "Disconnecting"; - sendRequestBye( ourUsername, ourPassword ); -} - - - -void SipCallMember::requestRefer( bool shortTr,const SipUri &referto, - const QString &body, const MimeContentType &bodytype ) -{ - if( state == state_Disconnected ) return; - state = state_r202; - statusdesc = "Transfering"; - local = call->newRequest( this, Sip::REFER, body, bodytype, referto, QString::null, QString::null, localExpiresTime, shortTr ); - if( local ) { - connect( local, SIGNAL( statusUpdated() ), this, SLOT( localStatusUpdated() ) ); - } - statusUpdated( this ); -} - - -void SipCallMember::requestOptions( const QString &body, const MimeContentType &bodytype ) -{ - if( local ) { - local->cancelRequest(); - disconnect( local, 0, this, 0 ); - } - callMemberType = Options; - statusdesc = "Querying options"; - localsessiondesc = body; - localsessiontype = bodytype; - statusdesc = "Querying options"; - sendRequestOptions(ourUsername, ourPassword); -} - - -void SipCallMember::sendRequestOptions( QString username, QString password ) -{ - ourUsername=username; - ourPassword=password; - if( !username.isEmpty() && !password.isEmpty() && - ( authstate == authState_AuthenticationRequired || - authstate == authState_AuthenticationRequiredWithNewPassword || authstate == SipCallMember::authState_AuthenticationOK ) ) { - if( authtype == ProxyDigestAuthenticationRequired ) { - proxyauthresponse = Sip::getDigestResponse( - username, password, "OPTIONS", getContactUri().theUri(), proxyauthstr ); - } else if( authtype == ProxyBasicAuthenticationRequired ) { - proxyauthresponse = Sip::getBasicResponse( username, password ); - } - local = call->newRequest( this, Sip::OPTIONS, localsessiondesc, localsessiontype, - SipUri::null, proxyauthresponse,authresponse, localExpiresTime ); - } else { - local = call->newRequest( this, Sip::OPTIONS, localsessiondesc, localsessiontype, - SipUri::null, QString::null,QString::null); - } - if( local ) { - op = opRequest; - if( authstate == authState_AuthenticationRequired || - authstate == authState_AuthenticationRequiredWithNewPassword ) { - authstate = authState_AuthenticationTryingWithPassword; - } else { - authstate = authState_AuthenticationTrying; - } - - connect( local, SIGNAL( statusUpdated() ), this, SLOT( localStatusUpdated() ) ); - } -} - -void SipCallMember::requestAuthOptions( void ) -{ ---------------------------------------------- Diff block truncated. (Max lines = 200) ---------------------------------------------- |
From: klaus f. <kgf...@us...> - 2007-11-09 23:43:05
|
kgfleischmann 2007/11/09 15:43:09 PST Kphone CVS Repository Modified files: . CHANGES configure.in dissipate2 sipclient.cpp sipclient.h siptransaction.cpp siptransaction.h sipuri.cpp kaudio dspoutalsa.cpp dspoutrtp.cpp dspoutrtp.h kphone kcallwidget.cpp kphoneview.cpp sessioncontrol.h Log: TCP, 64bit, Docs, Cleanup 64bit-processors work better now, we have two exceptions: Speex and SRTP Revision Changes Path 1.47 +10 -1 kphoneSI/CHANGES http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/CHANGES?r1=1.46&r2=1.47 1.14 +2 -2 kphoneSI/configure.in http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/configure.in?r1=1.13&r2=1.14 1.29 +48 -157 kphoneSI/dissipate2/sipclient.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/dissipate2/sipclient.cpp?r1=1.28&r2=1.29 1.14 +1 -1 kphoneSI/dissipate2/sipclient.h http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/dissipate2/sipclient.h?r1=1.13&r2=1.14 1.25 +16 -59 kphoneSI/dissipate2/siptransaction.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/dissipate2/siptransaction.cpp?r1=1.24&r2=1.25 1.10 +12 -2 kphoneSI/dissipate2/siptransaction.h http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/dissipate2/siptransaction.h?r1=1.9&r2=1.10 1.9 +1 -1 kphoneSI/dissipate2/sipuri.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/dissipate2/sipuri.cpp?r1=1.8&r2=1.9 1.12 +3 -4 kphoneSI/kaudio/dspoutalsa.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kaudio/dspoutalsa.cpp?r1=1.11&r2=1.12 1.9 +23 -16 kphoneSI/kaudio/dspoutrtp.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kaudio/dspoutrtp.cpp?r1=1.8&r2=1.9 1.5 +1 -1 kphoneSI/kaudio/dspoutrtp.h http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kaudio/dspoutrtp.h?r1=1.4&r2=1.5 1.28 +0 -1 kphoneSI/kphone/kcallwidget.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/kcallwidget.cpp?r1=1.27&r2=1.28 1.32 +1 -1 kphoneSI/kphone/kphoneview.cpp http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/kphoneview.cpp?r1=1.31&r2=1.32 1.17 +6 -6 kphoneSI/kphone/sessioncontrol.h http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/sessioncontrol.h?r1=1.16&r2=1.17 Index: CHANGES =================================================================== RCS file: /cvsroot/kphone/kphoneSI/CHANGES,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- CHANGES 26 Oct 2007 13:36:00 -0000 1.46 +++ CHANGES 9 Nov 2007 23:42:59 -0000 1.47 @@ -1,6 +1,15 @@ -CVS Version: KPhoneSI 1.39 +CVS Version: KPhoneSI 1.41 +========================================= + - documentation update + - TCP stuff + - Cleanups + - Minor changes for 64 bit CPUs + +CVS Version: KPhoneSI 1.40 ========================================= - documentation update + - cmd-line: flag -n, startup w.o. registration + - SipUtil: AMD64 patch, numper of interfaces increased CVS Version: KPhoneSI 1.39 ========================================= Index: configure.in =================================================================== RCS file: /cvsroot/kphone/kphoneSI/configure.in,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- configure.in 18 Oct 2007 08:32:39 -0000 1.13 +++ configure.in 9 Nov 2007 23:42:59 -0000 1.14 @@ -112,9 +112,9 @@ AC_MSG_CHECKING(whether to enable speex) -speex_default="yes" +speex_default="no" AC_ARG_ENABLE(speex, [ --enable-speex=[no/yes] use SPEEX - [default=yes]],, enable_speex=$speex_default) + [default=no]],, enable_speex=$speex_default) if test "$enable_speex" = "yes"; then AC_DEFINE(SPEEX) Index: sipclient.cpp =================================================================== RCS file: /cvsroot/kphone/kphoneSI/dissipate2/sipclient.cpp,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- sipclient.cpp 26 Oct 2007 13:35:57 -0000 1.28 +++ sipclient.cpp 9 Nov 2007 23:42:59 -0000 1.29 @@ -1164,39 +1164,60 @@ } } } else { - - // send to the host/port in the request uri + // find destination QString sendtoaddr; + unsigned int sendtoport = msg->getRequestUri().getPortNumber(); + //maddr ?? if( msg->getRequestUri().hasMaddrParam() ) { sendtoaddr = msg->getRequestUri().getMaddrParam(); } else { - sendtoaddr = msg->getRequestUri().getHostname(); - } + SipUri route( msg->getHeaderData( SipHeader::Route ) ); + //loose route?? + if( route.uri().contains( ";lr" ) ) { + sendtoaddr = route.getHostname(); + sendtoport = route.getPortNumber(); + } else { + //send to own server + if( KStatics::isReg && myProxy != "" && !sturi) { + sendtoaddr = myProxy; + //send to RURI + } else { + sendtoaddr = msg->getRequestUri().getHostname(); + } + sendtoaddr = getSipProxySrv( sendtoaddr ); + unsigned int port; + if( sendtoaddr.contains( "]:" ) ) { + port = sendtoaddr.mid( sendtoaddr.find( ']' ) + 1 ).toUInt(); + msg->getRequestUri().setPortNumber( port ); + sendtoaddr = sendtoaddr.left( sendtoaddr.find( ']' )+1 ); - sendtoaddr = getSipProxySrv( sendtoaddr ); - - if( sendtoaddr.contains( ':' ) ) { - unsigned int port = sendtoaddr.mid( sendtoaddr.find( ':' ) + 1 ).toUInt(); - msg->getRequestUri().setPortNumber( port ); - sendtoaddr = sendtoaddr.left( sendtoaddr.find( ':' ) ); + } else if( sendtoaddr.contains( ':') && !sendtoaddr.contains(']') ) {//ÃÂÃÂÃÂç && !useIPv6 + port = sendtoaddr.mid( sendtoaddr.find( ':' ) + 1 ).toUInt(); + msg->getRequestUri().setPortNumber( port ); + sendtoaddr = sendtoaddr.left( sendtoaddr.find( ':' ) ); + + } + sendtoport = msg->getRequestUri().getPortNumber(); + + } } - if(debug >= 2) printf( "=====SipClient: Sending TCP to '%s:%d'\n ", sendtoaddr.latin1(), - msg->getRequestUri().getPortNumber() ); + + if(debug >= 2) printf( "=====SipClient: Sending TCP to '%s:%d'\n ", sendtoaddr.latin1(), sendtoport ); for (it.toFirst(); it.current(); ++it) { tcpSocket = it.current(); - if( tcpSocket->cmpSocket( sendtoaddr, msg->getRequestUri().getPortNumber() ) ) { + if( tcpSocket->cmpSocket( sendtoaddr, sendtoport ) ) { createTcpSocket = false; break; } } if( createTcpSocket ) { tcpSocket = new TCPMessageSocket; - if( !tcpSocket->setHostnamePort( sendtoaddr, msg->getRequestUri().getPortNumber() ) ) { + if( !tcpSocket->setHostnamePort( sendtoaddr, sendtoport ) ) { return false; } - if( tcpSocket->connect( msg->getRequestUri().getPortNumber() ) == -1 ) { + if( tcpSocket->connect( sendtoport ) == -1 ) { delete tcpSocket; tcpSocket = 0; return false; @@ -1221,34 +1242,31 @@ } else { s = &sendsocket; } - - // Choose destination - + // Choose destination if( useExplicitProxy ) { - if( !s->setHostname( proxy.utf8().data() ) ) { - return false; - - } - - if( debug >= 2 ) { - printf( "to host=%s port=%d' (UDP)\n", proxy.latin1(), proxyport ); - } - s->connect( proxyport ); + return false; + } + if( debug >= 2 ) printf( "to host=%s port=%d' (UDP)\n", proxy.latin1(), proxyport ); + s->connect( proxyport ); } else { - // send to the host/port in the request uri + // find destination QString sendtoaddr; unsigned int sendtoport = msg->getRequestUri().getPortNumber(); + //maddr ? if( msg->getRequestUri().hasMaddrParam() ) { sendtoaddr = msg->getRequestUri().getMaddrParam(); } else { + //loose route SipUri route( msg->getHeaderData( SipHeader::Route ) ); if( route.uri().contains( ";lr" ) ) { - sendtoaddr = route.getHostname(); sendtoport = route.getPortNumber(); + sendtoaddr = route.getHostname(); } else { + //send to own server if( KStatics::isReg && myProxy != "" && !sturi) { - sendtoaddr = myProxy; + sendtoaddr = myProxy; + // send to RURI } else { sendtoaddr = msg->getRequestUri().getHostname(); } @@ -1266,7 +1284,6 @@ } sendtoport = msg->getRequestUri().getPortNumber(); - } } if(debug >= 2) printf( "=====SipCient Sending UDP to '%s:%d' ", sendtoaddr.latin1(), sendtoport ); @@ -1966,132 +1983,6 @@ callListUpdated(); } -void SipClient::printStatus() -{ - for( SipCall *curcall = calls.first(); curcall != 0; curcall = calls.next() ) { - // call type - if(debug >= 2) printf("\nSipClient:printStatus: CallType = "); - switch ( curcall->getCallType()) { - case SipCall::StandardCall: - if(debug >= 2) printf("StandardCall"); - break; - case SipCall::videoCall: ---------------------------------------------- Diff block truncated. (Max lines = 200) ---------------------------------------------- |