Menu
▾
▴
[kphone-devel] CVS:commitlog: kphoneSI CHANGES kphoneSI/dissipate2 sipcall.cpp sipclient.cpp sipprotocol.cpp siptransaction.cpp siptransaction.h udpmessagesocket.cpp udpmessagesocket.h kphoneSI/document sippref-socket.png usermanual3.html usermanual6p.html ...
|
From: klaus f. <kgf...@us...> - 2006-07-31 09:01:39
|
kgfleischmann 2006/07/31 02:01:36 PDT
Kphone CVS Repository
Modified files:
. CHANGES
dissipate2 sipcall.cpp sipclient.cpp sipprotocol.cpp
siptransaction.cpp siptransaction.h
udpmessagesocket.cpp udpmessagesocket.h
document sippref-socket.png usermanual3.html
usermanual6p.html
kphone Makefile.in callaudio.cpp
calllistview.cpp dspoutalsa.cpp
dspoutrtp.cpp dspoutrtp.h kcallwidget.cpp
kphone.cpp kphonebook.cpp kphoneview.cpp
ksippreferences.cpp ksippreferences.h
sessioncontrol.cpp
Log:
doc+symm
Revision Changes Path
1.17 +5 -0 kphoneSI/CHANGES
http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/CHANGES?r1=1.16&r2=1.17
1.11 +6 -5 kphoneSI/dissipate2/sipcall.cpp
http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/dissipate2/sipcall.cpp?r1=1.10&r2=1.11
1.11 +85 -86 kphoneSI/dissipate2/sipclient.cpp
http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/dissipate2/sipclient.cpp?r1=1.10&r2=1.11
1.4 +5 -5 kphoneSI/dissipate2/sipprotocol.cpp
http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/dissipate2/sipprotocol.cpp?r1=1.3&r2=1.4
1.11 +12 -12 kphoneSI/dissipate2/siptransaction.cpp
http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/dissipate2/siptransaction.cpp?r1=1.10&r2=1.11
1.4 +2 -0 kphoneSI/dissipate2/siptransaction.h
http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/dissipate2/siptransaction.h?r1=1.3&r2=1.4
1.3 +10 -0 kphoneSI/dissipate2/udpmessagesocket.cpp
http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/dissipate2/udpmessagesocket.cpp?r1=1.2&r2=1.3
1.3 +2 -0 kphoneSI/dissipate2/udpmessagesocket.h
http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/dissipate2/udpmessagesocket.h?r1=1.2&r2=1.3
1.2 +28 -90 kphoneSI/document/sippref-socket.png
http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/document/sippref-socket.png?r1=1.1&r2=1.2
1.8 +39 -17 kphoneSI/document/usermanual3.html
http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/document/usermanual3.html?r1=1.7&r2=1.8
1.3 +9 -2 kphoneSI/document/usermanual6p.html
http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/document/usermanual6p.html?r1=1.2&r2=1.3
1.10 +1 -1 kphoneSI/kphone/Makefile.in
http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/Makefile.in?r1=1.9&r2=1.10
1.5 +1 -0 kphoneSI/kphone/callaudio.cpp
http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/callaudio.cpp?r1=1.4&r2=1.5
1.6 +0 -1 kphoneSI/kphone/calllistview.cpp
http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/calllistview.cpp?r1=1.5&r2=1.6
1.4 +3 -4 kphoneSI/kphone/dspoutalsa.cpp
http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/dspoutalsa.cpp?r1=1.3&r2=1.4
1.7 +9 -83 kphoneSI/kphone/dspoutrtp.cpp
http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/dspoutrtp.cpp?r1=1.6&r2=1.7
1.6 +0 -2 kphoneSI/kphone/dspoutrtp.h
http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/dspoutrtp.h?r1=1.5&r2=1.6
1.11 +4 -3 kphoneSI/kphone/kcallwidget.cpp
http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/kcallwidget.cpp?r1=1.10&r2=1.11
1.10 +3 -3 kphoneSI/kphone/kphone.cpp
http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/kphone.cpp?r1=1.9&r2=1.10
1.5 +0 -2 kphoneSI/kphone/kphonebook.cpp
http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/kphonebook.cpp?r1=1.4&r2=1.5
1.13 +0 -6 kphoneSI/kphone/kphoneview.cpp
http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/kphoneview.cpp?r1=1.12&r2=1.13
1.9 +8 -6 kphoneSI/kphone/ksippreferences.cpp
http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/ksippreferences.cpp?r1=1.8&r2=1.9
1.4 +4 -4 kphoneSI/kphone/ksippreferences.h
http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/ksippreferences.h?r1=1.3&r2=1.4
1.15 +11 -15 kphoneSI/kphone/sessioncontrol.cpp
http://cvs.sourceforge.net/viewcvs.py/kphone/kphoneSI/kphone/sessioncontrol.cpp?r1=1.14&r2=1.15
Index: CHANGES
===================================================================
RCS file: /cvsroot/kphone/kphoneSI/CHANGES,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- CHANGES 19 Jul 2006 19:50:21 -0000 1.16
+++ CHANGES 31 Jul 2006 09:01:34 -0000 1.17
@@ -1,3 +1,8 @@
+CVS Version: KPhoneSI 1.17
+=========================================
+ - signalling and media transport for UDP are always set to symmetric mode
+ - documentation update for audio
+
CVS Version: KPhoneSI 1.16
=========================================
- presence adaptions
Index: sipcall.cpp
===================================================================
RCS file: /cvsroot/kphone/kphoneSI/dissipate2/sipcall.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sipcall.cpp 25 Jun 2006 08:18:02 -0000 1.10
+++ sipcall.cpp 31 Jul 2006 09:01:34 -0000 1.11
@@ -28,7 +28,7 @@
connect( timer, SIGNAL( timeout() ), this, SLOT( call_timeout() ) );
holdRefused=false;
statuscode=0;
- printf(":::::Begin SipCallMember\n");
+ if(KStatics::debugLevel>=2) printf(":::::Begin SipCallMember\n");
ourUsername="";
ourPassword="";
nonceCounter=0;
@@ -43,7 +43,7 @@
SipCallMember::~SipCallMember( void )
{
delete timer;
- printf(":::::End SipCallMember\n");
+ if(KStatics::debugLevel>=2) printf(":::::End SipCallMember\n");
}
@@ -180,8 +180,9 @@
return;
} else if( (local->getStatus().getCode() == 423 ) || (local->getStatus().getCode() == 481 )|| (local->getStatus().getCode() == 489) ) {
+ call->terminateSubscribes(local->getStatus().getCode());
+ } else if (local->getStatus().getCode() == 404 ) {
call->terminateSubscribes(local->getStatus().getCode());
-
} else if( local->getStatus().getCode() < 500 ) {
if( call->getCallStatus() == SipCall::callInProgress ) {
contactUpdate( false );
@@ -1234,13 +1235,13 @@
useCmdLine=false;
RemoteStart=false;
switchthru=false;
- printf(":::::Begin SipCall\n");
+ if(KStatics::debugLevel>=2) printf(":::::Begin SipCall\n");
}
SipCall::~SipCall( void )
{
- printf(":::::End SipCall\n");
+ if(KStatics::debugLevel>=2)printf(":::::End SipCall\n");
parent->deleteCall( this );
transactions.clear();
members.clear();
Index: sipclient.cpp
===================================================================
RCS file: /cvsroot/kphone/kphoneSI/dissipate2/sipclient.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sipclient.cpp 22 Jun 2006 18:25:43 -0000 1.10
+++ sipclient.cpp 31 Jul 2006 09:01:34 -0000 1.11
@@ -211,6 +211,7 @@
bool newLooseRoute, bool newStrictRoute, QString socketStr )
: QObject( parent, name )
{
+ debug=KStatics::debugLevel;
if( !setupSocketStuff( newListenport, socketStr ) ) {
printf("=====SipClient::setupSocketStuff() Failed.\n");
exit( 1 );
@@ -235,7 +236,6 @@
testOn = false;
useStunProxy = false;
tcpSocket = 0;
- debug=KStatics::debugLevel;
stopStun = false;
foundStun = false;
}
@@ -280,13 +280,14 @@
listenport = TCP_listener.listen( listenport );
if( !listenport ) { return false; }
TCP_listener.forcePortNumber( listenport );
- }
- listenport = listener.listen( listenport );
- nlp=listenport;
- if( !listenport ) { return false; }
- listener.forcePortNumber( listenport );
- if(debug) printf( "=====SipClient: Listening UDP on port: %d\n", listener.getPortNumber() );
-// }
+ if(debug>=2) printf( "=====SipClient: Listening TCP on port: %d\n", TCP_listener.getPortNumber() );
+ }
+ listenport = listener.listen( listenport );
+ nlp=listenport;
+ if( !listenport ) { return false; }
+ listener.forcePortNumber( listenport );
+ if(debug>0) printf( "=====SipClient: Listening UDP on port: %d\n", listener.getPortNumber() );
+
return true;
}
@@ -393,7 +394,6 @@
printf("=====Malformed packet (sizeof(StunMsgHdr) > bytesread)\n");
return;
}
- //if (debug) printf( "=====SipCient: STUN response\n" );
char* body = inputbuf + sizeof( StunMsgHdr );
unsigned int size = ntohs( hdr->msgLength );
port = listener.getPortNumber();
@@ -412,7 +412,6 @@
StunAtrAddress4* atrAdd4 = reinterpret_cast<StunAtrAddress4*>( body );
if ( hdrLen == sizeof( StunAtrAddress4 ) - 4 ) {
port = ntohs( atrAdd4->addrHdr.port );
- //if(debug) printf( "=====SipCient: STUN response address_port: %d\n", port );
i1 = atrAdd4->v4addr & 0xFF;
i2 = (atrAdd4->v4addr & 0xFF00) >> 8;
i3 = (atrAdd4->v4addr & 0xFF0000) >> 16;
@@ -561,11 +560,11 @@
SipMessage *curmessage = new SipMessage( fullmessage);
if( !curmessage->isValid() ) {
delete curmessage;
- if( debug ) printf( "\n>>>>>this is not valid\n");
+ if( debug>0 ) printf( "\n>>>>>this is not valid\n");
return;
}
QString body = curmessage->messageBody();
- if( debug ) printf( "\n>>>>>this is valid\n");
+ if( debug>0 ) printf( "\n>>>>>this is valid\n");
if( testOn ) {
incomingTestMessage();
delete curmessage;
@@ -586,7 +585,7 @@
QString cseq = curmessage->getHeaderData( SipHeader::CSeq );
if( curmessage->getMethod() == Sip::MESSAGE ) {
if( callid == messageCID && cseq == messageCSeq ) {
- if(debug) printf( "=====SipClient: Received what was likely a retransmission, badly ignoring...\n" );
+ if(debug>0) printf( "=====SipClient: Received what was likely a retransmission, badly ignoring...\n" );
delete curmessage;
return;
}
@@ -604,13 +603,13 @@
if( curmessage->getMethod() == Sip::SUBSCRIBE ) {
if ( fullmessage.contains("Event: presence.winfo") || fullmessage.contains("Event: presence.presencelist") ) {
- if(debug) printf( "=====SipClient: We dont support this\n" );
+ if(debug>0) printf( "=====SipClient: We dont support this\n" );
delete curmessage;
return;
}
if( callid == subscribeCID && cseq == subscribeCSeq ) {
- if(debug) printf( "=====SipClient: Received what was likely a retransmission, badly ignoring...\n" );
+ if(debug>0) printf( "=====SipClient: Received what was likely a retransmission, badly ignoring...\n" );
delete curmessage;
return;
}
@@ -718,7 +717,7 @@
curmessage->getMethod() != Sip::CANCEL ) {
sendQuickResponse( curmessage, SipStatus( 481 ) );
} else {
- if(debug) printf( "=====SipClient: Dropping ACK/CANCEL which deserved a 481\n" );
+ if(debug>0) printf( "=====SipClient: Dropping ACK/CANCEL which deserved a 481\n" );
}
delete curmessage;
return;
@@ -732,19 +731,19 @@
// Check message type
if( curmessage->getType() != SipMessage::Request ) {
- if(debug) printf( "=====SipClient: No call found for incoming response. Dropping.\n" );
+ if(debug>0) printf( "=====SipClient: No call found for incoming response. Dropping.\n" );
delete curmessage;
return;
}
// Check method
if( curmessage->getMethod() == Sip::ACK ) {
- if(debug) printf( "=====SipClient: ACK received, but nobody was listening. Dropping.\n" );
+ if(debug>0) printf( "=====SipClient: ACK received, but nobody was listening. Dropping.\n" );
delete curmessage;
return;
}
if( curmessage->getMethod() == Sip::CANCEL ) {
----------------------------------------------
Diff block truncated. (Max lines = 200)
----------------------------------------------
|
