fixed finding lone configured module when another module is also there

pull/12/head
Tom Early 7 years ago
parent 4934b1466f
commit e418c976a0

@ -174,10 +174,8 @@ static bool read_config(const char *cfgFile)
test.append(1, 'a'+i);
if (cfg.KeyExists(test)) {
cfg.GetValue(test, estr, type, 1, 16);
if (type.compare("dvap")) {
fprintf(stderr, "%s = '%s', expecting 'dvap'!\n", test.c_str(), type.c_str());
return true;
}
if (type.compare("dvap"))
continue; // this ain't it!
dvap_path.assign(test);
assigned_module = i;
break;

@ -1827,10 +1827,8 @@ static bool read_config(const char *cfgFile)
test.append(1, 'a'+i);
if (cfg.KeyExists(test)) {
cfg.GetValue(test, estr, type, 1, 16);
if (type.compare("dvrptr")) {
fprintf(stderr, "%s = '%s', expecting 'dvrptr'!\n", test.c_str(), type.c_str());
return true;
}
if (type.compare("dvrptr"))
continue; // this ain't it!
path.assign(test);
assigned_module = i;
break;

@ -468,10 +468,8 @@ bool CQnetITAP::ReadConfig(const char *cfgFile)
test.append(1, 'a'+i);
if (cfg.KeyExists(test)) {
cfg.GetValue(test, estr, type, 1, 16);
if (type.compare("itap")) {
fprintf(stderr, "%s = '%s', expecting 'itap'!\n", test.c_str(), type.c_str());
return true;
}
if (type.compare("itap"))
continue; // this ain't it!
itap_path.assign(test);
assigned_module = i;
break;

@ -335,7 +335,7 @@ bool CQnetRelay::ProcessMMDVM(const int len, const unsigned char *raw)
printf("ERROR: ProcessMMDVM: Could not write gateway voice packet\n");
return true;
}
if (log_qso && dstr.vpkt.ctrl&0x40)
printf("Sent DSTR end of streamid=%04x\n", ntohs(dstr.vpkt.streamid));
}
@ -365,10 +365,8 @@ bool CQnetRelay::ReadConfig(const char *cfgFile)
test.append(1, 'a'+i);
if (cfg.KeyExists(test)) {
cfg.GetValue(test, estr, type, 1, 16);
if (type.compare("mmdvm")) {
fprintf(stderr, "%s = '%s', expecting 'mmdvm'!\n", test.c_str(), type.c_str());
return true;
}
if (type.compare("mmdvm"))
continue; // this ain't it!
mmdvm_path.assign(test);
assigned_module = i;
break;

@ -1,8 +1,8 @@
// version strings must be 55 characters or less!
#define IRCDDB_VERSION "QnetGateway-8.0.1"
#define LINK_VERSION "QnetLink7.0.1"
#define DVAP_VERSION "QnetDVAP-6.0.0"
#define RELAY_VERSION "QnetRelay-1.0.1"
#define ITAP_VERSION "QnetITAP-1.0.1"
#define DVRPTR_VERSION "QnetDVRPTR-6.0.1"
#define DVAP_VERSION "QnetDVAP-6.0.1"
#define RELAY_VERSION "QnetRelay-1.0.2"
#define ITAP_VERSION "QnetITAP-1.0.2"
#define DVRPTR_VERSION "QnetDVRPTR-6.0.2"
#define MMDVM_VERSION "QnetGateway-MMDVM-1.0.0"

Loading…
Cancel
Save

Powered by TurnKey Linux.