Menu
▾
▴
[kphone-devel] CVS:commitlog: kphoneSI/dissipate2 base64.c sipcall.cpp sipcall.h sipclient.cpp sipregister.cpp sipregister.h siptransaction.cpp sipvialist.h kphoneSI/document dial1.png dial2.png dial3.png hold0.png kphoneSI.png subscribe.png subscribe4.png subscribe5.png ...
|
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)
----------------------------------------------
|
