Commit: d52f5d843f98a4fb120f697e2a305d126674a747 - rpi-dmonitor (git)

Commit MetaInfo

• Révision: d52f5d843f98a4fb120f697e2a305d126674a747 (tree)
• l'heure: 2020-10-15 01:37:43
• Auteur: Satoshi Yasuda <7m3tjz@jarl...>
• Commiter: Satoshi Yasuda

Message de Log

modified: dmonitor_utils.c
modified: dvap.c
modified: inet_read.c
modified: main.c
modified: send_msg.c

Change Summary

• modified: dmonitor_utils.c
• modified: dvap.c
• modified: inet_read.c
• modified: main.c
• modified: send_msg.c

Modification

--- a/dmonitor_utils.c
+++ b/dmonitor_utils.c
@@ -394,9 +394,9 @@ int	send_rig (void)
 		rig_write (17, send_buff);
 		if (send_buff[3] & 0x40)
 		{
-			//#ifdef	_DEBUG
+			#ifdef	_DEBUG
 			syslog (LOG_INFO, "Fifo_cnt (last frame) %d", Fifo_cnt);
-			//#endif
+			#endif
 			if (Fifo_cnt < fifo_hold) 
 			{
 				rig_send_sw = FALSE;
@@ -720,7 +720,6 @@ void	dmonitor_close (void)
                 (struct sockaddr *)&in_addr, sizeof(in_addr));
 }
 
-#if 0
 void	jitter_buff_init(void)
 {
 	int	n;
@@ -739,8 +738,6 @@ void	jitter_buff_init(void)
 
 void	jitter_put (unsigned char buff[])
 {
-
-//syslog (LOG_DEBUG, "jitter put %2.2x %2.2x", buff[0], buff[1]);
 	//if (rig_last_frame_send) return;
 	jitter_wr_pnt = buff[0] & 0x1f;
 	if (jitter_wr_pnt > 20) return;
@@ -762,16 +759,14 @@ void	jitter_putFifo (void)
 	int k, n;
 	int	jitter_n;
 
-//syslog (LOG_DEBUG, "debug 100 %2.2x %2.2x", jitter_wr_pnt, jitter_rd_pnt);
+	if (jitter_buff[jitter_wr_pnt][0] == 0xff) return;
 	if ((jitter_buff[jitter_wr_pnt][0] != 0xff) &&  (jitter_buff[jitter_wr_pnt][0] & 0x40))
 	{
 		#ifdef	_DEBUG_JITTER
 		syslog(LOG_DEBUG, "last freame in jitter");
 		#endif
-syslog (LOG_DEBUG, "200 %2.2x %2.2x", jitter_wr_pnt, jitter_rd_pnt);
 		while (jitter_wr_pnt != jitter_rd_pnt)
 		{
-syslog (LOG_DEBUG, "210 %2.2x %2.2x", jitter_wr_pnt, jitter_rd_pnt);
 			if (jitter_buff[jitter_rd_pnt][0] == 0xff) 
 			{
 				jitter_buff[jitter_rd_pnt][0] = jitter_rd_pnt;
@@ -787,17 +782,16 @@ syslog (LOG_DEBUG, "210 %2.2x %2.2x", jitter_wr_pnt, jitter_rd_pnt);
 		}
 		putFifo (13, &jitter_buff[jitter_wr_pnt][0]);
 		jitter_buff[jitter_wr_pnt][0] = 0xff;
-		jitter_rd_pnt++;
-		jitter_wr_pnt = jitter_rd_pnt;
+		//jitter_rd_pnt++;
+		//jitter_wr_pnt = jitter_rd_pnt;
 		if (jitter_rd_pnt > 20) jitter_rd_pnt = 0;
                 digitalWrite (INET_LED, 0);
                 digitalWrite (RIG_LED, 0);
 		rig_last_frame_send = TRUE;
 		return;
 	}
-	while ((jitter_buff[jitter_rd_pnt][0] != 0xff) && !(jitter_buff[jitter_rd_pnt][0] & 0x40))
+	while (jitter_buff[jitter_rd_pnt][0] != 0xff)
 	{
-syslog (LOG_DEBUG, "jitter putFifo %d", jitter_rd_pnt);
 		putFifo (13, &jitter_buff[jitter_rd_pnt][0]);
 		jitter_buff[jitter_rd_pnt][0] = 0xff;
 		if (jitter_rd_pnt == 0) memcpy (&jitter_buff[jitter_rd_pnt][1], NullVoice, 12);
@@ -806,7 +800,6 @@ syslog (LOG_DEBUG, "jitter putFifo %d", jitter_rd_pnt);
 		jitter_rd_pnt++;
 		if (jitter_rd_pnt > 20) jitter_rd_pnt = 0;
 		jitter_wr_cnt--;
-		if (jitter_wr_cnt < 0) jitter_wr_cnt = 0;
 	}
 	#ifdef	_DEBUG_JITTER
 	syslog (LOG_INFO, "debug %d %d", jitter_wr_pnt, jitter_rd_pnt);
@@ -820,7 +813,6 @@ syslog (LOG_DEBUG, "jitter putFifo %d", jitter_rd_pnt);
 	if (((jitter_wr_pnt + 1) != jitter_rd_pnt) && ((jitter_wr_pnt + 1) != (jitter_rd_pnt + 21)))
 	{
 		k = jitter_wr_pnt;
-syslog (LOG_DEBUG, "debug 100 %d", jitter_rd_pnt);
 		while (k != jitter_rd_pnt)
 		{
 			if (jitter_buff[k][0] != 0xff)
@@ -832,7 +824,6 @@ syslog (LOG_DEBUG, "debug 100 %d", jitter_rd_pnt);
 			k--;
 			if (k < 0) k = 20;
 		}
-syslog (LOG_DEBUG, "debug 110 %d", jitter_rd_pnt);
 	#ifdef	_DEBUG_JITTER
 	syslog (LOG_INFO, "n:%d\n", n);
 	#endif
@@ -844,7 +835,6 @@ syslog (LOG_DEBUG, "debug 110 %d", jitter_rd_pnt);
 		{
 			if (jitter_buff[jitter_n][0] == 0xff) inet_read_drop_cnt++;
 			jitter_buff[jitter_n][0] = jitter_n;
-syslog (LOG_DEBUG, "test %d %d", jitter_n, jitter_wr_pnt); 
 			putFifo (13, &jitter_buff[jitter_n][0]);
 			jitter_buff[jitter_n][0] = 0xff;
 			if (jitter_n == 0) memcpy (&jitter_buff[jitter_n][1], NullVoice, 12);
@@ -854,9 +844,7 @@ syslog (LOG_DEBUG, "test %d %d", jitter_n, jitter_wr_pnt);
 		}
 		//jitter_wr_cnt = 0;
 	}
-syslog (LOG_DEBUG, "debug 120 %d", jitter_rd_pnt);
 }
-#endif 
 
 void	drop_rate_print (void)
 {
@@ -943,118 +931,3 @@ int     ja_check (unsigned char callsign[])
         return FALSE;
 }
 
-void	jitter_buff_init(void)
-{
-	int	n;
-
-	jitter_rd_pnt = 0;
-	jitter_wr_cnt = 0;
-
-	for (n = 0 ; n < 21 ; n++)
-	{
-		jitter_buff[n][0] = 0xff;
-		if (n == 0) memcpy (&jitter_buff[n][1], NullVoice, 12);
-		else        memcpy (&jitter_buff[n][1], NullVoice1, 12);
-	}
-}
-
-void	jitter_put (unsigned char buff[])
-{
-	jitter_wr_pnt = buff[0] & 0x1f;
-	if (jitter_wr_pnt > 20) return;
-	if (jitter_wr_pnt)
-		memcpy (&jitter_buff[jitter_wr_pnt][0], buff, 13);
-	else
-		memcpy (&jitter_buff[jitter_wr_pnt][0], buff, 10);
-	jitter_wr_cnt++;
-	if (jitter_wr_cnt < 0) jitter_wr_cnt = 0;
-	#ifdef	_DEBUG_JITTER
-	syslog (LOG_INFO, "jitter put %d %d", jitter_wr_pnt, jitter_wr_cnt);
-	#endif
-	jitter_putFifo();
-}
-
-void	jitter_putFifo (void)
-{
-	int k, n;
-
-	if ((jitter_buff[jitter_wr_pnt][0] != 0xff) &&  (jitter_buff[jitter_wr_pnt][0] & 0x40))
-	{
-		#ifdef	_DEBUG_JITTER
-		syslog(LOG_DEBUG, "last freame in jitter");
-		#endif
-		while (jitter_wr_pnt != jitter_rd_pnt)
-		{
-			if (jitter_buff[jitter_rd_pnt][0] == 0xff) 
-			{
-				jitter_buff[jitter_rd_pnt][0] = jitter_rd_pnt;
-				inet_read_drop_cnt++;
-				syslog (LOG_INFO, "packet loss (drop) %2.2x", jitter_rd_pnt);
-			}
-			putFifo (13, &jitter_buff[jitter_rd_pnt][0]);
-			jitter_buff[jitter_rd_pnt][0] = 0xff;
-			if (jitter_rd_pnt == 0) memcpy (&jitter_buff[jitter_rd_pnt][1], NullVoice, 12);
-			else        memcpy (&jitter_buff[jitter_rd_pnt][1], NullVoice1, 12);
-			jitter_rd_pnt++;
-			if (jitter_rd_pnt > 20) jitter_rd_pnt = 0;
-		}
-		putFifo (13, &jitter_buff[jitter_wr_pnt][0]);
-		jitter_buff[jitter_wr_pnt][0] = 0xff;
-		jitter_rd_pnt = 0;
-                digitalWrite (INET_LED, 0);
-                digitalWrite (RIG_LED, 0);
-		return;
-	}			
-	while (jitter_buff[jitter_rd_pnt][0] != 0xff)
-	{
-		putFifo (13, &jitter_buff[jitter_rd_pnt][0]);
-		jitter_buff[jitter_rd_pnt][0] = 0xff;
-		if (jitter_rd_pnt == 0) memcpy (&jitter_buff[jitter_rd_pnt][1], NullVoice, 12);
-		else        memcpy (&jitter_buff[jitter_rd_pnt][1], NullVoice1, 12);
-		jitter_rd_pnt++;
-		if (jitter_rd_pnt > 20) jitter_rd_pnt = 0;
-		jitter_wr_cnt--;
-	}
-	#ifdef	_DEBUG_JITTER
-	syslog (LOG_INFO, "debug %d %d", jitter_wr_pnt, jitter_rd_pnt);
-	syslog (LOG_INFO, "%2.2x %2.2x %2.2x %2.2x %2.2x %2.2x %2.2x %2.2x %2.2x %2.2x %2.2x %2.2x %2.2x %2.2x %2.2x %2.2x %2.2x %2.2x %2.2x %2.2x %2.2x",
-		jitter_buff[0][0], jitter_buff[1][0],jitter_buff[2][0],jitter_buff[3][0],jitter_buff[4][0],
-		jitter_buff[5][0],jitter_buff[6][0],jitter_buff[7][0],jitter_buff[8][0],jitter_buff[8][0],jitter_buff[10][0],
-		jitter_buff[11][0], jitter_buff[12][0],jitter_buff[13][0],jitter_buff[14][0],jitter_buff[15][0],
-		jitter_buff[16][0],jitter_buff[17][0],jitter_buff[18][0],jitter_buff[19][0],jitter_buff[20][0]);
-	#endif
-	n = 0;
-	if (((jitter_wr_pnt + 1) != jitter_rd_pnt) && ((jitter_wr_pnt + 1) != (jitter_rd_pnt + 21)))
-	{
-		k = jitter_wr_pnt;
-		while (k != jitter_rd_pnt)
-		{
-			if (jitter_buff[k][0] != 0xff)
-			{
-				n++;
-			}
-			else
-				break;
-			k--;
-			if (k < 0) k = 20;
-		}
-	#ifdef	_DEBUG_JITTER
-	syslog (LOG_INFO, "n:%d\n", n);
-	#endif
-	}
-	if (n > 4)
-	{
-		while (jitter_rd_pnt != jitter_wr_pnt)
-		{
-			if (jitter_buff[jitter_rd_pnt][0] == 0xff) inet_read_drop_cnt++;
-			jitter_buff[jitter_rd_pnt][0] = jitter_rd_pnt;
-			putFifo (13, &jitter_buff[jitter_rd_pnt][0]);
-			jitter_buff[jitter_rd_pnt][0] = 0xff;
-			if (jitter_rd_pnt == 0) memcpy (&jitter_buff[jitter_rd_pnt][1], NullVoice, 12);
-			else        memcpy (&jitter_buff[jitter_rd_pnt][1], NullVoice1, 12);
-			jitter_rd_pnt++;
-			if (jitter_rd_pnt > 20) jitter_rd_pnt = 0;
-		}
-		jitter_wr_cnt = 0;
-	}
-}

--- a/dvap.c
+++ b/dvap.c
@@ -744,19 +744,19 @@ void	dvap_write (int	fd, unsigned char buff[], int length)
 			dvap_send_pkt[6] &= 0x07;
 			ret = write (fd, dvap_send_pkt, 47);
 			//dvap_send_pkt[4] = 0x00;
-			//dvap_send_pkt[5]++;
+			dvap_send_pkt[5]++;
 			
 			send_header_sw = TRUE;
 			dvap_first_voice_pkt = TRUE;
 			syslog (LOG_DEBUG, "to DVAP rpt2:%8.8s rpt1:%8.8s ur:%8.8s my:%8.8s my2:%4.4s", &buff[5], &buff[13],&buff[21], &buff[29], &buff[37]);
-//#ifdef  _DEBUG_DVAP_SEND
+#ifdef  _DEBUG_DVAP_SEND
 syslog (LOG_DEBUG, "%2.2x %2.2x %2.2x %2.2x %2.2x %2.2x %2.2x %2.2x %2.2x %2.2x %2.2x %2.2x %2.2x %2.2x %2.2x %2.2x",
 	dvap_send_pkt[0],dvap_send_pkt[1],dvap_send_pkt[2],dvap_send_pkt[3], dvap_send_pkt[4],dvap_send_pkt[5],dvap_send_pkt[6], dvap_send_pkt[7],dvap_send_pkt[8],dvap_send_pkt[9], dvap_send_pkt[10],dvap_send_pkt[11],dvap_send_pkt[12], dvap_send_pkt[13],dvap_send_pkt[14],dvap_send_pkt[15]);
 syslog (LOG_DEBUG, "%2.2x %2.2x %2.2x %2.2x %2.2x %2.2x %2.2x %2.2x %2.2x %2.2x %2.2x %2.2x %2.2x %2.2x %2.2x %2.2x",
         dvap_send_pkt[16],dvap_send_pkt[17],dvap_send_pkt[18],dvap_send_pkt[19], dvap_send_pkt[20],dvap_send_pkt[21],dvap_send_pkt[22], dvap_send_pkt[23],dvap_send_pkt[24],dvap_send_pkt[25], dvap_send_pkt[26],dvap_send_pkt[27],dvap_send_pkt[28], dvap_send_pkt[29],dvap_send_pkt[30],dvap_send_pkt[31]);
 syslog (LOG_DEBUG, "%2.2x %2.2x %2.2x %2.2x %2.2x %2.2x %2.2x %2.2x %2.2x %2.2x %2.2x %2.2x %2.2x %2.2x %2.2x %2.2x",
         dvap_send_pkt[32],dvap_send_pkt[33],dvap_send_pkt[34],dvap_send_pkt[35], dvap_send_pkt[36],dvap_send_pkt[37],dvap_send_pkt[38], dvap_send_pkt[39],dvap_send_pkt[40],dvap_send_pkt[41], dvap_send_pkt[42],dvap_send_pkt[43],dvap_send_pkt[44], dvap_send_pkt[45],dvap_send_pkt[46],dvap_send_pkt[47]);
-//#endif
+#endif
 		}
 	}
 	else if (length == 17)
@@ -769,22 +769,23 @@ syslog (LOG_DEBUG, "%2.2x %2.2x %2.2x %2.2x %2.2x %2.2x %2.2x %2.2x %2.2x %2.2x
         			time(&dvap_keep_alive);
         			dvap_send_pkt[0] = 0x12;
         			dvap_send_pkt[1] = 0xc0;
-        			memcpy (&dvap_send_pkt[5], &buff[3], 13);
-				if ((dvap_send_pkt[5] & 0x40) || 
+				dvap_send_pkt[4] = buff[3];
+        			memcpy (&dvap_send_pkt[6], &buff[4], 12);
+				if ((dvap_send_pkt[4] & 0x40) || 
 					(!memcmp (&dvap_send_pkt[6], &lastframe[3], 3) && !memcmp (&dvap_send_pkt[15], lastframe, 3)))
 				{
 					dvap_send_pkt[5] |= 0x40;
 					send_header_sw = FALSE;
 				}
         			ret = write (fd, dvap_send_pkt, 18);
-        			//dvap_send_pkt[5]++;
-        			dvap_send_pkt[4]++;
+        			dvap_send_pkt[5]++;
+        			//dvap_send_pkt[4]++;
         			//if (dvap_send_pkt[4] == 21) dvap_send_pkt[4] = 0;
 				dvap_first_voice_pkt = FALSE;
-//#ifdef	_DEBUG_DVAP_SEND 
+#ifdef	_DEBUG_DVAP_SEND 
 syslog (LOG_DEBUG, "%2.2x %2.2x %2.2x %2.2x %2.2x %2.2x %2.2x %2.2x %2.2x %2.2x %2.2x %2.2x %2.2x %2.2x %2.2x %2.2x %2.2x %2.2x",
         dvap_send_pkt[0], dvap_send_pkt[1], dvap_send_pkt[2], dvap_send_pkt[3], dvap_send_pkt[4], dvap_send_pkt[5], dvap_send_pkt[6], dvap_send_pkt[7], dvap_send_pkt[8], dvap_send_pkt[9], dvap_send_pkt[10], dvap_send_pkt[11], dvap_send_pkt[12], dvap_send_pkt[13], dvap_send_pkt[14], dvap_send_pkt[15], dvap_send_pkt[16], dvap_send_pkt[17]);
-//#endif
+#endif
 			}
 		}
 	}

--- a/inet_read.c
+++ b/inet_read.c
@@ -223,7 +223,6 @@ void	inet_read (void)
 	{
 		if (send_header_sw && !memcmp (&inet_frame_id, &recvBuff[14], 2) && (inet_frame_id[0] != 0x00) && (inet_frame_id[1] != 0x00))
 		{
-//syslog (LOG_DEBUG, "pkt seq:%2.2x %2.2x", recvBuff[16], recvBuff[17]);
 			#ifdef	_SPECIFICATIO_CHECK
 			if (!memcmp (&recvBuff[14], voice_packet_save, 15))
 				syslog (LOG_INFO, "Dup. packet (maybe loop) from %2.2x %2.2x %2.2x", 

--- a/main.c
+++ b/main.c
@@ -362,7 +362,7 @@ top:
 				else if (rig_type == DVMEGA) dvmega_read();
 			}
 		}
-		if (Fifo_cnt) jitter_putFifo();
+		jitter_putFifo();
 		rig ();
 		if ((cur_time - hole_punch_send_time) >= hole_punch_send_interval)
 		{
@@ -398,7 +398,6 @@ top:
 				send_keep_alive();
 			}
 		}
-syslog (LOG_DEBUG, "Fifo_cnt %d", Fifo_cnt);
 		if(rig_send_sw)
 		{
 			if (rig_type == NODE)

--- a/send_msg.c
+++ b/send_msg.c
@@ -37,7 +37,6 @@ void	send_msg (unsigned char string[], unsigned char my2[])
 	int	n;
 	time_t	ctime;
 
-syslog (LOG_DEBUG, "msg_send");
 	time (&ctime);
 	if ((ctime - msg_send_set_time) >= 2)
 	{