Skip to content

Add and remove talkgroups via DTMF #613

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dh0dm wants to merge 9 commits into
base: master
Choose a base branch
from
Open

Add and remove talkgroups via DTMF #613

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
ba11808
Initial commit
Aug 23, 2022
d0923cf
Merge branch 'upstream'
bitcycle Aug 24, 2022
e026792
Merge branch 'upstream'
bitcycle Aug 26, 2022
fb4611c
Merge branch 'upstream'
dh0dm Jan 22, 2023
2ed3d1e
remove temp monitored tg from monitor
bitcycle Jan 31, 2023
341452d
make log entry for removing a temp tg consitent
bitcycle Feb 1, 2023
6afb3b6
add a second temp tg monitor (10 years timeout)
bitcycle Feb 1, 2023
eed93ba
add configuration variable for long monitor timeout
dh0dm Feb 11, 2023
80ecc7b
cleanup
dh0dm Feb 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 44 additions & 6 deletions src/svxlink/svxlink/ReflectorLogic.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,8 @@ ReflectorLogic::ReflectorLogic(void)
m_tg_local_activity(false), m_last_qsy(0), m_logic_con_in_valve(0),
m_mute_first_tx_loc(true), m_mute_first_tx_rem(false),
m_tmp_monitor_timer(1000, Async::Timer::TYPE_PERIODIC),
m_tmp_monitor_timeout(DEFAULT_TMP_MONITOR_TIMEOUT), m_use_prio(true),
m_tmp_monitor_timeout(DEFAULT_TMP_MONITOR_TIMEOUT),
m_tmp_monitor_timeout_long(DEFAULT_TMP_MONITOR_TIMEOUT_LONG), m_use_prio(true),
m_qsy_pending_timer(-1), m_verbose(true)
{
m_reconnect_timer.expired.connect(
Expand Down Expand Up @@ -400,6 +401,7 @@ bool ReflectorLogic::initialize(Async::Config& cfgobj, const std::string& logic_
}

cfg().getValue(name(), "TMP_MONITOR_TIMEOUT", m_tmp_monitor_timeout);
cfg().getValue(name(), "TMP_MONITOR_TIMEOUT_LONG", m_tmp_monitor_timeout_long);

std::string node_info_file;
if (cfg().getValue(name(), "NODE_INFO_FILE", node_info_file))
Expand Down Expand Up @@ -526,11 +528,18 @@ void ReflectorLogic::remoteCmdReceived(LogicBase* src_logic,
processEvent(std::string("command_failed ") + cmd);
}
}
else if (cmd[0] == '4') // Temporarily monitor talk group
{
else if (cmd[0] == '4' || cmd[0] == '5') // Temporarily monitor talk group
{
int monitor_timeout = m_tmp_monitor_timeout;
if (cmd[0] == '5')
{
monitor_timeout = m_tmp_monitor_timeout_long;
}


std::ostringstream os;
const std::string subcmd(cmd.substr(1));
if ((m_tmp_monitor_timeout > 0) && !subcmd.empty())
if ((monitor_timeout > 0) && !subcmd.empty())
{
istringstream is(subcmd);
uint32_t tg = 0;
Expand All @@ -544,7 +553,7 @@ void ReflectorLogic::remoteCmdReceived(LogicBase* src_logic,
std::cout << name() << ": Refresh temporary monitor for TG #"
<< tg << std::endl;
// NOTE: (*it).timeout is mutable
(*it).timeout = m_tmp_monitor_timeout;
(*it).timeout = monitor_timeout;
os << "tmp_monitor_add " << tg;
}
else
Expand All @@ -560,7 +569,7 @@ void ReflectorLogic::remoteCmdReceived(LogicBase* src_logic,
std::cout << name() << ": Add temporary monitor for TG #"
<< tg << std::endl;
MonitorTgEntry mte(tg);
mte.timeout = m_tmp_monitor_timeout;
mte.timeout = monitor_timeout;
m_monitor_tgs.insert(mte);
sendMsg(MsgTgMonitor(std::set<uint32_t>(
m_monitor_tgs.begin(), m_monitor_tgs.end())));
Expand All @@ -583,6 +592,35 @@ void ReflectorLogic::remoteCmdReceived(LogicBase* src_logic,
}
processEvent(os.str());
}
else if (cmd[0] == '6') // remove temp tg from monitor
{
std::ostringstream os;
const std::string subcmd(cmd.substr(1));
if (!subcmd.empty())
{
istringstream is(subcmd);
uint32_t tg = 0;
if (is >> tg)
{
const MonitorTgsSet::iterator it = m_monitor_tgs.find(tg);
if (it != m_monitor_tgs.end())
{
m_monitor_tgs.erase(it);
std::cout << name() << ": Temporary monitor timeout for TG #"
<< tg << std::endl;
sendMsg(MsgTgMonitor(std::set<uint32_t>(
m_monitor_tgs.begin(), m_monitor_tgs.end())));
// os << "removing tg from monitor: " << cmd;
}
else
{
std::cout << name() << ": Could not remove TG #"
<< tg << "from monitor - not monitored" << std::endl;
}
}
// processEvent(os.str()); no tcl processing for now
}
}
else
{
processEvent(std::string("unknown_command ") + cmd);
Expand Down
2 changes: 2 additions & 0 deletions src/svxlink/svxlink/ReflectorLogic.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,7 @@ class ReflectorLogic : public LogicBase
static const unsigned TCP_HEARTBEAT_RX_CNT_RESET = 15;
static const unsigned DEFAULT_TG_SELECT_TIMEOUT = 30;
static const int DEFAULT_TMP_MONITOR_TIMEOUT = 3600;
static const int DEFAULT_TMP_MONITOR_TIMEOUT_LONG = 0x12cc0300; //10 years

std::string m_reflector_host;
FramedTcpClient m_con;
Expand Down Expand Up @@ -253,6 +254,7 @@ class ReflectorLogic : public LogicBase
bool m_mute_first_tx_rem;
Async::Timer m_tmp_monitor_timer;
int m_tmp_monitor_timeout;
int m_tmp_monitor_timeout_long;
bool m_use_prio;
Async::Timer m_qsy_pending_timer;
bool m_verbose;
Expand Down