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

Fix testcookie behavior on shared libary test 

https://github.com/Hamlib/Hamlib/issues/695
pull/712/head
Mike Black W9MDB 2021-05-21 17:04:09 -05:00
rodzic 3d780676b5
commit 82c27e55ee
1 zmienionych plików z 3 dodań i 3 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

6
src/rig.c
Wyświetl plik

@ -6509,7 +6509,7 @@ int HAMLIB_API rig_cookie(RIG *rig, enum cookie_e cookie_cmd, char *cookie,
return -RIG_EINVAL; // nothing to do return -RIG_EINVAL; // nothing to do
} }
if (strcmp(cookie, cookie_save) == 0) // matching cookie so we'll clear it if (cookie_save[0] != 0 && strcmp(cookie, cookie_save) == 0) // matching cookie so we'll clear it
{ {
rig_debug(RIG_DEBUG_VERBOSE, "%s(%d): %s coookie released\n", rig_debug(RIG_DEBUG_VERBOSE, "%s(%d): %s coookie released\n",
__FILE__, __LINE__, cookie_save); __FILE__, __LINE__, cookie_save);
@ -6530,7 +6530,7 @@ int HAMLIB_API rig_cookie(RIG *rig, enum cookie_e cookie_cmd, char *cookie,
rig_debug(RIG_DEBUG_VERBOSE, "%s(%d): %s comparing renew request to %s==%d\n", rig_debug(RIG_DEBUG_VERBOSE, "%s(%d): %s comparing renew request to %s==%d\n",
__FILE__, __LINE__, cookie, cookie_save, strcmp(cookie, cookie_save)); __FILE__, __LINE__, cookie, cookie_save, strcmp(cookie, cookie_save));
if (strcmp(cookie, cookie_save) == 0) // matching cookie so we'll renew it if (cookie_save[0] != 0 && strcmp(cookie, cookie_save) == 0) // matching cookie so we'll renew it
{ {
rig_debug(RIG_DEBUG_VERBOSE, "%s(%d) %s renew request granted\n", __FILE__, rig_debug(RIG_DEBUG_VERBOSE, "%s(%d) %s renew request granted\n", __FILE__,
__LINE__, cookie); __LINE__, cookie);
@ -6553,7 +6553,7 @@ int HAMLIB_API rig_cookie(RIG *rig, enum cookie_e cookie_cmd, char *cookie,
clock_gettime(CLOCK_REALTIME, &tp); clock_gettime(CLOCK_REALTIME, &tp);
time_curr = tp.tv_sec + tp.tv_nsec / 1e9; time_curr = tp.tv_sec + tp.tv_nsec / 1e9;
if ((strcmp(cookie_save, cookie) == 0) if (cookie_save[0] != 0 && (strcmp(cookie_save, cookie) == 0)
&& (time_curr - time_last_used < 1)) // then we will deny the request && (time_curr - time_last_used < 1)) // then we will deny the request
{ {
printf("Cookie %s in use\n", cookie_save); printf("Cookie %s in use\n", cookie_save);