laforge
/
openbts-osmo
Archived
1
0
Fork 0

Other USSD code beautification and fixes.

This commit is contained in:
Alexander Chemeris 2010-09-09 18:22:55 +04:00
parent 9f707665ba
commit a2298288fe
2 changed files with 8 additions and 6 deletions

View File

@ -801,6 +801,7 @@ void MOTestHandler::run()
}
else
{
USSDString = "";
messageType = USSDData::release;
}
@ -848,7 +849,7 @@ void MOHttpHandler::run()
if (!wget) {
LOG(NOTICE) << "cannot open wget with " << command;
USSDString = "cannot open wget";
messageType = USSDData::release;
messageType = USSDData::error;
}
fgets (mystring , 182 , wget);
LOG(NOTICE) << "wget response " << mystring;
@ -1100,7 +1101,7 @@ void Control::resolveIMSI(L3MobileIdentity& mobileIdentity, LogicalChannel* LCH
}
}
bool USSDMatchHandler(const std::string &handlerName, const std::string &ussdString)
bool Control::USSDMatchHandler(const std::string &handlerName, const std::string &ussdString)
{
std::string handlerKeyName("USSD.Handler.");
handlerKeyName += handlerName;

View File

@ -392,12 +392,13 @@ class USSDData {
release
};
private:
protected:
ThreadSemaphore mSemWaitMS;
ThreadSemaphore mSemWaitNW;
USSDMessageType mType; // USSD message type
std::string mUSSDString; // USSD message string
ThreadSemaphore mSemWaitNW;
ThreadSemaphore mSemIncomingData; ///< External entity has sent us some data
USSDMessageType mType; ///< USSD message type
std::string mUSSDString; ///< USSD message string
public: