ua1zbe
/
dsd-fme_20_06_2023
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

RIGCTL hostname to mirror TCP Audio Link Hostname;

This commit is contained in:
lwvmobile 2022-12-19 18:24:37 -05:00
parent 5c733c0660
commit 2441664b19
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/dsd.h
View File

@ -297,7 +297,7 @@ typedef struct
int rigctl_sockfd; int rigctl_sockfd;
int use_rigctl; int use_rigctl;
int rigctlportno; int rigctlportno;
char * rigctlhostname; char rigctlhostname[1024];
//udp socket for GQRX, SDR++, etc //udp socket for GQRX, SDR++, etc
int udp_sockfd; int udp_sockfd;

22
src/dsd_main.c
View File

@ -461,7 +461,7 @@ initOpts (dsd_opts * opts)
opts->use_rigctl = 0; opts->use_rigctl = 0;
opts->rigctl_sockfd = 0; opts->rigctl_sockfd = 0;
opts->rigctlportno = 7356; //TCP Port Number; GQRX - 7356; SDR++ - 4532 opts->rigctlportno = 7356; //TCP Port Number; GQRX - 7356; SDR++ - 4532
opts->rigctlhostname = "localhost"; sprintf (opts->rigctlhostname, "%s", "localhost");
//udp input options //udp input options
opts->udp_sockfd = 0; opts->udp_sockfd = 0;
@ -1978,12 +1978,6 @@ main (int argc, char **argv)
openSerial (&opts, &state); openSerial (&opts, &state);
} }
//need error handling on opening rigctl so we don't exit or crash on disconnect
if (opts.use_rigctl == 1)
{
opts.rigctl_sockfd = Connect(opts.rigctlhostname, opts.rigctlportno);
}
if((strncmp(opts.audio_in_dev, "tcp", 3) == 0)) //tcp socket input from SDR++ and others if((strncmp(opts.audio_in_dev, "tcp", 3) == 0)) //tcp socket input from SDR++ and others
{ {
//use same handling as connect function from rigctl //use same handling as connect function from rigctl
@ -1996,7 +1990,13 @@ main (int argc, char **argv)
else goto TCPEND; //end early with preset values else goto TCPEND; //end early with preset values
curr = strtok(NULL, ":"); //host address curr = strtok(NULL, ":"); //host address
if (curr != NULL) strncpy (opts.tcp_hostname, curr, 1023); if (curr != NULL)
{
strncpy (opts.tcp_hostname, curr, 1023);
//shim to tie the hostname of the tcp input to the rigctl hostname (probably covers a vast majority of use cases)
//in the future, I will rework part of this so that users can enter a hostname and port similar to how tcp and rtl strings work
memcpy (opts.rigctlhostname, opts.tcp_hostname, sizeof (opts.rigctlhostname) );
}
curr = strtok(NULL, ":"); //host port curr = strtok(NULL, ":"); //host port
if (curr != NULL) opts.tcp_portno = atoi (curr); if (curr != NULL) opts.tcp_portno = atoi (curr);
@ -2008,6 +2008,12 @@ main (int argc, char **argv)
opts.audio_in_type = 8; opts.audio_in_type = 8;
} }
//need error handling on opening rigctl so we don't exit or crash on disconnect
if (opts.use_rigctl == 1)
{
opts.rigctl_sockfd = Connect(opts.rigctlhostname, opts.rigctlportno);
}
if((strncmp(opts.audio_in_dev, "rtl", 3) == 0)) //rtl dongle input if((strncmp(opts.audio_in_dev, "rtl", 3) == 0)) //rtl dongle input
{ {
uint8_t rtl_ok = 0; uint8_t rtl_ok = 0;