• R/O
  • HTTP
  • SSH
  • HTTPS

Commit

Tags
Keine Tags

Frequently used words (click to add to your profile)

javac++androidlinuxc#objective-cqtwindows誰得cocoapythonphprubygameguibathyscaphec翻訳omegat計画中(planning stage)frameworktwittertestdomvb.netdirectxbtronarduinopreviewerゲームエンジン

Commit MetaInfo

Revision2c7476a125d0c80f446470967b7aec55ee8ea5eb (tree)
Zeit2022-06-04 03:16:12
AutorSatoshi Yasuda <7m3tjz@jarl...>
CommiterSatoshi Yasuda

Log Message

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

Ändern Zusammenfassung

Diff

--- a/config.h
+++ b/config.h
@@ -102,7 +102,7 @@
102102 #define PACKAGE_NAME "dmonitor"
103103
104104 /* Define to the full name and version of this package. */
105-#define PACKAGE_STRING "dmonitor 01.79"
105+#define PACKAGE_STRING "dmonitor 02.00"
106106
107107 /* Define to the one symbol short name of this package. */
108108 #define PACKAGE_TARNAME "dmonitor"
@@ -111,13 +111,13 @@
111111 #define PACKAGE_URL ""
112112
113113 /* Define to the version of this package. */
114-#define PACKAGE_VERSION "01.79"
114+#define PACKAGE_VERSION "02.00"
115115
116116 /* Define to 1 if you have the ANSI C header files. */
117117 #define STDC_HEADERS 1
118118
119119 /* Version number of package */
120-#define VERSION "01.79"
120+#define VERSION "02.00"
121121
122122 /* Define for Solaris 2.5.1 so the uint32_t typedef from <sys/synch.h>,
123123 <pthread.h>, or <semaphore.h> is not used. If the typedef were allowed, the
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
11 #! /bin/sh
22 # Guess values for system-dependent variables and create Makefiles.
3-# Generated by GNU Autoconf 2.69 for dmonitor 01.79.
3+# Generated by GNU Autoconf 2.69 for dmonitor 02.00.
44 #
55 # Report bugs to <7m3tjz@jarl.com>.
66 #
@@ -580,8 +580,8 @@ MAKEFLAGS=
580580 # Identity of this package.
581581 PACKAGE_NAME='dmonitor'
582582 PACKAGE_TARNAME='dmonitor'
583-PACKAGE_VERSION='01.79'
584-PACKAGE_STRING='dmonitor 01.79'
583+PACKAGE_VERSION='02.00'
584+PACKAGE_STRING='dmonitor 02.00'
585585 PACKAGE_BUGREPORT='7m3tjz@jarl.com'
586586 PACKAGE_URL=''
587587
@@ -1277,7 +1277,7 @@ if test "$ac_init_help" = "long"; then
12771277 # Omit some internal or obsolete options to make the list less imposing.
12781278 # This message is too long to be a string in the A/UX 3.1 sh.
12791279 cat <<_ACEOF
1280-\`configure' configures dmonitor 01.79 to adapt to many kinds of systems.
1280+\`configure' configures dmonitor 02.00 to adapt to many kinds of systems.
12811281
12821282 Usage: $0 [OPTION]... [VAR=VALUE]...
12831283
@@ -1344,7 +1344,7 @@ fi
13441344
13451345 if test -n "$ac_init_help"; then
13461346 case $ac_init_help in
1347- short | recursive ) echo "Configuration of dmonitor 01.79:";;
1347+ short | recursive ) echo "Configuration of dmonitor 02.00:";;
13481348 esac
13491349 cat <<\_ACEOF
13501350
@@ -1435,7 +1435,7 @@ fi
14351435 test -n "$ac_init_help" && exit $ac_status
14361436 if $ac_init_version; then
14371437 cat <<\_ACEOF
1438-dmonitor configure 01.79
1438+dmonitor configure 02.00
14391439 generated by GNU Autoconf 2.69
14401440
14411441 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1912,7 +1912,7 @@ cat >config.log <<_ACEOF
19121912 This file contains any messages produced by compilers while
19131913 running configure, to aid debugging if configure makes a mistake.
19141914
1915-It was created by dmonitor $as_me 01.79, which was
1915+It was created by dmonitor $as_me 02.00, which was
19161916 generated by GNU Autoconf 2.69. Invocation command line was
19171917
19181918 $ $0 $@
@@ -2773,7 +2773,7 @@ fi
27732773
27742774 # Define the identity of the package.
27752775 PACKAGE='dmonitor'
2776- VERSION='01.79'
2776+ VERSION='02.00'
27772777
27782778
27792779 cat >>confdefs.h <<_ACEOF
@@ -5043,7 +5043,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
50435043 # report actual input values of CONFIG_FILES etc. instead of their
50445044 # values after options handling.
50455045 ac_log="
5046-This file was extended by dmonitor $as_me 01.79, which was
5046+This file was extended by dmonitor $as_me 02.00, which was
50475047 generated by GNU Autoconf 2.69. Invocation command line was
50485048
50495049 CONFIG_FILES = $CONFIG_FILES
@@ -5109,7 +5109,7 @@ _ACEOF
51095109 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
51105110 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
51115111 ac_cs_version="\\
5112-dmonitor config.status 01.79
5112+dmonitor config.status 02.00
51135113 configured by $0, generated by GNU Autoconf 2.69,
51145114 with options \\"\$ac_cs_config\\"
51155115
--- a/dmonitor_utils.c
+++ b/dmonitor_utils.c
@@ -321,10 +321,12 @@ void send_keep_alive(void)
321321
322322 in_addr.sin_family = AF_INET;
323323 in_addr.sin_port = htons(hole_punch_port);
324- in_addr.sin_addr.s_addr = inet_addr(hole_punch_server);
324+ //in_addr.sin_addr.s_addr = inet_addr(hole_punch_server);
325+ in_addr.sin_addr.s_addr = inet_addr(server_address);
326+syslog(LOG_DEBUG, "%s", server_address);
325327 if (in_addr.sin_addr.s_addr == 0xffffffff)
326328 {
327- host = gethostbyname(hole_punch_server);
329+ host = gethostbyname(server_address);
328330 if (host == NULL) return;
329331 in_addr.sin_addr.s_addr = *(unsigned int *)host->h_addr_list[0];
330332 }
--- a/main.c
+++ b/main.c
@@ -137,8 +137,10 @@ int main(int argc, char *argv[])
137137 invalid_os ();
138138 return -1;
139139 os_ok:
140+syslog (LOG_DEBUG, "debug 100");
140141 fclose (os_release_file);
141142 right_os ();
143+syslog (LOG_DEBUG, "debug 110");
142144
143145 dmonitor_file = fopen (DMONITOR_FILE, "r");
144146 if (dmonitor_file == NULL)
@@ -213,12 +215,13 @@ os_ok:
213215 }
214216 memcpy (connect_call, argv[1], len);
215217 dest_address = argv[2];
216- server_address = argb[6];
218+ server_address = argv[6];
219+printf ("%s %s\n", argv[6], server_address);
217220 dest_inet_port = (unsigned short)atoi(argv[3]);
218221 memcpy (area_call, argv[4], strlen(argv[4]));
219222 memcpy (zone_call, argv[4], strlen(argv[4]));
220223 zone_call[7] = 'G';
221- if (argc == 6)
224+ if (argc == 7)
222225 {
223226 if (!memcmp (argv[6], "SCAN", 4)) scan_sw = TRUE;
224227 else if (!memcmp (argv[6], "NO_DAEMON", 9)) no_daemon = TRUE;
@@ -228,13 +231,13 @@ os_ok:
228231 zone_call[7] = 'G';
229232 }
230233 }
231- if (argc == 7)
234+ if (argc == 8)
232235 {
233236 if (!memcmp (argv[7], "SCAN", 4)) scan_sw = TRUE;
234237 else if (!memcmp (argv[7], "NO_DAEMON", 9)) no_daemon = TRUE;
235238 }
236239
237- if (argc >= 5) send_sw = TRUE;
240+ if (argc >= 6) send_sw = TRUE;
238241 if (!scan_sw)
239242 {
240243 if (!no_daemon) ret = daemon(0, 0);
--- a/repeater_mon.c
+++ b/repeater_mon.c
@@ -236,7 +236,7 @@ void prase (char str[])
236236 active_col++;
237237 }
238238 else
239- 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",
239+ 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",
240240 ip_addr, port, callsign, &rep_temp[8], zr_call, server_ip, call, &rep_temp[8]);
241241
242242 goto mast_close;
@@ -245,7 +245,7 @@ void prase (char str[])
245245 }
246246 if (status)
247247 {
248- 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",
248+ 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",
249249 rpt1_call, rpt2_call, ur_call, my_call, ip_addr, port, callsign, zr_call, server_ip, call);
250250 if (active_col == 0)
251251 {