Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

small bug fixes from last patch

git-svn-id: http://wush.net/svn/range/software/public/openbts/trunk@6759 19bc5d8c-e614-43d4-8b26-e1612bc8e597
  • Loading branch information...
commit 319a699fb9d3f7dff8b18223906321121128cc02 1 parent 5433fe9
kurtis.heimerl authored
View
2  Transceiver52M/runTransceiver.cpp
@@ -50,7 +50,7 @@
std::vector<std::string> configurationCrossCheck(const std::string& key);
static const char *cOpenBTSConfigEnv = "OpenBTSConfigFile";
// Load configuration from a file.
-ConfigurationTable gConfig(getenv(cOpenBTSConfigEnv)?getenv(cOpenBTSConfigEnv):CONFIGDB,"OpenBTS", getConfigurationKeys());
+ConfigurationTable gConfig(getenv(cOpenBTSConfigEnv)?getenv(cOpenBTSConfigEnv):CONFIGDB,"transceiver", getConfigurationKeys());
volatile bool gbShutdown = false;
View
2  TransceiverRAD1/runTransceiver.cpp
@@ -33,7 +33,7 @@ using namespace std;
std::vector<std::string> configurationCrossCheck(const std::string& key);
static const char *cOpenBTSConfigEnv = "OpenBTSConfigFile";
// Load configuration from a file.
-ConfigurationTable gConfig(getenv(cOpenBTSConfigEnv)?getenv(cOpenBTSConfigEnv):"/etc/OpenBTS/OpenBTS.db","OpenBTS", getConfigurationKeys());
+ConfigurationTable gConfig(getenv(cOpenBTSConfigEnv)?getenv(cOpenBTSConfigEnv):"/etc/OpenBTS/OpenBTS.db","transceiver", getConfigurationKeys());
FactoryCalibration gFactoryCalibration;
volatile bool gbShutdown = false;
View
9 apps/OpenBTS.cpp
@@ -130,9 +130,12 @@ pid_t gTransceiverPid = 0;
void startTransceiver()
{
- // kill any stray transceiver process
- //don't do this if we want to run two of them -kurtis
- if (system("killall transceiver 2>/dev/null")) {}
+ //if local kill the process currently listening on this port
+ char killCmd[32];
+ if (gConfig.getStr("TRX.IP") == "127.0.0.1"){
+ sprintf(killCmd,"fuser -k -n udp %d",(int)gConfig.getNum("TRX.Port"));
+ if (system(killCmd)) {}
+ }
// Start the transceiver binary, if the path is defined.
// If the path is not defined, the transceiver must be started by some other process.
Please sign in to comment.
Something went wrong with that request. Please try again.