Commit: eae425b547d1e1454d3e3a74315afb00fc90e13b - rpi-dmonitor (git)

Commit MetaInfo

• Revision: eae425b547d1e1454d3e3a74315afb00fc90e13b (tree)
• Zeit: 2022-07-11 12:53:59
• Autor: Satoshi Yasuda <7m3tjz@jarl...>
• Commiter: Satoshi Yasuda

Log Message

modified: dmonitor_utils.c
modified: main.c

Ändern Zusammenfassung

• modified: dmonitor_utils.c
• modified: main.c

Diff

--- a/dmonitor_utils.c
+++ b/dmonitor_utils.c
@@ -314,6 +314,7 @@ void	send_keep_alive(void)
 {
 	int k;
 	int n;
+	int	ret;
 	char	buff[88];
 	struct  hostent *host;
 
@@ -330,8 +331,9 @@ void	send_keep_alive(void)
 	memset (buff, 0x00, sizeof(buff));
 	memcpy (&buff[20], connect_call, 8);	
         sprintf (&buff[4], "%s", inet_ntoa (in_addr.sin_addr));
-        sendto(in_addr_sock, &buff[4], 24, MSG_DONTWAIT, 
+        ret =sendto(in_addr_sock, &buff[4], 24, MSG_DONTWAIT, 
 		(struct sockaddr *)&in_addr, sizeof(in_addr));
+	syslog (LOG_DEBUG, "sendto length:%d", ret);
 	time(&hole_punch_send_time);
 
 	memcpy (&buff[20], "dmoni", 5);
@@ -361,8 +363,9 @@ void	send_keep_alive(void)
 	memcpy (&buff[72], zone_call, 7);
 	memcpy (&buff[80], connect_call, 8);
 	buff[79] = 0x20;
-	sendto(in_addr_sock, buff, 88, MSG_DONTWAIT, 
+	ret = sendto(in_addr_sock, buff, 88, MSG_DONTWAIT, 
 		(struct sockaddr *)&in_addr, sizeof(in_addr));
+	syslog (LOG_DEBUG, "sendto length:%d", ret);
         time(&hole_punch_send_time);
         time(&dest_keep_alive_send_time);
 }

--- a/main.c
+++ b/main.c
@@ -223,12 +223,13 @@ os_ok:
 		else if (!memcmp (argv[5], "NO_DAEMON", 9)) no_daemon = TRUE;
 		else 
 		{
-			memcpy (zone_call, argv[4], strlen(argv[4]));
+			memcpy (zone_call, argv[5], strlen(argv[5]));
 			zone_call[7] = 'G';
 		}
 	}
 	if (argc == 7)
 	{
+		memcpy (zone_call, argv[5], strlen(argv[5]));
 		if (!memcmp (argv[6], "SCAN", 4)) scan_sw = TRUE;
 		else if (!memcmp (argv[6], "NO_DAEMON", 9)) no_daemon = TRUE;
 	}