public/tellusagent
4
Fork 0
Code Packages 1 Activity Actions

Update Rewind.h, TellusAgent.c

Browse source
This commit is contained in:
R3ABM Artem 2023-01-16 08:07:57 +00:00
parent 7c2ef72513
commit b02587fd94
2 changed files with 170 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

119
Rewind.h
View file

@ -21,6 +21,7 @@ extern "C"
#define REWIND_CLASS_SERVER_NOTICE 0x0200 #define REWIND_CLASS_SERVER_NOTICE 0x0200
#define REWIND_CLASS_DEVICE_DATA 0x0800 #define REWIND_CLASS_DEVICE_DATA 0x0800
#define REWIND_CLASS_APPLICATION 0x0900 #define REWIND_CLASS_APPLICATION 0x0900
#define REWIND_CLASS_TERMINAL 0x0a00
#define REWIND_CLASS_KAIROS_DATA (REWIND_CLASS_DEVICE_DATA + 0x00) #define REWIND_CLASS_KAIROS_DATA (REWIND_CLASS_DEVICE_DATA + 0x00)
#define REWIND_CLASS_HYTERA_DATA (REWIND_CLASS_DEVICE_DATA + 0x10) #define REWIND_CLASS_HYTERA_DATA (REWIND_CLASS_DEVICE_DATA + 0x10)
@ -30,6 +31,8 @@ extern "C"
#define REWIND_TYPE_CHALLENGE (REWIND_CLASS_REWIND_CONTROL + 2) #define REWIND_TYPE_CHALLENGE (REWIND_CLASS_REWIND_CONTROL + 2)
#define REWIND_TYPE_AUTHENTICATION (REWIND_CLASS_REWIND_CONTROL + 3) #define REWIND_TYPE_AUTHENTICATION (REWIND_CLASS_REWIND_CONTROL + 3)
#define REWIND_TYPE_REDIRECTION (REWIND_CLASS_REWIND_CONTROL + 8)
#define REWIND_TYPE_REPORT (REWIND_CLASS_SYSTEM_CONSOLE + 0) #define REWIND_TYPE_REPORT (REWIND_CLASS_SYSTEM_CONSOLE + 0)
#define REWIND_TYPE_BUSY_NOTICE (REWIND_CLASS_SERVER_NOTICE + 0) #define REWIND_TYPE_BUSY_NOTICE (REWIND_CLASS_SERVER_NOTICE + 0)
@ -43,14 +46,32 @@ extern "C"
#define REWIND_TYPE_PEER_DATA (REWIND_CLASS_HYTERA_DATA + 0) #define REWIND_TYPE_PEER_DATA (REWIND_CLASS_HYTERA_DATA + 0)
#define REWIND_TYPE_RDAC_DATA (REWIND_CLASS_HYTERA_DATA + 1) #define REWIND_TYPE_RDAC_DATA (REWIND_CLASS_HYTERA_DATA + 1)
#define REWIND_TYPE_MEDIA_DATA (REWIND_CLASS_HYTERA_DATA + 2) #define REWIND_TYPE_MEDIA_DATA (REWIND_CLASS_HYTERA_DATA + 2)
#define REWIND_TYPE_XNMS_DATA (REWIND_CLASS_HYTERA_DATA + 3)
#define REWIND_TYPE_SUBSCRIPTION (REWIND_CLASS_APPLICATION + 0x00) #define REWIND_TYPE_CONFIGURATION (REWIND_CLASS_APPLICATION + 0x00)
#define REWIND_TYPE_SUBSCRIPTION (REWIND_CLASS_APPLICATION + 0x01)
#define REWIND_TYPE_CANCELLING (REWIND_CLASS_APPLICATION + 0x02)
#define REWIND_TYPE_SESSION_POLL (REWIND_CLASS_APPLICATION + 0x03)
#define REWIND_TYPE_DMR_DATA_BASE (REWIND_CLASS_APPLICATION + 0x10) #define REWIND_TYPE_DMR_DATA_BASE (REWIND_CLASS_APPLICATION + 0x10)
#define REWIND_TYPE_DMR_AUDIO_FRAME (REWIND_CLASS_APPLICATION + 0x20) #define REWIND_TYPE_DMR_AUDIO_FRAME (REWIND_CLASS_APPLICATION + 0x20)
#define REWIND_TYPE_DMR_EMBEDDED_DATA (REWIND_CLASS_APPLICATION + 0x27)
#define REWIND_TYPE_SUPER_HEADER (REWIND_CLASS_APPLICATION + 0x28)
#define REWIND_TYPE_FAILURE_CODE (REWIND_CLASS_APPLICATION + 0x29)
#define REWIND_TYPE_TERMINAL_IDLE (REWIND_CLASS_TERMINAL + 0x00)
#define REWIND_TYPE_TERMINAL_ATTACH (REWIND_CLASS_TERMINAL + 0x02)
#define REWIND_TYPE_TERMINAL_DETACH (REWIND_CLASS_TERMINAL + 0x03)
#define REWIND_TYPE_TERMINAL_WAKEUP (REWIND_CLASS_TERMINAL + 0x04)
#define REWIND_TYPE_MESSAGE_TEXT (REWIND_CLASS_TERMINAL + 0x10)
#define REWIND_TYPE_MESSAGE_STATUS (REWIND_CLASS_TERMINAL + 0x11)
#define REWIND_TYPE_LOCATION_REPORT (REWIND_CLASS_TERMINAL + 0x20)
#define REWIND_TYPE_LOCATION_REQUEST (REWIND_CLASS_TERMINAL + 0x21)
#define REWIND_FLAG_NONE 0 #define REWIND_FLAG_NONE 0
#define REWIND_FLAG_REAL_TIME_1 (1 << 0) #define REWIND_FLAG_REAL_TIME_1 (1 << 0)
#define REWIND_FLAG_REAL_TIME_2 (1 << 1) #define REWIND_FLAG_REAL_TIME_2 (1 << 1)
#define REWIND_FLAG_BUFFERING (1 << 2)
#define REWIND_FLAG_DEFAULT_SET REWIND_FLAG_NONE #define REWIND_FLAG_DEFAULT_SET REWIND_FLAG_NONE
#define REWIND_ROLE_REPEATER_AGENT 0x10 #define REWIND_ROLE_REPEATER_AGENT 0x10
@ -59,6 +80,14 @@ extern "C"
#define REWIND_SERVICE_CRONOS_AGENT (REWIND_ROLE_REPEATER_AGENT + 0) #define REWIND_SERVICE_CRONOS_AGENT (REWIND_ROLE_REPEATER_AGENT + 0)
#define REWIND_SERVICE_TELLUS_AGENT (REWIND_ROLE_REPEATER_AGENT + 1) #define REWIND_SERVICE_TELLUS_AGENT (REWIND_ROLE_REPEATER_AGENT + 1)
#define REWIND_SERVICE_SIMPLE_APPLICATION (REWIND_ROLE_APPLICATION + 0) #define REWIND_SERVICE_SIMPLE_APPLICATION (REWIND_ROLE_APPLICATION + 0)
#define REWIND_SERVICE_OPEN_TERMINAL (REWIND_ROLE_APPLICATION + 1)
#define REWIND_OPTION_SUPER_HEADER (1 << 0)
#define REWIND_OPTION_LINEAR_FRAME (1 << 1)
#define REWIND_CALL_LENGTH 10
// Keep-Alive
struct RewindVersionData struct RewindVersionData
{ {
@ -67,6 +96,23 @@ struct RewindVersionData
char description[0]; // Software name and version char description[0]; // Software name and version
}; };
// Redirection
union RewindAddress
{
struct in_addr v4;
struct in6_addr v6;
};
struct RewindRedirectionData
{
uint16_t family; // Address family: AF_INET, AF_INET6 or AF_UNSPEC
uint16_t port; // UDP port
union RewindAddress address; //
};
// Generic Data Structures
struct RewindAddressData struct RewindAddressData
{ {
struct in_addr address; struct in_addr address;
@ -78,12 +124,79 @@ struct RewindBindingData
uint16_t ports[0]; uint16_t ports[0];
}; };
struct RewindForwardData
{
uint16_t port;
uint8_t data[0];
};
// Simple Application Protocol
struct RewindConfigurationData
{
uint32_t options; // REWIND_OPTION_*
};
struct RewindSubscriptionData struct RewindSubscriptionData
{ {
uint32_t type; uint32_t type; // SESSION_TYPE_*
uint32_t number; uint32_t number; // Destination ID
}; };
struct RewindSessionPollData
{
uint32_t type; // TREE_SESSION_*
uint32_t flag; // SESSION_FLAG_*
uint32_t number; // ID
uint32_t state; //
};
struct RewindSuperHeader
{
uint32_t type; // SESSION_TYPE_*
uint32_t sourceID; // Source ID or 0
uint32_t destinationID; // Destination ID or 0
char sourceCall[REWIND_CALL_LENGTH]; // Source Call or zeros
char destinationCall[REWIND_CALL_LENGTH]; // Destination Call or zeros
};
// Open DMR Terminal
struct RewindTextMessageData
{
uint32_t reserved; // Reserved for future use, should be 0
uint32_t sourceID; // Source ID
uint32_t destinationID; // Destination ID
uint16_t option; // CHEAD_GROUP_DESTINATION = 128, private message = 0
uint16_t length; // Length of message in bytes
uint16_t data[0]; // Message text, UTF-16LE
};
struct RewindTextMessageStatus
{
uint32_t reserved; // Reserved for future use, should be 0
uint32_t sourceID; // Source ID
uint32_t destinationID; // Destination ID
uint8_t status; // STATUS_TYPE_*, corresponds to status field of DMR response header of data call
};
struct RewindLocationRequest
{
uint32_t reserved; // Reserved for future use, should be 0
uint32_t type; // LOCATION_REQUEST_SHOT = 0, LOCATION_REQUEST_TIMED_START = 1, LOCATION_REQUEST_TIMED_STOP = 2
uint32_t interval; // Interval of timed report in seconds
};
struct RewindLocationReport
{
uint32_t reserved; // Reserved for future use, should be 0
uint32_t format; // LOCATION_FORMAT_NMEA = 0
uint16_t length; // Length of message in bytes
char data[0]; // NMEA position data
};
// Rewind Transport Layer
struct RewindData struct RewindData
{ {
char sign[REWIND_SIGN_LENGTH]; char sign[REWIND_SIGN_LENGTH];

23
TellusAgent.c
View file

@ -101,8 +101,8 @@ void print(const char* format, ...)
int main(int argc, const char* argv[]) int main(int argc, const char* argv[])
{ {
print("\n"); print("\n");
print("TellusAgent for BrandMeister DMR Master Server\n"); print("TellusAgent for BrandMeister Core\n");
print("Copyright 2016 Artem Prilutskiy (R3ABM, cyanide.burnout@gmail.com)\n"); print("Copyright 2016-2023 Artem Prilutskiy (R3ABM, cyanide.burnout@gmail.com)\n");
print("Software revision " STRING(VERSION) " build " BUILD "\n"); print("Software revision " STRING(VERSION) " build " BUILD "\n");
print("\n"); print("\n");
@ -260,7 +260,7 @@ int main(int argc, const char* argv[])
int handle; int handle;
proxySocketAddress.sin_port = proxyPorts[selection]; proxySocketAddress.sin_port = proxyPorts[selection];
handle = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); handle = socket(PF_INET, SOCK_DGRAM, IPPROTO_UDP);
if ((handle < 0) || if ((handle < 0) ||
(bind(handle, (struct sockaddr*)&proxySocketAddress, proxySocketLength) < 0)) (bind(handle, (struct sockaddr*)&proxySocketAddress, proxySocketLength) < 0))
@ -282,7 +282,7 @@ int main(int argc, const char* argv[])
uplinkSocketAddress.sin6_port = 0; uplinkSocketAddress.sin6_port = 0;
uplinkSocketAddress.sin6_scope_id = 0; uplinkSocketAddress.sin6_scope_id = 0;
uplinkHandle = socket(AF_INET6, SOCK_DGRAM, IPPROTO_UDP); uplinkHandle = socket(PF_INET6, SOCK_DGRAM, IPPROTO_UDP);
if ((uplinkHandle < 0) || if ((uplinkHandle < 0) ||
(bind(uplinkHandle, (struct sockaddr*)&uplinkSocketAddress, sizeof(uplinkSocketAddress)) < 0)) (bind(uplinkHandle, (struct sockaddr*)&uplinkSocketAddress, sizeof(uplinkSocketAddress)) < 0))
{ {
@ -463,6 +463,21 @@ int main(int argc, const char* argv[])
continue; continue;
} }
if (type == REWIND_TYPE_XNMS_DATA)
{
struct sockaddr_in* address;
struct RewindForwardData* data;
data = (struct RewindForwardData*)incomingBuffer->data;
length -= sizeof(struct RewindForwardData);
address = repeaterSocketAddresses + 1;
address->sin_port = data->port;
sendto(proxyHandles[1], data->data, length, 0, (struct sockaddr*)address, sizeof(struct sockaddr_in));
continue;
}
if (type == REWIND_TYPE_REPORT) if (type == REWIND_TYPE_REPORT)
{ {
incomingBuffer->data[length] = '\0'; incomingBuffer->data[length] = '\0';