Commit: 26dfc6ef3b846f6f37bda4a7fcdca12e3cba8fd8 - rpi-dmonitor (git)

Commit MetaInfo

• Revision: 26dfc6ef3b846f6f37bda4a7fcdca12e3cba8fd8 (tree)
• Zeit: 2020-10-14 23:39:04
• Autor: Satoshi Yasuda <7m3tjz@jarl...>
• Commiter: Satoshi Yasuda

Log Message

modified: dmonitor.h
modified: dmonitor_utils.c
modified: dstar_data.c
modified: dvap.c
modified: dvmega.h
modified: dvmega_utils.c
modified: from_node.c
modified: inet_read.c
modified: main.c
modified: rig_read.c
modified: rpt_conn.h
modified: rpt_conn_dvap.c
modified: rpt_conn_send_msg.c
modified: send_msg.c
modified: send_node.c

Ändern Zusammenfassung

• modified: dmonitor.h
• modified: dmonitor_utils.c
• modified: dstar_data.c
• modified: dvap.c
• modified: dvmega.h
• modified: dvmega_utils.c
• modified: from_node.c
• modified: inet_read.c
• modified: main.c
• modified: rig_read.c
• modified: rpt_conn.h
• modified: rpt_conn_dvap.c
• modified: rpt_conn_send_msg.c
• modified: send_msg.c
• modified: send_node.c

Diff

--- a/dmonitor.h
+++ b/dmonitor.h
@@ -113,6 +113,7 @@ int	hole_punch_port;
 char	hole_punch_server[128];
 
 unsigned char	inet_frame_id[2];
+unsigned char	inet_frame_id_save[2];
 struct	timeval	inet_recv_time;
 struct	timeval	inet_recv_time_save;
 struct	timeval	inet_recv_timeout;
@@ -200,7 +201,6 @@ unsigned char	MD5_dmonitor[32];
 
 char	rig_type;
 
-int	dvap_send_header_sw;
 char	dvap_first_voice_pkt;
 
 time_t	dest_keep_alive_send_time;
@@ -298,4 +298,5 @@ time_t	lcd_time_save;
 /* misc */
 char	voice_packet_save[15];
 int	hole_punchd_recvd;
+int	send_header_sw;
 time_t	msg_send_set_time;

--- a/dmonitor_utils.c
+++ b/dmonitor_utils.c
@@ -13,7 +13,8 @@ int	send_dest_keep_alive(void);
 int	node_usb_init (void);
 void	node_close (void);
 void	lcd_write(void);
-
+int	node_space_check (int length);
+int	check_getFifo(void);
 extern	char	dummy_frame_1[12];
 extern	char	dummy_frame_2[12];
 extern	char	dummy_frame_3[12];
@@ -360,6 +361,12 @@ int	send_rig (void)
 	int	length;
 	int	rate;
 
+	if (rig_type == NODE)
+	{
+		length = check_getFifo();
+		if (!node_space_check (length)) return TRUE;
+	}
+
 	length = getFifo (&send_buff[3]);
 	if (length == 0)
 	{
@@ -374,7 +381,7 @@ int	send_rig (void)
 	}
 	else if (length == 13)
 	{
-		#if 0
+		#if 0 
 		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",
 		send_buff[3], send_buff[4], send_buff[5], send_buff[6], send_buff[7], send_buff[8], send_buff[9], send_buff[10],
 		send_buff[11], send_buff[12], send_buff[13], send_buff[14], send_buff[15]);
@@ -387,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;
@@ -445,12 +452,25 @@ void    LastFrameSend (void)
 
 }
 
+int	check_getFifo (void)
+{
+	struct	FifoPkt	*tmp;
+
+	if (Rp->next == NULL) return 0;
+	tmp = Rp->next; 
+	return tmp->length;
+}
+	
 int	getFifo	(char pkt[])
 {
 	struct	FifoPkt	*tmp;
 	int	len;
 
-	if (Rp->next ==	NULL) return 0;
+	if (Rp->next ==	NULL) 
+	{
+		Fifo_cnt = 0;
+		return 0;
+	}
 	tmp = Rp;
 	Rp = Rp->next;
 	len = Rp->length;
@@ -466,7 +486,7 @@ int	getFifo	(char pkt[])
 void    putFifo (int len, unsigned char pkt[])
 {
         struct FifoPkt  *ret;
-
+//syslog(LOG_DEBUG, "putFifo %d %2.2x %2.2x %2.2x", len, pkt[0], pkt[1],  pkt[2]);
 	#ifdef	_DEBUG
 	syslog (LOG_INFO, "putFifo len:%d %2.2x", len, pkt[0]);
 	#endif
@@ -700,11 +720,13 @@ void	dmonitor_close (void)
                 (struct sockaddr *)&in_addr, sizeof(in_addr));
 }
 
+#if 0
 void	jitter_buff_init(void)
 {
 	int	n;
 
 	jitter_rd_pnt = 0;
+	jitter_wr_pnt = 0;
 	jitter_wr_cnt = 0;
 
 	for (n = 0 ; n < 21 ; n++)
@@ -717,6 +739,9 @@ 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;
 	if (jitter_wr_pnt)
@@ -726,7 +751,8 @@ void	jitter_put (unsigned char buff[])
 	jitter_wr_cnt++;
 	if (jitter_wr_cnt < 0) jitter_wr_pnt = 0;
 	#ifdef	_DEBUG_JITTER
-	syslog (LOG_INFO, "jitter put %d %d", jitter_wr_pnt, jitter_wr_cnt);
+	syslog (LOG_INFO, "jitter put %d %d   %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_wr_pnt, jitter_wr_cnt,
+	buff[0], buff[1], buff[2], buff[3], buff[4], buff[5], buff[6],buff[7],buff[8],buff[9],buff[10], buff[11],buff[12]);
 	#endif
 	jitter_putFifo();
 }
@@ -734,14 +760,18 @@ void	jitter_put (unsigned char buff[])
 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) &&  (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;
@@ -758,20 +788,25 @@ void	jitter_putFifo (void)
 		putFifo (13, &jitter_buff[jitter_wr_pnt][0]);
 		jitter_buff[jitter_wr_pnt][0] = 0xff;
 		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)
+	while ((jitter_buff[jitter_rd_pnt][0] != 0xff) && !(jitter_buff[jitter_rd_pnt][0] & 0x40))
 	{
+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);
 		else        memcpy (&jitter_buff[jitter_rd_pnt][1], NullVoice1, 12);
+		//jitter_wr_pnt = 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);
@@ -785,6 +820,7 @@ void	jitter_putFifo (void)
 	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)
@@ -796,26 +832,31 @@ void	jitter_putFifo (void)
 			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
 	}
 	if (n > 4)
 	{
-		while (jitter_rd_pnt != jitter_wr_pnt)
+		jitter_n = jitter_rd_pnt;
+		while (jitter_n != 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;
+			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);
+			else        memcpy (&jitter_buff[jitter_n][1], NullVoice1, 12);
+			jitter_n++;
+			if (jitter_n > 20) jitter_n = 0;
 		}
-		jitter_wr_cnt = 0;
+		//jitter_wr_cnt = 0;
 	}
+syslog (LOG_DEBUG, "debug 120 %d", jitter_rd_pnt);
 }
+#endif 
 
 void	drop_rate_print (void)
 {
@@ -833,7 +874,6 @@ void	drop_rate_print (void)
 		sprintf (str, "drop packet rate %d,%02d%% (%ld/%ld)", 
 			rate/100, rate%100, inet_read_drop_cnt, inet_read_cnt);
 		drop_rate_msg (str);
-                jitter_rd_pnt = 0;
                 digitalWrite (INET_LED, 0);
                 digitalWrite (RIG_LED, 0);
         }
@@ -902,3 +942,119 @@ 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/dstar_data.c
+++ b/dstar_data.c
@@ -51,6 +51,7 @@ void	short_msg_wrt (void)
 
 void	alt_header_set (unsigned char buff[],  unsigned char alt_hdr[], int inet)
 {
+return;
 	if ((inet_frame_id[0] == 0x00) && (inet_frame_id[1] == 0x00))
 	{
 		syslog (LOG_INFO, "alter header set");
@@ -62,29 +63,12 @@ void	alt_header_set (unsigned char buff[],  unsigned char alt_hdr[], int inet)
 		if (((buff[7] & ZR) && !memcmp (area_call, &alt_hdr[11], 8)) || scan_sw
                 	|| ((buff[7] & GW) && !memcmp (area_call, &alt_hdr[3], 8)))
                 {
-                	memcpy (inet_frame_id, &buff[14], 2);
+                	memcpy (inet_frame_id_save, &buff[14], 2);
                         send_buff[0] = 0x29;
                         send_buff[1] = 0x20,
                         memcpy (&send_buff[2], alt_hdr, 39);
                         send_buff[41] = 0xff;
                         header_store (send_buff);
-                        putFifo (42, send_buff);
-                        recv_frame_seq = 20;
-                        gettimeofday (&inet_recv_time, NULL);
-                        rig_last_frame_send = FALSE;
-                        inet_read_cnt = 0;
-                        inet_read_drop_cnt = 0;
-                        jitter_max = 0;
-                        jitter_min = 500000;
-                        jitter_ave = 0;
-                        #ifdef  _SPECIFICATION_CHECK
-                        memset (voice_packet_save, 0xff, 15);
-                        #endif
-                        memset (short_msg, 0x20, 20);
-                        memcpy (used_call, &alt_hdr[27], 8);
-                        memcpy (used_call2, &alt_hdr[35], 4);
-                        short_msg_wrt();
-			send_msg_sw = FALSE;
 		}
                 if (!scan_sw)
                 {
@@ -143,46 +127,9 @@ void    dstar_data (unsigned char string[], int inet)
 					memcpy (&short_msg[15], &data_temp[0], 5);
 					short_msg_wrt();
 					break;
-
-				case 0x51:
-					n = (string[16] - code_sq) / 2 - 1;
-					if (n != 8) break;
-					alt_header[40] = data_temp[0];
-					crc_dstar_ffff = 0xffff;
-					for (n = 0 ; n < 39 ; n++)
-					{
-						crc_dstar_ffff = update_crc_dstar (crc_dstar_ffff, alt_header[n]);
-					}
-					crc_dstar_ffff = result_crc_dstar(crc_dstar_ffff);
-					if ((alt_header[39] == (crc_dstar_ffff >> 8)) && (alt_header[40] == (crc_dstar_ffff & 0xff)))
-					{
-						//syslog (LOG_INFO, "crc ok");
-						alt_header_set (string, alt_header, inet);
-					}
-					#if 0 
-					syslog (LOG_INFO, "%4.4x", crc_dstar_ffff);
-					syslog (LOG_INFO, "%2.2x %2.2x %2.2x %36.36s %2.2x %2.2x",
-						alt_header[0], alt_header[1], alt_header[2],
-						&alt_header[3], alt_header[39], alt_header[40]);
-					#endif
-					break;
-
-				case 0xc2:
-					code_sq = 2;
-					break;
-
-				case 0x55:
-					n = (string[16] - code_sq) / 2 - 1;	
-					if ((n < 0) || (n > 7)) break;	
-					memcpy (&alt_header[n*5], &data_temp[0], 5);
-					break;
 			}
 		}
 	}
-	else
-	{
-		code_sq = 0;
-	}
 }
 
 void	rig_alt_header_set (unsigned char alt_hdr[])
@@ -191,6 +138,7 @@ void	rig_alt_header_set (unsigned char alt_hdr[])
 	unsigned short int	crc;
 
 	if (!rig_status_check()) return;
+	if (send_header_sw) return;
 
         if (!scan_sw) syslog (LOG_NOTICE, "Alt header %8.8s from rig", &alt_hdr[27]);
         else
@@ -262,4 +210,74 @@ void	rig_alt_header_set (unsigned char alt_hdr[])
         seq = 0;
 }
 
+void    dstar_alt_header (unsigned char string[], int inet)
+{
+	unsigned short int	crc_dstar_ffff;
+	int	n;
+
+	if (string[16] != 0)
+	{
+		if (string[16] & 0x40)		// Last Frame
+		{
+			return;
+		}
+		
+		if (string[16] % 2)
+		{
+			mini_header 
+				= string[26] ^ 0x70;
+			data_temp[0] 
+				= string[27] ^ 0x4f;
+			data_temp[1] 
+				= string[28] ^ 0x93;
+		}
+		else
+		{
+			data_temp[2] 
+				= string[26] ^ 0x70;
+			data_temp[3] 
+				= string[27] ^ 0x4f;
+			data_temp[4] 
+				= string[28] ^ 0x93;
+			switch (mini_header)
+			{
+				case 0x51:
+					n = (string[16] - code_sq) / 2 - 1;
+					if (n != 8) break;
+					alt_header[40] = data_temp[0];
+					crc_dstar_ffff = 0xffff;
+					for (n = 0 ; n < 39 ; n++)
+					{
+						crc_dstar_ffff = update_crc_dstar (crc_dstar_ffff, alt_header[n]);
+					}
+					crc_dstar_ffff = result_crc_dstar(crc_dstar_ffff);
+					if ((alt_header[39] == (crc_dstar_ffff >> 8)) && (alt_header[40] == (crc_dstar_ffff & 0xff)))
+					{
+						//syslog (LOG_INFO, "crc ok");
+						alt_header_set (string, alt_header, inet);
+					}
+					#if 0 
+					syslog (LOG_INFO, "%4.4x", crc_dstar_ffff);
+					syslog (LOG_INFO, "%2.2x %2.2x %2.2x %36.36s %2.2x %2.2x",
+						alt_header[0], alt_header[1], alt_header[2],
+						&alt_header[3], alt_header[39], alt_header[40]);
+					#endif
+					break;
+
+				case 0xc2:
+					code_sq = 2;
+					break;
 
+				case 0x55:
+					n = (string[16] - code_sq) / 2 - 1;	
+					if ((n < 0) || (n > 7)) break;	
+					memcpy (&alt_header[n*5], &data_temp[0], 5);
+					break;
+			}
+		}
+	}
+	else
+	{
+		code_sq = 0;
+	}
+}

--- a/dvap.c
+++ b/dvap.c
@@ -9,6 +9,7 @@ void	send_dvap_keep_alive(void);
 int	inet_send_buff_set(void);
 void	inet_led_onoff(void);
 void	dstar_data(unsigned char string[], int inet);
+void    dstar_alt_header (unsigned char string[], int inet);
 void	short_msg_wrt (void);
 void	send_msg (unsigned char str[], unsigned char my2[]);
 int	cmd_check (unsigned char cmd[]);
@@ -633,6 +634,7 @@ void	dvap_send_header (void)
 		memcpy (used_call, &inet_send_buff[44], 8);
 		memcpy (used_call2, &inet_send_buff[52], 4);
 		short_msg_wrt ();
+		send_header_sw = TRUE;
                 if (gw_on)
                 {
                 	memcpy (&inet_send_buff[20], zone_call, 8);
@@ -662,8 +664,13 @@ void	dvap_send_header (void)
 void	dvap_send_voice (void)
 {
 	int	length;
-
-	//if (!dvap_voice_send_sw) return;
+	if (!send_header_sw)
+	{
+		inet_send_buff[16] = dvap_voice[4];
+		memcpy (&inet_send_buff[17], &dvap_voice[6], 12);
+		dstar_alt_header (inet_send_buff, FALSE);
+		return;
+	}
 	
  	inet_send_buff[9] = 0x13;
         inet_send_buff[4] = (m_seq >> 8) & 0xff;
@@ -724,7 +731,7 @@ void	dvap_write (int	fd, unsigned char buff[], int length)
 
 	if (length == 42)
 	{
-		if (!dvap_send_header_sw)
+		if (!send_header_sw)
 		{
 			time(&dvap_keep_alive);
 			dvap_send_pkt[0] = 0x2f;
@@ -736,24 +743,25 @@ void	dvap_write (int	fd, unsigned char buff[], int length)
        			memcpy (&dvap_send_pkt[6], &buff[2], 41);
 			dvap_send_pkt[6] &= 0x07;
 			ret = write (fd, dvap_send_pkt, 47);
-			dvap_send_pkt[4] = 0x00;
-			dvap_send_pkt[5]++;
-			dvap_send_header_sw = TRUE;
+			//dvap_send_pkt[4] = 0x00;
+			//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)
 	{
-		if (dvap_send_header_sw)
+		if (send_header_sw)
 		{
 		
 			if (!dvap_first_voice_pkt || !memcmp (&buff[13], resync , 3))
@@ -761,22 +769,22 @@ 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[6], &buff[4], 12);
-				if ((dvap_send_pkt[4] & 0x40) || 
+        			memcpy (&dvap_send_pkt[5], &buff[3], 13);
+				if ((dvap_send_pkt[5] & 0x40) || 
 					(!memcmp (&dvap_send_pkt[6], &lastframe[3], 3) && !memcmp (&dvap_send_pkt[15], lastframe, 3)))
 				{
-					dvap_send_pkt[4] |= 0x40;
-					dvap_send_header_sw = FALSE;
+					dvap_send_pkt[5] |= 0x40;
+					send_header_sw = FALSE;
 				}
         			ret = write (fd, dvap_send_pkt, 18);
-        			dvap_send_pkt[5]++;
+        			//dvap_send_pkt[5]++;
         			dvap_send_pkt[4]++;
-        			if (dvap_send_pkt[4] == 21) dvap_send_pkt[4] = 0;
+        			//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/dvmega.h
+++ b/dvmega.h
@@ -24,6 +24,7 @@ int	dvmega_last_frame_sw;
 int	dvmega_sw;
 int	dvmega_gw_resp_sw;
 int     dvmega_NoRespReply_sw;
+int	dvmega_send_header_sw;
 
 //unsigned        char    dvmega_squelch;
 

--- a/dvmega_utils.c
+++ b/dvmega_utils.c
@@ -8,6 +8,7 @@ void	inet_led_onoff(void);
 int	inet_send_buff_set(void);
 void	short_msg_wrt(void);
 void    dstar_data (unsigned char string[], int inet);
+void    dstar_alt_header (unsigned char string[], int inet);
 void    rig_buff_reset (int length);
 unsigned short int crc_calc (unsigned char string[], int length);
 int	cmd_check (unsigned char cmd[]);
@@ -17,7 +18,7 @@ int	rig_status_check (void);
 char	lastframe1[3] = {0x55, 0x55, 0x55};
 char	lastframe2[3] = {0x55, 0xc8, 0x7a};
 int	dvmega_last_frame_sw;
-
+extern	unsigned char resync[];
 
 void    dvmega_write (int fd, unsigned char buff[], int length)
 {
@@ -148,6 +149,7 @@ void	dvmega_read (void)
                         if (memcmp (&inet_send_buff[36], "CQCQCQ  ", 8)) gw_on = TRUE;
                         if (send_sw && !rig_send_sw)
                         {
+				send_header_sw = TRUE;
                         	memset (inet_frame_id, 0xff, 2);
 				dvmega_last_frame_sw = FALSE;
                                 in_addr.sin_port = htons(dest_inet_port);
@@ -196,6 +198,16 @@ void	dvmega_read (void)
 			break;
 
 		case DVMEGA_DSTAR_DATA:
+			if (!memcmp (&rig_buff[12], resync, 3)) dvmega_frame_seq = 0;
+			if (!send_header_sw)
+			{
+				inet_send_buff[16] = dvmega_frame_seq;
+				dvmega_frame_seq++;
+				if (dvmega_frame_seq > 20) dvmega_frame_seq = 0;
+				memcpy (&inet_send_buff[17], &rig_buff[3], 12);
+				dstar_alt_header (inet_send_buff, FALSE);
+				break;
+			}
 			#ifdef	_DEBUG_DVMEGA
 			syslog (LOG_DEBUG, "data %2.2x %d %2.2x %2.2x %2.2x %2.2x", 
 				rig_buff[0], rig_buff[1], rig_buff[2], rig_buff[3], rig_buff[4], rig_buff[5]);
@@ -250,7 +262,6 @@ void	dvmega_read (void)
                                 in_addr.sin_addr.s_addr = inet_addr(dest_address);
                                 sendto (in_addr_sock, inet_send_buff, 29, MSG_DONTWAIT,
                                         (struct sockaddr *)&in_addr, sizeof(in_addr));
-                                dstar_data (inet_send_buff, FALSE);
                         }
                         m_seq++;
                         m_seq &= 0xffff;
@@ -260,6 +271,7 @@ void	dvmega_read (void)
 			#ifdef	_DEBUG_DVMEGA
 			syslog (LOG_DEBUG, "EOT");
 			#endif
+			send_header_sw = FALSE;
 			if (!dvmega_last_frame_sw)
 			{ 
 			   if (send_sw)

--- a/from_node.c
+++ b/from_node.c
@@ -7,6 +7,7 @@ void	inet_led_onoff (void);
 int	inet_send_buff_set (void);
 void	short_msg_wrt (void);
 void    dstar_data (unsigned char string[], int inet);
+void    dstar_alt_header (unsigned char string[], int inet);
 unsigned short int	crc_calc (char str[], int length);
 int	cmd_check (unsigned char cmd[]);
 int	rig_status_check(void);
@@ -112,6 +113,7 @@ void	header_read_from_node(void)         /* read from rig (DV packet) */
 		m_seq++;
 		m_seq &= 0xffff;
 		HeaderLength = 41;
+		send_header_sw = TRUE;
 		voice_pnt = 12;
 		seq = 0;
 	}
@@ -144,7 +146,6 @@ int	voice_read_from_node()
 	ret = usb_control_msg(udev, 0xC0, GET_DATA, 0, 0, usb.buffer, read_len, 200);
 	if (ret > 0)
 	{
-		//gettimeofday(&Node_InTime, NULL);
 		for (i = 0 ; i < ret; i++)
 		{
 			node_voice_save[voice_pnt] = usb.buffer[i];
@@ -169,7 +170,7 @@ int	voice_read_from_node()
 				seq++;
 				if (seq > 20) seq = 0;
         			memcpy (&inet_send_buff[17], node_voice_save, 12);
-				if (send_sw && !rig_send_sw && node_voice_send_sw)
+				if (send_sw && !rig_send_sw && send_header_sw)
         			{
         				in_addr.sin_port = htons(dest_inet_port);
                 			in_addr.sin_addr.s_addr = inet_addr(dest_address);
@@ -177,6 +178,9 @@ int	voice_read_from_node()
                 				(struct sockaddr *)&in_addr, sizeof(in_addr));
 					dstar_data (inet_send_buff, FALSE);
 				}
+				else
+					dstar_alt_header (inet_send_buff, FALSE);
+
         			m_seq++;
 				m_seq &= 0xffff;
 			}
@@ -198,6 +202,7 @@ int	voice_read_from_node()
 					memset (inet_frame_id, 0x00, 2);
 					frameID = 0;
 					HeaderLength = 0;
+					send_header_sw = FALSE;
 					node_voice_send_sw = FALSE;
 					digitalWrite (RIG_LED, 0);
 					digitalWrite (INET_LED, 0);

--- a/inet_read.c
+++ b/inet_read.c
@@ -9,9 +9,9 @@ void	jitter_put (unsigned char str[]);
 void	rig_send_check(void);
 void	called_msg (char call1[], char call2[]);
 void	dstar_data (unsigned char string[], int inet);
+void    dstar_alt_header (unsigned char string[], int inet);
 void	short_msg_wrt (void);
-
-//unsigned char	recvBuff[256];
+void	jitter_buff_init (void);
 
 char            dummy_frame_1[12] = {
                         0x73, 0x44, 0x1a, 0x72, 0x31, 0x3c, 0xa7, 0x53, 0x02, 0x55, 0x55, 0x55};
@@ -40,6 +40,7 @@ void	rig_fifo_check (void)
 
 void	dummy_last_frame (void)
 {
+	if (rig_last_frame_send) return;
 	recvBuff[16] = jitter_rd_pnt;
         memcpy (&recvBuff[17], dummy_frame_1, 12);
 	jitter_put (&recvBuff[16]);
@@ -61,7 +62,7 @@ void	dummy_last_frame (void)
         digitalWrite (RIG_LED, 0);
         rig_last_frame_send = TRUE;
 	drop_rate_print();
-	dvap_send_header_sw = FALSE;
+	send_header_sw = FALSE;
 }
 
 void	inet_read (void)
@@ -180,6 +181,7 @@ void	inet_read (void)
 				|| ((recvBuff[7] & GW) && !memcmp (area_call, &recvBuff[20], 8)))
 			{
 				memcpy (inet_frame_id, &recvBuff[14], 2);
+				memcpy (inet_frame_id_save, &recvBuff[14], 2);
 				send_buff[0] = 0x29;
 				send_buff[1] = 0x20,
 				memcpy (&send_buff[2], &recvBuff[17], 39);
@@ -194,6 +196,7 @@ void	inet_read (void)
 				jitter_max = 0;
 				jitter_min = 500000;
 				jitter_ave = 0;
+				jitter_buff_init();
 				#ifdef	_SPECIFICATION_CHECK
 				memset (voice_packet_save, 0xff, 15);
 				#endif
@@ -201,8 +204,8 @@ void	inet_read (void)
 				memcpy (used_call, &recvBuff[44], 8);
 				memcpy (used_call2, &recvBuff[52], 4);
 				short_msg_wrt();
-				send_msg_sw = FALSE;
 				beep_sw = OFF;
+				send_header_sw = TRUE;
 			}
 			if (!scan_sw)
 			{
@@ -218,11 +221,13 @@ void	inet_read (void)
 	}
 	else if (length == 29)
 	{
-		if (!memcmp (&inet_frame_id, &recvBuff[14], 2))
+		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", recvBuff[14], recvBuff[15], recvBuff[16]); 
+				syslog (LOG_INFO, "Dup. packet (maybe loop) from %2.2x %2.2x %2.2x", 
+					recvBuff[14], recvBuff[15], recvBuff[16]); 
 				memcpy (voice_packet_save, &recvBuff[14], 15);
 			#endif
 			#ifdef _DEBUG
@@ -233,11 +238,14 @@ void	inet_read (void)
 			if (recvBuff[16] & 0x40) 
 			{
 				memcpy (&recvBuff[17], dummy_frame_3, 12);
+				jitter_put (&recvBuff[16]);
 				memset (inet_frame_id, 0x00, 2);
+				memset (inet_frame_id_save, 0x00, 2);
 				digitalWrite (INET_LED, 0);
 				digitalWrite (RIG_LED, 0);
 				rig_last_frame_send = TRUE;
 				drop_rate_print();
+				send_header_sw = FALSE;
 				rig_send_check();
 			}
         		inet_recv_time_save.tv_sec = inet_recv_time.tv_sec;
@@ -253,10 +261,10 @@ void	inet_read (void)
                                 syslog (LOG_INFO, "insert dummy_last_frame");
                                 dummy_last_frame();
 			}
-			#ifdef	_SPECIFICATION_CHECK
+			//#ifdef	_SPECIFICATION_CHECK
 			if (t_sub > 300) syslog (LOG_INFO, "long interval %ld.%03ld Sec. seq:%2.2x", t_sub / 1000, t_sub % 1000, recvBuff[16]);
 			//if (t_sub < 2)   syslog (LOG_INFO, "short interval %ld mSec.", t_sub);
-			#endif
+			//#endif
 			if (!memcmp (&recvBuff[17] , dummy_frame_3, 3) && !memcmp (&recvBuff[26], &dummy_frame_3[9], 3)) 
 			{
 				recvBuff[16] |= 0x40;
@@ -269,14 +277,76 @@ void	inet_read (void)
 				recvBuff[16], recvBuff[26] ^ 0x70, recvBuff[27] ^ 0x4f, recvBuff[28] ^ 0x93, recvBuff[26] ^ 0x70, recvBuff[27] ^ 0x4f, recvBuff[28] ^ 0x93);
 #endif
 		}
-		else
+		else if ((recvBuff[16] == 0) && !send_header_sw && !memcmp (&inet_frame_id_save, &recvBuff[14], 2))
 		{
-			dstar_data (recvBuff, TRUE);
+			if ((inet_frame_id[0] == 0x00) && (inet_frame_id[1] == 0x00)) 
+			{
+				syslog (LOG_DEBUG, "same frame ID");
+                		memcpy (inet_frame_id, inet_frame_id_save, 2);
+                        	putFifo (42, header_save);
+                        	recv_frame_seq = 20;
+                        	gettimeofday (&inet_recv_time, NULL);
+                        	rig_last_frame_send = FALSE;
+                        	inet_read_cnt = 0;
+                        	inet_read_drop_cnt = 0;
+                        	jitter_max = 0;
+                        	jitter_min = 500000;
+                        	jitter_ave = 0;
+				jitter_buff_init();
+                        	#ifdef  _SPECIFICATION_CHECK
+                        	memset (voice_packet_save, 0xff, 15);
+                        	#endif
+                        	memset (short_msg, 0x20, 20);
+                        	short_msg_wrt();
+                        	send_msg_sw = FALSE;
+                        	beep_sw = OFF;
+				send_header_sw = TRUE;
+                        inet_read_cnt++;
+                        if (recvBuff[16] == 0x00) inet_led_onoff();
+                        if (recvBuff[16] & 0x40)
+                        {
+                                memcpy (&recvBuff[17], dummy_frame_3, 12);
+                                memset (inet_frame_id, 0x00, 2);
+                                memset (inet_frame_id_save, 0x00, 2);
+                                digitalWrite (INET_LED, 0);
+                                digitalWrite (RIG_LED, 0);
+                                rig_last_frame_send = TRUE;
+                                drop_rate_print();
+                                send_header_sw = FALSE;
+                                rig_send_check();
+                        }
+                        inet_recv_time_save.tv_sec = inet_recv_time.tv_sec;
+                        inet_recv_time_save.tv_usec = inet_recv_time.tv_usec;
+                        gettimeofday (&inet_recv_time, NULL);
+                        timersub (&inet_recv_time, &inet_recv_time_save, &time_sub);
+                        t_sub = time_sub.tv_sec * 1000 + time_sub.tv_usec / 1000;
+                        if (t_sub > jitter_max) jitter_max = t_sub;
+                        if (t_sub & (t_sub < jitter_min)) jitter_min = t_sub;
+                        jitter_ave += (t_sub - 20);
+                        if (timercmp (&time_sub, &inet_recv_timeout, >) && !(recvBuff[16] & 0x40))
+                        {
+                                syslog (LOG_INFO, "insert dummy_last_frame");
+                                dummy_last_frame();
+                        }
+                        //#ifdef        _SPECIFICATION_CHECK
+                        if (t_sub > 300) syslog (LOG_INFO, "long interval %ld.%03ld Sec. seq:%2.2x", t_sub / 1000, t_sub % 1000, recvBuff[16]);
+                        //if (t_sub < 2)   syslog (LOG_INFO, "short interval %ld mSec.", t_sub);
+                        //#endif
+                        if (!memcmp (&recvBuff[17] , dummy_frame_3, 3) && !memcmp (&recvBuff[26], &dummy_frame_3[9], 3))
+                        {
+                                recvBuff[16] |= 0x40;
+                                memset (inet_frame_id, 0x00, 2);
+                        }
+                        jitter_put (&recvBuff[16]);
+                        if (!scan_sw) dstar_data (recvBuff, TRUE);
+			}
 		}
+		dstar_alt_header (recvBuff, TRUE);
 	}
 	else if (length == 32)
 	{
-		if (!memcmp (inet_frame_id, &recvBuff[14], 2))
+		if (send_header_sw && !memcmp (&inet_frame_id, &recvBuff[14], 2) && (inet_frame_id[0] != 0x00) && (inet_frame_id[1] != 0x00))
+		//if ((recvBuff[16] == 0) && !send_header_sw && !memcmp (&inet_frame_id_save, &recvBuff[14], 2))
 		{
                         #ifdef  _SPECIFICATION_CHECK
                         syslog (LOG_INFO, "Packet length wrong (32 bytes) from %8.8s", &header_save[29]);
@@ -315,6 +385,7 @@ void	inet_read (void)
 			recvBuff[16] |= 0x40;
 			memcpy (&recvBuff[17], dummy_frame_3, 12);
 			memset (inet_frame_id, 0x00, 2);
+			memset (inet_frame_id_save, 0x00, 2);
 			inet_recv_time_save.tv_sec = inet_recv_time.tv_sec;
 			inet_recv_time_save.tv_usec = inet_recv_time.tv_usec;
 			gettimeofday (&inet_recv_time, NULL);

--- a/main.c
+++ b/main.c
@@ -1,7 +1,7 @@
 #include "dmonitor.h"
 
 void    send_keep_alive(void);
-void	send_dest_keep_alive(void);
+int	send_dest_keep_alive(void);
 void    inet_read(void);
 void	init(void);
 void	handler (void);
@@ -13,6 +13,8 @@ int	rig_status_check (void);
 int	dvap_status_check (void);
 int	dvmega_status_check (void);
 int	node_status_check (void);
+int	rig_read(void);
+int	node_space_check (int length);
 
 void	rig_close (void);
 void	connected_table_clean(void);
@@ -88,6 +90,7 @@ int	main(int argc, char *argv[])
 	beep_sw = OFF;
 	scan_stop_sw = FALSE;
 	lcd_time_save = 0;
+	send_header_sw = FALSE;
 
 	openlog ("dmonitor", LOG_CONS | LOG_PID, LOG_LOCAL0);
 
@@ -291,7 +294,6 @@ int	main(int argc, char *argv[])
 	if (rig_type == DVAP) dvap_conf();
 	else if (rig_type == DVMEGA)  dvmega_conf();
 	else if (rig_type == NODE) node_conf();
-	dvap_send_header_sw = FALSE;
 	dvap_first_voice_pkt = FALSE;
 
 	for (k = 0 ;  k < 2 ; k++)
@@ -360,7 +362,7 @@ top:
 				else if (rig_type == DVMEGA) dvmega_read();
 			}
 		}
-		jitter_putFifo();
+		if (Fifo_cnt) jitter_putFifo();
 		rig ();
 		if ((cur_time - hole_punch_send_time) >= hole_punch_send_interval)
 		{
@@ -375,7 +377,7 @@ top:
 					time (&msg_send_set_time);
 					syslog (LOG_INFO,
 						"Not Connected to %8.8s", area_call);
-					error_msg ("ERROR接続できまません");
+					error_msg ("ERROR接続できません");
 					
 					sleep (15);
 					break;
@@ -396,26 +398,42 @@ top:
 				send_keep_alive();
 			}
 		}
+syslog (LOG_DEBUG, "Fifo_cnt %d", Fifo_cnt);
 		if(rig_send_sw)
 		{
-			gettimeofday (&c_time, NULL);
-			timeradd (&rig_send_time, &rig_send_time_20mSec, &temp_time);
-			if (timercmp (&c_time, &temp_time, >))
+			if (rig_type == NODE)
 			{
-				if (send_rig())
+				if (node_space_check (15))
 				{
-					rig_send_time.tv_sec = temp_time.tv_sec;
-					rig_send_time.tv_usec = temp_time.tv_usec;
+					if (!send_rig())
+                                        {
+                                                syslog (LOG_INFO, "Empty of the jitter buffer");
+                                                LastFrameSend();
+                                        }
 				}
-				else
+			}
+			else
+			{
+				gettimeofday (&c_time, NULL);
+				timeradd (&rig_send_time, &rig_send_time_20mSec, &temp_time);
+				if (timercmp (&c_time, &temp_time, >)) 
 				{
-					syslog (LOG_INFO, "Empty of the jitter buffer");
-					LastFrameSend();
+					if (send_rig())
+					{
+						rig_send_time.tv_sec = temp_time.tv_sec;
+						rig_send_time.tv_usec = temp_time.tv_usec;
+					}
+					else
+					{
+						syslog (LOG_INFO, "Empty of the jitter buffer");
+						LastFrameSend();
+					}
 				}
 			}
 		}
 		if ((inet_frame_id[0] != 0xff) || (inet_frame_id[1] != 0xff))
 		{
+//syslog (LOG_DEBUG, "%2.2x %2.2x", inet_frame_id[0], inet_frame_id[1]);
 		   if ((inet_frame_id[0] != 0x00) || (inet_frame_id[1] != 0x00))
 		   {
 			gettimeofday (&c_time, NULL);
@@ -424,10 +442,11 @@ top:
 			{
 				syslog (LOG_INFO, "insert dummy_last_frame");
 				dummy_last_frame();
-				#ifdef	_SPECIFICATION_CHECK
+				//#ifdef	_SPECIFICATION_CHECK
 				timersub (&c_time, &inet_recv_time, &temp_time);
 				syslog (LOG_INFO, "long interval %ld.%03ld Sec.", temp_time.tv_sec, temp_time.tv_usec/1000);
-				#endif
+				//#endif
+				gettimeofday (&inet_recv_time, NULL);
 			}
 		   }
 		}
@@ -454,14 +473,14 @@ skip:
 				beep_sw = OFF;
 			}
 #endif
-			if (send_msg_sw && (!scan_sw || scan_stop_sw))
+			if (send_msg_sw && (!scan_sw || scan_stop_sw))	/* send replay message for cmd */
 			{
 				if (((rig_type == ICOM) && rig_status_check())
 					|| ((rig_type == DVAP) && dvap_status_check())
 					|| ((rig_type == DVMEGA) && dvmega_status_check())
 					|| ((rig_type == NODE) && node_status_check()))
 				{
-					if (frameID == 0)
+					if ((frameID == 0) && (inet_frame_id[0] == 0x00) && (inet_frame_id[1] == 0x00))
 					{
 						send_msg(msg_temp, mycall2);
 						if (reboot_sw)

--- a/rig_read.c
+++ b/rig_read.c
@@ -23,6 +23,7 @@ void    dvap_write (int fd, unsigned char buff[], int length);
 void    dvmega_write (int fd, unsigned char buff[], int length);
 void	node_write (unsigned char buff[], int length);
 void	dstar_data (unsigned char string[], int inet);
+void    dstar_alt_header (unsigned char string[], int inet);
 void	short_msg_wrt (void);
 void	rig_not_connect_msg (void);
 int	dvmega_init (void);
@@ -271,6 +272,7 @@ void	rig(void)
 			break;
 
 		case NODE_INIT_DONE:
+			gettimeofday (&inet_recv_time, NULL);
 			rig_state = HOLE_PUNCH_WAIT;;
 			break;
 
@@ -429,6 +431,7 @@ int	rig_read (void)
 				if (memcmp (&inet_send_buff[36], "CQCQCQ  ", 8)) gw_on = TRUE;
 				if (send_sw && !rig_send_sw) 
 				{
+					send_header_sw = TRUE;
 					memset (inet_frame_id, 0xff, 2);
 					in_addr.sin_port = htons(dest_inet_port);
 					in_addr.sin_addr.s_addr = inet_addr(dest_address);
@@ -489,7 +492,7 @@ int	rig_read (void)
 				}
 				if (rig_buff[3] & 0x40) memset (&rig_buff[13], 0x55, 3);
 				memcpy (&inet_send_buff[16], &rig_buff[3], 13);
-				if (send_sw)
+				if (send_sw && send_header_sw)
 				{
                                         in_addr.sin_port = htons(dest_inet_port);
                                         in_addr.sin_addr.s_addr = inet_addr(dest_address);
@@ -497,10 +500,13 @@ int	rig_read (void)
 						(struct sockaddr *)&in_addr, sizeof(in_addr));
 					dstar_data (inet_send_buff, FALSE);
 				}
+				else
+					dstar_alt_header (inet_send_buff, FALSE);
 				if (rig_buff[3] & 0x40) 
 				{
 					memset (inet_frame_id, 0x00, 2);
 					frameID = 0;
+					send_header_sw = FALSE;
 					digitalWrite (RIG_LED, 0);
 					digitalWrite (INET_LED, 0);
 				}
@@ -572,7 +578,6 @@ void	rig_write (int length, unsigned char buff[])
 	}
 	else if (rig_type == NODE)
 	{
-
 		node_write (buff, length);
 	}	
 		

--- a/rpt_conn.h
+++ b/rpt_conn.h
@@ -145,7 +145,7 @@ unsigned char	MD5_dmonitor[32];
 
 char	rig_type;
 
-int	dvap_send_header_sw;
+//int	send_header_sw;
 char	dvap_first_voice_pkt;
 
 time_t	dest_keep_alive_send_time;

--- a/rpt_conn_dvap.c
+++ b/rpt_conn_dvap.c
@@ -563,60 +563,51 @@ void	dvap_write (int	fd, unsigned char buff[], int length)
 
 	if (length == 42)
 	{
-		if (!dvap_send_header_sw)
-		{
-			time(&dvap_keep_alive);
-			dvap_send_pkt[0] = 0x2f;
-        		dvap_send_pkt[1] = 0xa0;
-        		tmp = rand() & 0xffff;
-        		memcpy (&dvap_send_pkt[2], &tmp, 2);
-        		dvap_send_pkt[4] = 0x80;
-        		dvap_send_pkt[5] = 0x00;
-       			memcpy (&dvap_send_pkt[6], &buff[2], 41);
-			dvap_send_pkt[6] &= 0x07;
-			ret = write (fd, dvap_send_pkt, 47);
-			dvap_send_pkt[4] = 0x00;
-			dvap_send_pkt[5]++;
-			dvap_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]);
-#if 0
-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",
+		time(&dvap_keep_alive);
+		dvap_send_pkt[0] = 0x2f;
+       		dvap_send_pkt[1] = 0xa0;
+       		tmp = rand() & 0xffff;
+       		memcpy (&dvap_send_pkt[2], &tmp, 2);
+       		dvap_send_pkt[4] = 0x80;
+       		dvap_send_pkt[5] = 0x00;
+       		memcpy (&dvap_send_pkt[6], &buff[2], 41);
+		dvap_send_pkt[6] &= 0x07;
+		ret = write (fd, dvap_send_pkt, 47);
+		dvap_send_pkt[4] = 0x00;
+		dvap_send_pkt[5]++;
+		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]);
+#if 0 
+sysog (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
-		}
 	}
 	else if (length == 17)
 	{
-		if (dvap_send_header_sw)
-		{
-		
-			if (!dvap_first_voice_pkt || !memcmp (&buff[13], resync , 3))
-			{ 
-        			time(&dvap_keep_alive);
-        			dvap_send_pkt[0] = 0x12;
-        			dvap_send_pkt[1] = 0xc0;
-        			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[4] |= 0x40;
-					dvap_send_header_sw = FALSE;
-				}
-        			ret = write (fd, dvap_send_pkt, 18);
-        			dvap_send_pkt[5]++;
-        			dvap_send_pkt[4]++;
-        			if (dvap_send_pkt[4] == 21) dvap_send_pkt[4] = 0;
-				dvap_first_voice_pkt = FALSE;
+		if (!dvap_first_voice_pkt || !memcmp (&buff[13], resync , 3))
+		{ 
+        		time(&dvap_keep_alive);
+        		dvap_send_pkt[0] = 0x12;
+        		dvap_send_pkt[1] = 0xc0;
+        		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[4] |= 0x40;
+			}
+        		ret = write (fd, dvap_send_pkt, 18);
+        		dvap_send_pkt[5]++;
+        		dvap_send_pkt[4]++;
+        		if (dvap_send_pkt[4] == 21) dvap_send_pkt[4] = 0;
+			dvap_first_voice_pkt = FALSE;
 #if 0
 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
-			}
 		}
 	}
 	else

--- a/rpt_conn_send_msg.c
+++ b/rpt_conn_send_msg.c
@@ -5,55 +5,65 @@ void	rig_send_check (void);
 int	send_rig(void);
 void	rig_write (int length, char str[]);
 
-unsigned char	status_msg[13][17] =
+unsigned char	status_msg[21][13] =
 {
-	0x10, 0x22, 0x00, 0x00, 0x9e, 0x8d, 0x32, 0x88, 0x26, 0x1a, 0x3f, 0x61, 0xe8, 0x55, 0x2d, 0x16, 0xff,
-	0x10, 0x22, 0x01, 0x01, 0x9e, 0x8d, 0x32, 0x88, 0x26, 0x1a, 0x3f, 0x61, 0xe8, 0x16, 0x29, 0xf5, 0xff,
-	0x10, 0x22, 0x02, 0x02, 0x9e, 0x8d, 0x32, 0x88, 0x26, 0x1a, 0x3f, 0x61, 0xe8, 0x16, 0x29, 0xf5, 0xff,
-	0x10, 0x22, 0x03, 0x03, 0x9e, 0x8d, 0x32, 0x88, 0x26, 0x1a, 0x3f, 0x61, 0xe8, 0x16, 0x29, 0xf5, 0xff,
-	0x10, 0x22, 0x04, 0x04, 0x9e, 0x8d, 0x32, 0x88, 0x26, 0x1a, 0x3f, 0x61, 0xe8, 0x16, 0x29, 0xf5, 0xff,
-	0x10, 0x22, 0x05, 0x05, 0x9e, 0x8d, 0x32, 0x88, 0x26, 0x1a, 0x3f, 0x61, 0xe8, 0x16, 0x29, 0xf5, 0xff,
-	0x10, 0x22, 0x06, 0x06, 0x9e, 0x8d, 0x32, 0x88, 0x26, 0x1a, 0x3f, 0x61, 0xe8, 0x16, 0x29, 0xf5, 0xff,
-	0x10, 0x22, 0x07, 0x07, 0x9e, 0x8d, 0x32, 0x88, 0x26, 0x1a, 0x3f, 0x61, 0xe8, 0x16, 0x29, 0xf5, 0xff,
-	0x10, 0x22, 0x08, 0x08, 0x9e, 0x8d, 0x32, 0x88, 0x26, 0x1a, 0x3f, 0x61, 0xe8, 0x16, 0x29, 0xf5, 0xff,
-	0x10, 0x22, 0x09, 0x09, 0x9e, 0x8d, 0x32, 0x88, 0x26, 0x1a, 0x3f, 0x61, 0xe8, 0x16, 0x29, 0xf5, 0xff,
-	0x10, 0x22, 0x0a, 0x0a, 0x9e, 0x8d, 0x32, 0x88, 0x26, 0x1a, 0x3f, 0x61, 0xe8, 0x16, 0x29, 0xf5, 0xff,
-        0x10, 0x22, 0x0b, 0x0b, 0x9e, 0x8d, 0x32, 0x88, 0x26, 0x1a, 0x3f, 0x61, 0xe8, 0x55, 0x55, 0x55, 0xff,
-        0x10, 0x22, 0x0c, 0x4c, 0x55, 0xc8, 0x7a, 0x88, 0x26, 0x1a, 0x3f, 0x61, 0xe8, 0x55, 0x55, 0x55, 0xff};
+	0x00, 0x9e, 0x8d, 0x32, 0x88, 0x26, 0x1a, 0x3f, 0x61, 0xe8, 0x55, 0x2d, 0x16,
+	0x01, 0x9e, 0x8d, 0x32, 0x88, 0x26, 0x1a, 0x3f, 0x61, 0xe8, 0x16, 0x29, 0xf5,
+	0x02, 0x9e, 0x8d, 0x32, 0x88, 0x26, 0x1a, 0x3f, 0x61, 0xe8, 0x16, 0x29, 0xf5,
+	0x03, 0x9e, 0x8d, 0x32, 0x88, 0x26, 0x1a, 0x3f, 0x61, 0xe8, 0x16, 0x29, 0xf5,
+	0x04, 0x9e, 0x8d, 0x32, 0x88, 0x26, 0x1a, 0x3f, 0x61, 0xe8, 0x16, 0x29, 0xf5,
+	0x05, 0x9e, 0x8d, 0x32, 0x88, 0x26, 0x1a, 0x3f, 0x61, 0xe8, 0x16, 0x29, 0xf5,
+	0x06, 0x9e, 0x8d, 0x32, 0x88, 0x26, 0x1a, 0x3f, 0x61, 0xe8, 0x16, 0x29, 0xf5,
+	0x07, 0x9e, 0x8d, 0x32, 0x88, 0x26, 0x1a, 0x3f, 0x61, 0xe8, 0x16, 0x29, 0xf5,
+	0x08, 0x9e, 0x8d, 0x32, 0x88, 0x26, 0x1a, 0x3f, 0x61, 0xe8, 0x16, 0x29, 0xf5,
+	0x09, 0x9e, 0x8d, 0x32, 0x88, 0x26, 0x1a, 0x3f, 0x61, 0xe8, 0x16, 0x29, 0xf5,
+	0x0a, 0x9e, 0x8d, 0x32, 0x88, 0x26, 0x1a, 0x3f, 0x61, 0xe8, 0x16, 0x29, 0xf5,
+	0x0b, 0x9e, 0x8d, 0x32, 0x88, 0x26, 0x1a, 0x3f, 0x61, 0xe8, 0x16, 0x29, 0xf5,
+	0x0c, 0x9e, 0x8d, 0x32, 0x88, 0x26, 0x1a, 0x3f, 0x61, 0xe8, 0x16, 0x29, 0xf5,
+	0x0d, 0x9e, 0x8d, 0x32, 0x88, 0x26, 0x1a, 0x3f, 0x61, 0xe8, 0x16, 0x29, 0xf5,
+	0x0e, 0x9e, 0x8d, 0x32, 0x88, 0x26, 0x1a, 0x3f, 0x61, 0xe8, 0x16, 0x29, 0xf5,
+	0x0f, 0x9e, 0x8d, 0x32, 0x88, 0x26, 0x1a, 0x3f, 0x61, 0xe8, 0x16, 0x29, 0xf5,
+	0x10, 0x9e, 0x8d, 0x32, 0x88, 0x26, 0x1a, 0x3f, 0x61, 0xe8, 0x16, 0x29, 0xf5,
+	0x11, 0x9e, 0x8d, 0x32, 0x88, 0x26, 0x1a, 0x3f, 0x61, 0xe8, 0x16, 0x29, 0xf5,
+	0x12, 0x9e, 0x8d, 0x32, 0x88, 0x26, 0x1a, 0x3f, 0x61, 0xe8, 0x16, 0x29, 0xf5,
+        0x13, 0x9e, 0x8d, 0x32, 0x88, 0x26, 0x1a, 0x3f, 0x61, 0xe8, 0x55, 0x55, 0x55,
+        0x54, 0x55, 0xc8, 0x7a, 0x88, 0x26, 0x1a, 0x3f, 0x61, 0xe8, 0x55, 0x55, 0x55};
+
 		
-void	send_msg (unsigned char string[], unsigned char my2[], unsigned char flag)
+void	send_msg (unsigned char string[], unsigned char my2[])
 {	
+	char	hdr_buff[42];
+	struct	timeval	temp_time;
 	int	n;
-	unsigned char	hdr_buff[42];
 
-	status_msg[3][13] = 0x70 ^ 0x40; 
-	status_msg[3][14] = 0x4f ^ string[0];
-	status_msg[3][15] = 0x93 ^ string[1];
-	status_msg[4][13] = 0x70 ^ string[2];
-	status_msg[4][14] = 0x4f ^ string[3];
-	status_msg[4][15] = 0x93 ^ string[4];
-	status_msg[5][13] = 0x70 ^ 0x41;
-	status_msg[5][14] = 0x4f ^ string[5];
-	status_msg[5][15] = 0x93 ^ string[6];
-	status_msg[6][13] = 0x70 ^ string[7];
-	status_msg[6][14] = 0x4f ^ string[8];
-	status_msg[6][15] = 0x93 ^ string[9];
-        status_msg[7][13] = 0x70 ^ 0x42;
-        status_msg[7][14] = 0x4f ^ string[10];
-        status_msg[7][15] = 0x93 ^ string[11];
-        status_msg[8][13] = 0x70 ^ string[12];
-        status_msg[8][14] = 0x4f ^ string[13];
-        status_msg[8][15] = 0x93 ^ string[14];
-        status_msg[9][13] = 0x70 ^ 0x43;
-        status_msg[9][14] = 0x4f ^ string[15];
-        status_msg[9][15] = 0x93 ^ string[16];
-        status_msg[10][13] = 0x70 ^ string[17];
-        status_msg[10][14] = 0x4f ^ string[18];
-	status_msg[10][15] = 0x93 ^ string[19];
+	status_msg[5][10] = 0x70 ^ 0x40; 
+	status_msg[5][11] = 0x4f ^ string[0];
+	status_msg[5][12] = 0x93 ^ string[1];
+	status_msg[6][10] = 0x70 ^ string[2];
+	status_msg[6][11] = 0x4f ^ string[3];
+	status_msg[6][12] = 0x93 ^ string[4];
+	status_msg[7][10] = 0x70 ^ 0x41;
+	status_msg[7][11] = 0x4f ^ string[5];
+	status_msg[7][12] = 0x93 ^ string[6];
+	status_msg[8][10] = 0x70 ^ string[7];
+	status_msg[8][11] = 0x4f ^ string[8];
+	status_msg[8][12] = 0x93 ^ string[9];
+        status_msg[9][10] = 0x70 ^ 0x42;
+        status_msg[9][11] = 0x4f ^ string[10];
+        status_msg[9][12] = 0x93 ^ string[11];
+        status_msg[10][10] = 0x70 ^ string[12];
+        status_msg[10][11] = 0x4f ^ string[13];
+        status_msg[10][12] = 0x93 ^ string[14];
+        status_msg[11][10] = 0x70 ^ 0x43;
+        status_msg[11][11] = 0x4f ^ string[15];
+        status_msg[11][12] = 0x93 ^ string[16];
+        status_msg[12][10] = 0x70 ^ string[17];
+        status_msg[12][11] = 0x4f ^ string[18];
+	status_msg[12][12] = 0x93 ^ string[19];
 
         hdr_buff[0] = 0x29;
         hdr_buff[1] = 0x20,
-	hdr_buff[2] = flag;
+	hdr_buff[2] = 0x00;
 	hdr_buff[3] = 0x00;
 	hdr_buff[4] = 0x00;
 	memcpy (&hdr_buff[5], "DIRECT  ", 8);
@@ -63,15 +73,14 @@ void	send_msg (unsigned char string[], unsigned char my2[], unsigned char flag)
 	memcpy (&hdr_buff[37], my2, 4);
         hdr_buff[41] = 0xff;
 
-        rig_write (42, hdr_buff);
+	rig_write (42, hdr_buff);
 
-	usleep (30000);
-	for (n = 0 ; n < 13 ; n++)
+	usleep (300000);
+	for (n = 0 ; n < 21 ; n++)
 	{
-		rig_write (17, &status_msg[n][0]);
-		usleep (20000);
+        	rig_write (17, &status_msg[n][0]);
+        	usleep (20000);
 	}
-
 	send_msg_sw = FALSE;
 }
 

--- a/send_msg.c
+++ b/send_msg.c
@@ -37,36 +37,37 @@ 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)
 	{
 		send_msg_sw = FALSE;
 		return;
 	}
-	status_msg[3][10] = 0x70 ^ 0x40; 
-	status_msg[3][11] = 0x4f ^ string[0];
-	status_msg[3][12] = 0x93 ^ string[1];
-	status_msg[4][10] = 0x70 ^ string[2];
-	status_msg[4][11] = 0x4f ^ string[3];
-	status_msg[4][12] = 0x93 ^ string[4];
-	status_msg[5][10] = 0x70 ^ 0x41;
-	status_msg[5][11] = 0x4f ^ string[5];
-	status_msg[5][12] = 0x93 ^ string[6];
-	status_msg[6][10] = 0x70 ^ string[7];
-	status_msg[6][11] = 0x4f ^ string[8];
-	status_msg[6][12] = 0x93 ^ string[9];
-        status_msg[7][10] = 0x70 ^ 0x42;
-        status_msg[7][11] = 0x4f ^ string[10];
-        status_msg[7][12] = 0x93 ^ string[11];
-        status_msg[8][10] = 0x70 ^ string[12];
-        status_msg[8][11] = 0x4f ^ string[13];
-        status_msg[8][12] = 0x93 ^ string[14];
-        status_msg[9][10] = 0x70 ^ 0x43;
-        status_msg[9][11] = 0x4f ^ string[15];
-        status_msg[9][12] = 0x93 ^ string[16];
-        status_msg[10][10] = 0x70 ^ string[17];
-        status_msg[10][11] = 0x4f ^ string[18];
-	status_msg[10][12] = 0x93 ^ string[19];
+	status_msg[5][10] = 0x70 ^ 0x40; 
+	status_msg[5][11] = 0x4f ^ string[0];
+	status_msg[5][12] = 0x93 ^ string[1];
+	status_msg[6][10] = 0x70 ^ string[2];
+	status_msg[6][11] = 0x4f ^ string[3];
+	status_msg[6][12] = 0x93 ^ string[4];
+	status_msg[7][10] = 0x70 ^ 0x41;
+	status_msg[7][11] = 0x4f ^ string[5];
+	status_msg[7][12] = 0x93 ^ string[6];
+	status_msg[8][10] = 0x70 ^ string[7];
+	status_msg[8][11] = 0x4f ^ string[8];
+	status_msg[8][12] = 0x93 ^ string[9];
+        status_msg[9][10] = 0x70 ^ 0x42;
+        status_msg[9][11] = 0x4f ^ string[10];
+        status_msg[9][12] = 0x93 ^ string[11];
+        status_msg[10][10] = 0x70 ^ string[12];
+        status_msg[10][11] = 0x4f ^ string[13];
+        status_msg[10][12] = 0x93 ^ string[14];
+        status_msg[11][10] = 0x70 ^ 0x43;
+        status_msg[11][11] = 0x4f ^ string[15];
+        status_msg[11][12] = 0x93 ^ string[16];
+        status_msg[12][10] = 0x70 ^ string[17];
+        status_msg[12][11] = 0x4f ^ string[18];
+	status_msg[12][12] = 0x93 ^ string[19];
 
         hdr_buff[0] = 0x29;
         hdr_buff[1] = 0x20,
@@ -82,7 +83,6 @@ void	send_msg (unsigned char string[], unsigned char my2[])
 
         putFifo(42, hdr_buff);
 
-	usleep (300000);
 	for (n = 0 ; n < 21 ; n++)
 	{
 		putFifo (13, &status_msg[n][0]);
@@ -103,7 +103,6 @@ void	send_msg (unsigned char string[], unsigned char my2[])
 				break;
 		}
 	}
-	sleep (1);
 	send_msg_sw = FALSE;
 }
 

--- a/send_node.c
+++ b/send_node.c
@@ -27,13 +27,14 @@ void	node_header_send (unsigned char header[])
 	header[1] = 0x00;
 	header[2] = 0x00;
 	usb_control_msg(udev, 0x40, SET_FLAGS, 0, 0, header, 3, 100);
-
+#if 0
 	usb_control_msg(udev, 0xc0, GET_REMAINSPACE, 0, 0, (char *)&len ,1, 100);
 	while (len < 95)
 	{
-		usleep (100000);
+		usleep (2000);
 		usb_control_msg(udev, 0xc0, GET_REMAINSPACE, 0, 0, (char *)&len ,1, 100);
 	}
+#endif
 	usb_control_msg(udev, 0x40, SET_PTT, ON, 0, NULL, 0, 100);
 }
 
@@ -46,18 +47,22 @@ void	node_voice_send (unsigned char voice[])
 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",
 	voice[0], voice[1], voice[2], voice[3], voice[4], voice[5], voice[6], voice[7], voice[8], voice[9], voice[10], voice[11]);
 #endif
+#if 0
 	usb_control_msg(udev, 0xc0, GET_REMAINSPACE, 0, 0, (char *)&len ,1, 100);
 	while (len < 12)
 	{
-		usleep (20000);
+		usleep (2000);
 		usb_control_msg(udev, 0xc0, GET_REMAINSPACE, 0, 0, (char *)&len ,1, 100);
 	}
+#endif
 	ret = usb_control_msg(udev, 0x40, PUT_DATA, 0, 0, voice, 12, 100);
+#if 0
 	while (ret < 0)
 	{
-		usleep (2000);
+		usleep (200);
 		ret = usb_control_msg(udev, 0x40, PUT_DATA, 0, 0, voice, 12, 100);
 	}
+#endif
 }
 
 void	node_last_send (unsigned char voice[])
@@ -66,18 +71,22 @@ void	node_last_send (unsigned char voice[])
 	unsigned char	len;
 
 	memcpy (&voice[9], lastframe, 6);
+#if 0
 	usb_control_msg(udev, 0xc0, GET_REMAINSPACE, 0, 0, (char *)&len ,1, 100);
 	while (len < 15)
        	{
-               	usleep (20000);
+               	usleep (2000);
                	usb_control_msg(udev, 0xc0, GET_REMAINSPACE, 0, 0, (char *)&len ,1, 100);
        	}
+#endif
        	ret = usb_control_msg(udev, 0x40, PUT_DATA, 0, 0, voice, 15, 100);
+#if 0
        	while (ret < 0)
        	{
-               	usleep (2000);
+               	usleep (200);
                	ret = usb_control_msg(udev, 0x40, PUT_DATA, 0, 0, voice, 15, 100);
        	}
+#endif
 	/* PTT OFF */
 	ret = usb_control_msg(udev, 0x40, SET_PTT, OFF, 0, NULL, 0, 100);
 	frameID = 0;
@@ -91,10 +100,19 @@ void	node_write (unsigned char str[], int length)
 	}
 	else if (length == 17)
 	{
-//syslog(LOG_DEBUG," %2.2x %2.2x %2.2x    %2.2x %2.2x %2.2x", str[4], str[5], str[6], str[13], str[14], str[15]);
 		if ((str[3] & 0x40) 
 			|| !memcmp (&str[13], &lastframe[3], 3)
 			|| !memcmp (&str[4], &lastframe[3], 3))  node_last_send (&str[4]);
 		else node_voice_send (&str[4]);
 	}
 }
+
+int	node_space_check (int length)
+{
+	unsigned  char	len;
+
+        usb_control_msg(udev, 0xc0, GET_REMAINSPACE, 0, 0, (char *)&len , 1, 100);
+	if (len < length) return FALSE;
+	return TRUE;
+}
+