public/AutoPatch
4
Fork 0
Code Activity

Updated to support actual D-BUS interface

Browse source
This commit is contained in:
R3ABM Artem 2016-04-04 23:22:28 +03:00
parent 660133c812
commit 9c4c356a3d
9 changed files with 103 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

63
SVXLink/echolink/BrandMeisterBridge.cpp
View file

@ -6,34 +6,59 @@
#include <syslog.h>
#include <stdio.h>
#define ECHOLINK_DEFAULT_USER_CALL "N0CALL Unknown call"
#define ECHOLINK_DEFAULT_USER_NUMBER 1
#define ECHOLINK_DEFAULT_CORD_NUMBER 10
#define REGISTRY_CONFIGURATION_FILE "/opt/BrandMeister/Registry.cnf"
BrandMeisterBridge::BrandMeisterBridge() :
proxy(ECHOLINK_DEFAULT_CORD_NUMBER),
store(REGISTRY_CONFIGURATION_FILE),
talker(NULL)
#define DELETE(object) \
if (object) \
delete object;
BrandMeisterBridge::BrandMeisterBridge()
{
proxy = NULL;
store = NULL;
talker = NULL;
}
BrandMeisterBridge::~BrandMeisterBridge()
{
DELETE(proxy);
DELETE(store);
free(talker);
}
// Interface methods for ModuleEchoLink
void BrandMeisterBridge::setProxyConfiguration(const char* configuration)
{
char* pointer = const_cast<char*>(configuration);
uint32_t network = strtol(pointer + 0, &pointer, 10);
uint32_t link = strtol(pointer + 1, &pointer, 10);
proxy = new PatchCordProxy(network, link);
}
void BrandMeisterBridge::setStoreConfiguration(const char* configuration)
{
store = new UserDataStore(configuration);
}
const char* BrandMeisterBridge::getTalker()
{
if ((proxy == NULL) ||
(store == NULL))
{
syslog(LOG_ERR, "BrandMeister bridge is not configured");
return ECHOLINK_DEFAULT_USER_CALL;
}
free(talker);
uint32_t number = proxy.getTalkerID();
uint32_t number = proxy->getTalkerID();
char call[LONG_CALLSIGN_LENGTH];
char text[SLOW_DATA_TEXT_LENGTH];
if ((number != 0) &&
(store.getCredentialsForID(number, call, text)))
(store->getCredentialsForID(number, call, text)))
{
asprintf(&talker, "%s %s", call, text);
return talker;
@ -45,6 +70,13 @@ const char* BrandMeisterBridge::getTalker()
void BrandMeisterBridge::setTalker(const char* call, const char* name)
{
if ((proxy == NULL) ||
(store == NULL))
{
syslog(LOG_ERR, "BrandMeister bridge is not configured");
return;
}
if (*call == '*')
{
// Do not process conference call-sign
@ -61,12 +93,12 @@ void BrandMeisterBridge::setTalker(const char* call, const char* name)
call = buffer;
}
uint32_t number = store.getPrivateIDForCall(call);
uint32_t number = store->getPrivateIDForCall(call);
if (number == 0)
number = ECHOLINK_DEFAULT_USER_NUMBER;
syslog(LOG_INFO, "Set talker ID to %d for call-sign %s", number, call);
proxy.setTalkerID(number);
proxy->setTalkerID(number);
}
void BrandMeisterBridge::handleChatMessage(const char* text)
@ -76,6 +108,13 @@ void BrandMeisterBridge::handleChatMessage(const char* text)
// UB3AMO Moscow T I N A O
// ->UA0LQE-L USSURIISK
if ((proxy == NULL) ||
(store == NULL))
{
syslog(LOG_ERR, "BrandMeister bridge is not configured");
return;
}
if (strncmp(text, "CONF ", 5) == 0)
{
const char* delimiter = strstr(text, "\n->");
@ -88,7 +127,7 @@ void BrandMeisterBridge::handleChatMessage(const char* text)
{
uint32_t number = ECHOLINK_DEFAULT_USER_NUMBER;
syslog(LOG_INFO, "Set talker ID to %d (call-sign was not fit into chat message)", number);
proxy.setTalkerID(number);
proxy->setTalkerID(number);
}
}
}