mirror
/
Hamlib
kopia lustrzana https://github.com/Hamlib/Hamlib
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Clean up JSON 

https://github.com/Hamlib/Hamlib/issues/695
pull/1289/head
Mike Black W9MDB 2023-05-08 17:15:26 -05:00
rodzic a4c10c3206
commit ca763d4ff1
2 zmienionych plików z 225 dodań i 218 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

147
src/multicast.c
Wyświetl plik

@ -86,27 +86,21 @@ static int multicast_status_changed(RIG *rig)
return 0; return 0;
} }
void json_add_string(char *msg, const char *key, const char *value) void json_add_string(char *msg, const char *key, const char *value,
int addComma)
{ {
if (strlen(msg) != 0)
{
strcat(msg, ",\n");
}
strcat(msg, "\""); strcat(msg, "\"");
strcat(msg, key); strcat(msg, key);
strcat(msg, "\": "); strcat(msg, "\": ");
strcat(msg, "\""); strcat(msg, "\"");
strcat(msg, value); strcat(msg, value);
strcat(msg, "\""); strcat(msg, "\"");
if (addComma) { strcat(msg, ",\n"); }
} }
void json_add_int(char *msg, const char *key, const int number) void json_add_int(char *msg, const char *key, const int number, int addComma)
{ {
if (strlen(msg) != 0)
{
strcat(msg, ",\n");
}
strcat(msg, "\""); strcat(msg, "\"");
strcat(msg, key); strcat(msg, key);
@ -114,6 +108,11 @@ void json_add_int(char *msg, const char *key, const int number)
char tmp[64]; char tmp[64];
sprintf(tmp, "%d", number); sprintf(tmp, "%d", number);
strcat(msg, tmp); strcat(msg, tmp);
if (addComma)
{
strcat(msg, ",\n");
}
} }
void json_add_double(char *msg, const char *key, const double value) void json_add_double(char *msg, const char *key, const double value)
@ -131,49 +130,52 @@ void json_add_double(char *msg, const char *key, const double value)
strcat(msg, tmp); strcat(msg, tmp);
} }
void json_add_boolean(char *msg, const char *key, const int value) void json_add_boolean(char *msg, const char *key, const int value, int addComma)
{ {
if (strlen(msg) != 0)
{
strcat(msg, ",\n");
}
strcat(msg, "\""); strcat(msg, "\"");
strcat(msg, key); strcat(msg, key);
strcat(msg, "\": "); strcat(msg, "\": ");
char tmp[64]; char tmp[64];
sprintf(tmp, "%s", value == 0 ? "False" : "True"); sprintf(tmp, "%s", value == 0 ? "false" : "true");
strcat(msg, tmp); strcat(msg, tmp);
if (addComma)
{
strcat(msg, ",\n");
}
} }
void json_add_time(char *msg) void json_add_time(char *msg, int addComma)
{ {
char mydate[256]; char mydate[256];
date_strget(mydate, sizeof(mydate), 0); date_strget(mydate, sizeof(mydate), 0);
if (strlen(msg) != 0)
strcat(msg, "\"Time\": \"");
strcat(msg, mydate);
strcat(msg, "\"");
if (addComma)
{ {
strcat(msg, ",\n"); strcat(msg, ",\n");
} }
strcat(msg, "\"Time\": ");
strcat(msg, mydate);
} }
void json_add_vfoA(RIG *rig, char *msg) void json_add_vfoA(RIG *rig, char *msg)
{ {
strcat(msg, "{\n"); strcat(msg, "{\n");
json_add_string(msg, "Name", "VFOA"); json_add_string(msg, "Name", "VFOA", 1);
json_add_int(msg, "Freq", rig->state.cache.freqMainA); json_add_int(msg, "Freq", rig->state.cache.freqMainA, 1);
if (strlen(rig_strrmode(rig->state.cache.modeMainA)) > 0) if (strlen(rig_strrmode(rig->state.cache.modeMainA)) > 0)
{ {
json_add_string(msg, "Mode", rig_strrmode(rig->state.cache.modeMainA)); json_add_string(msg, "Mode", rig_strrmode(rig->state.cache.modeMainA), 1);
} }
if (rig->state.cache.widthMainA > 0) if (rig->state.cache.widthMainA > 0)
{ {
json_add_int(msg, "Width", rig->state.cache.widthMainA); json_add_int(msg, "Width", rig->state.cache.widthMainA, 1);
} }
// what about full duplex? rx_vfo would be in rx all the time? // what about full duplex? rx_vfo would be in rx all the time?
@ -181,70 +183,70 @@ void json_add_vfoA(RIG *rig, char *msg)
{ {
if (rig->state.tx_vfo && (RIG_VFO_B | RIG_VFO_MAIN_B)) if (rig->state.tx_vfo && (RIG_VFO_B | RIG_VFO_MAIN_B))
{ {
json_add_boolean(msg, "RX", !rig->state.cache.ptt); json_add_boolean(msg, "RX", !rig->state.cache.ptt, 1);
json_add_boolean(msg, "TX", 0); json_add_boolean(msg, "TX", 0, 0);
} }
else // we must be in reverse split else // we must be in reverse split
{ {
json_add_boolean(msg, "RX", 0); json_add_boolean(msg, "RX", 0, 1);
json_add_boolean(msg, "TX", rig->state.cache.ptt); json_add_boolean(msg, "TX", rig->state.cache.ptt, 0);
} }
} }
else if (rig->state.current_vfo && (RIG_VFO_A | RIG_VFO_MAIN_A)) else if (rig->state.current_vfo && (RIG_VFO_A | RIG_VFO_MAIN_A))
{ {
json_add_boolean(msg, "RX", !rig->state.cache.ptt); json_add_boolean(msg, "RX", !rig->state.cache.ptt, 1);
json_add_boolean(msg, "TX", rig->state.cache.ptt); json_add_boolean(msg, "TX", rig->state.cache.ptt, 0);
} }
else // VFOB must be active so never RX or TX else // VFOB must be active so never RX or TX
{ {
json_add_boolean(msg, "RX", 0); json_add_boolean(msg, "RX", 0, 1);
json_add_boolean(msg, "TX", 0); json_add_boolean(msg, "TX", 0, 0);
} }
strcat(msg, "\n}\n"); strcat(msg, "\n}");
} }
void json_add_vfoB(RIG *rig, char *msg) void json_add_vfoB(RIG *rig, char *msg)
{ {
strcat(msg, "{\n"); strcat(msg, ",\n{\n");
json_add_string(msg, "Name", "VFOB"); json_add_string(msg, "Name", "VFOB", 1);
json_add_int(msg, "Freq", rig->state.cache.freqMainB); json_add_int(msg, "Freq", rig->state.cache.freqMainB, 1);
if (strlen(rig_strrmode(rig->state.cache.modeMainB)) > 0) if (strlen(rig_strrmode(rig->state.cache.modeMainB)) > 0)
{ {
json_add_string(msg, "Mode", rig_strrmode(rig->state.cache.modeMainB)); json_add_string(msg, "Mode", rig_strrmode(rig->state.cache.modeMainB), 1);
} }
if (rig->state.cache.widthMainB > 0) if (rig->state.cache.widthMainB > 0)
{ {
json_add_int(msg, "Width", rig->state.cache.widthMainB); json_add_int(msg, "Width", rig->state.cache.widthMainB, 1);
} }
if (rig->state.rx_vfo != rig->state.tx_vfo && rig->state.cache.split) if (rig->state.rx_vfo != rig->state.tx_vfo && rig->state.cache.split)
{ {
if (rig->state.tx_vfo && (RIG_VFO_B | RIG_VFO_MAIN_B)) if (rig->state.tx_vfo && (RIG_VFO_B | RIG_VFO_MAIN_B))
{ {
json_add_boolean(msg, "RX", 0); json_add_boolean(msg, "RX", 0, 1);
json_add_boolean(msg, "TX", rig->state.cache.ptt); json_add_boolean(msg, "TX", rig->state.cache.ptt, 0);
} }
else // we must be in reverse split else // we must be in reverse split
{ {
json_add_boolean(msg, "RX", rig->state.cache.ptt); json_add_boolean(msg, "RX", rig->state.cache.ptt, 1);
json_add_boolean(msg, "TX", 0); json_add_boolean(msg, "TX", 0, 0);
} }
} }
else if (rig->state.current_vfo && (RIG_VFO_A | RIG_VFO_MAIN_A)) else if (rig->state.current_vfo && (RIG_VFO_A | RIG_VFO_MAIN_A))
{ {
json_add_boolean(msg, "RX", !rig->state.cache.ptt); json_add_boolean(msg, "RX", !rig->state.cache.ptt, 1);
json_add_boolean(msg, "TX", rig->state.cache.ptt); json_add_boolean(msg, "TX", rig->state.cache.ptt, 0);
} }
else // VFOB must be active so always RX or TX else // VFOB must be active so always RX or TX
{ {
json_add_boolean(msg, "RX", 1); json_add_boolean(msg, "RX", 1, 1);
json_add_boolean(msg, "TX", 1); json_add_boolean(msg, "TX", 1, 0);
} }
strcat(msg, "\n},\n"); strcat(msg, "\n}\n]\n");
} }
static int multicast_send_json(RIG *rig) static int multicast_send_json(RIG *rig)
@ -255,13 +257,16 @@ static int multicast_send_json(RIG *rig)
msg[0] = 0; msg[0] = 0;
snprintf(buf, sizeof(buf), "%s:%s", rig->caps->model_name, snprintf(buf, sizeof(buf), "%s:%s", rig->caps->model_name,
rig->state.rigport.pathname); rig->state.rigport.pathname);
json_add_string(msg, "ID", buf); strcat(msg, "{\n");
json_add_time(msg); json_add_string(msg, "ID", buf, 1);
json_add_int(msg, "Sequence", rig->state.multicast->seqnumber++); json_add_time(msg, 1);
json_add_string(msg, "VFOCurr", rig_strvfo(rig->state.current_vfo)); json_add_int(msg, "Sequence", rig->state.multicast->seqnumber++, 1);
json_add_int(msg, "Split", rig->state.cache.split); json_add_string(msg, "VFOCurr", rig_strvfo(rig->state.current_vfo), 1);
strcat(msg, ",\n\"VFOs\": [\n{\n"); json_add_int(msg, "Split", rig->state.cache.split, 1);
strcat(msg, "\"VFOs\": [\n");
json_add_vfoA(rig, msg); json_add_vfoA(rig, msg);
json_add_vfoB(rig, msg);
strcat(msg, "}\n");
// send the thing // send the thing
multicast_send(rig, msg, strlen(msg)); multicast_send(rig, msg, strlen(msg));
@ -322,7 +327,8 @@ void *multicast_thread(void *vrig)
#ifdef WIN32 #ifdef WIN32
static char *GetWinsockLastError(char *errorBuffer, DWORD errorBufferSize) static char *GetWinsockLastError(char *errorBuffer, DWORD errorBufferSize)
{ {
void GetWinsockErrorString(char *errorBuffer, DWORD errorBufferSize) { void GetWinsockErrorString(char *errorBuffer, DWORD errorBufferSize)
{
int errorCode = WSAGetLastError(); int errorCode = WSAGetLastError();
DWORD charsWritten; DWORD charsWritten;
@ -335,18 +341,19 @@ static char *GetWinsockLastError(char *errorBuffer, DWORD errorBufferSize)
errorBufferSize, errorBufferSize,
NULL NULL
); );
} }
#endif #endif
int multicast_init(RIG *rig, char *addr, int port) int multicast_init(RIG * rig, char *addr, int port)
{ {
#ifdef _WIN32 #ifdef _WIN32
WSADATA wsaData; WSADATA wsaData;
if (WSAStartup(MAKEWORD(2, 2), &wsaData) != 0) if (WSAStartup(MAKEWORD(2, 2), &wsaData) != 0)
{ {
char errorMessage[1024]; char errorMessage[1024];
fprintf(stderr, "WSAStartup failed: %s\n", GetWinsockLastError(errorMessage, sizeof(errorMessage))); fprintf(stderr, "WSAStartup failed: %s\n", GetWinsockLastError(errorMessage,
sizeof(errorMessage)));
return 1; return 1;
} }
@ -438,10 +445,10 @@ int multicast_init(RIG *rig, char *addr, int port)
//printf("threadid=%ld\n", rig->state.multicast->threadid); //printf("threadid=%ld\n", rig->state.multicast->threadid);
rig->state.multicast->multicast_running = 1; rig->state.multicast->multicast_running = 1;
return RIG_OK; return RIG_OK;
} }
void multicast_close(RIG *rig) void multicast_close(RIG * rig)
{ {
int retval; int retval;
// Leave the multicast group // Leave the multicast group
@ -458,11 +465,11 @@ void multicast_close(RIG *rig)
{ {
rig_debug(RIG_DEBUG_ERR, "%s: close: %s\n", __func__, strerror(errno)); rig_debug(RIG_DEBUG_ERR, "%s: close: %s\n", __func__, strerror(errno));
} }
} }
// if msglen=0 msg is assumed to be a string // if msglen=0 msg is assumed to be a string
int multicast_send(RIG *rig, const char *msg, int msglen) int multicast_send(RIG * rig, const char *msg, int msglen)
{ {
// Construct the message to send // Construct the message to send
if (msglen == 0) { msglen = strlen((char *)msg); } if (msglen == 0) { msglen = strlen((char *)msg); }
@ -483,12 +490,12 @@ int multicast_send(RIG *rig, const char *msg, int msglen)
} }
return num_bytes; return num_bytes;
} }
//#define TEST //#define TEST
#ifdef TEST #ifdef TEST
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
RIG *rig; RIG *rig;
rig_model_t myrig_model; rig_model_t myrig_model;
rig_set_debug_level(RIG_DEBUG_NONE); rig_set_debug_level(RIG_DEBUG_NONE);
@ -513,5 +520,5 @@ int main(int argc, char *argv[])
pthread_join(rig->state.multicast->threadid, NULL); pthread_join(rig->state.multicast->threadid, NULL);
pthread_exit(NULL); pthread_exit(NULL);
return 0; return 0;
} }
#endif #endif

2
tests/rigtestmcastrx.c
Wyświetl plik

@ -90,7 +90,7 @@ int main()
} }
buffer[bytes_received] = '\0'; buffer[bytes_received] = '\0';
printf("Received: %s\n", buffer); printf("%s\n", buffer);
} }
// Drop membership before closing the socket // Drop membership before closing the socket