mirror of
https://github.com/Hamlib/Hamlib.git
synced 2024-09-21 10:27:18 +00:00
Remove testsecurity from tests/Makefile.am
Will implement later https://github.com/Hamlib/Hamlib/issues/813
This commit is contained in:
parent
9e2ac43631
commit
b3d93cc231
@ -7097,6 +7097,7 @@ void *async_data_handler(void *arg)
|
||||
|
||||
return NULL;
|
||||
}
|
||||
#endif
|
||||
|
||||
HAMLIB_EXPORT(int) rig_password(RIG *rig, const unsigned char *key1, const unsigned char *key2)
|
||||
{
|
||||
@ -7109,4 +7110,3 @@ HAMLIB_EXPORT(int) rig_password(RIG *rig, const unsigned char *key1, const unsig
|
||||
RETURNFUNC(retval);
|
||||
}
|
||||
|
||||
#endif
|
||||
|
@ -16,7 +16,8 @@ DISTCLEANFILES = rigctl.log rigctl.sum testbcd.log testbcd.sum
|
||||
|
||||
bin_PROGRAMS = rigctl rigctld rigmem rigsmtr rigswr rotctl rotctld rigctlcom ampctl ampctld $(TESTLIBUSB)
|
||||
|
||||
check_PROGRAMS = dumpmem testrig testrigopen testrigcaps testtrn testbcd testfreq listrigs testloc rig_bench testcache cachetest cachetest2 testcookie testgrid testsecurity
|
||||
#check_PROGRAMS = dumpmem testrig testrigopen testrigcaps testtrn testbcd testfreq listrigs testloc rig_bench testcache cachetest cachetest2 testcookie testgrid testsecurity
|
||||
check_PROGRAMS = dumpmem testrig testrigopen testrigcaps testtrn testbcd testfreq listrigs testloc rig_bench testcache cachetest cachetest2 testcookie testgrid
|
||||
|
||||
RIGCOMMONSRC = rigctl_parse.c rigctl_parse.h dumpcaps.c uthash.h
|
||||
ROTCOMMONSRC = rotctl_parse.c rotctl_parse.h dumpcaps_rot.c uthash.h
|
||||
@ -37,7 +38,7 @@ if HAVE_LIBUSB
|
||||
endif
|
||||
|
||||
# include generated include files ahead of any in sources
|
||||
rigctl_CPPFLAGS = -I$(top_builddir)/tests -I$(top_builddir)/src -I$(srcdir) -I$(top_builddir)/security $(AM_CPPFLAGS)
|
||||
rigctl_CPPFLAGS = -I$(top_builddir)/tests -I$(top_builddir)/src -I$(srcdir) -I$(top_srcdir)/security $(AM_CPPFLAGS)
|
||||
|
||||
# all the programs need this
|
||||
LDADD = $(top_builddir)/src/libhamlib.la $(top_builddir)/lib/libmisc.la $(DL_LIBS)
|
||||
@ -52,7 +53,7 @@ rigctlcom_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS)
|
||||
if HAVE_LIBUSB
|
||||
rigtestlibusb_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS) $(LIBUSB_CFLAGS)
|
||||
endif
|
||||
testsecurity_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS) -I$(top_builddir)/src -I$(top_builddir)/security
|
||||
#testsecurity_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS) -I$(top_builddir)/src -I$(top_builddir)/security
|
||||
|
||||
rigctl_LDADD = $(PTHREAD_LIBS) $(READLINE_LIBS) $(LDADD)
|
||||
rigctld_LDADD = $(NET_LIBS) $(PTHREAD_LIBS) $(LDADD) $(READLINE_LIBS)
|
||||
|
@ -1690,9 +1690,15 @@ readline_repeat:
|
||||
|
||||
// chk_vfo is the one command we'll allow without a password
|
||||
// since it's in the initial handshake
|
||||
if (use_password && !is_passwordOK && (cmd_entry->arg1 != NULL) && strcmp(cmd_entry->arg1,"ChkVFO")!=0)
|
||||
int preCmd = 0; // some command are allowed without passoword to satisfy rigctld initialization from rigctl -m 2
|
||||
if (cmd_entry->arg1 != NULL)
|
||||
{
|
||||
rig_debug(RIG_DEBUG_ERR, "%s: need password=%s\n", __func__, rigctld_password);
|
||||
if (strcmp(cmd_entry->arg1,"ChkVFO")==0) preCmd = 1;
|
||||
else if (strcmp(cmd_entry->arg1,"VFO")==0) preCmd = 1;
|
||||
}
|
||||
if (use_password && !is_passwordOK && (cmd_entry->arg1 != NULL) && !preCmd)
|
||||
{
|
||||
rig_debug(RIG_DEBUG_ERR, "%s: need password=%s for cmd=%s\n", __func__, rigctld_password, cmd_entry->arg1);
|
||||
return(-RIG_EPROTO);
|
||||
}
|
||||
retcode = (*cmd_entry->rig_routine)(my_rig,
|
||||
|
@ -979,6 +979,11 @@ int main(int argc, char *argv[])
|
||||
rig_debug(RIG_DEBUG_ERR, "%s: select() failed: %s\n", __func__,
|
||||
strerror(errno_stored));
|
||||
|
||||
if (ctrl_c)
|
||||
{
|
||||
rig_debug(RIG_DEBUG_VERBOSE, "%s: ctrl_c when retcode==-1\n", __func__);
|
||||
break;
|
||||
}
|
||||
if (errno == EINTR)
|
||||
{
|
||||
rig_debug(RIG_DEBUG_VERBOSE, "%s: ignoring interrupted system call\n",
|
||||
@ -990,6 +995,7 @@ int main(int argc, char *argv[])
|
||||
{
|
||||
if (ctrl_c)
|
||||
{
|
||||
rig_debug(RIG_DEBUG_VERBOSE, "%s: ctrl_c when retcode==0\n", __func__);
|
||||
break;
|
||||
}
|
||||
}
|
||||
@ -1045,6 +1051,7 @@ int main(int argc, char *argv[])
|
||||
}
|
||||
}
|
||||
while (retcode == 0 && !ctrl_c);
|
||||
rig_debug(RIG_DEBUG_VERBOSE, "%s: while loop done\n", __func__);
|
||||
|
||||
#ifdef HAVE_PTHREAD
|
||||
/* allow threads to finish current action */
|
||||
|
Loading…
Reference in New Issue
Block a user