Changeset 3856

Timestamp:

06/28/2012 01:10:41 AM (11 months ago)

Author:

kurtis.heimerl

Message:

SIP MESSAGES now wait when they receive a 100 TRYING, rather than repeating themselves.

Files:

• openbts/trunk/SIP/SIPEngine.cpp (modified) (2 diffs)

openbts/trunk/SIP/SIPEngine.cpp

@@ -1154 +1154 @@
         assert(mINVITE);
         osip_message_t *ok = NULL;
+        // have we received a 100 TRYING message? If so, don't retransmit after timeout
+        bool recv_trying = false;
         while (!timeout.passed()) {
                 try {
@@ -1161 +1163 @@
                 }
                 catch (SIPTimeout& e) {
-                        LOG(NOTICE) << "SIP MESSAGE packet to " << mProxyIP << ":" << mProxyPort << " timedout; resending"; 
-                        gSIPInterface.write(&mProxyAddr,mINVITE);       
+                        if (!recv_trying){
+                                LOG(NOTICE) << "SIP MESSAGE packet to " << mProxyIP << ":" << mProxyPort << " timedout; resending"; 
+                                gSIPInterface.write(&mProxyAddr,mINVITE);
+                        } else {
+                                LOG(NOTICE) << "SIP MESSAGE packet to " << mProxyIP << ":" << mProxyPort << " timedout; ignoring (got 100 TRYING)"; 
+                        }
                         continue;
                 }
                 assert(ok);
+                if((ok->status_code==100)) {
+                        recv_trying = true;
+                        LOG(INFO) << "received TRYING MESSAGE";
+                }
                 if((ok->status_code==200) || (ok->status_code==202) ) {
                         mState = Cleared;