public/AutoPatch
4
Fork 0
Code Activity

Fixes

Browse source
This commit is contained in:
Artem Prilutskiy 2019-02-28 21:52:11 +03:00
parent dd0a950616
commit ab7b86dd44
4 changed files with 32 additions and 37 deletions
SVXLink/echolink
BrandMeisterBridge.cpp

18
SVXLink/echolink/BrandMeisterBridge.cpp
View file

@ -1,4 +1,4 @@
// Copyright 2015 by Artem Prilutskiy
// Copyright 2015-2019 by Artem Prilutskiy
#include "BrandMeisterBridge.h"
#include <string.h>
@ -9,6 +9,10 @@
#define ECHOLINK_DEFAULT_USER_CALL "N0CALL Unknown call"
#define ECHOLINK_DEFAULT_USER_NUMBER 1
#define CALL_BUFFER_SIZE 16
#define TEXT_BUFFER_SIZE 48
#define TALKER_BUFFER_SIZE 80
#define DELETE(object) \
if (object) \
delete object;
@ -17,7 +21,7 @@ BrandMeisterBridge::BrandMeisterBridge()
{
proxy = NULL;
handle = NULL;
talker = NULL;
talker = (char*)malloc(TALKER_BUFFER_SIZE);
unknown = ECHOLINK_DEFAULT_USER_NUMBER;
}
@ -57,19 +61,19 @@ const char* BrandMeisterBridge::getTalker()
return ECHOLINK_DEFAULT_USER_CALL;
}
free(talker);
uint32_t number = proxy->getTalkerID();
char call[16];
char text[48];
char call[CALL_BUFFER_SIZE];
char text[TEXT_BUFFER_SIZE];
if ((number != 0) &&
(proxy->getCredentialsForID(number, call, text)))
{
asprintf(&talker, "%s %s", call, text);
snprintf(talker, TALKER_BUFFER_SIZE, "%s %s", call, text);
return talker;
}
asprintf(&talker, "DMR ID: %d", number);
snprintf(talker, TALKER_BUFFER_SIZE, "DMR ID: %d", number);
return talker;
}