Commit: 2c7476a125d0c80f446470967b7aec55ee8ea5eb - rpi-dmonitor (git)

Commit MetaInfo

• Revision: 2c7476a125d0c80f446470967b7aec55ee8ea5eb (tree)
• Zeit: 2022-06-04 03:16:12
• Autor: Satoshi Yasuda <7m3tjz@jarl...>
• Commiter: Satoshi Yasuda

Log Message

modified: dmonitor_utils.c
modified: main.c
modified: repeater_mon.c

Ändern Zusammenfassung

• modified: config.h
• modified: configure
• modified: dmonitor_utils.c
• 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 01.79"
+#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.79"
+#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.79"
+#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.79.
+# 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.79'
-PACKAGE_STRING='dmonitor 01.79'
+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.79 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.79:";;
+     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.79
+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.79, 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.79'
+ 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.79, 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.79
+dmonitor config.status 02.00
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

--- a/dmonitor_utils.c
+++ b/dmonitor_utils.c
@@ -321,10 +321,12 @@ 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);
+	//in_addr.sin_addr.s_addr = inet_addr(hole_punch_server);
+	in_addr.sin_addr.s_addr = inet_addr(server_address);
+syslog(LOG_DEBUG, "%s", server_address);
 	if (in_addr.sin_addr.s_addr == 0xffffffff)
 	{
-		host = gethostbyname(hole_punch_server);
+		host = gethostbyname(server_address);
 		if (host == NULL) return;
 		in_addr.sin_addr.s_addr = *(unsigned int *)host->h_addr_list[0];
 	}

--- a/main.c
+++ b/main.c
@@ -137,8 +137,10 @@ int	main(int argc, char *argv[])
 	invalid_os ();
 	return -1;
 os_ok:
+syslog (LOG_DEBUG, "debug 100");
 	fclose (os_release_file);
 	right_os ();
+syslog (LOG_DEBUG, "debug 110");
 	
 	dmonitor_file = fopen (DMONITOR_FILE, "r");
 	if (dmonitor_file == NULL)
@@ -213,12 +215,13 @@ os_ok:
 	}
 	memcpy (connect_call, argv[1], len);
 	dest_address = argv[2];
-	server_address = argb[6];
+	server_address = argv[6];
+printf ("%s  %s\n", argv[6], server_address);
 	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 (argc == 7)
 	{
 		if (!memcmp (argv[6], "SCAN", 4)) scan_sw = TRUE;
 		else if (!memcmp (argv[6], "NO_DAEMON", 9)) no_daemon = TRUE;
@@ -228,13 +231,13 @@ os_ok:
 			zone_call[7] = 'G';
 		}
 	}
-	if (argc == 7)
+	if (argc == 8)
 	{
 		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;
+	if (argc >= 6) send_sw = TRUE;
 	if (!scan_sw)
 	{
 		if (!no_daemon) ret = daemon(0, 0);

--- a/repeater_mon.c
+++ b/repeater_mon.c
@@ -236,7 +236,7 @@ void	prase (char str[])
 						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'&server_ip='%s\" target=\"cmd1\">%s</a></tt></td><td>%s</td>\n", 
+						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;
@@ -245,7 +245,7 @@ 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'&server_ip='%s\" target=\"cmd1\" style=\"color:red;\">%s</a></td></tt><td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>\n", 
+				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) 
 					{