[asterisk-scf-commits] asterisk-scf/integration/sip.git branch "master" updated.

[Commits to the Asterisk SCF project code repositories]

branch "master" has been updated
       via  edf99b7f203e6b652fc364aff6c3f6f5b670bdd3 (commit)
       via  a9b338bd99298e5fc52e2350e23c45a07332c5d0 (commit)
      from  7c246ecf103d050bd710dd53e0adfcb47cf92793 (commit)

Summary of changes:
 src/PJSipSessionModule.cpp |    2 +-
 src/SipSession.cpp         |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


- Log -----------------------------------------------------------------
commit edf99b7f203e6b652fc364aff6c3f6f5b670bdd3
Author: Joshua Colp <jcolp at digium.com>
Date:   Mon Sep 20 09:36:13 2010 -0300

    Instead of using more space in the pool just reuse another value when creating SDP.

diff --git a/src/SipSession.cpp b/src/SipSession.cpp
index 4e19b02..d1f8040 100644
--- a/src/SipSession.cpp
+++ b/src/SipSession.cpp
@@ -421,7 +421,7 @@ pjmedia_sdp_session *SipSession::createSDPOffer()
    pj_strdup2(mImplPriv->mDialog->pool, &sdp->origin.net_type, "IN");
    pj_strdup2(mImplPriv->mDialog->pool, &sdp->origin.addr_type, "IP4");
    sdp->origin.addr = *pj_gethostname();
-   pj_strdup2(mImplPriv->mDialog->pool, &sdp->name, "sip");
+   sdp->name = sdp->origin.user;
    sdp->time.start = 0;
    sdp->time.stop = 0;
    sdp->attr_count = 0;

commit a9b338bd99298e5fc52e2350e23c45a07332c5d0
Author: Joshua Colp <jcolp at digium.com>
Date:   Mon Sep 20 09:36:05 2010 -0300

    Fix compilation error.

diff --git a/src/PJSipSessionModule.cpp b/src/PJSipSessionModule.cpp
index afa8cee..62ffed8 100644
--- a/src/PJSipSessionModule.cpp
+++ b/src/PJSipSessionModule.cpp
@@ -508,7 +508,7 @@ static void handle_invite_response(pjsip_inv_session *inv, pjsip_rx_data *rdata,
 
 static void invOnStateChanged(pjsip_inv_session *inv, pjsip_event *event)
 {
-   if (inv->state == PJSIP_INV_STATE_EARLY || inv->state == PJSIP_INV_STATE_CONNECTING &&
+   if ((inv->state == PJSIP_INV_STATE_EARLY || inv->state == PJSIP_INV_STATE_CONNECTING) &&
          event->type == PJSIP_EVENT_RX_MSG)
    {
       //Received a 1XX or 2XX message in response to our initial outgoing INVITE.

-----------------------------------------------------------------------


-- 
asterisk-scf/integration/sip.git