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

Merge branch 'master' of https://github.com/Hamlib/Hamlib

pull/345/head
DL1YCF 2020-06-13 15:38:30 +02:00
rodzic 9571772015 a11cddfd24
commit 3e0b1e2eed
1 zmienionych plików z 7 dodań i 14 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

21
src/rig.c
Wyświetl plik

@ -582,20 +582,19 @@ int HAMLIB_API rig_open(RIG *rig)
is_network |= sscanf(rs->rigport.pathname, "%u.%u.%u.%u:%u", &net1, &net2, is_network |= sscanf(rs->rigport.pathname, "%u.%u.%u.%u:%u", &net1, &net2,
&net3, &net4, &port) == 5; &net3, &net4, &port) == 5;
is_network |= sscanf(rs->rigport.pathname, ":%u", &port) == 1; is_network |= sscanf(rs->rigport.pathname, ":%u", &port) == 1;
is_network |= strstr(rs->rigport.pathname, "localhost") != NULL;
is_network |= sscanf(rs->rigport.pathname, "%u::%u:%u:%u:%u:%u", &net1, &net2, is_network |= sscanf(rs->rigport.pathname, "%u::%u:%u:%u:%u:%u", &net1, &net2,
&net3, &net4, &net5, &port) == 6; &net3, &net4, &net5, &port) == 6;
is_network |= sscanf(rs->rigport.pathname, "%u:%u:%u:%u:%u:%u:%u:%u:%u", &net1, is_network |= sscanf(rs->rigport.pathname, "%u:%u:%u:%u:%u:%u:%u:%u:%u", &net1,
&net2, &net3, &net4, &net5, &net6, &net7, &net8, &port) == 9; &net2, &net3, &net4, &net5, &net6, &net7, &net8, &port) == 9;
// if we haven't met one of the condition above then we must have a hostname
if ((token = strtok_r(rs->rigport.pathname, ":", &strtokp))) if (!is_network && (token = strtok_r(rs->rigport.pathname, ":", &strtokp)))
{ {
rig_debug(RIG_DEBUG_ERR, "%s: token1=%s\n", __func__, token); rig_debug(RIG_DEBUG_TRACE, "%s: token1=%s\n", __func__, token);
token = strtok_r(strtokp, ":", &strtokp); token = strtok_r(strtokp, ":", &strtokp);
if (token) if (token)
{ {
rig_debug(RIG_DEBUG_ERR, "%s: token2=%s\n", __func__, token); rig_debug(RIG_DEBUG_TRACE, "%s: token2=%s\n", __func__, token);
if (sscanf(token, "%d", &port)) { is_network |= 1; } if (sscanf(token, "%d", &port)) { is_network |= 1; }
} }
@ -607,12 +606,6 @@ int HAMLIB_API rig_open(RIG *rig)
rs->rigport.pathname); rs->rigport.pathname);
rs->rigport.type.rig = RIG_PORT_NETWORK; rs->rigport.type.rig = RIG_PORT_NETWORK;
} }
else if (sscanf(rs->rigport.pathname, ":%u", &port) == 1)
{
rig_debug(RIG_DEBUG_TRACE, "%s: using network address %s\n", __func__,
rs->rigport.pathname);
rs->rigport.type.rig = RIG_PORT_NETWORK;
}
if (rs->rigport.type.rig == RIG_PORT_SERIAL) if (rs->rigport.type.rig == RIG_PORT_SERIAL)
{ {
@ -3006,7 +2999,7 @@ int HAMLIB_API rig_get_split_freq(RIG *rig, vfo_t vfo, freq_t *tx_freq)
{ {
const struct rig_caps *caps; const struct rig_caps *caps;
int retcode, rc2; int retcode, rc2;
vfo_t curr_vfo, tx_vfo; vfo_t save_vfo, tx_vfo;
rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__); rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
@ -3029,7 +3022,7 @@ int HAMLIB_API rig_get_split_freq(RIG *rig, vfo_t vfo, freq_t *tx_freq)
} }
/* Assisted mode */ /* Assisted mode */
curr_vfo = rig->state.current_vfo; save_vfo = rig->state.current_vfo;
/* Use previously setup TxVFO */ /* Use previously setup TxVFO */
if (vfo == RIG_VFO_CURR || vfo == RIG_VFO_TX) if (vfo == RIG_VFO_CURR || vfo == RIG_VFO_TX)
@ -3081,7 +3074,7 @@ int HAMLIB_API rig_get_split_freq(RIG *rig, vfo_t vfo, freq_t *tx_freq)
/* try and revert even if we had an error above */ /* try and revert even if we had an error above */
if (caps->set_vfo) if (caps->set_vfo)
{ {
rc2 = caps->set_vfo(rig, curr_vfo); rc2 = caps->set_vfo(rig, save_vfo);
} }
else else
{ {