paulmataruso/openbts
1
0
Fork 0
mirror of https://github.com/RangeNetworks/openbts.git synced 2025-11-03 21:33:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #991 in public. We now appropriately handle rejections of our SIP MESSAGE content

Browse Source 
git-svn-id: http://wush.net/svn/range/software/public/openbts/trunk@3812 19bc5d8c-e614-43d4-8b26-e1612bc8e597
This commit is contained in:
Kurtis Heimerl
2012-06-19 21:33:26 +00:00
parent af13ea7902
commit 6b648a8399
1 changed files with 28 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
SIP/SIPEngine.cpp
View File

@@ -1150,28 +1150,48 @@ SIPState SIPEngine::MOSMSWaitForSubmit()
{
LOG(INFO) << "user " << mSIPUsername << " state " << mState;
try {
osip_message_t * ok = gSIPInterface.read(mCallID, gConfig.getNum("SIP.Timer.A"));
// That should never return NULL.
Timeval timeout(gConfig.getNum("SIP.Timer.B"));
assert(mINVITE);
osip_message_t *ok = NULL;
while (!timeout.passed()) {
try {
// SIPInterface::read will throw SIPTIimeout if it times out.
// It should not return NULL.
ok = gSIPInterface.read(mCallID, gConfig.getNum("SIP.Timer.A"));
}
catch (SIPTimeout& e) {
LOG(NOTICE) << "SIP MESSAGE packet to " << mProxyIP << ":" << mProxyPort << " timedout; resending";
gSIPInterface.write(&mProxyAddr,mINVITE);
continue;
}
assert(ok);
if((ok->status_code==200) || (ok->status_code==202) ) {
mState = Cleared;
LOG(INFO) << "successful";
LOG(INFO) << "successful SIP MESSAGE SMS submit to " << mProxyIP << ":" << mProxyPort << ": " << mINVITE;
break;
}
//demonstrate that these are not forwarded correctly
if (ok->status_code >= 400){
mState = Fail;
LOG (ALERT) << "SIP MESSAGE rejected: " << ok->status_code << " " << ok->reason_phrase;
break;
}
// RFC-3428 does not use 1xx reponses so we won't look for them.
LOG(WARNING) << "unhandled response " << ok->status_code;
osip_message_free(ok);
}
catch (SIPTimeout& e) {
LOG(ALERT) << "SIP MESSAGE timed out; is the SMS server " << mProxyIP << ":" << mProxyPort << " OK?";
mState = Fail;
if (!ok) {
LOG(ALERT) << "SIP MESSAGE timed out; is the smqueue server " << mProxyIP << ":" << mProxyPort << " OK?";
throw SIPTimeout();
}
osip_message_free(ok);
return mState;
}
SIPState SIPEngine::MTSMSSendOK()
{
LOG(INFO) << "user " << mSIPUsername << " state " << mState;