diff --git a/ASN/makefile b/ASN/makefile index 4da1ee8..e2b56c0 100644 --- a/ASN/makefile +++ b/ASN/makefile @@ -4916,7 +4916,7 @@ 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 $(ASN_MODULE_SOURCES) + #rm -f $(ASN_MODULE_HEADERS) + #rm -f $(ASN_CONVERTER_SOURCES) $(ASN_CONVERTER_HEADERS) rm -f Makefile.am.sample diff --git a/README.md b/README.md index 74b0bad..5aed79a 100644 --- a/README.md +++ b/README.md @@ -3,3 +3,11 @@ 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: +Run ./install_dependences.sh before installation + + +./autogen.sh +./configure +make +sudo make install diff --git a/SGSNGGSN/Sgsn.cpp b/SGSNGGSN/Sgsn.cpp index 74dd92c..fe8b9dd 100644 --- a/SGSNGGSN/Sgsn.cpp +++ b/SGSNGGSN/Sgsn.cpp @@ -124,7 +124,7 @@ void SgsnInfo::sirm() { std::ostringstream ss; sgsnInfoDump(this,ss); - SGSNLOG("Removing SgsnInfo:"<19)||(namelen<18)) { LOG(WARNING) << "INVITE with malformed username \"" << IMSI << "\""; - return false; + return nullptr; } // Skip first 4 char "IMSI". return IMSI+4; diff --git a/SMS/SMSMessages.cpp b/SMS/SMSMessages.cpp index 2b33d01..adbc6d3 100644 --- a/SMS/SMSMessages.cpp +++ b/SMS/SMSMessages.cpp @@ -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; diff --git a/UMTS/UMTSRadioModem.h b/UMTS/UMTSRadioModem.h index 82df8a4..07bc8d0 100644 --- a/UMTS/UMTSRadioModem.h +++ b/UMTS/UMTSRadioModem.h @@ -178,7 +178,7 @@ class RadioModem friend void *RACHLoopAdapter(RadioModem*); friend void *DCHLoopAdapter(DCHLoopInfo*); - static const float mRACHThreshold = 10.0; + static constexpr float mRACHThreshold = 10.0; private: diff --git a/install_dependences.sh b/install_dependences.sh new file mode 100755 index 0000000..cf7d884 --- /dev/null +++ b/install_dependences.sh @@ -0,0 +1,11 @@ +sudo apt-get install git autoconf libtool libtool-bin gpp g++ libzmq3-dev pkg-config libosip2-dev libortp-dev libusb-dev libusb-1.0-0-dev libreadline-dev libsqlite3-dev libuhd-dev -y + +git submodule init +git submodule update + +tar -xvzf asn1c-0.9.23.tar.gz +cd ./vlm-asn1c-0959ffb/ +./configure +make +sudo make install +cd ../