Commit: 7f776a9dadca31bf1466531245b3170b7ccb4e92 - rpi-dmonitor (git)

Commit MetaInfo

• Revision: 7f776a9dadca31bf1466531245b3170b7ccb4e92 (tree)
• Zeit: 2022-05-31 12:36:49
• Autor: Satoshi Yasuda <7m3tjz@jarl...>
• Commiter: Satoshi Yasuda

Log Message

modified: dmonitor.h
modified: extern_dmonitor.h
modified: inet_read.c
modified: main.c

Ändern Zusammenfassung

• modified: config.h
• modified: configure
• modified: debian/changelog
• modified: debian/control
• modified: debian/install
• modified: debian/rules
• modified: dmonitor.h
• modified: extern_dmonitor.h
• modified: inet_read.c
• modified: main.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.75"
+#define PACKAGE_STRING "dmonitor 02.00"
 
 /* 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.75"
+#define PACKAGE_VERSION "02.00"
 
 /* Define to 1 if you have the ANSI C header files. */
 #define STDC_HEADERS 1
 
 /* Version number of package */
-#define VERSION "01.75"
+#define VERSION "02.00"
 
 /* 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.75.
+# Generated by GNU Autoconf 2.69 for dmonitor 02.00.
 #
 # Report bugs to <[e-mail]>.
 #
@@ -580,8 +580,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='dmonitor'
 PACKAGE_TARNAME='dmonitor'
-PACKAGE_VERSION='01.75'
-PACKAGE_STRING='dmonitor 01.75'
+PACKAGE_VERSION='02.00'
+PACKAGE_STRING='dmonitor 02.00'
 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.75 to adapt to many kinds of systems.
+\`configure' configures dmonitor 02.00 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.75:";;
+     short | recursive ) echo "Configuration of dmonitor 02.00:";;
    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.75
+dmonitor configure 02.00
 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.75, which was
+It was created by dmonitor $as_me 02.00, 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.75'
+ VERSION='02.00'
 
 
 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.75, which was
+This file was extended by dmonitor $as_me 02.00, 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.75
+dmonitor config.status 02.00
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,26 @@
+dmonitor (01.78) unstable; urgency=low
+
+  * update Closes: (#138)
+  * changed assist rpt2
+  * addes dmonitor_start script
+
+ -- Satoshi Yasuda <[e-mail]>  Fri, 27 May 2022 15:20:00 +0900
+
+
+dmonitor (01.77) unstable; urgency=low
+
+  * update Closes: (#137)
+  * bug fixed arg of zone_call
+
+ -- Satoshi Yasuda <[e-mail]>  Mon, 23 May 2022 23:20:00 +0900
+
+dmonitor (01.76) unstable; urgency=low
+
+  * update Closes: (#136)
+  * added DVmega set (serial set)
+
+ -- Satoshi Yasuda <[e-mail]>  Sun, 08 Apr 2022 19:00:00 +0900
+
 dmonitor (01.75) unstable; urgency=low
 
   * update Closes: (#135)

--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Homepage: http://app.d-star.info/
 
 Package: dmonitor
 Architecture: armhf
-Depends: ${shlibs:Depends}, ${perl:Depends}, monitorix, nkf, lighttpd, surf, wiringpi
+Depends: ${shlibs:Depends}, ${perl:Depends}, libcgi-application-perl, nkf, lighttpd, surf, wiringpi
 Description: D-STAR repeater monitor
  D-STAR Rpeater monitor program 
   access point multi_forward program

--- a/debian/install
+++ b/debian/install
@@ -36,7 +36,6 @@ DvmegaSet	/var/www/cgi-bin
 DvmegaStore	/var/www/cgi-bin
 NodeSet		/var/www/cgi-bin
 NodeStore	/var/www/cgi-bin
-system_info	/var/www/cgi-bin
 repDmon		/var/www/cgi-bin
 tool_exec	/var/www/cgi-bin
 debug_dmonitor_log	/var/www/cgi-bin
@@ -80,7 +79,7 @@ error_msg.html.save /var/www/html
 short_msg.html.save /var/www/html
 010_www-data-nopasswd	/etc/sudoers.d
 dmonitor_log	/etc/logrotate.d
-rpt_conn	/etc/logrotate.d
+rpt_conn_log	/etc/logrotate.d
 auto_repmon.service	/etc/systemd/system
 rpt_conn.service	/etc/systemd/system
 auto_repmon_light.service     /etc/systemd/system
@@ -105,7 +104,7 @@ dvap.conf.save		/var/www
 dvmega.conf.save	/var/www
 node.conf.save		/var/www
 99-dstar.rules		/var/tmp
-monitorix.conf		/var/tmp
-resize_dmon.sh.org	/var/tmp
+#resize_dmon.sh.org	/var/tmp
 dmonitor_update		/var/tmp
 dmonitor_update_surf	/var/tmp
+dmonitor_start		/var/tmp

--- a/debian/rules
+++ b/debian/rules
@@ -74,7 +74,6 @@ override_dh_prep:
 	cp /var/www/cgi-bin/DvmegaStore	debian/tmp/
 	cp /var/www/cgi-bin/NodeSet	debian/tmp/
 	cp /var/www/cgi-bin/NodeStore	debian/tmp/
-	cp /var/www/cgi-bin/system_info	debian/tmp/
 	cp /var/www/cgi-bin/repDmon	debian/tmp/
 	cp /var/www/cgi-bin/debug_dmonitor_log	debian/tmp/
 	cp /var/www/cgi-bin/debug_rpt_conn_log	debian/tmp/
@@ -94,7 +93,7 @@ override_dh_prep:
 	cp /var/www/html/buff_hold.txt	debian/tmp/
 	cp /etc/sudoers.d/010_www-data-nopasswd debian/tmp/
 	cp /etc/logrotate.d/dmonitor_log	debian/tmp/
-	cp /etc/logrotate.d/rpt_conn		debian/tmp/
+	cp /etc/logrotate.d/rpt_conn_log	debian/tmp/
 	cp /usr/bin/rig_port_check	debian/tmp/
 	cp /usr/bin/kill_dmonitor	debian/tmp/
 	cp /usr/bin/auto_repmon		debian/tmp/
@@ -117,7 +116,7 @@ override_dh_prep:
 	cp /var/www/rpt_mast.txt	debian/tmp/
 	cp /etc/udev/rules.d/99-dstar.rules 	debian/tmp/
 	cp /usr/share/javascript/jquery/jquery.cookie.js debian/tmp/
-	cp /etc/monitorix/monitorix.conf	debian/tmp/
-	cp /usr/local/bin/resize_dmon.sh.org	debian/tmp/
+	#cp /usr/local/bin/resize_dmon.sh.org	debian/tmp/
 	cp /usr/local/bin/dmonitor_update	debian/tmp/
 	cp /usr/local/bin/dmonitor_update_surf	debian/tmp/
+	cp /usr/local/bin/dmonitor_start	debian/tmp/

--- a/dmonitor.h
+++ b/dmonitor.h
@@ -235,7 +235,7 @@ int		alt_header_pnt;
 int		gw_on;
 
 char	cmd[256];
-unsigned char   recvBuff[256];
+unsigned char   recvBuff[1024];
 int	code_sq;
 
 unsigned char	msg_temp[21];

--- a/extern_dmonitor.h
+++ b/extern_dmonitor.h
@@ -235,7 +235,7 @@ extern int		alt_header_pnt;
 extern int		gw_on;
 
 extern char	cmd[256];
-extern unsigned char   recvBuff[256];
+extern unsigned char   recvBuff[1024];
 extern int	code_sq;
 
 extern unsigned char	msg_temp[21];

--- a/inet_read.c
+++ b/inet_read.c
@@ -149,6 +149,8 @@ void	inet_read (void)
 	#ifdef	_DEBUG_INET
 	syslog (LOG_DEBUG, "inet read %d", length);
 	#endif
+	length = recvBuff[8] << 8 | recvBuff[9];
+	length += 10;
 	if ((inet_frame_id[0] == 0xff) && (inet_frame_id[1] == 0xff)) 
 	{
 		if (length == 58)
@@ -183,7 +185,9 @@ void	inet_read (void)
 			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]);
 			#endif
-			if (((recvBuff[7] & ZR) && !memcmp (area_call, &recvBuff[28], 8)) || scan_sw
+			if (((recvBuff[7] & ZR) && !memcmp (area_call, &recvBuff[28], 8)) 
+				|| ((recvBuff[7] & ZR) && !memcmp (area_call, &recvBuff[20], 8))
+				|| scan_sw
 				|| ((recvBuff[7] & GW) && !memcmp (area_call, &recvBuff[20], 8)))
 			{
 				while (getFifo(buff)) ;

--- a/main.c
+++ b/main.c
@@ -186,7 +186,7 @@ os_ok:
 	if (length <= 0 ) return -1;
 	pg_path[length] = 0x00;
 	if (ETagGen (pg_path, MD5_dmonitor) < 0) return 5;
-	//memcpy (MD5_dmonitor, "5ebe211107266a57b1af14a7fdcd8480", 32);
+	memcpy (MD5_dmonitor, "5ebe211107266a57b1af14a7fdcd8480", 32);
 
 	Rp = malloc (sizeof (struct FifoPkt) - 1024);
 	Wp = Rp;
@@ -223,7 +223,7 @@ os_ok:
 		else if (!memcmp (argv[5], "NO_DAEMON", 9)) no_daemon = TRUE;
 		else 
 		{
-			memcpy (zone_call, argv[4], strlen(argv[5]));
+			memcpy (zone_call, argv[5], strlen(argv[5]));
 			zone_call[7] = 'G';
 		}
 	}