Timur Davydov has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-trx/+/42410?usp=email )
Change subject: transceiver: split control command handling from socket I/O
......................................................................
transceiver: split control command handling from socket I/O
- move control command parsing/response generation into ctrl_cmd_handle()
- keep ctrl_sock_handle_rx() focused on socket read/write
- make command input read-only where applicable
- switch response formatting from sprintf() to snprintf()
Change-Id: I5413aa511e951522270c75635e89448395fc429e
---
M Transceiver52M/Transceiver.cpp
M Transceiver52M/Transceiver.h
2 files changed, 67 insertions(+), 54 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/10/42410/1
diff --git a/Transceiver52M/Transceiver.cpp b/Transceiver52M/Transceiver.cpp
index f5ddd9b..928a30f 100644
--- a/Transceiver52M/Transceiver.cpp
+++ b/Transceiver52M/Transceiver.cpp
@@ -828,8 +828,8 @@
* @param params pointer to arguments, or NULL
* @return true if command matches, otherwise false
*/
-static bool match_cmd(char *buf,
- const char *cmd, char **params)
+static bool match_cmd(const char *buf,
+ const char *cmd, const char **params)
{
size_t cmd_len = strlen(cmd);
@@ -894,28 +894,10 @@
return -1;
}
-int Transceiver::ctrl_sock_handle_rx(int chan)
+int Transceiver::ctrl_cmd_handle(int chan, const char *buffer, char *response,
size_t response_size)
{
- ctrl_msg cmd_received;
- ctrl_msg cmd_to_send;
- char *buffer = cmd_received.data;
- char *response = cmd_to_send.data;
- char *command, *params;
- int msgLen;
- ctrl_sock_state& s = mCtrlSockets[chan];
-
- /* Attempt to read from control socket */
- msgLen = read(s.conn_bfd.fd, buffer, sizeof(cmd_received.data)-1);
- if (msgLen < 0 && errno == EAGAIN)
- return 0; /* Try again later */
- if (msgLen <= 0) {
- LOGCHAN(chan, DTRXCTRL, NOTICE) << "mCtrlSockets read(" << s.conn_bfd.fd
<< ") failed: " << msgLen;
- return -EIO;
- }
-
-
- /* Zero-terminate received string */
- buffer[msgLen] = '\0';
+ const char *command;
+ const char *params;
/* Verify a command signature */
if (strncmp(buffer, "CMD ", 4)) {
@@ -929,12 +911,12 @@
if (match_cmd(command, "POWEROFF", NULL)) {
stop();
- sprintf(response,"RSP POWEROFF 0");
+ snprintf(response, response_size, "RSP POWEROFF 0");
} else if (match_cmd(command, "POWERON", NULL)) {
if (!start()) {
- sprintf(response,"RSP POWERON 1");
+ snprintf(response, response_size, "RSP POWERON 1");
} else {
- sprintf(response,"RSP POWERON 0");
+ snprintf(response, response_size, "RSP POWERON 0");
for (int i = 0; i < 8; i++) {
for (int j = 0; j < 8; j++)
mHandover[i][j] = false;
@@ -944,62 +926,62 @@
unsigned ts = 0, ss = 0;
sscanf(params, "%u %u", &ts, &ss);
if (ts > 7 || ss > 7) {
- sprintf(response, "RSP HANDOVER 1 %u %u", ts, ss);
+ snprintf(response, response_size, "RSP HANDOVER 1 %u %u", ts, ss);
} else {
mHandover[ts][ss] = true;
- sprintf(response, "RSP HANDOVER 0 %u %u", ts, ss);
+ snprintf(response, response_size, "RSP HANDOVER 0 %u %u", ts, ss);
}
} else if (match_cmd(command, "NOHANDOVER", ¶ms)) {
unsigned ts = 0, ss = 0;
sscanf(params, "%u %u", &ts, &ss);
if (ts > 7 || ss > 7) {
- sprintf(response, "RSP NOHANDOVER 1 %u %u", ts, ss);
+ snprintf(response, response_size, "RSP NOHANDOVER 1 %u %u", ts, ss);
} else {
mHandover[ts][ss] = false;
- sprintf(response, "RSP NOHANDOVER 0 %u %u", ts, ss);
+ snprintf(response, response_size, "RSP NOHANDOVER 0 %u %u", ts, ss);
}
} else if (match_cmd(command, "SETMAXDLY", ¶ms)) {
//set expected maximum time-of-arrival for Access Bursts
int maxDelay;
sscanf(params, "%d", &maxDelay);
mMaxExpectedDelayAB = maxDelay; // 1 GSM symbol is approx. 1 km
- sprintf(response,"RSP SETMAXDLY 0 %d",maxDelay);
+ snprintf(response, response_size,"RSP SETMAXDLY 0 %d",maxDelay);
} else if (match_cmd(command, "SETMAXDLYNB", ¶ms)) {
//set expected maximum time-of-arrival for Normal Bursts
int maxDelay;
sscanf(params, "%d", &maxDelay);
mMaxExpectedDelayNB = maxDelay; // 1 GSM symbol is approx. 1 km
- sprintf(response,"RSP SETMAXDLYNB 0 %d",maxDelay);
+ snprintf(response, response_size,"RSP SETMAXDLYNB 0 %d",maxDelay);
} else if (match_cmd(command, "SETRXGAIN", ¶ms)) {
int newGain;
sscanf(params, "%d", &newGain);
newGain = mRadioInterface->setRxGain(newGain, chan);
- sprintf(response,"RSP SETRXGAIN 0 %d",newGain);
+ snprintf(response, response_size,"RSP SETRXGAIN 0 %d",newGain);
} else if (match_cmd(command, "NOISELEV", NULL)) {
if (mOn) {
float lev = mStates[chan].mNoiseLev;
- sprintf(response,"RSP NOISELEV 0 %d",
+ snprintf(response, response_size,"RSP NOISELEV 0 %d",
(int) round(20.0 * log10(rxFullScale / lev)));
}
else {
- sprintf(response,"RSP NOISELEV 1 0");
+ snprintf(response, response_size,"RSP NOISELEV 1 0");
}
} else if (match_cmd(command, "SETPOWER", ¶ms)) {
int power;
sscanf(params, "%d", &power);
power = mRadioInterface->setPowerAttenuation(power, chan);
mStates[chan].mPower = power;
- sprintf(response, "RSP SETPOWER 0 %d", power);
+ snprintf(response, response_size, "RSP SETPOWER 0 %d", power);
} else if (match_cmd(command, "ADJPOWER", ¶ms)) {
int power, step;
sscanf(params, "%d", &step);
power = mStates[chan].mPower + step;
power = mRadioInterface->setPowerAttenuation(power, chan);
mStates[chan].mPower = power;
- sprintf(response, "RSP ADJPOWER 0 %d", power);
-} else if (match_cmd(command, "NOMTXPOWER", NULL)) {
+ snprintf(response, response_size, "RSP ADJPOWER 0 %d", power);
+ } else if (match_cmd(command, "NOMTXPOWER", NULL)) {
int power = mRadioInterface->getNominalTxPower(chan);
- sprintf(response, "RSP NOMTXPOWER 0 %d", power);
+ snprintf(response, response_size, "RSP NOMTXPOWER 0 %d", power);
} else if (match_cmd(command, "RXTUNE", ¶ms)) {
// tune receiver
int freqKhz;
@@ -1007,10 +989,10 @@
mRxFreq = (freqKhz + cfg->freq_offset_khz) * 1e3;
if (!mRadioInterface->tuneRx(mRxFreq, chan)) {
LOGCHAN(chan, DTRXCTRL, FATAL) << "RX failed to tune";
- sprintf(response,"RSP RXTUNE 1 %d",freqKhz);
+ snprintf(response, response_size, "RSP RXTUNE 1 %d", freqKhz);
}
else
- sprintf(response,"RSP RXTUNE 0 %d",freqKhz);
+ snprintf(response, response_size, "RSP RXTUNE 0 %d", freqKhz);
} else if (match_cmd(command, "TXTUNE", ¶ms)) {
// tune txmtr
int freqKhz;
@@ -1018,20 +1000,20 @@
mTxFreq = (freqKhz + cfg->freq_offset_khz) * 1e3;
if (!mRadioInterface->tuneTx(mTxFreq, chan)) {
LOGCHAN(chan, DTRXCTRL, FATAL) << "TX failed to tune";
- sprintf(response,"RSP TXTUNE 1 %d",freqKhz);
+ snprintf(response, response_size, "RSP TXTUNE 1 %d", freqKhz);
}
else
- sprintf(response,"RSP TXTUNE 0 %d",freqKhz);
+ snprintf(response, response_size, "RSP TXTUNE 0 %d", freqKhz);
} else if (match_cmd(command, "SETTSC", ¶ms)) {
// set TSC
unsigned TSC;
sscanf(params, "%u", &TSC);
if (TSC > 7) {
- sprintf(response, "RSP SETTSC 1 %d", TSC);
+ snprintf(response, response_size, "RSP SETTSC 1 %d", TSC);
} else {
LOGC(DTRXCTRL, NOTICE) << "Changing TSC from " << mTSC << " to " << TSC;
mTSC = TSC;
- sprintf(response,"RSP SETTSC 0 %d", TSC);
+ snprintf(response, response_size, "RSP SETTSC 0 %d", TSC);
}
} else if (match_cmd(command, "SETSLOT", ¶ms)) {
// set slot type
@@ -1040,12 +1022,12 @@
sscanf(params, "%d %d", ×lot, &corrCode);
if ((timeslot < 0) || (timeslot > 7)) {
LOGCHAN(chan, DTRXCTRL, NOTICE) << "bogus message on control interface";
- sprintf(response,"RSP SETSLOT 1 %d %d",timeslot,corrCode);
- return 0;
+ snprintf(response, response_size, "RSP SETSLOT 1 %d
%d",timeslot,corrCode);
+ return -EINVAL;
}
mStates[chan].chanType[timeslot] = (ChannelCombination) corrCode;
setModulus(timeslot, chan);
- sprintf(response,"RSP SETSLOT 0 %d %d",timeslot,corrCode);
+ snprintf(response, response_size,"RSP SETSLOT 0 %d %d",timeslot,corrCode);
} else if (match_cmd(command, "SETFORMAT", ¶ms)) {
// set TRXD protocol version
unsigned version_recv;
@@ -1054,30 +1036,60 @@
if (version_recv > TRX_DATA_FORMAT_VER) {
LOGCHAN(chan, DTRXCTRL, INFO) << "rejecting TRXD version " <<
version_recv
<< " in favor of " << TRX_DATA_FORMAT_VER;
- sprintf(response, "RSP SETFORMAT %u %u", TRX_DATA_FORMAT_VER,
version_recv);
+ snprintf(response, response_size, "RSP SETFORMAT %u %u",
TRX_DATA_FORMAT_VER, version_recv);
} else {
LOGCHAN(chan, DTRXCTRL, NOTICE) << "switching to TRXD version " <<
version_recv;
mVersionTRXD[chan] = version_recv;
- sprintf(response, "RSP SETFORMAT %u %u", version_recv, version_recv);
+ snprintf(response, response_size, "RSP SETFORMAT %u %u", version_recv,
version_recv);
}
} else if (match_cmd(command, "RFMUTE", ¶ms)) {
// (Un)mute RF TX and RX
unsigned mute;
sscanf(params, "%u", &mute);
mStates[chan].mMuted = mute ? true : false;
- sprintf(response, "RSP RFMUTE 0 %u", mute);
+ snprintf(response, response_size, "RSP RFMUTE 0 %u", mute);
} else if (match_cmd(command, "_SETBURSTTODISKMASK", ¶ms)) {
// debug command! may change or disappear without notice
// set a mask which bursts to dump to disk
int mask;
sscanf(params, "%d", &mask);
mWriteBurstToDiskMask = mask;
- sprintf(response,"RSP _SETBURSTTODISKMASK 0 %d",mask);
+ snprintf(response, response_size, "RSP _SETBURSTTODISKMASK 0 %d", mask);
} else {
LOGCHAN(chan, DTRXCTRL, NOTICE) << "bogus command " << command << " on
control interface.";
- sprintf(response,"RSP ERR 1");
+ snprintf(response, response_size, "RSP ERR 1");
}
+ return 0;
+}
+
+int Transceiver::ctrl_sock_handle_rx(int chan)
+{
+ int rc;
+ ctrl_msg cmd_received;
+ ctrl_msg cmd_to_send;
+ char *buffer = cmd_received.data;
+ char *response = cmd_to_send.data;
+ const size_t response_size = sizeof(cmd_to_send.data);
+ int msgLen;
+ ctrl_sock_state& s = mCtrlSockets[chan];
+
+ /* Attempt to read from control socket */
+ msgLen = read(s.conn_bfd.fd, buffer, sizeof(cmd_received.data)-1);
+ if (msgLen < 0 && errno == EAGAIN)
+ return 0; /* Try again later */
+ if (msgLen <= 0) {
+ LOGCHAN(chan, DTRXCTRL, NOTICE) << "mCtrlSockets read(" << s.conn_bfd.fd
<< ") failed: " << msgLen;
+ return -EIO;
+ }
+
+ /* Zero-terminate received string */
+ buffer[msgLen] = '\0';
+
+ rc = ctrl_cmd_handle(chan, buffer, response, response_size);
+ if (rc < 0)
+ return rc == -EINVAL ? 0 : rc; /* Ignore invalid values, but report other
errors */
+
LOGCHAN(chan, DTRXCTRL, INFO) << "response is '" << response << "'";
transceiver->ctrl_sock_send(cmd_to_send, chan);
return 0;
diff --git a/Transceiver52M/Transceiver.h b/Transceiver52M/Transceiver.h
index babe420..f25fd0b 100644
--- a/Transceiver52M/Transceiver.h
+++ b/Transceiver52M/Transceiver.h
@@ -147,7 +147,7 @@
LOOPBACK ///< similar go VII, used in loopback testing
} ChannelCombination;
-private:
+protected:
size_t mChans;
struct ctrl_msg {
char data[101];
@@ -217,6 +217,7 @@
int ctrl_sock_write(int chan);
void ctrl_sock_send(ctrl_msg& m, int chan);
/** drive handling of control messages from GSM core */
+ int ctrl_cmd_handle(int chan, const char* buffer, char *response, size_t
response_size);
int ctrl_sock_handle_rx(int chan);
--
To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/42410?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: osmo-trx
Gerrit-Branch: master
Gerrit-Change-Id: I5413aa511e951522270c75635e89448395fc429e
Gerrit-Change-Number: 42410
Gerrit-PatchSet: 1
Gerrit-Owner: Timur Davydov <[email protected]>
