KB8PMY
/
QnetGateway
mirror of https://github.com/n7tae/QnetGateway.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

test for icom

Browse Source
pull/5/head
Tom Early 8 years ago
parent 228ec898a7
commit a9563d108b
3 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File

10
QnetGateway.cpp
Unescape View File

@ -252,7 +252,7 @@ bool CQnetGateway::read_config(char *cfgFile)
return true;
// modules
is_icom = is_not_icom = false;
bool is_icom = is_not_icom = false;
for (short int m=0; m<3; m++) {
std::string path = "module.";
path += m + 'a';
@ -260,16 +260,16 @@ bool CQnetGateway::read_config(char *cfgFile)
std::string type;
if (cfg.lookupValue(std::string(path+".type").c_str(), type)) {
rptr.mod[m].defined = true;
if (0 == strcasecmp(type.c_str(), "icom")) {
if (0 == type.compare("icom")) {
rptr.mod[m].package_version = ICOM_VERSION;
is_icom = true;
} else if (0 == strcasecmp(type.c_str(), "dvap")) {
} else if (0 == type.compare("dvap")) {
rptr.mod[m].package_version = DVAP_VERSION;
is_not_icom = true;
} else if (0 == strcasecmp(type.c_str(), "dvrptr")) {
} else if (0 == type.compare("dvrptr")) {
rptr.mod[m].package_version = DVRPTR_VERSION;
is_not_icom = true;
} else if (0 == strcasecmp(type.c_str(), "mmdvm")) {
} else if (0 == type.compare("mmdvm")) {
rptr.mod[m].package_version = MMDVM_VERSION;
is_not_icom = true;
} else {

12
QnetRemote.cpp
Unescape View File

@ -50,6 +50,7 @@ short streamid_raw = 0;
bool isdefined[3] = { false, false, false };
std::string REPEATER, IP_ADDRESS;
int PORT, PLAY_WAIT, PLAY_DELAY;
bool is_icom = false;
unsigned char silence[9] = { 0x9E, 0x8D, 0x32, 0x88, 0x26, 0x1A, 0x3F, 0x61, 0xE8 };
@ -197,10 +198,11 @@ bool read_config(const char *cfgFile)
path += m + 'a';
std::string type;
if (cfg.lookupValue(std::string(path+".type").c_str(), type)) {
if (strcasecmp(type.c_str(), "dvap") && strcasecmp(type.c_str(), "dvrptr") && strcasecmp(type.c_str(), "mmdvm")) {
if (type.compare("dvap") && type.compare("dvrptr") && type.compare("mmdvm") && type.compare("icom")) {
printf("module type '%s' is invalid\n", type.c_str());
return true;
}
is_icom = type.compare("icom") ? false : true;
isdefined[m] = true;
}
}
@ -209,10 +211,10 @@ bool read_config(const char *cfgFile)
return true;
}
if (! get_value(cfg, "gateway.internal.ip", IP_ADDRESS, 7, 15, "127.0.0.1"))
if (! get_value(cfg, "gateway.internal.ip", IP_ADDRESS, 7, 15, is_icom ? "172.16.0.1" : "127.0.0.1"))
return true;
get_value(cfg, "gateway.internal.port", PORT, 16000, 65535, 19000);
get_value(cfg, "gateway.internal.port", PORT, 16000, 65535, is_icom ? 20000 : 19000);
get_value(cfg, "timing.play.wait", PLAY_WAIT, 1, 10, 2);
@ -234,11 +236,11 @@ int main(int argc, char *argv[])
if (argc != 4) {
printf("Usage: %s <module> <mycall> <yourcall>\n", argv[0]);
printf("Example: %s c n7tae xrf757cl\n", argv[0]);
printf("Example: %s c n7tae xrf757al\n", argv[0]);
printf("Where...\n");
printf(" c is the local repeater module\n");
printf(" n7tae is the value of mycall\n");
printf(" xrf757cl is the value of yourcall, in this case this is a Link command\n\n");
printf(" xrf757al is the value of yourcall, in this case this is a Link command\n\n");
return 0;
}

18
QnetVoice.cpp
Unescape View File

@ -50,6 +50,7 @@ short streamid_raw = 0;
int moduleport[3] = { 0, 0, 0 };
std::string REPEATER, IP_ADDRESS;
int PORT, PLAY_WAIT, PLAY_DELAY;
bool is_icom = false;
unsigned short crc_tabccitt[256] = {
0x0000,0x1189,0x2312,0x329b,0x4624,0x57ad,0x6536,0x74bf,0x8c48,0x9dc1,0xaf5a,0xbed3,0xca6c,0xdbe5,0xe97e,0xf8f7,
@ -196,11 +197,12 @@ bool read_config(const char *cfgFile)
path += m + 'a';
std::string type;
if (cfg.lookupValue(std::string(path+".type").c_str(), type)) {
if (strcasecmp(type.c_str(), "dvap") && strcasecmp(type.c_str(), "dvrptr") && strcasecmp(type.c_str(), "mmdvm")) {
if (strcasecmp(type.c_str(), "dvap") && strcasecmp(type.c_str(), "dvrptr") && strcasecmp(type.c_str(), "mmdvm") && strcasecmp(type.c_str(), "icom")) {
printf("module type '%s' is invalid\n", type.c_str());
return true;
}
get_value(cfg, std::string(path+".port").c_str(), moduleport[m], 1000, 65535, 19998+m);
is_icom = strcasecmp(type.c_str(), "icom") ? false : true;
get_value(cfg, std::string(path+".port").c_str(), moduleport[m], 1000, 65535, is_icom ? 20000 : 19998+m);
}
}
if (0==moduleport[0] && 0==moduleport[1] && 0==moduleport[2]) {
@ -208,7 +210,7 @@ bool read_config(const char *cfgFile)
return true;
}
if (! get_value(cfg, "gateway.internal.ip", IP_ADDRESS, 7, 15, "127.0.0.1"))
if (! get_value(cfg, "gateway.internal.ip", IP_ADDRESS, 7, 15, is_icom ? "172.16.0.20" : "127.0.0.1"))
return true;
get_value(cfg, "timing.play.wait", PLAY_WAIT, 1, 10, 2);
@ -332,7 +334,7 @@ int main(int argc, char *argv[])
printf("Read %d byte packet from %s\n", (int)nread*rlen, argv[3]);
if (rlen == 56)
printf("rpt1=%.8s rpt2=%.8s urcall=%.8s, mycall=%.8s, sfx=%.4s\n",
dsvt.hdr.rpt1, dsvt.hdr.rpt2, dsvt.hdr.urcall, dsvt.hdr.mycall, dsvt.hdr.sfx);
dsvt.hdr.rpt1, dsvt.hdr.rpt2, dsvt.hdr.urcall, dsvt.hdr.mycall, dsvt.hdr.sfx);
else
printf("streamid=%04X counter=%02X\n", dsvt.streamid, dsvt.counter);
if (nread == 1) {
@ -368,9 +370,9 @@ int main(int argc, char *argv[])
dstr.vpkt.hdr.flag[i] = dsvt.hdr.flag[i];
memset(dstr.vpkt.hdr.r2, ' ', 36);
memcpy(dstr.vpkt.hdr.r2, REPEATER.c_str(), REPEATER.size());
dstr.vpkt.hdr.r1[7] = 'G';
dstr.vpkt.hdr.r1[7] = module;
memcpy(dstr.vpkt.hdr.r1, REPEATER.c_str(), REPEATER.size());
dstr.vpkt.hdr.r2[7] = module;
dstr.vpkt.hdr.r2[7] = 'G';
memcpy(dstr.vpkt.hdr.ur, "CQCQCQ", 6); /* yrcall */
memcpy(dstr.vpkt.hdr.my, mycall.c_str(), mycall.size());
memcpy(dstr.vpkt.hdr.nm, "QNET", 4);
@ -423,8 +425,8 @@ int main(int argc, char *argv[])
int sent = sendto(sockDst, dstr.pkt_id, rlen + 2,0, (struct sockaddr *)&toDst, sizeof(toDst));
if (sent == 58)
printf("Sent DSTR HDR r2=%.8s r1=%.8s ur=%.8s my=%.8s nm=%.4s\n",
dstr.vpkt.hdr.r2, dstr.vpkt.hdr.r1, dstr.vpkt.hdr.ur, dstr.vpkt.hdr.my, dstr.vpkt.hdr.nm);
printf("Sent DSTR HDR ur=%.8s r1=%.8s r2=%.8s my=%.8s/%.4s\n",
dstr.vpkt.hdr.ur, dstr.vpkt.hdr.r1, dstr.vpkt.hdr.r2, dstr.vpkt.hdr.my, dstr.vpkt.hdr.nm);
else if (sent == 29)
printf("Sent DSTR DATA streamid=%04X, ctrl=%02X\n", dstr.vpkt.streamid, dstr.vpkt.ctrl);
else

Write Preview
Loading…
Cancel
Save

Powered by TurnKey Linux.