picked fixes from @KonstantinZavertkin's fork

This commit is contained in:
Alister Amo 2019-02-13 03:50:29 +01:00
parent 5f087a9342
commit 5a9b3ef2e2
6 changed files with 7 additions and 8 deletions

View File

@ -4916,7 +4916,4 @@ check: ${TARGET}
@echo ================
distclean: clean
rm -f $(ASN_MODULE_SOURCES)
rm -f $(ASN_MODULE_HEADERS)
rm -f $(ASN_CONVERTER_SOURCES) $(ASN_CONVERTER_HEADERS)
rm -f Makefile.am.sample

View File

@ -3,3 +3,5 @@ Welcome to the OpenBTS-UMTS source code
For information on supported hardware, and build, install, setup and run instructions see [the wiki page](http://openbts.org/w/index.php/OpenBTS-UMTS).
Notes for this fork: You can run ./install_dependences.sh to get dependencies satisfied before installation.

View File

@ -124,7 +124,7 @@ void SgsnInfo::sirm()
{
std::ostringstream ss;
sgsnInfoDump(this,ss);
SGSNLOG("Removing SgsnInfo:"<<ss);
SGSNLOG(string("Removing SgsnInfo: ") + ss.str());
sSgsnInfoList.remove(this);
delete this;
}
@ -221,7 +221,7 @@ static void GmmRemove(GmmInfo *gmm)
{
std::ostringstream ss;
gmmInfoDump(gmm,ss,0);
SGSNLOG("Removing gmm:"<<ss);
SGSNLOG(string("Removing gmm: ") + ss.str());
SgsnInfo *si;
RN_FOR_ALL(SgsnInfoList_t,sSgsnInfoList,si) {
// The second test here should be redundant.

View File

@ -287,7 +287,7 @@ const char* extractIMSI(const osip_message_t *msg)
unsigned namelen = strlen(IMSI);
if ((namelen>19)||(namelen<18)) {
LOG(WARNING) << "INVITE with malformed username \"" << IMSI << "\"";
return false;
return nullptr;
}
// Skip first 4 char "IMSI".
return IMSI+4;

View File

@ -75,7 +75,7 @@ RPData *SMS::hex2rpdata(const char *hexstring)
BitVector RPDUbits(strlen(hexstring)*4);
if (!RPDUbits.unhex(hexstring)) {
return false;
return nullptr;
}
LOG(DEBUG) << "SMS RPDU bits: " << RPDUbits;

View File

@ -178,7 +178,7 @@ public:
friend void *RACHLoopAdapter(RadioModem*);
friend void *DCHLoopAdapter(DCHLoopInfo*);
static const float mRACHThreshold = 10.0;
static constexpr float mRACHThreshold = 10.0;
private: