aprs fix

QnetGateway.cpp

@@ -823,7 +823,7 @@ void CQnetGateway::ProcessTimeouts()
 // the to_print is an integer that counts down how many 2-voice-frame pairs remain to be processed.
 // ABC_grp means that we are processing a 20-character message.
 // C_seen means that we are processing the last 2-voice-frame packet on a 20 character message.
-void CQnetGateway::ProcessSlowData(unsigned char *data, unsigned short sid, unsigned char header_type, bool *new_group, short *to_print, bool *ABC_grp, bool *C_seen)
+void CQnetGateway::ProcessSlowData(unsigned char *data, unsigned short sid, unsigned char &header_type, bool *new_group, short *to_print, bool *ABC_grp, bool *C_seen)
 {
 	/* extract 20-byte RADIO ID */
 	if ((data[0] != 0x55) || (data[1] != 0x2d) || (data[2] != 0x16)) {
@@ -2007,7 +2007,7 @@ void CQnetGateway::Process()
 						/* aprs processing */
 						if (bool_send_aprs)
 							//                             streamID               seq                audio+text             size
-							aprs->ProcessText(rptrbuf.vpkt.streamid, rptrbuf.vpkt.ctrl, rptrbuf.vpkt.vasd.voice, (recvlen == 29)?12:15);
+							aprs->ProcessText(ntohs(rptrbuf.vpkt.streamid), rptrbuf.vpkt.ctrl, rptrbuf.vpkt.vasd.voice, (recvlen == 29)?12:15);
 
 						for (int i=0; i<3; i++) {
 							/* find out if data must go to the remote G2 */

QnetGateway.h

@@ -154,7 +154,7 @@ private:
 	void compute_aprs_hash();
 	void APRSBeaconThread();
 	void ProcessTimeouts();
-	void ProcessSlowData(unsigned char *data, unsigned short sid, unsigned char header_type, bool *new_group, short *to_print, bool *ABC_grp, bool *C_seen);
+	void ProcessSlowData(unsigned char *data, unsigned short sid, unsigned char &header_type, bool *new_group, short *to_print, bool *ABC_grp, bool *C_seen);
 	bool Flag_is_ok(unsigned char flag);
 
 	// read configuration file

aprs.cpp

@@ -70,7 +70,7 @@ void CAPRS::ProcessText(unsigned short streamID, unsigned char seq, unsigned cha
 	}
 
 	if ((rptr_idx < 0) || (rptr_idx > 2)) {
-		// printf("ERROR in aprs_process_text: rptr_idx %d is invalid\n", rptr_idx);
+		printf("ERROR in aprs_process_text: rptr_idx %d is invalid\n", rptr_idx);
 		return;
 	}
 

versions.h

@@ -1,5 +1,5 @@
 // version strings must be 55 characters or less!
-#define IRCDDB_VERSION "QnetGateway-7.4.2"
+#define IRCDDB_VERSION "QnetGateway-7.4.3"
 #define LINK_VERSION "QnetLink-6.2.0"
 #define DVAP_VERSION "QnetDVAP-5.1.2"
 #define RELAY_VERSION "QnetRelay-0.2.3"