Commit: 3652bb6c4696c75c500ca526a5d0006b48c08947 - rpi-dmonitor (git)

Commit MetaInfo

• Revision: 3652bb6c4696c75c500ca526a5d0006b48c08947 (tree)
• Zeit: 2022-12-01 18:44:46
• Autor: Satoshi Yasuda <7m3tjz@jarl...>
• Commiter: Satoshi Yasuda

Log Message

modified: dmonitor.h
modified: dmonitor_utils.c
modified: dvap.c
modified: dvmega_utils.c
modified: extern_dmonitor.h
modified: from_node.c
modified: inet_read.c
modified: init.c
modified: main.c
modified: repeater_mon.c
modified: rig_read.c
modified: rpt_conn.c

Ändern Zusammenfassung

• modified: config.h
• modified: configure
• modified: debian/changelog
• modified: dmonitor.h
• modified: dmonitor_utils.c
• modified: dvap.c
• modified: dvmega_utils.c
• modified: extern_dmonitor.h
• modified: from_node.c
• modified: inet_read.c
• modified: init.c
• modified: main.c
• modified: repeater_mon.c
• modified: rig_read.c
• modified: rpt_conn.c

Diff

--- a/config.h
+++ b/config.h
@@ -102,7 +102,7 @@
 #define PACKAGE_NAME "dmonitor"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "dmonitor 01.81"
+#define PACKAGE_STRING "dmonitor 01.82"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "dmonitor"
@@ -111,13 +111,13 @@
 #define PACKAGE_URL ""
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "01.81"
+#define PACKAGE_VERSION "01.82"
 
 /* Define to 1 if you have the ANSI C header files. */
 #define STDC_HEADERS 1
 
 /* Version number of package */
-#define VERSION "01.81"
+#define VERSION "01.82"
 
 /* Define for Solaris 2.5.1 so the uint32_t typedef from <sys/synch.h>,
    <pthread.h>, or <semaphore.h> is not used. If the typedef were allowed, the

--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for dmonitor 01.81.
+# Generated by GNU Autoconf 2.69 for dmonitor 01.82.
 #
 # Report bugs to <[e-mail]>.
 #
@@ -580,8 +580,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='dmonitor'
 PACKAGE_TARNAME='dmonitor'
-PACKAGE_VERSION='01.81'
-PACKAGE_STRING='dmonitor 01.81'
+PACKAGE_VERSION='01.82'
+PACKAGE_STRING='dmonitor 01.82'
 PACKAGE_BUGREPORT='[e-mail]'
 PACKAGE_URL=''
 
@@ -1277,7 +1277,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures dmonitor 01.81 to adapt to many kinds of systems.
+\`configure' configures dmonitor 01.82 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1344,7 +1344,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of dmonitor 01.81:";;
+     short | recursive ) echo "Configuration of dmonitor 01.82:";;
    esac
   cat <<\_ACEOF
 
@@ -1435,7 +1435,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-dmonitor configure 01.81
+dmonitor configure 01.82
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1912,7 +1912,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by dmonitor $as_me 01.81, which was
+It was created by dmonitor $as_me 01.82, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2773,7 +2773,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='dmonitor'
- VERSION='01.81'
+ VERSION='01.82'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -5043,7 +5043,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by dmonitor $as_me 01.81, which was
+This file was extended by dmonitor $as_me 01.82, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -5109,7 +5109,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-dmonitor config.status 01.81
+dmonitor config.status 01.82
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,33 @@
+dmonitor (01.82) unstable; urgency=low
+
+  * V01.82 release (#145)
+
+ -- Satoshi Yasuda <[e-mail]>  Wed, 27 Oct 2022 06:20:00 +0900
+
+dmonitor (01.82c) unstable; urgency=low
+
+  * added gps_skip_sw (#144)
+
+ -- Satoshi Yasuda <[e-mail]>  Wed, 26 Oct 2022 14:00:00 +0900
+
+dmonitor (01.82b) unstable; urgency=low
+
+  * changed repeacter_mon cookie (#143)
+
+ -- Satoshi Yasuda <[e-mail]>  Tue, 25 Oct 2022 11:50:00 +0900
+
+dmonitor (01.82a) unstable; urgency=low
+
+  * changed droppacket routine (#142)
+
+ -- Satoshi Yasuda <[e-mail]>  Mon, 24 Oct 2022 23:30:00 +0900
+
 dmonitor (01.81) unstable; urgency=low
 
   * bug fixed main.c (#141)
   * added skip the gps only packet & ci-v mode
 
- -- Satoshi Yasuda <[e-mail]>  Tue, 18 Oct 2022 09:20:00 +0900
+ -- Satoshi Yasuda <[e-mail]>  Sat, 22 Oct 2022 23:20:00 +0900
 
 dmonitor (01.80) unstable; urgency=low
 

--- a/dmonitor.h
+++ b/dmonitor.h
@@ -41,6 +41,7 @@
 //#define		_DEBUG_DVAP_SQUELCH
 //#define		_DEBUG_JITTER
 //#define		_DEBUG_INET
+//#define		_DEBUG_RIG_WRITE_PACKET
 //#define		_DEBUG_GPS_ONLY
 #define		_DEBUG_MD5
 
@@ -53,7 +54,7 @@
 #define		HOLE_PUNCHD_SERVER	"hole-punchd.d-star.info"
 #define		HOLE_PUNCHD_PORT	30010
 
-#define		KEEP_ALIVE_INTERVAL	2
+#define		KEEP_ALIVE_INTERVAL	5	
 
 #define		CONNECTED_LIST		"/var/tmp/connected_table.html"	
 #define         CONNECTED_LIST_TEMP     "/var/tmp/connected_table.temp"	
@@ -108,6 +109,8 @@ int	rig_fd;
 struct	termios	save_attr;
 struct	termios	attr;
 
+struct	sockaddr_in	hole_punch_server_addr;
+
 time_t	send_time;
 
 time_t	rig_alive_recv;
@@ -133,6 +136,10 @@ struct	timeval	inet_recv_time;
 struct	timeval	inet_recv_time_save;
 struct	timeval	inet_recv_timeout;
 
+struct	timeval	dvmega_recv_time;
+struct	timeval dvmega_status_time;
+struct	timeval	dvmega_temp;
+
 struct	timeval		rig_last_timeout;
 int	seq;
 unsigned char send_buff[128];
@@ -324,7 +331,8 @@ long int	l_int;
 /* GPS skip */
 int	gps_wait;
 int	gps_only;
+int	gps_skip_sw;
 
 char	rf_header_save[44];
 
-	
+char	voice_save[9];	

--- a/dmonitor_utils.c
+++ b/dmonitor_utils.c
@@ -16,6 +16,7 @@ void	lcd_write(void);
 int	node_space_check (int length);
 int	check_getFifo(void);
 void	send_dvap_keep_alive(void);
+void	send_synmetric_nat (void);
 
 extern	char	dummy_frame_1[12];
 extern	char	dummy_frame_2[12];
@@ -44,6 +45,25 @@ int     htoi (const char *s)
         return n;
 }
 
+void	get_hole_punch_server_addr (void)
+{
+	int k;
+	int n;
+	int	ret;
+	char	buff[88];
+	struct  hostent *host;
+
+	hole_punch_server_addr.sin_family = AF_INET;
+	hole_punch_server_addr.sin_port = htons(hole_punch_port);
+	hole_punch_server_addr.sin_addr.s_addr = inet_addr(hole_punch_server);
+	if (hole_punch_server_addr.sin_addr.s_addr == 0xffffffff)
+	{
+		host = gethostbyname(hole_punch_server);
+		if (host == NULL) return;
+		hole_punch_server_addr.sin_addr.s_addr = *(unsigned int *)host->h_addr_list[0];
+	}
+}
+
 int	rig_open(void)
 {
         struct termios attr;
@@ -138,7 +158,7 @@ void    pselectSet(void)
 {
         FD_ZERO (&fd_save);
         timeout.tv_sec = 0;
-        timeout.tv_nsec = 10000000;
+        timeout.tv_nsec = 2000000;
 }
 
 void    handler (int sig)
@@ -261,6 +281,7 @@ int	send_dest_keep_alive (void)
 {
 	int k;
 	int n;
+	int	ret;
 	char	buff[80];
 	struct  hostent *host;
 
@@ -277,8 +298,9 @@ int	send_dest_keep_alive (void)
 	memset (buff, 0x00, sizeof(buff));
 	memcpy (&buff[20], connect_call, 8);	
         sprintf (&buff[4], "%s", inet_ntoa (in_addr.sin_addr));
-        sendto(in_addr_sock, &buff[4], 24, MSG_DONTWAIT, 
+        ret = sendto(in_addr_sock, &buff[4], 24, MSG_DONTWAIT, 
 		(struct sockaddr *)&in_addr, sizeof(in_addr));
+	if (ret == -1) syslog (LOG_ERR, "dest keep alive send error %s", strerror(errno));
 	time(&hole_punch_send_time);
 	time(&dest_keep_alive_send_time);
 	return TRUE;
@@ -348,22 +370,13 @@ void	send_keep_alive(void)
 		}
 	}
 
-	in_addr.sin_family = AF_INET;
-	in_addr.sin_port = htons(hole_punch_port);
-	in_addr.sin_addr.s_addr = inet_addr(hole_punch_server);
-	if (in_addr.sin_addr.s_addr == 0xffffffff)
-	{
-		host = gethostbyname(hole_punch_server);
-		if (host == NULL) return;
-		in_addr.sin_addr.s_addr = *(unsigned int *)host->h_addr_list[0];
-	}
 	memcpy (buff, "HPCH", 4);
 	memcpy (&buff[64], area_call, 8); 
 	memcpy (&buff[72], zone_call, 7);
 	memcpy (&buff[80], connect_call, 8);
 	buff[79] = 0x20;
 	ret = sendto(in_addr_sock, buff, 88, MSG_DONTWAIT, 
-		(struct sockaddr *)&in_addr, sizeof(in_addr));
+		(struct sockaddr *)&hole_punch_server_addr, sizeof(hole_punch_server_addr));
         time(&hole_punch_send_time);
         time(&dest_keep_alive_send_time);
 }
@@ -401,14 +414,17 @@ void	send_drop_packet (void)
 {
                 send_buff[0] = 0x10;
                 send_buff[1] = 0x22;
+		send_buff[3]++;
 		if (send_buff[3] > 20)
 		{
 			send_buff[3] = 0;
 			memcpy  (&send_buff[4], NullVoice, 12);
+			memcpy (&send_buff[4], voice_save, 9);
 		}
 		else
 		{
 			memcpy  (&send_buff[4], NullVoice1, 12);
+			memcpy (&send_buff[4], voice_save, 9);
 		}
                 send_buff[2] = seq & 0xff;
 		seq++;
@@ -443,6 +459,7 @@ int	send_rig (void)
 	else if (length == 42)
 	{
 		rig_write (42, &send_buff[3]);
+		memcpy (voice_save, NullVoice, 9);
 		seq = 0;
 	}
 	else if (length == 13)
@@ -475,6 +492,7 @@ int	send_rig (void)
 			frameID = 0;
 		}
 	}
+	memcpy (voice_save, &send_buff[4], 9);
 	return TRUE;
 }
 
@@ -1078,3 +1096,31 @@ void	right_os (void)
        	ret = system (cmd);
 }
 
+void	send_synmetric_nat (void)
+{
+	int k;
+	int n;
+	char	buff[42];
+	struct  hostent *host;
+
+        in_addr.sin_family = AF_INET;
+        in_addr.sin_port = htons(dest_inet_port);
+	//in_addr.sin_port = htons(51000);
+        in_addr.sin_addr.s_addr = inet_addr(dest_address);
+        if (in_addr.sin_addr.s_addr == 0xffffffff)
+        {
+                host = gethostbyname(dest_address);
+                if (host == NULL) return;
+                in_addr.sin_addr.s_addr = *(unsigned int *)host->h_addr_list[0];
+        }
+	memset (buff, 0x00, sizeof(buff));
+	memcpy (buff, "HPCH", 4);
+        sprintf (&buff[4], "%s:%d", inet_ntoa (in_addr.sin_addr), dest_inet_port);
+	//memcpy (&buff[4], "0.0.0.0:0", 9);
+	memcpy (&buff[26], area_call, 8);
+	memcpy (&buff[34], zone_call, 8);
+	buff[41] = 0x20;
+        sendto(in_addr_sock, buff, 42, MSG_DONTWAIT, 
+		(struct sockaddr *)&in_addr, sizeof(in_addr));
+}
+

--- a/dvap.c
+++ b/dvap.c
@@ -699,11 +699,14 @@ void	dvap_send_voice (void)
 	if (gps_wait)
 	{
 		gps_wait = FALSE;
-		if (!memcmp (&dvap_voice[6], NullVoice, 12)
-			|| !memcmp (&dvap_voice[6], gps_only_1, 12))
+		if (gps_skip_sw)
 		{
-			gps_only = TRUE;
-			goto gps_skip;
+			if (!memcmp (&dvap_voice[6], NullVoice, 12)
+				|| !memcmp (&dvap_voice[6], gps_only_1, 12))
+			{
+				gps_only = TRUE;
+				goto gps_skip;
+			}
 		}
         	inet_send_buff[16] = 0x80;
         	//memcpy (&inet_send_buff[17], &dvap_header[6], 41);

--- a/dvmega_utils.c
+++ b/dvmega_utils.c
@@ -216,6 +216,7 @@ void	dvmega_read (void)
 			break;
 
 		case DVMEGA_DSTAR_DATA:
+			gettimeofday (&dvmega_recv_time, NULL);
 			if (gps_only) break;
 			if (gps_wait)
 			{
@@ -226,17 +227,21 @@ void	dvmega_read (void)
 					rig_buff[3], rig_buff[4], rig_buff[5], rig_buff[6], rig_buff[7], rig_buff[8], 
 					rig_buff[9], rig_buff[10], rig_buff[11], rig_buff[12], rig_buff[13], rig_buff[14]);
 				syslog (LOG_DEBUG, "gps only 100  %2.2x %2.2x %2.2x %2.2x %2.2x %2.2x %2.2x %2.2x %2.2x %2.2x %2.2x %2.2x",
-					gps_only_1[0], gps_only_1[1],gps_only_1[2],gps_only_1[3],gps_only_1[4],gps_only_1[5],gps_only_1[6],gps_only_1[7],gps_only_1[8],gps_only_1[9],gps_only_1[10],gps_only_1[11]);
+					gps_only_1[0], gps_only_1[1],gps_only_1[2],gps_only_1[3],gps_only_1[4],gps_only_1[5],gps_only_1[6],
+					gps_only_1[7],gps_only_1[8],gps_only_1[9],gps_only_1[10],gps_only_1[11]);
 				#endif
-				if (!memcmp (&rig_buff[3], NullVoice, 12)
-					|| !memcmp (&rig_buff[3], gps_only_1, 12))
+				if (gps_skip_sw)
 				{
-					#ifdef _DEBUG_GPS_ONLY
-					syslog (LOG_DEBUG, "gps only Set");
-					#endif
-					frameID = 0;
-					gps_only = TRUE;
-					break;
+					if (!memcmp (&rig_buff[3], NullVoice, 12)
+						|| !memcmp (&rig_buff[3], gps_only_1, 12))
+					{
+						#ifdef _DEBUG_GPS_ONLY
+						syslog (LOG_DEBUG, "gps only Set");
+						#endif
+						frameID = 0;
+						gps_only = TRUE;
+						break;
+					}
 				}
 				gw_on = FALSE;
 				if (!inet_send_buff_set()) break;
@@ -377,12 +382,13 @@ void	dvmega_read (void)
 			#ifdef	_DEBUG_DVMEGA
 			syslog (LOG_DEBUG, "EOT");
 			#endif
+eot:
 			send_header_sw = FALSE;
 			if (!dvmega_last_frame_sw)
 			{
 			   if (send_sw && no_cmd_sw)
 			   {
-				//if (!gps_only)
+				if (!gps_only)
 				{
                         		inet_send_buff[9] = 0x13;
                         		inet_send_buff[4] = (m_seq >> 8) & 0xff;
@@ -408,8 +414,6 @@ void	dvmega_read (void)
                                 	inet_send_buff[9] = 0x13;
                                 	inet_send_buff[4] = (m_seq >> 8) & 0xff;
                                 	inet_send_buff[5] = m_seq & 0xff;
-                                	inet_send_buff[7] &= 0x33;
-                                	inet_send_buff[7] |= FWD | ZR;
                                 	inet_send_buff[16] = dvmega_frame_seq;
                                 	inet_send_buff[16] |= 0x40;
                                 	dvmega_frame_seq++;
@@ -437,6 +441,12 @@ void	dvmega_read (void)
 			#ifdef	_DEBUG_DVMEGA
 			syslog (LOG_INFO, "dvmega dstar space:%d dvmega_mode:%2.2x dvmega_tx:%2.2x", dvmega_dstarSpace, dvmega_mode, dvmega_tx);
 			#endif
+			if ((inet_frame_id[0] == 0xff) && (inet_frame_id[1] == 0xff))
+			{
+				gettimeofday (&dvmega_status_time, NULL);
+				timersub (&dvmega_status_time, &dvmega_recv_time, &dvmega_temp);
+				if (dvmega_temp.tv_sec || (dvmega_temp.tv_usec > 40000)) goto eot;
+			}
 			break;
 
 		default:

--- a/extern_dmonitor.h
+++ b/extern_dmonitor.h
@@ -40,6 +40,7 @@
 //#define		_DEBUG_DVAP_SQUELCH
 //#define		_DEBUG_JITTER
 //#define		_DEBUG_INET
+//#define		_DEBUG_RIG_WRITE_PACKET
 //#define		_DEBUG_GPS_ONLY
 
 #define		GW	0x80
@@ -51,7 +52,7 @@
 #define		HOLE_PUNCHD_SERVER	"hole-punchd.d-star.info"
 #define		HOLE_PUNCHD_PORT	30010
 
-#define		KEEP_ALIVE_INTERVAL	2
+#define		KEEP_ALIVE_INTERVAL	5
 
 #define		CONNECTED_LIST		"/var/tmp/connected_table.html"	
 #define         CONNECTED_LIST_TEMP     "/var/tmp/connected_table.temp"	
@@ -102,6 +103,8 @@ extern int	in_addr_sock;
 
 extern struct	sockaddr_in	out_addr;
 
+extern struct	sockaddr_in	hole_punch_server_addr;
+
 extern int	rig_fd;
 extern struct	termios	save_attr;
 extern struct	termios	attr;
@@ -131,6 +134,10 @@ extern struct	timeval	inet_recv_time;
 extern struct	timeval	inet_recv_time_save;
 extern struct	timeval	inet_recv_timeout;
 
+extern struct	timeval	dvmega_recv_time;
+extern struct	timeval	dvmega_status_time;
+extern struct	timeval	dvmega_temp;
+
 extern struct	timeval		rig_last_timeout;
 extern int	seq;
 extern unsigned char send_buff[128];
@@ -321,8 +328,10 @@ extern long int	l_int;
 /* GPS only cehck */
 extern int     gps_wait;
 extern int     gps_only;
+extern int	gps_skip_sw;
 
-extern char    rf_header_save[44];
+extern char	rf_header_save[44];
+extern char	voice_save[9];
 
 extern unsigned char	NullVoice[12];
 extern unsigned char	NullVoice1[12];

--- a/from_node.c
+++ b/from_node.c
@@ -183,12 +183,15 @@ int	voice_read_from_node()
 				}
 				if (gps_wait) 
 				{
-					if (!memcmp (&node_voice_save[12], NullVoice, 12)
-						|| !memcmp (&node_voice_save[12], gps_only_1, 12))
+					if (gps_skip_sw)
 					{
-						gps_only = TRUE;
-						voice_pnt = 12;
-						goto loop_end;;
+						if (!memcmp (&node_voice_save[12], NullVoice, 12)
+							|| !memcmp (&node_voice_save[12], gps_only_1, 12))
+						{
+							gps_only = TRUE;
+							voice_pnt = 12;
+							goto loop_end;;
+						}
 					}
 					gw_on = FALSE;
 					if (!inet_send_buff_set()) return len;

--- a/inet_read.c
+++ b/inet_read.c
@@ -85,9 +85,10 @@ void	inet_read (void)
 		syslog (LOG_ERR, "recvfrom error (inet_read) %s", strerror (errno));
 		return;
 	}
-//syslog (LOG_DEBUG, "test length %d %4.4s", length, recvBuff);
+syslog (LOG_DEBUG, "length:%d %s", length, inet_ntoa (in_addr.sin_addr));
 	if (length == 24)
 	{
+		//time (&dest_keep_alive_send_time);
 		dest_keep_alive_send_time = 0;
 		dest_keep_alive_cnt = 0;
 		return;
@@ -97,7 +98,7 @@ void	inet_read (void)
 		if (!memcmp (recvBuff, "HPCH", 4))
 		{
         		in_addr.sin_family = AF_INET;
-        		in_addr.sin_port = htons(dest_inet_port);
+        		//in_addr.sin_port = htons(dest_inet_port); //debug test
         		in_addr.sin_addr.s_addr = inet_addr(dest_address);
         		if (in_addr.sin_addr.s_addr == 0xffffffff)
         		{

--- a/init.c
+++ b/init.c
@@ -9,11 +9,13 @@ void	init (void)
 	if (!scan_sw) syslog (LOG_INFO, "dmonitor start V%s (Compiled %s %s)\n", PACKAGE_VERSION, __DATE__, __TIME__);
 	else fprintf (status_fd, "dmonitor start V%s (Compiled %s %s)\n", PACKAGE_VERSION, __DATE__, __TIME__);
         in_addr_sock = socket(AF_INET, SOCK_DGRAM, 0);
-	if (setsockopt (in_addr_sock, SOL_SOCKET, SO_REUSEADDR, (const char *)&yes, sizeof(yes)) < 0)
+	#if 0		// for symmetric nat
+	if (setsockopt (in_addr_sock, SOL_SOCKET, SO_REUSEADDR, (const char *)&yes, sizeof(yes)) < 0)	// symmetric nat
         {
                 syslog(LOG_ERR, "Monitor socket (setsockopt) error");
 		if(scan_sw) fprintf (status_fd, "Monitor socket (setsockopt) error");
         }
+	#endif
 
 #if 0 
 	out_addr.sin_family = AF_INET;

--- a/main.c
+++ b/main.c
@@ -46,7 +46,8 @@ void	lcd_write (void);
 void	ntpdate(void);
 void	dvap_reopen(void);
 void	invalid_os (void);
-
+void	send_synmetric_nat (void);
+void    get_hole_punch_server_addr (void);
 
 time_t	send_time;
 unsigned char 	*ppp;
@@ -148,6 +149,7 @@ os_ok:
 	{
 		rig_type = ICOM;
 		lcd_type = NONE;
+		gps_skip_sw = TRUE;
 	}
 	else
 	{
@@ -163,6 +165,13 @@ os_ok:
 				else if (!memcmp (recvBuff, "G20x4", 5)) lcd_type = LCD_20x4;
 				else if (!memcmp (recvBuff, "G16x2", 5)) lcd_type = LCD_16x2;
 			}
+			fgets (recvBuff, sizeof (recvBuff), dmonitor_file);	// callsign skip
+			if (fgets (recvBuff, sizeof (recvBuff), dmonitor_file))
+			{
+				if (!memcmp (recvBuff, "SKIP", 4)) gps_skip_sw = TRUE;
+				else
+					gps_skip_sw = FALSE;
+			}
 		}
 		fclose (dmonitor_file);
 	}
@@ -348,13 +357,14 @@ os_ok:
 	else if (rig_type == NODE) node_conf();
 	dvap_first_voice_pkt = FALSE;
 
+	get_hole_punch_server_addr();
 	for (k = 0 ;  k < 2 ; k++)
 	{
 		send_keep_alive();
 		usleep (10000);
 	}
 
-	dest_keep_alive_cnt= 0;
+	dest_keep_alive_cnt = 0;
 	memset (short_msg, 0x20, 20);
 	memset (used_call, 0x20, 8);
 	memset (used_call2, 0x20, 4);
@@ -439,7 +449,7 @@ top:
 			if (hole_punch_send_cnt < 3) send_dest_keep_alive();
 			else alt_send_dest_keep_alive();
 			#else
-			send_dest_keep_alive();
+			send_keep_alive();
 			#endif
 		}
 		if (dest_keep_alive_send_time)
@@ -447,7 +457,8 @@ top:
 			if ((cur_time - dest_keep_alive_send_time) >= KEEP_ALIVE_INTERVAL)
 			{
 				dest_keep_alive_cnt++;
-				if (dest_keep_alive_cnt >= 10) 
+syslog (LOG_DEBUG, "dest_keep_alive_send_time:%d", dest_keep_alive_send_time);
+				if (dest_keep_alive_cnt >= (60 / KEEP_ALIVE_INTERVAL)) 
 				{
                                         sprintf (msg_temp, "RPT DOWN %8.8s   ", area_call);
                                         memcpy (mycall2, "DOWN", 4);
@@ -463,7 +474,7 @@ top:
 					}
 					break;
 				}
-				send_keep_alive();
+				send_dest_keep_alive();
 			}
 		}
 		if(rig_send_sw)
@@ -472,15 +483,12 @@ top:
 			timeradd (&rig_send_time, &rig_send_time_20mSec, &temp_time);
 			if (timercmp (&c_time, &temp_time, >=)) 
 			{
-				if (send_rig())
+				rig_send_time.tv_sec = temp_time.tv_sec;
+				rig_send_time.tv_usec = temp_time.tv_usec;
+				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");
 					send_drop_packet();
+					syslog (LOG_INFO, "Empty of the jitter buffer");
 					//LastFrameSend();
 				}
 			}
@@ -494,14 +502,16 @@ top:
 			if (timercmp (&c_time, &temp_time, >))
 			{
 				syslog (LOG_INFO, "%19.19s:%03ld", ctime(&c_time.tv_sec), c_time.tv_usec/1000);
-				syslog (LOG_INFO, "%19.19s:%03ld", ctime(&inet_recv_timeout.tv_sec), inet_recv_timeout.tv_usec/1000);
+				syslog (LOG_INFO, "%19.19s:%03ld", ctime(&temp_time.tv_sec), temp_time.tv_usec/1000);
 				syslog (LOG_INFO, "insert dummy_last_frame (main)");
 				dummy_last_frame();
 				//#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
-				gettimeofday (&inet_recv_time, NULL);
+				//gettimeofday (&inet_recv_time, NULL);
+				inet_recv_time.tv_sec = temp_time.tv_sec;
+				inet_recv_time.tv_usec = temp_time.tv_usec;
 			}
 		   }
 		}

--- a/repeater_mon.c
+++ b/repeater_mon.c
@@ -212,7 +212,7 @@ void	prase (char str[])
 					col = 0;
 				}
 				area_save = area;
-				fprintf (html_fd, "<a name=\"area%c\"></a>%cエリア<br>\n", area, area);
+				fprintf (html_fd, "<a id=\"area%c\">%cエリア</a><br>\n", area, area);
 				fprintf (html_fd, "<table border=\"1\" style=\"font-size:0.9em;\">\n");
 			}
 			if ((col % COL) == 0) fprintf (html_fd, "<tr>");
@@ -565,7 +565,7 @@ os_ok:
     	fprintf (html_fd, "}\n");
     	fprintf (html_fd, "return(\"\");\n");
 	fprintf (html_fd, "}\n");
-	fprintf (html_fd, "function setCookie(key, val, tmp) {\n");
+	fprintf (html_fd, "function setCookie(key, val) {\n");
     	fprintf (html_fd, "tmp = key + \"=\" + escape(val) + \"; \";\n");
     	fprintf (html_fd, "tmp += \"expires=Tue, 31-Dec-2030 23:59:59; \";\n");
     	fprintf (html_fd, "document.cookie = tmp;\n");

--- a/rig_read.c
+++ b/rig_read.c
@@ -518,11 +518,14 @@ int 	rig_read (void)
 				if (gps_wait)
 				{
 					gps_wait = FALSE;
-					if (!memcmp (&rig_buff[4], NullVoice, 12)
-						|| !memcmp (&rig_buff[4], gps_only_1, 12)) 
+					if (gps_skip_sw)
 					{
-						gps_only = TRUE;
-						goto voice_skip;
+						if (!memcmp (&rig_buff[4], NullVoice, 12)
+							|| !memcmp (&rig_buff[4], gps_only_1, 12)) 
+						{
+							gps_only = TRUE;
+							goto voice_skip;
+						}
 					}
 					inet_send_buff[16] = 0x80;
 					//memcpy (&inet_send_buff[17], &rig_buff[2], 41);
@@ -655,6 +658,7 @@ void	rig_write (int length, unsigned char buff[])
 {
 	int ret;
 	unsigned char	temp[8];
+	struct	timeval	check_time;
 
 	if (length == 17)
 	{
@@ -695,8 +699,10 @@ void	rig_write (int length, unsigned char buff[])
 	#ifdef	_DEBUG_RIG_WRITE_PACKET
 	if (length == 17)
 	{
-		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 %d %d",
+		gettimeofday (&check_time, NULL);
+		syslog (LOG_DEBUG,
+			"%03ld %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 %d %d",
+			check_time.tv_usec/1000, 
 			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], buff[13], buff[14], buff[15], buff[16], fifo_hold_limit, Fifo_cnt);
 	}

--- a/rpt_conn.c
+++ b/rpt_conn.c
@@ -333,6 +333,6 @@ end:
 	if (udev) node_close();
 	closelog();
 	remove (PID_FILE);
-	usleep (500000);
+	usleep (1000000);
 }