jami/jami-daemon
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-daemon.git synced 2025-08-12 22:09:25 +08:00
Code Issues Projects Releases Wiki Activity

temporary commit

Browse Source
This commit is contained in:
Emmanuel Milou
2009-02-27 16:47:37 -05:00
parent 777f7a4d8c
commit b529963bdf
4 changed files with 32 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/sdp.cpp
View File

@ -192,8 +192,11 @@ void Sdp::sdpAddOrigin( void )
void Sdp::sdpAddConnectionInfo( void )
{
_localSDP->conn->net_type = _localSDP->origin.net_type;
_debug("IP : %s\n", _localSDP->origin.net_type.ptr );
_localSDP->conn->addr_type = _localSDP->origin.addr_type;
_debug("IP : %s\n", _localSDP->origin.addr_type.ptr );
_localSDP->conn->addr = _localSDP->origin.addr;
_debug("IP : %s\n", _localSDP->origin.addr.ptr );
}
void Sdp::sdpAddMediaDescription()

4
src/sipcall.cpp
View File

@ -24,13 +24,15 @@
#include "global.h" // for _debug
SIPCall::SIPCall(const CallID& id, Call::CallType type) : Call(id, type)
SIPCall::SIPCall(const CallID& id, Call::CallType type, pj_pool_t *pool) : Call(id, type)
, _cid(0)
, _did(0)
, _tid(0)
, _xferSub(NULL)
, _invSession(NULL)
, _local_sdp(0)
{
_local_sdp = new Sdp (pool);
_debug("SIPCALL::Constructor for this clss is called \n");
}

9
src/sipcall.h
View File

@ -23,6 +23,7 @@
#include "call.h"
#include "sipvoiplink.h"
#include "sdp.h"
class AudioCodec;
@ -40,7 +41,7 @@ class SIPCall : public Call
* @param type The type of the call. Could be Incoming
* Outgoing
*/
SIPCall(const CallID& id, Call::CallType type);
SIPCall(const CallID& id, Call::CallType type, pj_pool_t *pool );
/**
* Destructor
@ -90,8 +91,14 @@ class SIPCall : public Call
void setInvSession(pjsip_inv_session* inv) {_invSession = inv;}
pjsip_inv_session *getInvSession() {return _invSession;}
Sdp* getLocalSDP (void) { return _local_sdp; }
void setLocalSDP (Sdp *local_sdp) { _local_sdp = local_sdp; }
private:
Sdp *_local_sdp;
int _cid;
int _did;
int _tid;

38
src/sipvoiplink.cpp
View File

@ -410,7 +410,7 @@ SIPVoIPLink::newOutgoingCall(const CallID& id, const std::string& toUrl)
{
Account* account;
SIPCall* call = new SIPCall(id, Call::Outgoing);
SIPCall* call = new SIPCall(id, Call::Outgoing, _pool);
if (call) {
account = dynamic_cast<SIPAccount *>(Manager::instance().getAccount(Manager::instance().getAccountFromCall(id)));
@ -457,7 +457,7 @@ SIPVoIPLink::answer(const CallID& id)
}
// User answered the incoming call, tell peer this news
if (call->startNegociation()) {
if (call->getLocalSDP()->startNegociation()) {
// Create and send a 200(OK) response
_debug("UserAgent: Negociation success!\n");
status = pjsip_inv_answer(call->getInvSession(), PJSIP_SC_OK, NULL, NULL, &tdata);
@ -592,7 +592,7 @@ SIPVoIPLink::onhold(const CallID& id)
_audiortp->closeRtpSession();
//_mutexSIP.leaveMutex();
local_sdp = call->getLocalSDPSession();
local_sdp = call->getLocalSDP()->getLocalSDPSession();
if( local_sdp == NULL ){
_debug("! SIP Failure: unable to find local_sdp\n");
@ -633,7 +633,7 @@ SIPVoIPLink::offhold(const CallID& id)
return false;
}
local_sdp = call->getLocalSDPSession();
local_sdp = call->getLocalSDP()->getLocalSDPSession();
if( local_sdp == NULL ){
_debug("! SIP Failure: unable to find local_sdp\n");
return false;
@ -908,14 +908,14 @@ SIPVoIPLink::SIPStartCall(SIPCall* call, const std::string& subject UNUSED)
PJ_ASSERT_RETURN(status == PJ_SUCCESS, false);
setCallAudioLocal(call, getLocalIPAddress(), useStun(), getStunServer());
_local_sdp->setIp(getLocalIP());
call->getLocalSDP()->setIp(getLocalIP());
// Building the local SDP offer
_local_sdp->createInitialOffer();
call->getLocalSDP()->createInitialOffer();
// Create the invite session for this call
pjsip_inv_session *inv;
status = pjsip_inv_create_uac(dialog, _local_sdp->getLocalSDPSession(), 0, &inv);
status = pjsip_inv_create_uac(dialog, call->getLocalSDP()->getLocalSDPSession(), 0, &inv);
PJ_ASSERT_RETURN(status == PJ_SUCCESS, false);
// Set auth information
@ -984,7 +984,7 @@ std::string SIPVoIPLink::getSipTo(const std::string& to_url, std::string hostnam
call->setLocalIp(localIP);
call->setLocalAudioPort(callLocalAudioPort);
call->setLocalExternAudioPort(callLocalExternAudioPort);
_local_sdp->setLocalExternAudioPort(callLocalExternAudioPort);
call->getLocalSDP()->setLocalExternAudioPort(callLocalExternAudioPort);
return true;
}
@ -1061,7 +1061,7 @@ std::string SIPVoIPLink::getSipTo(const std::string& to_url, std::string hostnam
if (call->getConnectionState() != Call::Connected) {
//call->SIPCallAnswered(event);
_local_sdp->SIPCallAnsweredWithoutHold(rdata);
call->getLocalSDP()->SIPCallAnsweredWithoutHold(rdata);
call->setConnectionState(Call::Connected);
call->setState(Call::Active);
@ -1264,10 +1264,6 @@ std::string SIPVoIPLink::getSipTo(const std::string& to_url, std::string hostnam
// Register "application/sdp" in ACCEPT header
pjsip_endpt_add_capability(_endpt, &_mod_ua, PJSIP_H_ACCEPT, NULL, 1, &accepted);
/* Create the SDP object */
_local_sdp = new Sdp (_pool);
_debug("UserAgent: pjsip version %s for %s initialized\n", pj_get_version(), PJ_OS_NAME);
// Create the secondary thread to poll sip events
@ -1837,7 +1833,7 @@ std::string SIPVoIPLink::getSipTo(const std::string& to_url, std::string hostnam
// Generate a new call ID for the incoming call!
id = Manager::instance().getNewCallID();
call = new SIPCall(id, Call::Incoming);
call = new SIPCall(id, Call::Incoming, _pool);
/* If an error occured at the call creation */
if (!call) {
@ -1847,9 +1843,9 @@ std::string SIPVoIPLink::getSipTo(const std::string& to_url, std::string hostnam
// Set the codec map, IP, peer number and so on... for the SIPCall object
setCallAudioLocal(call, link->getLocalIPAddress(), link->useStun(), link->getStunServer());
_local_sdp->setCodecMap(Manager::instance().getCodecDescriptorMap());
call->getLocalSDP()->setCodecMap(Manager::instance().getCodecDescriptorMap());
call->setConnectionState(Call::Progressing);
_local_sdp->setIp(link->getLocalIPAddress());
call->getLocalSDP()->setIp(link->getLocalIPAddress());
call->setPeerNumber(peerNumber);
/* Call the SIPCallInvite function to generate the local sdp,
@ -1859,7 +1855,7 @@ std::string SIPVoIPLink::getSipTo(const std::string& to_url, std::string hostnam
* remote IP and port number
* possilbe audio codec will be used in this call
*/
if (_local_sdp->SIPCallInvite(rdata)) {
if (call->getLocalSDP()->SIPCallInvite(rdata)) {
// Notify UI there is an incoming call
if (Manager::instance().incomingCall(call, account_id)) {
@ -1890,7 +1886,7 @@ std::string SIPVoIPLink::getSipTo(const std::string& to_url, std::string hostnam
// Specify media capability during invite session creation
pjsip_inv_session *inv;
status = pjsip_inv_create_uas(dialog, rdata, _local_sdp->getLocalSDPSession(), 0, &inv);
status = pjsip_inv_create_uas(dialog, rdata, call->getLocalSDP()->getLocalSDPSession(), 0, &inv);
PJ_ASSERT_RETURN(status == PJ_SUCCESS, 1);
// Associate the call in the invite session
@ -2305,6 +2301,7 @@ std::string SIPVoIPLink::getSipTo(const std::string& to_url, std::string hostnam
void on_rx_offer( pjsip_inv_session *inv, const pjmedia_sdp_session *offer ){
PJ_UNUSED_ARG( inv );
#ifdef CAN_REINVITE
SIPCall *call;
pj_status_t status;
@ -2312,8 +2309,9 @@ std::string SIPVoIPLink::getSipTo(const std::string& to_url, std::string hostnam
if (!call)
return;
_local_sdp->receiving_initial_offer( (pjmedia_sdp_session*)offer);
status=pjsip_inv_set_sdp_answer( call->getInvSession(), _local_sdp->getLocalSDPSession() );
call->getLocalSDP()->receiving_initial_offer( (pjmedia_sdp_session*)offer);
status=pjsip_inv_set_sdp_answer( call->getInvSession(), call->getLocalSDP()->getLocalSDPSession() );
#endif
}