Commit: 14482b60cddceb9661b9ad2d6af99736516d93a9 - rpi-dmonitor (git)

Commit MetaInfo

• Révision: 14482b60cddceb9661b9ad2d6af99736516d93a9 (tree)
• l'heure: 2019-07-24 22:20:29
• Auteur: Satoshi Yasuda <7m3tjz@jarl...>
• Commiter: Satoshi Yasuda

Message de Log

modified: dmonitor_utils.c
modified: repeater_mon.c
modified: repeater_mon.h
modified: repeater_scan.c

Change Summary

• modified: config.h
• modified: configure
• modified: debian/changelog
• modified: debian/dmonitor/DEBIAN/control
• modified: debian/dmonitor/DEBIAN/md5sums
• modified: debian/dmonitor/usr/bin/dmonitor
• modified: debian/dmonitor/usr/share/doc/dmonitor/changelog.gz
• modified: debian/files
• modified: dmonitor_utils.c
• modified: repeater_mon.c
• modified: repeater_mon.h
• modified: repeater_scan.c

Modification

--- a/config.h
+++ b/config.h
@@ -86,7 +86,7 @@
 #define PACKAGE_NAME "dmonitor"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "dmonitor 00.49"
+#define PACKAGE_STRING "dmonitor 00.50"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "dmonitor"
@@ -95,10 +95,10 @@
 #define PACKAGE_URL ""
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "00.49"
+#define PACKAGE_VERSION "00.50"
 
 /* Define to 1 if you have the ANSI C header files. */
 #define STDC_HEADERS 1
 
 /* Version number of package */
-#define VERSION "00.49"
+#define VERSION "00.50"

--- 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 00.49.
+# Generated by GNU Autoconf 2.69 for dmonitor 00.50.
 #
 # Report bugs to <[e-mail]>.
 #
@@ -580,8 +580,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='dmonitor'
 PACKAGE_TARNAME='dmonitor'
-PACKAGE_VERSION='00.49'
-PACKAGE_STRING='dmonitor 00.49'
+PACKAGE_VERSION='00.50'
+PACKAGE_STRING='dmonitor 00.50'
 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 00.49 to adapt to many kinds of systems.
+\`configure' configures dmonitor 00.50 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 00.49:";;
+     short | recursive ) echo "Configuration of dmonitor 00.50:";;
    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 00.49
+dmonitor configure 00.50
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1804,7 +1804,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 00.49, which was
+It was created by dmonitor $as_me 00.50, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2670,7 +2670,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='dmonitor'
- VERSION='00.49'
+ VERSION='00.50'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -4768,7 +4768,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 00.49, which was
+This file was extended by dmonitor $as_me 00.50, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -4834,7 +4834,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 00.49
+dmonitor config.status 00.50
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+dmonitor (00.50) unstable; urgency=low
+
+  * update Closes: (#046)
+  * keep alive time changed 5 to 10
+
+ -- Satoshi Yasuda <[e-mail]>  Thu, 18 Jul 2019 20:29:00 +0900
+
 dmonitor (00.49) unstable; urgency=low
 
   * update Closes: (#045)

--- a/debian/dmonitor/DEBIAN/control
+++ b/debian/dmonitor/DEBIAN/control
@@ -1,5 +1,5 @@
 Package: dmonitor
-Version: 00.49
+Version: 00.50
 Architecture: armhf
 Maintainer: Satoshi Yasuda <[e-mail]>
 Installed-Size: 105

--- a/debian/dmonitor/DEBIAN/md5sums
+++ b/debian/dmonitor/DEBIAN/md5sums
@@ -1,9 +1,9 @@
 b06db91f69046646316dbe873cab1658  usr/bin/auto_repmon
-9ba470908b4d7166489ce1c12cd4020b  usr/bin/dmonitor
+808e36d978623f9210338d5b2c707248  usr/bin/dmonitor
 6d4fb928a92fe66a0cfde11e70d8cdf2  usr/bin/repeater_mon
 7a467dfff10c33523ed2bcf2a7f6e91b  usr/bin/repeater_scan
 fd7d34a7321d40fd2c1c039565778ec9  usr/bin/rig_port_check
-ce08bced1e077eda1614f2ae9a34bd7a  usr/share/doc/dmonitor/changelog.gz
+03b539e389ee0b4b45280185f8f58f5b  usr/share/doc/dmonitor/changelog.gz
 50704bff5afce197b1ea87f23e44f64a  usr/share/doc/dmonitor/copyright
 9a0eeb38ddbd0829e064a5fdb29dc87f  var/www/cgi-bin/add_buffer
 c2cb1bcb277afdc44fd678198404b57e  var/www/cgi-bin/kill_dmon

Binary files a/debian/dmonitor/usr/bin/dmonitor and b/debian/dmonitor/usr/bin/dmonitor differ

Binary files a/debian/dmonitor/usr/share/doc/dmonitor/changelog.gz and b/debian/dmonitor/usr/share/doc/dmonitor/changelog.gz differ

--- a/debian/files
+++ b/debian/files
@@ -1,3 +1,3 @@
-dmonitor-dbgsym_00.49_armhf.deb debug extra
-dmonitor_00.49_armhf.buildinfo hamradio optional
-dmonitor_00.49_armhf.deb hamradio optional
+dmonitor-dbgsym_00.50_armhf.deb debug extra
+dmonitor_00.50_armhf.buildinfo hamradio optional
+dmonitor_00.50_armhf.deb hamradio optional

--- a/dmonitor_utils.c
+++ b/dmonitor_utils.c
@@ -103,19 +103,6 @@ void	send_keep_alive(void)
 	struct  hostent *host;
 
 	in_addr.sin_family = AF_INET;
-	in_addr.sin_port = htons(dest_inet_port);
-	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];
-	}
-	sprintf (&buff[4], "%s", inet_ntoa (in_addr.sin_addr));
-	sendto(in_addr_sock, &buff[4], 16, 0, (struct sockaddr *)&in_addr, sizeof(in_addr));
-	time (&send_time);
-	
-	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)
@@ -127,6 +114,18 @@ void	send_keep_alive(void)
 	memcpy (buff, "HPCH", 4);
 	sendto(in_addr_sock, buff, 20, 0, 
 		(struct sockaddr *)&in_addr, sizeof(in_addr));
+        in_addr.sin_family = AF_INET;
+        in_addr.sin_port = htons(dest_inet_port);
+        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];
+        }
+        sprintf (&buff[4], "%s", inet_ntoa (in_addr.sin_addr));
+        sendto(in_addr_sock, &buff[4], 16, 0, (struct sockaddr *)&in_addr, sizeof(in_addr));
+        time (&send_time);
 }
 
 void	inet_send_buff_set(void)

--- a/repeater_mon.c
+++ b/repeater_mon.c
@@ -233,7 +233,20 @@ void main(int argc, char** argv)
                 addr.sin_addr.s_addr = *(unsigned int *)host->h_addr_list[0];
         }
 
-    	connect(sd, (struct sockaddr *)&addr, sizeof(struct sockaddr_in));
+	ret = -1;
+	while (ret == -1)
+	{
+    		ret = connect(sd, (struct sockaddr *)&addr, sizeof(struct sockaddr_in));
+		if (ret == -1)
+		{
+			if (errno == ECONNREFUSED)
+			{
+				sleep (1);
+			}
+			else
+				return;
+		}
+	}
  
     	if(send(sd, "REQ", 3, 0) < 0) {
         	perror("send");

--- a/repeater_mon.h
+++ b/repeater_mon.h
@@ -11,6 +11,7 @@
 #include <unistd.h>
 #include <time.h>
 #include <signal.h>
+#include <errno.h>
 
 #define	HOLE_PUNCH_SERVER	"hole-punch.d-star.info"
 #define	JSON_PORT		30011		// json port

--- a/repeater_scan.c
+++ b/repeater_scan.c
@@ -152,7 +152,20 @@ int main(int argc, char** argv)
                 	addr.sin_addr.s_addr = *(unsigned int *)host->h_addr_list[0];
         	}
  
-    		connect(sd, (struct sockaddr *)&addr, sizeof(struct sockaddr_in));
+        	ret = -1;
+        	while (ret == -1)
+        	{
+                	ret = connect(sd, (struct sockaddr *)&addr, sizeof(struct sockaddr_in));
+                	if (ret == -1)
+                	{
+                        	if (errno == ECONNREFUSED)
+                        	{
+                                	sleep (1);
+                        	}
+                        	else
+                                	return -1;
+                	}
+        	}
 
     		if(send(sd, "REQ", 3, 0) < 0) {
         	perror("send");