r3319 - trunk/libminisip/source/subsystem_signaling/sip
erik at minisip.org
erik at minisip.org
Thu Jun 14 14:07:52 CEST 2007
Author: erik
Date: 2007-06-14 14:07:52 +0200 (Thu, 14 Jun 2007)
New Revision: 3319
Modified:
trunk/libminisip/source/subsystem_signaling/sip/DefaultDialogHandler.cxx
trunk/libminisip/source/subsystem_signaling/sip/SipDialogConfVoip.cxx
trunk/libminisip/source/subsystem_signaling/sip/SipDialogVoip.cxx
trunk/libminisip/source/subsystem_signaling/sip/SipDialogVoipClient.cxx
trunk/libminisip/source/subsystem_signaling/sip/SipDialogVoipServer.cxx
Log:
* Misses to commit the .cxx files in the last commit.
Modified: trunk/libminisip/source/subsystem_signaling/sip/DefaultDialogHandler.cxx
===================================================================
--- trunk/libminisip/source/subsystem_signaling/sip/DefaultDialogHandler.cxx 2007-06-14 11:18:53 UTC (rev 3318)
+++ trunk/libminisip/source/subsystem_signaling/sip/DefaultDialogHandler.cxx 2007-06-14 12:07:52 UTC (rev 3319)
@@ -529,6 +529,8 @@
if( !id ){
merr << "ERROR: could not determine what local identity to use" << endl;
+ CommandString err("","error", "No matching local identity");
+ return err;
}
// securityConfig.useIdentity( id );
@@ -570,7 +572,7 @@
MRef<Session *> mediaSession = mediaHandler->createSession( id );
- MRef<SipDialog*> voipCall = new SipDialogVoipClient(sipStack, id, phoneconf, mediaSession);
+ MRef<SipDialog*> voipCall = new SipDialogVoipClient(sipStack, id, phoneconf->useSTUN, phoneconf->useAnat, mediaSession);
sipStack->addDialog(voipCall);
CommandString inv(voipCall->getCallId(), SipCommandString::invite, user);
#ifdef ENABLE_TS
Modified: trunk/libminisip/source/subsystem_signaling/sip/SipDialogConfVoip.cxx
===================================================================
--- trunk/libminisip/source/subsystem_signaling/sip/SipDialogConfVoip.cxx 2007-06-14 11:18:53 UTC (rev 3318)
+++ trunk/libminisip/source/subsystem_signaling/sip/SipDialogConfVoip.cxx 2007-06-14 12:07:52 UTC (rev 3319)
@@ -903,12 +903,12 @@
}
-SipDialogConfVoip::SipDialogConfVoip(MRef<ConfMessageRouter*> confCb, MRef<SipStack*> stack, MRef<SipIdentity*> ident, MRef<SipSoftPhoneConfiguration*> pconf, MRef<Session *> s, minilist<ConfMember> *conflist,string confid, string cid) :
+SipDialogConfVoip::SipDialogConfVoip(MRef<ConfMessageRouter*> confCb, MRef<SipStack*> stack, MRef<SipIdentity*> ident, bool stun, MRef<Session *> s, minilist<ConfMember> *conflist,string confid, string cid) :
SipDialog(stack,ident,cid),
confCallback(confCb),
lastInvite(NULL),
- phoneconf(pconf),
- mediaSession(s)
+ mediaSession(s),
+ useStun(stun)
{
confId=confid;
numConnected= conflist->size();
@@ -949,12 +949,12 @@
setUpStateMachine();
}
-SipDialogConfVoip::SipDialogConfVoip(MRef<ConfMessageRouter*> confCb, MRef<SipStack*> stack, MRef<SipIdentity*> ident, MRef<SipSoftPhoneConfiguration*> pconf, MRef<Session *> s, string confid, string cid) :
+SipDialogConfVoip::SipDialogConfVoip(MRef<ConfMessageRouter*> confCb, MRef<SipStack*> stack, MRef<SipIdentity*> ident, bool stun, MRef<Session *> s, string confid, string cid) :
SipDialog(stack,ident, cid),
confCallback(confCb),
lastInvite(NULL),
- phoneconf(pconf),
- mediaSession(s)
+ mediaSession(s),
+ useStun(stun)
{
confId=confid;
//cerr<<"SDCVididididididididididdididi "+confId<<endl;
@@ -981,7 +981,7 @@
dialogState.callId,
SipUri(dialogState.remoteUri),
getDialogConfig()->sipIdentity->getSipUri(),
- getDialogConfig()->getContactUri(phoneconf->useSTUN),
+ getDialogConfig()->getContactUri(useStun),
dialogState.seqNo,
getSipStack()) ;
Modified: trunk/libminisip/source/subsystem_signaling/sip/SipDialogVoip.cxx
===================================================================
--- trunk/libminisip/source/subsystem_signaling/sip/SipDialogVoip.cxx 2007-06-14 11:18:53 UTC (rev 3318)
+++ trunk/libminisip/source/subsystem_signaling/sip/SipDialogVoip.cxx 2007-06-14 12:07:52 UTC (rev 3319)
@@ -580,13 +580,13 @@
SipDialogVoip::SipDialogVoip( MRef<SipStack*> stack,
MRef<SipIdentity*> ident,
- MRef<SipSoftPhoneConfiguration*> pconf,
+ bool stun,
MRef<Session *> s,
string cid ) :
SipDialog(stack,ident, cid),
- phoneconf(pconf),
mediaSession(s),
notifyEarlyTermination(false),
+ useStun(stun),
lastInvite(NULL)
{
dialogState.localTag = itoa(rand());
@@ -637,7 +637,7 @@
ok->getHeaderValueTo()->setParameter("tag",dialogState.localTag);
MRef<SipHeaderValue *> contact =
new SipHeaderValueContact(
- getDialogConfig()->getContactUri(phoneconf->useSTUN),
+ getDialogConfig()->getContactUri(useStun),
-1); //set expires to -1, we do not use it (only in register)
ok->addHeader( new SipHeader(*contact) );
Modified: trunk/libminisip/source/subsystem_signaling/sip/SipDialogVoipClient.cxx
===================================================================
--- trunk/libminisip/source/subsystem_signaling/sip/SipDialogVoipClient.cxx 2007-06-14 11:18:53 UTC (rev 3318)
+++ trunk/libminisip/source/subsystem_signaling/sip/SipDialogVoipClient.cxx 2007-06-14 12:07:52 UTC (rev 3319)
@@ -513,8 +513,9 @@
}
-SipDialogVoipClient::SipDialogVoipClient(MRef<SipStack*> stack, MRef<SipIdentity*> ident, MRef<SipSoftPhoneConfiguration*> pconf, MRef<Session *> s, string cid) :
- SipDialogVoip(stack, ident, pconf, s, cid)
+SipDialogVoipClient::SipDialogVoipClient(MRef<SipStack*> stack, MRef<SipIdentity*> ident, bool stun, bool anat, MRef<Session *> s, string cid) :
+ SipDialogVoip(stack, ident, stun, s, cid),
+ useAnat(anat)
{
setUpStateMachine();
}
@@ -530,7 +531,7 @@
dialogState.callId,
SipUri(dialogState.remoteUri),
getDialogConfig()->sipIdentity->getSipUri(),
- getDialogConfig()->getContactUri(phoneconf->useSTUN),
+ getDialogConfig()->getContactUri(useStun),
dialogState.seqNo,
getSipStack() ) ;
@@ -549,7 +550,7 @@
#ifdef ENABLE_TS
ts.save("getSdpOffer");
#endif
- bool anat = phoneconf->useAnat;
+ bool anat = useAnat;
sdp = mediaSession->getSdpOffer( peerUri, anat );
#ifdef ENABLE_TS
ts.save("getSdpOffer");
@@ -616,7 +617,7 @@
MRef<SipHeaderValue *> contact =
new SipHeaderValueContact(
- getDialogConfig()->getContactUri(phoneconf->useSTUN),
+ getDialogConfig()->getContactUri(useStun),
-1); //set expires to -1, we do not use it (only in register)
ok->addHeader( new SipHeader(*contact) );
Modified: trunk/libminisip/source/subsystem_signaling/sip/SipDialogVoipServer.cxx
===================================================================
--- trunk/libminisip/source/subsystem_signaling/sip/SipDialogVoipServer.cxx 2007-06-14 11:18:53 UTC (rev 3318)
+++ trunk/libminisip/source/subsystem_signaling/sip/SipDialogVoipServer.cxx 2007-06-14 12:07:52 UTC (rev 3319)
@@ -601,8 +601,8 @@
}
-SipDialogVoipServer::SipDialogVoipServer(MRef<SipStack*> stack, MRef<SipIdentity*> ident, MRef<SipSoftPhoneConfiguration*> pconf, MRef<Session *> s, string cid) :
- SipDialogVoip(stack, ident, pconf, s, cid),
+SipDialogVoipServer::SipDialogVoipServer(MRef<SipStack*> stack, MRef<SipIdentity*> ident, bool stun, MRef<Session *> s, string cid) :
+ SipDialogVoip(stack, ident, /*pconf*/ stun, s, cid),
use100Rel( false ), resendTimer1xx( 0 )
{
setUpStateMachine();
@@ -619,7 +619,7 @@
MRef<SipHeaderValue *> contact =
new SipHeaderValueContact(
- getDialogConfig()->getContactUri(phoneconf->useSTUN),
+ getDialogConfig()->getContactUri(useStun),
-1); //set expires to -1, we do not use it (only in register)
ok->addHeader( new SipHeader(*contact) );
@@ -687,7 +687,7 @@
MRef<SipHeaderValue *> contact =
new SipHeaderValueContact(
- getDialogConfig()->getContactUri(phoneconf->useSTUN),
+ getDialogConfig()->getContactUri(useStun),
-1); //set expires to -1, we do not use it (only in register)
ringing->addHeader( new SipHeader(*contact) );
@@ -715,7 +715,7 @@
MRef<SipResponse*> ok = createSipResponse( prack, 200, "OK" );
MRef<SipHeaderValue *> contact =
new SipHeaderValueContact(
- getDialogConfig()->getContactUri(phoneconf->useSTUN),
+ getDialogConfig()->getContactUri(useStun),
-1); //set expires to -1, we do not use it (only in register)
ok->addHeader( new SipHeader(*contact) );
@@ -733,7 +733,7 @@
MRef<SipHeaderValue *> contact =
new SipHeaderValueContact(
- getDialogConfig()->getContactUri(phoneconf->useSTUN),
+ getDialogConfig()->getContactUri(useStun),
-1); //set expires to -1, we do not use it (only in register)
progress->addHeader( new SipHeader(*contact) );
More information about the Minisip-devel
mailing list