public/AutoPatch
4
Fork 0
Code Activity

Merge branch 'master' of https://code.brandmeister.network/r3abm/AutoPatch

Browse source
This commit is contained in:
Artem Prilutskiy 2018-03-26 11:38:53 +03:00
commit a89bc58ede
6 changed files with 218 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
SVXLink/ModuleEchoLink.conf
View file

@ -9,8 +9,8 @@ TIMEOUT=0
#REJECT_OUTGOING=^()$
#ACCEPT_OUTGOING=^(.*)$
SERVERS=servers.echolink.org
CALLSIGN=R3ABM-L
PASSWORD=rqY69MWd
CALLSIGN=callsign
PASSWORD=password
SYSOPNAME=*DSTAR.SU DMR Bridge*
LOCATION=Moscow, Russia
MAX_QSOS=10

3
SVXLink/README.md
View file

@ -69,6 +69,7 @@ And add this ***BEFORE***:
```
bridge.handleChatMessage(escaped.c_str());
```
This code will pass chat messages of conference server to bridge to find talker of transmission on conference call.
Find this line (*void ModuleEchoLink::broadcastTalkerStatus(void)*):
@ -79,6 +80,7 @@ And add this ***BEFORE***:
```
const char* sysop_name = bridge.getTalker();
```
This code will pass call of transmisson to bridge on call of direct link.
Find this text (*void ModuleEchoLink::broadcastTalkerStatus(void)*):
@ -89,6 +91,7 @@ And add this ***AFTER***:
```
bridge.setTalker(talker->remoteCallsign().c_str(), talker->remoteName().c_str());
```
This code will pass call of transmisson from bridge to echolink.
## How to configure:

13
SVXLink/Test.cpp
View file

@ -1,13 +0,0 @@
#include <stdio.h>
#include "BrandMeisterBridge.h"
int main(int argc, const char* argv[])
{
BrandMeisterBridge bridge;
// Test 1
printf("Talker: %s\n", bridge.getTalker());
// Test 2
bridge.setTalker("R3ABM", "Artem");
return 0;
};

2
SVXLink/build.sh
View file

@ -1,7 +1,7 @@
#!/bin/bash
PREFIX=/opt/SVXLink
sudo apt-get install libsigc++-2.0-dev libpopt-dev libgcrypt11-dev libasound2-dev libgsm1-dev
sudo apt-get install libsigc++-2.0-dev libpopt-dev libgcrypt11-dev libasound2-dev libgsm1-dev tcl-dev libspeex-dev libopus-dev
sudo adduser svxlink --system --home $PREFIX --shell /bin/false --disabled-login --disabled-password
sudo addgroup svxlink

172
SVXLink/echolink/ModuleEchoLink.cpp
View file

@ -39,6 +39,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#include <cstdlib>
#include <vector>
#include <string.h>
/****************************************************************************
*
@ -58,6 +59,9 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#include <common.h>
#include <AsyncPty.h>
#include <AsyncPtyStreamBuf.h>
/****************************************************************************
*
* Local Includes
@ -158,7 +162,7 @@ ModuleEchoLink::ModuleEchoLink(void *dl_handle, Logic *logic,
listen_only_valve(0), selector(0), num_con_max(0), num_con_ttl(5*60),
num_con_block_time(120*60), num_con_update_timer(0), reject_conf(false),
autocon_echolink_id(0), autocon_time(DEFAULT_AUTOCON_TIME),
autocon_timer(0), proxy(0)
autocon_timer(0), proxy(0), pty(0)
{
cout << "\tModule EchoLink v" MODULE_ECHOLINK_VERSION " starting...\n";
@ -470,6 +474,21 @@ bool ModuleEchoLink::initialize(void)
mem_fun(*this, &ModuleEchoLink::checkAutoCon));
}
string pty_path;
if(cfg().getValue(cfgName(), "COMMAND_PTY", pty_path))
{
pty = new Pty(pty_path);
if (!pty->open())
{
cerr << "*** ERROR: Could not open echolink PTY "
<< pty_path << " as specified in configuration variable "
<< name() << "/" << "COMMAND_PTY" << endl;
return false;
}
pty->dataReceived.connect(
sigc::mem_fun(*this, &ModuleEchoLink::onCommandPtyInput));
}
return true;
} /* ModuleEchoLink::initialize */
@ -510,6 +529,85 @@ void ModuleEchoLink::logicIdleStateChanged(bool is_idle)
*
****************************************************************************/
void ModuleEchoLink::handlePtyCommand(const std::string &full_command)
{
istringstream is(full_command);
string command;
if (!(is >> command))
{
return;
}
if (command == "KILL") // Disconnect active talker
{
if (talker == 0)
{
cout << "EchoLink: Trying to KILL, but no active talker" << endl;
}
else
{
cout << "EchoLink: Killing talker: " << talker->remoteCallsign() << endl;
talker->disconnect();
}
}
else if (command == "DISC") // Disconnect client by callsign
{
string callsign;
if (!(is >> callsign))
{
cerr << "*** WARNING: Malformed EchoLink PTY disconnect command: \""
<< full_command << "\"" << endl;
return;
}
vector<QsoImpl *>::iterator it;
for (it = qsos.begin(); it != qsos.end(); ++it)
{
if ((*it)->remoteCallsign() == callsign)
{
cout << "EchoLink: Disconnecting user "
<< (*it)->remoteCallsign() << endl;
(*it)->disconnect();
return;
}
}
cerr << "*** WARNING: Could not find EchoLink user \"" << callsign
<< "\" in PTY command \"DISC\"" << endl;
}
else
{
cerr << "*** WARNING: Unknown EchoLink PTY command received: \""
<< full_command << "\"" << endl;
}
} /* ModuleEchoLink::handlePtyCommand */
void ModuleEchoLink::onCommandPtyInput(const void *buf, size_t count)
{
const char *buffer = reinterpret_cast<const char*>(buf);
for (size_t i=0; i<count; ++i)
{
char ch = buffer[i];
switch (ch)
{
case '\n': // Execute command on NL
handlePtyCommand(command_buf);
command_buf.clear();
break;
case '\r': // Ignore CR
break;
default: // Append character to command buffer
if (command_buf.size() >= 256) // Prevent cmd buffer growing too big
{
command_buf.clear();
}
command_buf += ch;
break;
}
}
} /* ModuleEchoLink::onCommandPtyInput */
void ModuleEchoLink::moduleCleanup(void)
{
@ -907,6 +1005,34 @@ void ModuleEchoLink::onError(const string& msg)
} /* onError */
/*
*----------------------------------------------------------------------------
* Method: clientListChanged
* Purpose: Called on connect or disconnect of a remote client to send an
* event to list the connected stations.
* Input: None
* Output: None
* Author: Wim Fournier / PH7WIM
* Created: 2016-01-11
* Remarks:
* Bugs:
*----------------------------------------------------------------------------
*/
void ModuleEchoLink::clientListChanged(void)
{
stringstream ss;
ss << "client_list_changed [list";
for (vector<QsoImpl *>::iterator it = qsos.begin(); it != qsos.end(); ++it)
{
if ((*it)->currentState() != Qso::STATE_DISCONNECTED)
{
ss << " " << (*it)->remoteCallsign();
}
}
ss << "]";
processEvent(ss.str());
} /* clientListChanged */
/*
*----------------------------------------------------------------------------
@ -990,6 +1116,8 @@ void ModuleEchoLink::onIncomingConnection(const IpAddress& ip,
qso->stateChange.connect(mem_fun(*this, &ModuleEchoLink::onStateChange));
qso->chatMsgReceived.connect(
mem_fun(*this, &ModuleEchoLink::onChatMsgReceived));
qso->infoMsgReceived.connect(
mem_fun(*this, &ModuleEchoLink::onInfoMsgReceived));
qso->isReceiving.connect(mem_fun(*this, &ModuleEchoLink::onIsReceiving));
qso->audioReceivedRaw.connect(
mem_fun(*this, &ModuleEchoLink::audioFromRemoteRaw));
@ -1097,9 +1225,15 @@ void ModuleEchoLink::onStateChange(QsoImpl *qso, Qso::State qso_state)
broadcastTalkerStatus();
updateDescription();
clientListChanged();
break;
}
case Qso::STATE_CONNECTED:
updateEventVariables();
clientListChanged();
break;
default:
updateEventVariables();
break;
@ -1151,6 +1285,37 @@ void ModuleEchoLink::onChatMsgReceived(QsoImpl *qso, const string& msg)
} /* onChatMsgReceived */
/*
*----------------------------------------------------------------------------
* Method: onInfoMsgReceived
* Purpose: Called by the EchoLink::Qso object when a info message has been
* received from the remote station.
* Input: qso - The QSO object
* msg - The received message
* Output: None
* Author: Tobias Blomberg / SM0SVX
* Created: 2017-05-13
* Remarks:
* Bugs:
*----------------------------------------------------------------------------
*/
void ModuleEchoLink::onInfoMsgReceived(QsoImpl *qso, const string& msg)
{
// Escape TCL control characters
string escaped(msg);
replaceAll(escaped, "\\", "\\\\");
replaceAll(escaped, "{", "\\{");
replaceAll(escaped, "}", "\\}");
stringstream ss;
// FIXME: This TCL specific code should not be here
ss << "info_received \"" << qso->remoteCallsign()
<< "\" [subst -nocommands -novariables {";
ss << escaped;
ss << "}]";
processEvent(ss.str());
} /* onInfoMsgReceived */
/*
*----------------------------------------------------------------------------
* Method: onIsReceiving
@ -1172,7 +1337,8 @@ void ModuleEchoLink::onIsReceiving(bool is_receiving, QsoImpl *qso)
// << (is_receiving ? "TRUE" : "FALSE") << endl;
stringstream ss;
ss << "is_receiving " << (is_receiving ? "1" : "0");
ss << "is_receiving " << (is_receiving ? "1" : "0")
<< " " << qso->remoteCallsign();
processEvent(ss.str());
if ((talker == 0) && is_receiving)
@ -1356,6 +1522,8 @@ void ModuleEchoLink::createOutgoingConnection(const StationData &station)
qso->stateChange.connect(mem_fun(*this, &ModuleEchoLink::onStateChange));
qso->chatMsgReceived.connect(
mem_fun(*this, &ModuleEchoLink::onChatMsgReceived));
qso->infoMsgReceived.connect(
mem_fun(*this, &ModuleEchoLink::onInfoMsgReceived));
qso->isReceiving.connect(mem_fun(*this, &ModuleEchoLink::onIsReceiving));
qso->audioReceivedRaw.connect(
mem_fun(*this, &ModuleEchoLink::audioFromRemoteRaw));

10
SVXLink/echolink/ModuleEchoLink.h
View file

@ -62,6 +62,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#include "version/SVXLINK.h"
#include "BrandMeisterBridge.h"
/****************************************************************************
*
* Forward declarations
@ -74,6 +75,7 @@ namespace Async
class AudioSplitter;
class AudioValve;
class AudioSelector;
class Pty;
};
namespace EchoLink
{
@ -152,9 +154,7 @@ class ModuleEchoLink : public Module
private:
BrandMeisterBridge bridge;
typedef enum
{
STATE_NORMAL,
@ -212,6 +212,8 @@ class ModuleEchoLink : public Module
int autocon_time;
Async::Timer *autocon_timer;
EchoLink::Proxy *proxy;
Async::Pty *pty;
std::string command_buf;
void moduleCleanup(void);
void activateInit(void);
@ -222,15 +224,19 @@ class ModuleEchoLink : public Module
void squelchOpen(bool is_open);
int audioFromRx(float *samples, int count);
void allMsgsWritten(void);
void handlePtyCommand(const std::string &full_command);
void onCommandPtyInput(const void *buf, size_t count);
void onStatusChanged(EchoLink::StationData::Status status);
void onStationListUpdated(void);
void onError(const std::string& msg);
void clientListChanged(void);
void onIncomingConnection(const Async::IpAddress& ip,
const std::string& callsign, const std::string& name,
const std::string& priv);
void onStateChange(QsoImpl *qso, EchoLink::Qso::State qso_state);
void onChatMsgReceived(QsoImpl *qso, const std::string& msg);
void onInfoMsgReceived(QsoImpl *qso, const std::string& msg);
void onIsReceiving(bool is_receiving, QsoImpl *qso);
void destroyQsoObject(QsoImpl *qso);