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

Fix Windows rigctl shutdown 

https://github.com/Hamlib/Hamlib/issues/1448
pull/1458/head
Mike Black W9MDB 2023-12-17 17:38:28 -06:00
rodzic 248d5e44a9
commit 1f38d59153
1 zmienionych plików z 17 dodań i 11 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

28
src/network.c
Wyświetl plik

@ -470,6 +470,7 @@ extern void sync_callback(int lock);
//! @cond Doxygen_Suppress //! @cond Doxygen_Suppress
#define MULTICAST_DATA_PIPE_TIMEOUT_MILLIS 1000 #define MULTICAST_DATA_PIPE_TIMEOUT_MILLIS 1000
#define MULTICAST_DATA_PIPE_TIMEOUT_USEC 100000
#if defined(WIN32) && defined(HAVE_WINDOWS_H) #if defined(WIN32) && defined(HAVE_WINDOWS_H)
@ -535,8 +536,7 @@ static int multicast_publisher_read_data(multicast_publisher_args
{ {
ssize_t result; ssize_t result;
result = async_pipe_wait_for_data(mcast_publisher_args->data_pipe, result = async_pipe_wait_for_data(mcast_publisher_args->data_pipe, 100);
MULTICAST_DATA_PIPE_TIMEOUT_MILLIS);
if (result < 0) if (result < 0)
{ {
@ -660,8 +660,8 @@ static int multicast_publisher_read_data(const multicast_publisher_args
ssize_t result; ssize_t result;
int retval; int retval;
timeout.tv_sec = MULTICAST_DATA_PIPE_TIMEOUT_MILLIS / 1000; timeout.tv_sec = 0;
timeout.tv_usec = 0; timeout.tv_usec = MULTICAST_DATA_PIPE_TIMEOUT_USEC;
FD_ZERO(&rfds); FD_ZERO(&rfds);
FD_SET(fd, &rfds); FD_SET(fd, &rfds);
@ -917,6 +917,8 @@ void *multicast_publisher(void *arg)
struct rig_state *rs = &rig->state; struct rig_state *rs = &rig->state;
struct rig_spectrum_line spectrum_line; struct rig_spectrum_line spectrum_line;
uint8_t packet_type = MULTICAST_PUBLISHER_DATA_PACKET_TYPE_SPECTRUM; uint8_t packet_type = MULTICAST_PUBLISHER_DATA_PACKET_TYPE_SPECTRUM;
multicast_publisher_priv_data *mcast_publisher_priv = (multicast_publisher_priv_data *)
rs->multicast_publisher_priv_data;
struct sockaddr_in dest_addr; struct sockaddr_in dest_addr;
int socket_fd = args->socket_fd; int socket_fd = args->socket_fd;
@ -982,8 +984,9 @@ void *multicast_publisher(void *arg)
strerror(errno)); strerror(errno));
} }
} }
mcast_publisher_priv->thread_id = 0;
rig_debug(RIG_DEBUG_VERBOSE, "%s(%d): Stopping multicast publisher\n", __FILE__, rig_debug(RIG_DEBUG_VERBOSE, "%s(%d): Stopped multicast publisher\n", __FILE__,
__LINE__); __LINE__);
return NULL; return NULL;
} }
@ -1198,14 +1201,16 @@ void *multicast_receiver(void *arg)
int select_result; int select_result;
ssize_t result; ssize_t result;
timeout.tv_sec = 1; timeout.tv_sec = 0;
timeout.tv_usec = 0; timeout.tv_usec = 100000;
FD_ZERO(&rfds); FD_ZERO(&rfds);
FD_SET(socket_fd, &rfds); FD_SET(socket_fd, &rfds);
efds = rfds; efds = rfds;
select_result = select(socket_fd + 1, &rfds, NULL, &efds, &timeout); select_result = select(socket_fd + 1, &rfds, NULL, &efds, &timeout);
rig_debug(RIG_DEBUG_VERBOSE,"%s(%d)\n", __func__, __LINE__);
rig_debug(RIG_DEBUG_VERBOSE,"%s(%d)\n", __func__, __LINE__);
if (rs->multicast_receiver_run == 0) if (rs->multicast_receiver_run == 0)
{ {
rig_debug(RIG_DEBUG_VERBOSE, "%s(%d): pselect signal\n", __func__, __LINE__); rig_debug(RIG_DEBUG_VERBOSE, "%s(%d): pselect signal\n", __func__, __LINE__);
@ -1215,7 +1220,7 @@ void *multicast_receiver(void *arg)
if (select_result == 0) if (select_result == 0)
{ {
// Select timed out // Select timed out
// rig_debug(RIG_DEBUG_ERR, "%s: select timeout\n", __FILE__); //rig_debug(RIG_DEBUG_ERR, "%s: select timeout\n", __FILE__);
continue; continue;
} }
@ -1268,7 +1273,7 @@ void *multicast_receiver(void *arg)
rs->multicast_receiver_run = 0; rs->multicast_receiver_run = 0;
rig_debug(RIG_DEBUG_VERBOSE, "%s(%d): Stopping multicast receiver\n", __FILE__, rig_debug(RIG_DEBUG_VERBOSE, "%s(%d): Stopped multicast receiver\n", __FILE__,
__LINE__); __LINE__);
return NULL; return NULL;
} }
@ -1316,10 +1321,12 @@ int network_multicast_publisher_start(RIG *rig, const char *multicast_addr,
status = network_init(); status = network_init();
#ifdef __MINGW32__ // always RIG_OK if not Windows
if (status != RIG_OK) if (status != RIG_OK)
{ {
RETURNFUNC(status); RETURNFUNC(status);
} }
#endif
socket_fd = socket(AF_INET, SOCK_DGRAM, 0); socket_fd = socket(AF_INET, SOCK_DGRAM, 0);
@ -1367,7 +1374,6 @@ int network_multicast_publisher_start(RIG *rig, const char *multicast_addr,
} }
rs->snapshot_packet_sequence_number = 0; rs->snapshot_packet_sequence_number = 0;
rs->multicast_publisher_run = 1;
rs->multicast_publisher_priv_data = calloc(1, rs->multicast_publisher_priv_data = calloc(1,
sizeof(multicast_publisher_priv_data)); sizeof(multicast_publisher_priv_data));
@ -1441,7 +1447,7 @@ int network_multicast_publisher_stop(RIG *rig)
if (mcast_publisher_priv->thread_id != 0) if (mcast_publisher_priv->thread_id != 0)
{ {
int err = pthread_join(mcast_publisher_priv->thread_id, NULL); int err = pthread_join(mcast_publisher_priv->thread_id, NULL);
if (err) if (err)
{ {