Commit: c4124a788e17db39e3465beedcceef16e5ee9a05 - rpi-dmonitor (git)

Commit MetaInfo

• Revision: c4124a788e17db39e3465beedcceef16e5ee9a05 (tree)
• Zeit: 2022-06-03 23:38:15
• Autor: Satoshi Yasuda <7m3tjz@jarl...>
• Commiter: Satoshi Yasuda

Log Message

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

Ändern Zusammenfassung

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

--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,16 @@
+dmonitor (01.79) unstable; urgency=low
+
+  * update Closes: (#139)
+  * addes dmonitor_start script
+
+ -- Satoshi Yasuda <[e-mail]>  Tue, 31 May 2022 18:15:00 +0900
+
 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
 
+ -- Satoshi Yasuda <[e-mail]>  Tue, 31 May 2022 13:45:00 +0900
 
 dmonitor (01.77) unstable; urgency=low
 

--- a/debian/install
+++ b/debian/install
@@ -104,7 +104,6 @@ dvap.conf.save		/var/www
 dvmega.conf.save	/var/www
 node.conf.save		/var/www
 99-dstar.rules		/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
@@ -116,7 +116,6 @@ 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 /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
@@ -113,6 +113,7 @@ int	rig_buff_next;
 
 int	dest_inet_port;
 char	*dest_address;
+char	*server_address;
 char	inet_send_buff[58];
 int	m_seq;
 int	frameID;
@@ -235,7 +236,7 @@ int		alt_header_pnt;
 int		gw_on;
 
 char	cmd[256];
-unsigned char   recvBuff[1024];
+unsigned char   recvBuff[256];
 int	code_sq;
 
 unsigned char	msg_temp[21];

--- a/extern_dmonitor.h
+++ b/extern_dmonitor.h
@@ -113,6 +113,7 @@ extern int	rig_buff_next;
 
 extern int	dest_inet_port;
 extern char	*dest_address;
+extern char	*server_address;
 extern char	inet_send_buff[58];
 extern int	m_seq;
 extern int	frameID;
@@ -235,7 +236,7 @@ extern int		alt_header_pnt;
 extern int		gw_on;
 
 extern char	cmd[256];
-extern unsigned char   recvBuff[1024];
+extern unsigned char   recvBuff[256];
 extern int	code_sq;
 
 extern unsigned char	msg_temp[21];

--- 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;
@@ -196,10 +196,10 @@ os_ok:
 	recv_frame_seq = 0x00;
 
 	memset (connect_call, 0x20, 8);
-	if (argc < 5) 
+	if (argc < 6) 
 	{
 		syslog (LOG_ERR, 
-			"Usage dmonitor my_call ip_address port area_call [zone_call]");
+			"Usage dmonitor my_call ip_address port area_call zone_call server_ip");
 		return 5;
 	}
 	len = strlen(argv[1]);
@@ -213,14 +213,15 @@ os_ok:
 	}
 	memcpy (connect_call, argv[1], len);
 	dest_address = argv[2];
+	server_address = argb[6];
 	dest_inet_port = (unsigned short)atoi(argv[3]);
 	memcpy (area_call, argv[4], strlen(argv[4]));
 	memcpy (zone_call, argv[4], strlen(argv[4]));
 	zone_call[7] = 'G';
 	if (argc == 6)
 	{
-		if (!memcmp (argv[5], "SCAN", 4)) scan_sw = TRUE;
-		else if (!memcmp (argv[5], "NO_DAEMON", 9)) no_daemon = TRUE;
+		if (!memcmp (argv[6], "SCAN", 4)) scan_sw = TRUE;
+		else if (!memcmp (argv[6], "NO_DAEMON", 9)) no_daemon = TRUE;
 		else 
 		{
 			memcpy (zone_call, argv[5], strlen(argv[5]));
@@ -229,8 +230,8 @@ os_ok:
 	}
 	if (argc == 7)
 	{
-		if (!memcmp (argv[6], "SCAN", 4)) scan_sw = TRUE;
-		else if (!memcmp (argv[6], "NO_DAEMON", 9)) no_daemon = TRUE;
+		if (!memcmp (argv[7], "SCAN", 4)) scan_sw = TRUE;
+		else if (!memcmp (argv[7], "NO_DAEMON", 9)) no_daemon = TRUE;
 	}
 
 	if (argc >= 5) send_sw = TRUE;

--- a/repeater_mon.c
+++ b/repeater_mon.c
@@ -62,6 +62,7 @@ void	prase (char str[])
 	char	callsign[8];
 	char	call[64];
 	char	ip_addr[20];
+	char	server_ip[20];
 	int	port;
 	char	rep_temp[128];
 	char	ur_call[8];
@@ -97,6 +98,19 @@ void	prase (char str[])
 				ip_addr[m++] = str[n];
 			}
 		}
+		else if (!memcmp (&str[k], "server_ip",  9))
+		{
+			m = 0;
+			for (n = k + 12; n < len ; n++)
+			{
+				if (str[n] == '"')
+				{
+					server_ip[m] = 0x00;
+					break;
+				}
+				server_ip[m++] = str[n];
+			}
+		}
 		else if (!memcmp (&str[k], "port", 4))
 		{
 			port = atoi (&str[k+6]);
@@ -209,21 +223,21 @@ void	prase (char str[])
 					rep_temp[l] = 0x00;
 					if (status)
 					{
-						fprintf (html_fd, "<td title=\"rpt1:%8.8s rpt2:%8.8s ur:%8.8s my:%8.8s\"<tt><a href=\"/cgi-bin/monitor?ip_addr=%s&port=%d&callsign='%8.8s'&rep_name='%s'&zr_call='%8.8s'\" target=\"cmd1\" style=\"color:red;\">%s</a></tt></td><td>%s</td>\n", 
-							rpt1_call, rpt2_call, ur_call, my_call, ip_addr, port, callsign, &rep_temp[8], zr_call, call, &rep_temp[8]);
+						fprintf (html_fd, "<td title=\"rpt1:%8.8s rpt2:%8.8s ur:%8.8s my:%8.8s\"<tt><a href=\"/cgi-bin/monitor?ip_addr=%s&port=%d&callsign='%8.8s'&rep_name='%s'&zr_call='%8.8s'&server_ip=%s\" target=\"cmd1\" style=\"color:red;\">%s</a></tt></td><td>%s</td>\n", 
+							rpt1_call, rpt2_call, ur_call, my_call, ip_addr, port, callsign, &rep_temp[8], server_ip, zr_call, call, &rep_temp[8]);
 						if (active_col == 0) 
 						{
 							fprintf (html_active_fd, "<table border=\"1\" style=\"font-size:1.0em;\">\n");
 							fprintf (html_active_fd, "<tr><td><center>Rep. Call</center></td><td><center>Rep. Name</center></td><td><center>GW Call</center></td><td><center>Ur Call</center></td><td><center>My Call</center></td></tr>\n");
 						}
-						fprintf (html_active_fd, "<tr><td><tt><a href=\"/cgi-bin/monitor?ip_addr=%s&port=%d&callsign='%8.8s'&rep_name='%s'&zr_call='%8.8s'\" target=\"cmd1\" style=\"color:red;\">%s</a></tt></td><td>%s</td><td><tt>%8.8s</tt></td><td><tt>%8.8s</tt></td><td><tt>%8.8s</tt></td></tr>\n",
+						fprintf (html_active_fd, "<tr><td><tt><a href=\"/cgi-bin/monitor?ip_addr=%s&port=%d&callsign='%8.8s'&rep_name='%s'&zr_call='%8.8s'&server_ip=%s\" target=\"cmd1\" style=\"color:red;\">%s</a></tt></td><td>%s</td><td><tt>%8.8s</tt></td><td><tt>%8.8s</tt></td><td><tt>%8.8s</tt></td></tr>\n",
                                                         ip_addr, port, callsign,
-&rep_temp[8], zr_call, call, &rep_temp[8], zr_call, ur_call, my_call);
+&rep_temp[8], zr_call, server_ip, call, &rep_temp[8], zr_call, ur_call, my_call);
 						active_col++;
 					}
 					else
-						fprintf (html_fd, "<td><tt><a href=\"/cgi-bin/monitor?ip_addr=%s&port=%d&callsign='%8.8s'&rep_name='%s'&zr_call='%8.8s'\" target=\"cmd1\">%s</a></tt></td><td>%s</td>\n", 
-							ip_addr, port, callsign, &rep_temp[8], zr_call, call, &rep_temp[8]);
+						fprintf (html_fd, "<td><tt><a href=\"/cgi-bin/monitor?ip_addr=%s&port=%d&callsign='%8.8s'&rep_name='%s'&zr_call='%8.8s'&server_ip='%s\" target=\"cmd1\">%s</a></tt></td><td>%s</td>\n", 
+							ip_addr, port, callsign, &rep_temp[8], zr_call, server_ip, call, &rep_temp[8]);
 					
 					goto mast_close;
 				}
@@ -231,8 +245,8 @@ void	prase (char str[])
 			}
 			if (status)
 			{
-				fprintf (html_fd, "<td title=\"rpt1:%8.8s rpt2:%8.8s ur:%8.8s my:%8.8s\"><tt><a href=\"/cgi-bin/monitor?ip_addr=%s&port=%d&callsign='%8.8s'&zr_call='%8.8s'\" target=\"cmd1\" style=\"color:red;\">%s</a></td></tt><td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>\n", 
-					rpt1_call, rpt2_call, ur_call, my_call, ip_addr, port, callsign, zr_call, call);
+				fprintf (html_fd, "<td title=\"rpt1:%8.8s rpt2:%8.8s ur:%8.8s my:%8.8s\"><tt><a href=\"/cgi-bin/monitor?ip_addr=%s&port=%d&callsign='%8.8s'&zr_call='%8.8s'&server_ip='%s\" target=\"cmd1\" style=\"color:red;\">%s</a></td></tt><td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>\n", 
+					rpt1_call, rpt2_call, ur_call, my_call, ip_addr, port, callsign, zr_call, server_ip, call);
 					if (active_col == 0) 
 					{
 						fprintf (html_active_fd, "<table border=\"1\" style=\"font-size:0.9em;\">\n");
@@ -245,8 +259,8 @@ void	prase (char str[])
 			}
 			else
 			{
-				fprintf (html_fd, "<td><tt><a href=\"/cgi-bin/monitor?ip_addr=%s&port=%d&callsign='%8.8s'&zr_call='%8.8s'\" target=\"cmd1\">%s</a></tt></td><td></td>\n", 
-					ip_addr, port, callsign, zr_call, call);
+				fprintf (html_fd, "<td><tt><a href=\"/cgi-bin/monitor?ip_addr=%s&port=%d&callsign='%8.8s'&zr_call='%8.8s'&server_ip=%s\" target=\"cmd1\">%s</a></tt></td><td></td>\n", 
+					ip_addr, port, callsign, zr_call, server_ip, call);
 			}
 mast_close:
 			fprintf (conn_fd, "%8.8sdmonitor '%8.8s' %s %d '%8.8s' '%8.8s'\n", callsign, ConnectCall, ip_addr, port, callsign, zr_call);