r3577 - in trunk: libminisip/source/subsystem_signaling/p2t libminisip/source/subsystem_signaling/sip libmsip/source libmsip/source/dialogs libmsip/source/messages libmsip/source/transports
erik at minisip.org
erik at minisip.org
Tue Apr 22 17:52:00 CEST 2008
Author: erik
Date: 2008-04-22 17:52:00 +0200 (Tue, 22 Apr 2008)
New Revision: 3577
Modified:
trunk/libminisip/source/subsystem_signaling/p2t/SipDialogP2Tuser.cxx
trunk/libminisip/source/subsystem_signaling/sip/SipDialogConfVoip.cxx
trunk/libminisip/source/subsystem_signaling/sip/SipDialogFileTransferClient.cxx
trunk/libminisip/source/subsystem_signaling/sip/SipDialogFileTransferServer.cxx
trunk/libminisip/source/subsystem_signaling/sip/SipDialogPresenceClient.cxx
trunk/libminisip/source/subsystem_signaling/sip/SipDialogPresenceServer.cxx
trunk/libminisip/source/subsystem_signaling/sip/SipDialogVoip.cxx
trunk/libmsip/source/SipCommandDispatcher.cxx
trunk/libmsip/source/dialogs/SipDialog.cxx
trunk/libmsip/source/dialogs/SipDialogRegister.cxx
trunk/libmsip/source/messages/SipRequest.cxx
trunk/libmsip/source/transports/SipTransport.cxx
Log:
* When creating a dialog you need to create a local tag. Each dialog
was responsible for that. Now it is done in the SipDialog constructor
instead.
* Removed some debug output.
Modified: trunk/libminisip/source/subsystem_signaling/p2t/SipDialogP2Tuser.cxx
===================================================================
--- trunk/libminisip/source/subsystem_signaling/p2t/SipDialogP2Tuser.cxx 2008-04-18 11:13:38 UTC (rev 3576)
+++ trunk/libminisip/source/subsystem_signaling/p2t/SipDialogP2Tuser.cxx 2008-04-22 15:52:00 UTC (rev 3577)
@@ -1173,8 +1173,6 @@
// getDialogConfig().callId = itoa(rand())+"@"+getDialogConfig().inherited->localIpString;
/*getDialogConfig().callId*/ dialogState.callId = itoa(rand())+"@"+getDialogConfig()->inherited->externalContactIP;
- dialogState.localTag=itoa(rand());
-
/* We will fill that later, once we know if that succeeded */
logEntry = NULL;
Modified: trunk/libminisip/source/subsystem_signaling/sip/SipDialogConfVoip.cxx
===================================================================
--- trunk/libminisip/source/subsystem_signaling/sip/SipDialogConfVoip.cxx 2008-04-18 11:13:38 UTC (rev 3576)
+++ trunk/libminisip/source/subsystem_signaling/sip/SipDialogConfVoip.cxx 2008-04-22 15:52:00 UTC (rev 3577)
@@ -943,8 +943,6 @@
//cerr << "CONFDIALOG: "+ ((*list)[1]).uri << endl;
//cerr << "CONFDIALOG: "+itoa(numConnected)<< endl;
- dialogState.localTag = itoa(rand());
-
/* We will fill that later, once we know if that succeeded */
logEntry = NULL;
@@ -962,8 +960,6 @@
//cerr << "CONFDIALOG: received"<< endl;
type="connect";
- dialogState.localTag = itoa(rand());
-
/* We will fill that later, once we know if that succeeded */
logEntry = NULL;
Modified: trunk/libminisip/source/subsystem_signaling/sip/SipDialogFileTransferClient.cxx
===================================================================
--- trunk/libminisip/source/subsystem_signaling/sip/SipDialogFileTransferClient.cxx 2008-04-18 11:13:38 UTC (rev 3576)
+++ trunk/libminisip/source/subsystem_signaling/sip/SipDialogFileTransferClient.cxx 2008-04-22 15:52:00 UTC (rev 3577)
@@ -412,9 +412,6 @@
useSTUN(use_stun),
phoneConf(pconf)
{
- dialogState.localTag = itoa(rand());
- //dialogState.remoteUri="mafe at minisip.org";
-
setUpStateMachine();
}
Modified: trunk/libminisip/source/subsystem_signaling/sip/SipDialogFileTransferServer.cxx
===================================================================
--- trunk/libminisip/source/subsystem_signaling/sip/SipDialogFileTransferServer.cxx 2008-04-18 11:13:38 UTC (rev 3576)
+++ trunk/libminisip/source/subsystem_signaling/sip/SipDialogFileTransferServer.cxx 2008-04-22 15:52:00 UTC (rev 3577)
@@ -343,8 +343,6 @@
SipDialog(stack,ident,callId),
phoneConf(pconf)
{
- dialogState.localTag=itoa(rand());
-
setUpStateMachine();
}
Modified: trunk/libminisip/source/subsystem_signaling/sip/SipDialogPresenceClient.cxx
===================================================================
--- trunk/libminisip/source/subsystem_signaling/sip/SipDialogPresenceClient.cxx 2008-04-18 11:13:38 UTC (rev 3576)
+++ trunk/libminisip/source/subsystem_signaling/sip/SipDialogPresenceClient.cxx 2008-04-22 15:52:00 UTC (rev 3577)
@@ -344,7 +344,6 @@
SipDialog(stack,ident, ""),
useSTUN(use_stun)
{
- dialogState.localTag = itoa(rand());
setUpStateMachine();
}
Modified: trunk/libminisip/source/subsystem_signaling/sip/SipDialogPresenceServer.cxx
===================================================================
--- trunk/libminisip/source/subsystem_signaling/sip/SipDialogPresenceServer.cxx 2008-04-18 11:13:38 UTC (rev 3576)
+++ trunk/libminisip/source/subsystem_signaling/sip/SipDialogPresenceServer.cxx 2008-04-22 15:52:00 UTC (rev 3577)
@@ -229,7 +229,6 @@
useSTUN(use_stun),
onlineStatus("online")
{
- dialogState.localTag=itoa(rand());
setUpStateMachine();
}
Modified: trunk/libminisip/source/subsystem_signaling/sip/SipDialogVoip.cxx
===================================================================
--- trunk/libminisip/source/subsystem_signaling/sip/SipDialogVoip.cxx 2008-04-18 11:13:38 UTC (rev 3576)
+++ trunk/libminisip/source/subsystem_signaling/sip/SipDialogVoip.cxx 2008-04-22 15:52:00 UTC (rev 3577)
@@ -589,8 +589,6 @@
useStun(stun),
lastInvite(NULL)
{
- dialogState.localTag = itoa(rand());
-
/* We will fill that later, once we know if that succeeded */
logEntry = NULL;
Modified: trunk/libmsip/source/SipCommandDispatcher.cxx
===================================================================
--- trunk/libmsip/source/SipCommandDispatcher.cxx 2008-04-18 11:13:38 UTC (rev 3576)
+++ trunk/libmsip/source/SipCommandDispatcher.cxx 2008-04-22 15:52:00 UTC (rev 3577)
@@ -109,11 +109,10 @@
}
mlock.unlock();
#ifdef DEBUG_OUTPUT
- mdbg("signaling/sip") << "DISPATCHER: got command!"<<endl;
if (item.type==TYPE_COMMAND)
- mdbg("signaling/sip") << "command: "<< **item.command << endl;
+ mdbg("signaling/sip") << "DISPATCHER: got command: "<< **item.command << endl;
else
- mdbg("signaling/sip") << "timeout: "<< **item.command << endl;
+ mdbg("signaling/sip") << "DISPATCHER: got timeout: "<< **item.command << endl;
#endif
@@ -123,14 +122,6 @@
// timeouts. SipSMCommands are passed to the dispatcher
// (and the defaultHandler if they are not handled).
// Timeouts have a known receiver set in the queue item.
-#ifdef DEBUG_OUTPUT
- if (item.type==TYPE_COMMAND){
- mdbg("signaling/sip") << "SipDialogContainer::run delivering command :: "<< **item.command << endl;
- }else{
- mdbg("signaling/sip") << "SipDialogContainer::run delivering timeout :: "<< **item.command << endl;
- }
-#endif
-
if (item.type == TYPE_COMMAND){
handled=handleCommand(**(item.command));
Modified: trunk/libmsip/source/dialogs/SipDialog.cxx
===================================================================
--- trunk/libmsip/source/dialogs/SipDialog.cxx 2008-04-18 11:13:38 UTC (rev 3576)
+++ trunk/libmsip/source/dialogs/SipDialog.cxx 2008-04-22 15:52:00 UTC (rev 3577)
@@ -71,6 +71,7 @@
}
this->dialogState.seqNo=100 * (rand()%9+1);
+ dialogState.localTag = itoa(rand());
dialogState.remoteSeqNo=-1;
dialogState.secure=false; //TODO: this variable is not maintained
//properly, right?! (this at least does not leave it uninitialized) -EE
Modified: trunk/libmsip/source/dialogs/SipDialogRegister.cxx
===================================================================
--- trunk/libmsip/source/dialogs/SipDialogRegister.cxx 2008-04-18 11:13:38 UTC (rev 3576)
+++ trunk/libmsip/source/dialogs/SipDialogRegister.cxx 2008-04-22 15:52:00 UTC (rev 3577)
@@ -458,7 +458,6 @@
guiFeedback(true)
{
setUpStateMachine();
- dialogState.localTag = itoa(rand());
myDomain = getDialogConfig()->sipIdentity->getSipUri().getIp();
}
Modified: trunk/libmsip/source/messages/SipRequest.cxx
===================================================================
--- trunk/libmsip/source/messages/SipRequest.cxx 2008-04-18 11:13:38 UTC (rev 3576)
+++ trunk/libmsip/source/messages/SipRequest.cxx 2008-04-22 15:52:00 UTC (rev 3577)
@@ -281,9 +281,6 @@
}
requestLine = build_from.substr( start, end - start );
- #ifdef DEBUG_OUTPUT
- cerr << "SipRequest::init - requestLine = " << requestLine << endl;
- #endif
start = 0;
end = requestLine.length();
@@ -294,9 +291,6 @@
}
method = requestLine.substr( start, pos - start );
- #ifdef DEBUG_OUTPUT
- cerr << "SipRequest::init - method = " << method << endl;
- #endif
// Parse version
pos2 = requestLine.rfind( ' ', end - 1 );
@@ -316,10 +310,6 @@
if( !uri.isValid() ){
throw SipExceptionInvalidMessage("SipRequest malformed - uri");
}
-
- #ifdef DEBUG_OUTPUT
- cerr << "SipRequest::init - uri = " << uri.getString() << endl;
- #endif
}
SipRequest::~SipRequest(){
Modified: trunk/libmsip/source/transports/SipTransport.cxx
===================================================================
--- trunk/libmsip/source/transports/SipTransport.cxx 2008-04-18 11:13:38 UTC (rev 3576)
+++ trunk/libmsip/source/transports/SipTransport.cxx 2008-04-22 15:52:00 UTC (rev 3577)
@@ -120,7 +120,7 @@
if( transport->isSecure() == secure &&
transport->getProtocol() == lcProt ){
- mdbg << "SipTransport: transport found!!! = " << lcProt << endl;
+ //mdbg << "SipTransport: transport found!!! = " << lcProt << endl;
return transport;
}
}
More information about the Minisip-devel
mailing list