From d398a8ccae89c544fda86efb52f48ac677eae39a Mon Sep 17 00:00:00 2001
From: KonstantinZavertkin <kostyanz2595@gmail.com>
Date: Wed, 6 Jun 2018 15:48:57 +0300
Subject: [PATCH 1/2] Errors fixed and script for setting dependencies added

---
 ASN/makefile           |  6 +++---
 README.md              | 10 +++++++++-
 SGSNGGSN/Sgsn.cpp      |  4 ++--
 SIP/SIPInterface.cpp   |  2 +-
 SMS/SMSMessages.cpp    |  2 +-
 UMTS/UMTSRadioModem.h  |  2 +-
 install_dependences.sh | 11 +++++++++++
 7 files changed, 28 insertions(+), 9 deletions(-)
 create mode 100755 install_dependences.sh

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..f6cc1e2 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,13 @@
 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:"<<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.
diff --git a/SIP/SIPInterface.cpp b/SIP/SIPInterface.cpp
index f9dc59f..97f5307 100644
--- a/SIP/SIPInterface.cpp
+++ b/SIP/SIPInterface.cpp
@@ -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;
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..a1808db
--- /dev/null
+++ b/install_dependences.sh
@@ -0,0 +1,11 @@
+sudo apt-get install git autoconf libtool gpp g++ libzmq3-dev pkg-config libosip2-dev libortp-dev libusb-dev libusb-1.0-0-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 ../

From c68221bd142a2d1dacf2f937aa2de6dd303ded5e Mon Sep 17 00:00:00 2001
From: KonstantinZavertkin <kostyanz2595@gmail.com>
Date: Wed, 6 Jun 2018 17:27:30 +0300
Subject: [PATCH 2/2] Some fixes

---
 README.md              | 2 +-
 install_dependences.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index f6cc1e2..5aed79a 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,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).
 
diff --git a/install_dependences.sh b/install_dependences.sh
index a1808db..cf7d884 100755
--- a/install_dependences.sh
+++ b/install_dependences.sh
@@ -1,4 +1,4 @@
-sudo apt-get install git autoconf libtool gpp g++ libzmq3-dev pkg-config libosip2-dev libortp-dev libusb-dev libusb-1.0-0-dev libuhd-dev -y
+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