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

renamed 'SRPTR rptr' to 'SRPTR Rptr'

Browse Source
pull/14/head
Tom Early 6 years ago
parent 1591828218
commit 210d69ac9c
2 changed files with 60 additions and 60 deletions
Show Stats Download Patch File Download Diff File

118
QnetGateway.cpp
Unescape View File

@ -245,39 +245,39 @@ bool CQnetGateway::ReadConfig(char *cfgFile)
path.append(1, 'a' + m); path.append(1, 'a' + m);
std::string type; std::string type;
if (cfg.GetValue(path, estr, type, 1, 16)) { if (cfg.GetValue(path, estr, type, 1, 16)) {
rptr.mod[m].defined = false; Rptr.mod[m].defined = false;
} else { } else {
printf("Found Module: %s = '%s'\n", path.c_str(), type.c_str()); printf("Found Module: %s = '%s'\n", path.c_str(), type.c_str());
if (0 == type.compare("dvap")) { rptr.mod[m].package_version.assign(GW_VERSION+".DVAP"); } if (0 == type.compare("dvap")) { Rptr.mod[m].package_version.assign(GW_VERSION+".DVAP"); }
else if (0 == type.compare("dvrptr")) { rptr.mod[m].package_version.assign(GW_VERSION+".DVRPTR"); } else if (0 == type.compare("dvrptr")) { Rptr.mod[m].package_version.assign(GW_VERSION+".DVRPTR"); }
else if (0 == type.compare("mmdvmhost")) { rptr.mod[m].package_version.assign(GW_VERSION+".Relay"); } else if (0 == type.compare("mmdvmhost")) { Rptr.mod[m].package_version.assign(GW_VERSION+".Relay"); }
else if (0 == type.compare("mmdvmmodem")) { rptr.mod[m].package_version.assign(GW_VERSION+".Modem"); } else if (0 == type.compare("mmdvmmodem")) { Rptr.mod[m].package_version.assign(GW_VERSION+".Modem"); }
else if (0 == type.compare("itap")) { rptr.mod[m].package_version.assign(GW_VERSION+".ITAP"); } else if (0 == type.compare("itap")) { Rptr.mod[m].package_version.assign(GW_VERSION+".ITAP"); }
else { else {
printf("module type '%s' is invalid\n", type.c_str()); printf("module type '%s' is invalid\n", type.c_str());
return true; return true;
} }
rptr.mod[m].defined = true; Rptr.mod[m].defined = true;
path.append(1, '_'); path.append(1, '_');
if (cfg.KeyExists(path+"tx_frequency")) { if (cfg.KeyExists(path+"tx_frequency")) {
cfg.GetValue(path+"tx_frequency", type, rptr.mod[m].frequency, 0.0, 6.0E9); cfg.GetValue(path+"tx_frequency", type, Rptr.mod[m].frequency, 0.0, 6.0E9);
double rx_freq; double rx_freq;
cfg.GetValue(path+"rx_frequency", type, rx_freq, 0.0, 6.0E9); cfg.GetValue(path+"rx_frequency", type, rx_freq, 0.0, 6.0E9);
if (0.0 == rx_freq) if (0.0 == rx_freq)
rx_freq = rptr.mod[m].frequency; rx_freq = Rptr.mod[m].frequency;
rptr.mod[m].offset = rx_freq - rptr.mod[m].frequency; Rptr.mod[m].offset = rx_freq - Rptr.mod[m].frequency;
} else if (cfg.KeyExists(path+"frequency")) { } else if (cfg.KeyExists(path+"frequency")) {
cfg.GetValue(path+"frequency", type, rptr.mod[m].frequency, 0.0, 1.0E9); cfg.GetValue(path+"frequency", type, Rptr.mod[m].frequency, 0.0, 1.0E9);
rptr.mod[m].offset = 0.0; Rptr.mod[m].offset = 0.0;
} else { } else {
rptr.mod[m].frequency = rptr.mod[m].offset = 0.0; Rptr.mod[m].frequency = Rptr.mod[m].offset = 0.0;
} }
cfg.GetValue(path+"range", type, rptr.mod[m].range, 0.0, 1609344.0); cfg.GetValue(path+"range", type, Rptr.mod[m].range, 0.0, 1609344.0);
cfg.GetValue(path+"agl", type, rptr.mod[m].agl, 0.0, 1000.0); cfg.GetValue(path+"agl", type, Rptr.mod[m].agl, 0.0, 1000.0);
} }
} }
if (! (rptr.mod[0].defined || rptr.mod[1].defined || rptr.mod[2].defined)) { if (! (Rptr.mod[0].defined || Rptr.mod[1].defined || Rptr.mod[2].defined)) {
printf("No modules defined!\n"); printf("No modules defined!\n");
return true; return true;
} }
@ -294,13 +294,13 @@ bool CQnetGateway::ReadConfig(char *cfgFile)
cfg.GetValue(path+"link2gate", estr, link2gate, 1, FILENAME_MAX); cfg.GetValue(path+"link2gate", estr, link2gate, 1, FILENAME_MAX);
cfg.GetValue(path+"modem2gate", estr, modem2gate, 1, FILENAME_MAX); cfg.GetValue(path+"modem2gate", estr, modem2gate, 1, FILENAME_MAX);
for (int m=0; m<3; m++) { for (int m=0; m<3; m++) {
if (rptr.mod[m].defined) { if (Rptr.mod[m].defined) {
cfg.GetValue(path+"gate2modem"+std::string(1, 'a'+m), estr, gate2modem[m], 1, FILENAME_MAX); cfg.GetValue(path+"gate2modem"+std::string(1, 'a'+m), estr, gate2modem[m], 1, FILENAME_MAX);
cfg.GetValue(path+"latitude", estr, rptr.mod[m].latitude, -90.0, 90.0); cfg.GetValue(path+"latitude", estr, Rptr.mod[m].latitude, -90.0, 90.0);
cfg.GetValue(path+"longitude", estr, rptr.mod[m].longitude, -180.0, 180.0); cfg.GetValue(path+"longitude", estr, Rptr.mod[m].longitude, -180.0, 180.0);
cfg.GetValue(path+"desc1", estr, rptr.mod[m].desc1, 0, 20); cfg.GetValue(path+"desc1", estr, Rptr.mod[m].desc1, 0, 20);
cfg.GetValue(path+"desc2", estr, rptr.mod[m].desc2, 0, 20); cfg.GetValue(path+"desc2", estr, Rptr.mod[m].desc2, 0, 20);
cfg.GetValue(path+"url", estr, rptr.mod[m].url, 0, 80); cfg.GetValue(path+"url", estr, Rptr.mod[m].url, 0, 80);
} }
} }
path.append("find_route"); path.append("find_route");
@ -314,10 +314,10 @@ bool CQnetGateway::ReadConfig(char *cfgFile)
// APRS // APRS
path.assign("aprs_"); path.assign("aprs_");
cfg.GetValue(path+"enable", estr, APRS_ENABLE); cfg.GetValue(path+"enable", estr, APRS_ENABLE);
cfg.GetValue(path+"host", estr, rptr.aprs.ip, 7, MAXHOSTNAMELEN); cfg.GetValue(path+"host", estr, Rptr.aprs.ip, 7, MAXHOSTNAMELEN);
cfg.GetValue(path+"port", estr, rptr.aprs.port, 10000, 65535); cfg.GetValue(path+"port", estr, Rptr.aprs.port, 10000, 65535);
cfg.GetValue(path+"interval", estr, rptr.aprs_interval, 40, 1000); cfg.GetValue(path+"interval", estr, Rptr.aprs_interval, 40, 1000);
cfg.GetValue(path+"filter", estr, rptr.aprs_filter, 0, 512); cfg.GetValue(path+"filter", estr, Rptr.aprs_filter, 0, 512);
// log // log
path.assign("log_"); path.assign("log_");
@ -387,7 +387,7 @@ void CQnetGateway::GetIRCDataThread(const int i)
short threshold = 0; short threshold = 0;
bool not_announced[3]; bool not_announced[3];
for (int i=0; i<3; i++) for (int i=0; i<3; i++)
not_announced[i] = this->rptr.mod[i].defined; // announce to all modules that are defined! not_announced[i] = this->Rptr.mod[i].defined; // announce to all modules that are defined!
bool is_quadnet = (std::string::npos != ircddb[i].ip.find(".openquad.net")); bool is_quadnet = (std::string::npos != ircddb[i].ip.find(".openquad.net"));
bool doFind = true; bool doFind = true;
while (keep_running) { while (keep_running) {
@ -1010,7 +1010,7 @@ void CQnetGateway::ProcessG2(const ssize_t g2buflen, const SDSVT &g2buf, const i
// Find out the local repeater module IP/port to send the data to // Find out the local repeater module IP/port to send the data to
int i = g2buf.hdr.rpt1[7] - 'A'; int i = g2buf.hdr.rpt1[7] - 'A';
/* valid repeater module? */ /* valid repeater module? */
if (i>=0 && i<3 && rptr.mod[i].defined) { if (i>=0 && i<3 && Rptr.mod[i].defined) {
// toRptr[i] is active if a remote system is talking to it or // toRptr[i] is active if a remote system is talking to it or
// toRptr[i] is receiving data from a cross-band // toRptr[i] is receiving data from a cross-band
if (0==toRptr[i].last_time && 0==band_txt[i].last_time && (Flag_is_ok(g2buf.hdr.flag[0]) || 0x01U==g2buf.hdr.flag[0] || 0x40U==g2buf.hdr.flag[0])) { if (0==toRptr[i].last_time && 0==band_txt[i].last_time && (Flag_is_ok(g2buf.hdr.flag[0]) || 0x01U==g2buf.hdr.flag[0] || 0x40U==g2buf.hdr.flag[0])) {
@ -1064,7 +1064,7 @@ void CQnetGateway::ProcessG2(const ssize_t g2buflen, const SDSVT &g2buf, const i
/* find out which repeater module to send the data to */ /* find out which repeater module to send the data to */
int i; int i;
for (i=0; i<3; i++) { for (i=0; i<3; i++) {
if (rptr.mod[i].defined) { if (Rptr.mod[i].defined) {
/* streamid match ? */ /* streamid match ? */
bool match = (toRptr[i].streamid == g2buf.streamid); bool match = (toRptr[i].streamid == g2buf.streamid);
if (source_sock >= 0) if (source_sock >= 0)
@ -1151,7 +1151,7 @@ void CQnetGateway::ProcessG2(const ssize_t g2buflen, const SDSVT &g2buf, const i
else { else {
/* for which repeater this stream has timed out ? */ /* for which repeater this stream has timed out ? */
for (i=0; i<3; i++) { for (i=0; i<3; i++) {
if (! rptr.mod[i].defined) if (! Rptr.mod[i].defined)
continue; continue;
/* match saved stream ? */ /* match saved stream ? */
bool match = (toRptr[i].saved_hdr.streamid == g2buf.streamid); bool match = (toRptr[i].saved_hdr.streamid == g2buf.streamid);
@ -1955,7 +1955,7 @@ void CQnetGateway::compute_aprs_hash()
hash ^= (*p++); hash ^= (*p++);
} }
printf("aprs hash code=[%d] for %s\n", hash, OWNER.c_str()); printf("aprs hash code=[%d] for %s\n", hash, OWNER.c_str());
rptr.aprs_hash = hash; Rptr.aprs_hash = hash;
return; return;
} }
@ -1992,11 +1992,11 @@ void CQnetGateway::APRSBeaconThread()
} }
time(&tnow); time(&tnow);
if ((tnow - last_beacon_time) > (rptr.aprs_interval * 60)) { if ((tnow - last_beacon_time) > (Rptr.aprs_interval * 60)) {
for (short int i=0; i<3; i++) { for (short int i=0; i<3; i++) {
if (rptr.mod[i].defined) { if (Rptr.mod[i].defined) {
float tmp_lat = fabs(rptr.mod[i].latitude); float tmp_lat = fabs(Rptr.mod[i].latitude);
float tmp_lon = fabs(rptr.mod[i].longitude); float tmp_lon = fabs(Rptr.mod[i].longitude);
float lat = floor(tmp_lat); float lat = floor(tmp_lat);
float lon = floor(tmp_lon); float lon = floor(tmp_lon);
lat = (tmp_lat - lat) * 60.0F + lat * 100.0F; lat = (tmp_lat - lat) * 60.0F + lat * 100.0F;
@ -2025,10 +2025,10 @@ void CQnetGateway::APRSBeaconThread()
/* send to aprs */ /* send to aprs */
sprintf(snd_buf, "%s>APJI23,TCPIP*,qAC,%sS:!%s%cD%s%c&RNG%04u %s %s", sprintf(snd_buf, "%s>APJI23,TCPIP*,qAC,%sS:!%s%cD%s%c&RNG%04u %s %s",
rptr.mod[i].call.c_str(), rptr.mod[i].call.c_str(), Rptr.mod[i].call.c_str(), Rptr.mod[i].call.c_str(),
lat_s, (rptr.mod[i].latitude < 0.0) ? 'S' : 'N', lat_s, (Rptr.mod[i].latitude < 0.0) ? 'S' : 'N',
lon_s, (rptr.mod[i].longitude < 0.0) ? 'W' : 'E', lon_s, (Rptr.mod[i].longitude < 0.0) ? 'W' : 'E',
(unsigned int)rptr.mod[i].range, rptr.mod[i].band.c_str(), GW_VERSION.c_str()); (unsigned int)Rptr.mod[i].range, Rptr.mod[i].band.c_str(), GW_VERSION.c_str());
if (LOG_DEBUG) if (LOG_DEBUG)
printf("APRS Beacon =[%s]\n", snd_buf); printf("APRS Beacon =[%s]\n", snd_buf);
strcat(snd_buf, "\r\n"); strcat(snd_buf, "\r\n");
@ -2257,10 +2257,10 @@ void CQnetGateway::qrgs_and_maps()
rptrcall += i + 'A'; rptrcall += i + 'A';
for (int j=0; j<2; j++) { for (int j=0; j<2; j++) {
if (ii[j]) { if (ii[j]) {
if (rptr.mod[i].latitude || rptr.mod[i].longitude || rptr.mod[i].desc1.length() || rptr.mod[i].url.length()) if (Rptr.mod[i].latitude || Rptr.mod[i].longitude || Rptr.mod[i].desc1.length() || Rptr.mod[i].url.length())
ii[j]->rptrQTH(rptrcall, rptr.mod[i].latitude, rptr.mod[i].longitude, rptr.mod[i].desc1, rptr.mod[i].desc2, rptr.mod[i].url, rptr.mod[i].package_version); ii[j]->rptrQTH(rptrcall, Rptr.mod[i].latitude, Rptr.mod[i].longitude, Rptr.mod[i].desc1, Rptr.mod[i].desc2, Rptr.mod[i].url, Rptr.mod[i].package_version);
if (rptr.mod[i].frequency) if (Rptr.mod[i].frequency)
ii[j]->rptrQRG(rptrcall, rptr.mod[i].frequency, rptr.mod[i].offset, rptr.mod[i].range, rptr.mod[i].agl); ii[j]->rptrQRG(rptrcall, Rptr.mod[i].frequency, Rptr.mod[i].offset, Rptr.mod[i].range, Rptr.mod[i].agl);
} }
} }
} }
@ -2308,24 +2308,24 @@ bool CQnetGateway::Init(char *cfgfile)
playNotInCache = false; playNotInCache = false;
/* build the repeater callsigns for aprs */ /* build the repeater callsigns for aprs */
rptr.mod[0].call = OWNER; Rptr.mod[0].call = OWNER;
for (i=OWNER.length(); i; i--) for (i=OWNER.length(); i; i--)
if (! isspace(OWNER[i-1])) if (! isspace(OWNER[i-1]))
break; break;
rptr.mod[0].call.resize(i); Rptr.mod[0].call.resize(i);
rptr.mod[1].call = rptr.mod[0].call; Rptr.mod[1].call = Rptr.mod[0].call;
rptr.mod[2].call = rptr.mod[0].call; Rptr.mod[2].call = Rptr.mod[0].call;
rptr.mod[0].call += "-A"; Rptr.mod[0].call += "-A";
rptr.mod[1].call += "-B"; Rptr.mod[1].call += "-B";
rptr.mod[2].call += "-C"; Rptr.mod[2].call += "-C";
rptr.mod[0].band = "23cm"; Rptr.mod[0].band = "23cm";
rptr.mod[1].band = "70cm"; Rptr.mod[1].band = "70cm";
rptr.mod[2].band = "2m"; Rptr.mod[2].band = "2m";
printf("Repeater callsigns: [%s] [%s] [%s]\n", rptr.mod[0].call.c_str(), rptr.mod[1].call.c_str(), rptr.mod[2].call.c_str()); printf("Repeater callsigns: [%s] [%s] [%s]\n", Rptr.mod[0].call.c_str(), Rptr.mod[1].call.c_str(), Rptr.mod[2].call.c_str());
for (i = 0; i < 3; i++) { for (i = 0; i < 3; i++) {
//rptr.mod[i].frequency = rptr.mod[i].offset = rptr.mod[i].latitude = rptr.mod[i].longitude = rptr.mod[i].agl = rptr.mod[i].range = 0.0; //Rptr.mod[i].frequency = Rptr.mod[i].offset = Rptr.mod[i].latitude = Rptr.mod[i].longitude = Rptr.mod[i].agl = Rptr.mod[i].range = 0.0;
band_txt[i].streamID = 0; band_txt[i].streamID = 0;
band_txt[i].flags[0] = band_txt[i].flags[1] = band_txt[i].flags[2] = 0; band_txt[i].flags[0] = band_txt[i].flags[1] = band_txt[i].flags[2] = 0;
band_txt[i].lh_mycall[0] = '\0'; band_txt[i].lh_mycall[0] = '\0';
@ -2356,7 +2356,7 @@ bool CQnetGateway::Init(char *cfgfile)
} }
if (APRS_ENABLE) { if (APRS_ENABLE) {
aprs = new CAPRS(&rptr); aprs = new CAPRS(&Rptr);
if (aprs) if (aprs)
aprs->Init(); aprs->Init();
else { else {
@ -2443,7 +2443,7 @@ bool CQnetGateway::Init(char *cfgfile)
return true; return true;
for (i=0; i<3; i++) { for (i=0; i<3; i++) {
if (rptr.mod[i].defined) { // open unix sockets between qngateway and each defined modem if (Rptr.mod[i].defined) { // open unix sockets between qngateway and each defined modem
Gate2Modem[i].SetUp(gate2modem[i].c_str()); Gate2Modem[i].SetUp(gate2modem[i].c_str());
} }
// recording for echotest on local repeater modules // recording for echotest on local repeater modules
@ -2640,7 +2640,7 @@ void CQnetGateway::build_aprs_from_gps_and_send(short int rptr_idx)
strcat(buf, ">"); strcat(buf, ">");
strcat(buf, "APDPRS,DSTAR*,qAR,"); strcat(buf, "APDPRS,DSTAR*,qAR,");
strcat(buf, rptr.mod[rptr_idx].call.c_str()); strcat(buf, Rptr.mod[rptr_idx].call.c_str());
strcat(buf, ":!"); strcat(buf, ":!");
//GPRMC = //GPRMC =

2
QnetGateway.h
Unescape View File

@ -118,7 +118,7 @@ private:
// data needed for aprs login and aprs beacon // data needed for aprs login and aprs beacon
// RPTR defined in aprs.h // RPTR defined in aprs.h
SRPTR rptr; SRPTR Rptr;
// local repeater modules being recorded // local repeater modules being recorded
// This is for echotest and voicemail // This is for echotest and voicemail

Write Preview
Loading…
Cancel
Save

Powered by TurnKey Linux.