Commit: ceb83066323e9678d911f32f64f0d57be5d680c4 - rpi-dmonitor (git)

Commit MetaInfo

• Revision: ceb83066323e9678d911f32f64f0d57be5d680c4 (tree)
• Time: 2020-10-17 01:57:29
• Author: Satoshi Yasuda <7m3tjz@jarl...>
• Commiter: Satoshi Yasuda

Log Message

modified: config.h
modified: configure
modified: debian/changelog
modified: dmonitor.h
modified: dmonitor_utils.c
modified: dvap.c
modified: dvmega_utils.c
modified: inet_read.c
modified: main.c
modified: rig_read.c

Change Summary

• modified: config.h
• modified: configure
• modified: debian/changelog
• modified: dmonitor.h
• modified: dmonitor_utils.c
• modified: dvap.c
• modified: dvmega_utils.c
• modified: inet_read.c
• modified: main.c
• modified: rig_read.c

Incremental Difference

--- 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.60"
+#define PACKAGE_STRING "dmonitor 01.61"
 
 /* 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.60"
+#define PACKAGE_VERSION "01.61"
 
 /* Define to 1 if you have the ANSI C header files. */
 #define STDC_HEADERS 1
 
 /* Version number of package */
-#define VERSION "01.60"
+#define VERSION "01.61"
 
 /* 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.60.
+# Generated by GNU Autoconf 2.69 for dmonitor 01.61.
 #
 # Report bugs to <[e-mail]>.
 #
@@ -580,8 +580,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='dmonitor'
 PACKAGE_TARNAME='dmonitor'
-PACKAGE_VERSION='01.60'
-PACKAGE_STRING='dmonitor 01.60'
+PACKAGE_VERSION='01.61'
+PACKAGE_STRING='dmonitor 01.61'
 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.60 to adapt to many kinds of systems.
+\`configure' configures dmonitor 01.61 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.60:";;
+     short | recursive ) echo "Configuration of dmonitor 01.61:";;
    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.60
+dmonitor configure 01.61
 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.60, which was
+It was created by dmonitor $as_me 01.61, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2778,7 +2778,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='dmonitor'
- VERSION='01.60'
+ VERSION='01.61'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -5048,7 +5048,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.60, which was
+This file was extended by dmonitor $as_me 01.61, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -5114,7 +5114,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.60
+dmonitor config.status 01.61
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,16 @@
+dmonitor (01.61) unstable; urgency=low
+
+  * update Closes: (#121)
+  * BUG fixed for dvap header routine (dvap_weire)
+
+ -- Satoshi Yasuda <[e-mail]>  Fri, 16 Oct 2020 20:00:00 +0900
+
 dmonitor (01.60) unstable; urgency=low
 
   * update Closes: (#120)
   * BUG fixed for node adapter routine
 
- -- Satoshi Yasuda <[e-mail]>  Thu, 15 Oct 2020 13:40:00 +0900
+ -- Satoshi Yasuda <[e-mail]>  Thu, 15 Oct 2020 14:30:00 +0900
 
 dmonitor (01.59) unstable; urgency=low
 

--- a/dmonitor.h
+++ b/dmonitor.h
@@ -34,6 +34,7 @@
 
 //#define		_DEBUG_DVMEGA
 //#define		_SPECIFICATIO_CHECK
+//#define		_DEBUG_DVAP_SEND
 
 #define		GW	0x80
 #define		ZR	0x40

--- a/dmonitor_utils.c
+++ b/dmonitor_utils.c
@@ -15,6 +15,7 @@ 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];
@@ -404,6 +405,10 @@ int	send_rig (void)
 				fifo_hold_limit = fifo_hold + 10;
 			}
 			else	fifo_hold_limit = Fifo_cnt + 10;
+                	rig_last_frame_send = TRUE;
+                	send_header_sw = FALSE;
+			memset (inet_frame_id, 0x00, 2);
+			frameID = 0;
 		}
 	}
 	return TRUE;

--- a/dvap.c
+++ b/dvap.c
@@ -14,6 +14,7 @@ void	short_msg_wrt (void);
 void	send_msg (unsigned char str[], unsigned char my2[]);
 int	cmd_check (unsigned char cmd[]);
 int     rig_status_check(void);
+unsigned short int crc_calc (unsigned char string[], int length);
 
 struct	termios	save_attr;
 char	dvap_buff[1024];
@@ -588,6 +589,7 @@ void	dvap_send_header (void)
 {
 	int	ret;
 	char	temp[21];
+	unsigned short int crc;
 
 	if (dvap_header[25] == 0x20) return;
 	if (!cmd_check (&dvap_header[25])) return;
@@ -620,6 +622,9 @@ void	dvap_send_header (void)
                 inet_send_buff[4] = (m_seq >> 8) & 0xff;
                 inet_send_buff[5] = m_seq & 0xff;
                 inet_send_buff[7] |= FWD | ZR;
+                crc = crc_calc (&inet_send_buff[17], 39);
+                inet_send_buff[56] = (crc >> 8) & 0xff;
+                inet_send_buff[57] = crc & 0xff;
                 ret = sendto (in_addr_sock, inet_send_buff, 58, MSG_DONTWAIT,
                 	(struct sockaddr *)&in_addr, sizeof(in_addr));
                	m_seq++;
@@ -628,6 +633,9 @@ void	dvap_send_header (void)
                	inet_send_buff[5] = m_seq & 0xff;
                	memcpy (&inet_send_buff[28], area_call, 8);
                	memcpy (&inet_send_buff[20], area_call, 8);
+                crc = crc_calc (&inet_send_buff[17], 39);
+                inet_send_buff[56] = (crc >> 8) & 0xff;
+                inet_send_buff[57] = crc & 0xff;
                	sendto (in_addr_sock, inet_send_buff, 58, MSG_DONTWAIT,
                		(struct sockaddr *)&in_addr, sizeof(in_addr));
 		memset (short_msg, 0x20, 20);
@@ -645,6 +653,9 @@ void	dvap_send_header (void)
                         m_seq &= 0xffff;
                         inet_send_buff[4] = (m_seq >> 8) & 0xff;
                         inet_send_buff[5] = m_seq & 0xff;
+                        crc = crc_calc (&inet_send_buff[17], 39);
+                        inet_send_buff[56] = (crc >> 8) & 0xff;
+                        inet_send_buff[57] = crc & 0xff;
                         sendto (in_addr_sock, inet_send_buff, 58, MSG_DONTWAIT,
                         	(struct sockaddr *)&in_addr, sizeof(in_addr));
                         m_seq++;
@@ -727,28 +738,29 @@ unsigned char    dvap_send_pkt[47];
 void	dvap_write (int	fd, unsigned char buff[], int length)
 {
 	unsigned short int tmp;
+	unsigned short int crc;
 	int	ret;
-
 	if (length == 42)
 	{
-		if (!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]++;
+		time(&dvap_keep_alive);
+		dvap_send_pkt[0] = 0x2f;
+       		dvap_send_pkt[1] = 0xa0;
+       		//tmp = rand() & 0xffff;
+       		//memcpy (&dvap_send_pkt[2], &tmp, 2);
+		memcpy (&dvap_send_pkt[2], inet_frame_id, 2);
+       		dvap_send_pkt[4] = 0x80;
+       		dvap_send_pkt[5] = 0x00;
+       		memcpy (&dvap_send_pkt[6], &buff[2], 41);
+		dvap_send_pkt[6] &= 0x07;
+                crc = crc_calc (&dvap_send_pkt[6], 39);
+                dvap_send_pkt[45] = (crc >> 8) & 0xff;
+                dvap_send_pkt[46] = crc & 0xff;
+		ret = write (fd, dvap_send_pkt, 47);
+		//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]);
+		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
 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]);
@@ -757,35 +769,31 @@ syslog (LOG_DEBUG, "%2.2x %2.2x %2.2x %2.2x %2.2x %2.2x %2.2x %2.2x %2.2x %2.2x
 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 (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;
-				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[4] |= 0x40;
-					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;
+			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[4] |= 0x40;
+				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;
 #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
-			}
 		}
 	}
 	else

--- a/dvmega_utils.c
+++ b/dvmega_utils.c
@@ -159,6 +159,9 @@ void	dvmega_read (void)
                                 inet_send_buff[4] = (m_seq >> 8) & 0xff;
                                 inet_send_buff[5] = m_seq & 0xff;
                                 inet_send_buff[7] |= FWD | ZR;
+                                crc = crc_calc (&inet_send_buff[17], 39);
+                                inet_send_buff[56] = (crc >> 8) & 0xff;
+                                inet_send_buff[57] = crc & 0xff;
                                 ret = sendto (in_addr_sock, inet_send_buff, 58, MSG_DONTWAIT,
                                 	(struct sockaddr *)&in_addr, sizeof(in_addr));
                                 m_seq++;
@@ -181,6 +184,9 @@ void	dvmega_read (void)
                                         m_seq &= 0xffff;
                                         inet_send_buff[4] = (m_seq >> 8) & 0xff;
                                         inet_send_buff[5] = m_seq & 0xff;
+                                        crc = crc_calc (&inet_send_buff[17], 39);
+                                        inet_send_buff[56] = (crc >> 8) & 0xff;
+                                        inet_send_buff[57] = crc & 0xff;
                                         sendto (in_addr_sock, inet_send_buff, 58, MSG_DONTWAIT,
                                         	(struct sockaddr *)&in_addr, sizeof(in_addr));
                                         m_seq++;

--- a/inet_read.c
+++ b/inet_read.c
@@ -177,6 +177,8 @@ void	inet_read (void)
 	{
 		if ((inet_frame_id[0] == 0x00) && (inet_frame_id[1] == 0x00))
 		{
+if (recvBuff[7] & GW) syslog (LOG_DEBUG, "GW area:%8.8s rpt2:%8.8s rpt1:%8.8s", area_call, &recvBuff[20], &recvBuff[28]);
+if (recvBuff[7] & ZR) syslog (LOG_DEBUG, "ZR area:%8.8s rpt2:%8.8s rpt1:%8.8s", area_call, &recvBuff[20], &recvBuff[28]);
 			if (((recvBuff[7] & ZR) && !memcmp (area_call, &recvBuff[28], 8)) || scan_sw
 				|| ((recvBuff[7] & GW) && !memcmp (area_call, &recvBuff[20], 8)))
 			{
@@ -208,16 +210,16 @@ void	inet_read (void)
 				short_msg_wrt();
 				beep_sw = OFF;
 				send_header_sw = TRUE;
-			}
-			if (!scan_sw)
-			{
-				if (recvBuff[7] & GW) syslog (LOG_NOTICE, "%8.8s from GW", &recvBuff[44]);
-				else if (recvBuff[7] & ZR) syslog (LOG_NOTICE, "%8.8s from ZR", &recvBuff[44]);
-			}
-			else
-			{
-                                if (recvBuff[7] & GW) fprintf (status_fd, "%8.8s from GW\n", &recvBuff[44]);
-                                else if (recvBuff[7] & ZR) fprintf (status_fd, "%8.8s from ZR\n", &recvBuff[44]);
+				if (!scan_sw)
+				{
+					if (recvBuff[7] & GW) syslog (LOG_NOTICE, "%8.8s from GW", &recvBuff[44]);
+					else if (recvBuff[7] & ZR) syslog (LOG_NOTICE, "%8.8s from ZR", &recvBuff[44]);
+				}
+				else
+				{
+                                	if (recvBuff[7] & GW) fprintf (status_fd, "%8.8s from GW\n", &recvBuff[44]);
+                                	else if (recvBuff[7] & ZR) fprintf (status_fd, "%8.8s from ZR\n", &recvBuff[44]);
+				}
 			}
 		}
 	}

--- a/main.c
+++ b/main.c
@@ -72,6 +72,7 @@ int	main(int argc, char *argv[])
 
 	FILE	*pid_file;
 	FILE	*dmonitor_file;
+	FILE	*model;
 
 	ret = nice (-15);
 	send_sw = FALSE;
@@ -225,9 +226,24 @@ int	main(int argc, char *argv[])
 		sizeof(HOLE_PUNCHD_SERVER));
 	hole_punch_port = HOLE_PUNCHD_PORT;
 
-	if (!scan_sw) syslog (LOG_INFO, "Connected to %8.8s (%s:%d) from %8.8s", 
+        model = fopen ("/proc/device-tree/model", "r");
+        if (model)
+        {
+                fgets (pg_path, sizeof(pg_path), model);
+                fclose (model);
+	}
+
+	if (!scan_sw) 
+	{
+		syslog (LOG_INFO, "Connected to %8.8s (%s:%d) from %8.8s", 
 			area_call, dest_address, dest_inet_port, connect_call);
-	else fprintf (status_fd, "Connected to %8.8s from %8.8s\n", area_call, connect_call);
+		syslog (LOG_INFO, "Model : %s", pg_path);
+	}
+	else 
+	{
+		fprintf (status_fd, "Connected to %8.8s from %8.8s\n", area_call, connect_call);
+		fprintf (status_fd, "Model : %s\n", pg_path);
+	}
 	memset (inet_frame_id, 0x00, 2);
 	frameID = 0;
 	gettimeofday (&inet_time, NULL);

--- a/rig_read.c
+++ b/rig_read.c
@@ -29,6 +29,7 @@ void	rig_not_connect_msg (void);
 int	dvmega_init (void);
 int	dvmega_init_recv (void);	
 int	cmd_check (unsigned char cmd[]);
+unsigned short int      crc_calc (char str[], int length);
 
 char	init_pkt[] = {0xff, 0xff, 0xff};
 char	alive[] = {0x02, 0x02, 0xff};
@@ -335,6 +336,7 @@ int	rig_read (void)
 	struct	timeval	cu_time;
 	struct	timeval	t_time;
 	struct	timeval	ack_timeout;
+	unsigned short int crc;
 
 	if (FD_ISSET (rig_fd, &read_set))
 	{
@@ -440,6 +442,9 @@ int	rig_read (void)
         				inet_send_buff[4] = (m_seq >> 8) & 0xff;
         				inet_send_buff[5] = m_seq & 0xff;
 					inet_send_buff[7] |= FWD | ZR;
+                        		crc = crc_calc (&inet_send_buff[17], 39);
+                        		inet_send_buff[56] = (crc >> 8) & 0xff;
+                        		inet_send_buff[57] = crc & 0xff;
 					ret = sendto (in_addr_sock, inet_send_buff, 58, MSG_DONTWAIT,
 						(struct sockaddr *)&in_addr, sizeof(in_addr));
 					m_seq++;
@@ -464,6 +469,9 @@ int	rig_read (void)
 						m_seq &= 0xffff;
 						inet_send_buff[4] = (m_seq >> 8) & 0xff;
 						inet_send_buff[5] = m_seq & 0xff;
+                                        	crc = crc_calc (&inet_send_buff[17], 39);
+                                        	inet_send_buff[56] = (crc >> 8) & 0xff;
+                                        	inet_send_buff[57] = crc & 0xff;
 						sendto (in_addr_sock, inet_send_buff, 58, MSG_DONTWAIT,
 							(struct sockaddr *)&in_addr, sizeof(in_addr));
 						m_seq++;