• R/O
  • HTTP
  • SSH
  • HTTPS

Commit

Tags
Keine Tags

Frequently used words (click to add to your profile)

javac++androidlinuxc#windowsobjective-cqtcocoa誰得pythonphprubygameguibathyscaphec翻訳計画中(planning stage)omegatframeworktwittertestdomvb.netdirectxbtronarduinopreviewerゲームエンジン

Commit MetaInfo

Revisionc4124a788e17db39e3465beedcceef16e5ee9a05 (tree)
Zeit2022-06-03 23:38:15
AutorSatoshi Yasuda <7m3tjz@jarl...>
CommiterSatoshi Yasuda

Log Message

modified: dmonitor.h
modified: extern_dmonitor.h
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 02.00"
105+#define PACKAGE_STRING "dmonitor 01.79"
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 "02.00"
114+#define PACKAGE_VERSION "01.79"
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 "02.00"
120+#define VERSION "01.79"
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 02.00.
3+# Generated by GNU Autoconf 2.69 for dmonitor 01.79.
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='02.00'
584-PACKAGE_STRING='dmonitor 02.00'
583+PACKAGE_VERSION='01.79'
584+PACKAGE_STRING='dmonitor 01.79'
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 02.00 to adapt to many kinds of systems.
1280+\`configure' configures dmonitor 01.79 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 02.00:";;
1347+ short | recursive ) echo "Configuration of dmonitor 01.79:";;
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 02.00
1438+dmonitor configure 01.79
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 02.00, which was
1915+It was created by dmonitor $as_me 01.79, 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='02.00'
2776+ VERSION='01.79'
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 02.00, which was
5046+This file was extended by dmonitor $as_me 01.79, 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 02.00
5112+dmonitor config.status 01.79
51135113 configured by $0, generated by GNU Autoconf 2.69,
51145114 with options \\"\$ac_cs_config\\"
51155115
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,16 @@
1+dmonitor (01.79) unstable; urgency=low
2+
3+ * update Closes: (#139)
4+ * addes dmonitor_start script
5+
6+ -- Satoshi Yasuda <7m3tjz@jarl.com> Tue, 31 May 2022 18:15:00 +0900
7+
18 dmonitor (01.78) unstable; urgency=low
29
310 * update Closes: (#138)
411 * changed assist rpt2
5- * addes dmonitor_start script
6-
7- -- Satoshi Yasuda <7m3tjz@jarl.com> Fri, 27 May 2022 15:20:00 +0900
812
13+ -- Satoshi Yasuda <7m3tjz@jarl.com> Tue, 31 May 2022 13:45:00 +0900
914
1015 dmonitor (01.77) unstable; urgency=low
1116
--- a/debian/install
+++ b/debian/install
@@ -104,7 +104,6 @@ dvap.conf.save /var/www
104104 dvmega.conf.save /var/www
105105 node.conf.save /var/www
106106 99-dstar.rules /var/tmp
107-#resize_dmon.sh.org /var/tmp
108107 dmonitor_update /var/tmp
109108 dmonitor_update_surf /var/tmp
110109 dmonitor_start /var/tmp
--- a/debian/rules
+++ b/debian/rules
@@ -116,7 +116,6 @@ override_dh_prep:
116116 cp /var/www/rpt_mast.txt debian/tmp/
117117 cp /etc/udev/rules.d/99-dstar.rules debian/tmp/
118118 cp /usr/share/javascript/jquery/jquery.cookie.js debian/tmp/
119- #cp /usr/local/bin/resize_dmon.sh.org debian/tmp/
120119 cp /usr/local/bin/dmonitor_update debian/tmp/
121120 cp /usr/local/bin/dmonitor_update_surf debian/tmp/
122121 cp /usr/local/bin/dmonitor_start debian/tmp/
--- a/dmonitor.h
+++ b/dmonitor.h
@@ -113,6 +113,7 @@ int rig_buff_next;
113113
114114 int dest_inet_port;
115115 char *dest_address;
116+char *server_address;
116117 char inet_send_buff[58];
117118 int m_seq;
118119 int frameID;
@@ -235,7 +236,7 @@ int alt_header_pnt;
235236 int gw_on;
236237
237238 char cmd[256];
238-unsigned char recvBuff[1024];
239+unsigned char recvBuff[256];
239240 int code_sq;
240241
241242 unsigned char msg_temp[21];
--- a/extern_dmonitor.h
+++ b/extern_dmonitor.h
@@ -113,6 +113,7 @@ extern int rig_buff_next;
113113
114114 extern int dest_inet_port;
115115 extern char *dest_address;
116+extern char *server_address;
116117 extern char inet_send_buff[58];
117118 extern int m_seq;
118119 extern int frameID;
@@ -235,7 +236,7 @@ extern int alt_header_pnt;
235236 extern int gw_on;
236237
237238 extern char cmd[256];
238-extern unsigned char recvBuff[1024];
239+extern unsigned char recvBuff[256];
239240 extern int code_sq;
240241
241242 extern unsigned char msg_temp[21];
--- a/main.c
+++ b/main.c
@@ -186,7 +186,7 @@ os_ok:
186186 if (length <= 0 ) return -1;
187187 pg_path[length] = 0x00;
188188 if (ETagGen (pg_path, MD5_dmonitor) < 0) return 5;
189- memcpy (MD5_dmonitor, "5ebe211107266a57b1af14a7fdcd8480", 32);
189+ //memcpy (MD5_dmonitor, "5ebe211107266a57b1af14a7fdcd8480", 32);
190190
191191 Rp = malloc (sizeof (struct FifoPkt) - 1024);
192192 Wp = Rp;
@@ -196,10 +196,10 @@ os_ok:
196196 recv_frame_seq = 0x00;
197197
198198 memset (connect_call, 0x20, 8);
199- if (argc < 5)
199+ if (argc < 6)
200200 {
201201 syslog (LOG_ERR,
202- "Usage dmonitor my_call ip_address port area_call [zone_call]");
202+ "Usage dmonitor my_call ip_address port area_call zone_call server_ip");
203203 return 5;
204204 }
205205 len = strlen(argv[1]);
@@ -213,14 +213,15 @@ os_ok:
213213 }
214214 memcpy (connect_call, argv[1], len);
215215 dest_address = argv[2];
216+ server_address = argb[6];
216217 dest_inet_port = (unsigned short)atoi(argv[3]);
217218 memcpy (area_call, argv[4], strlen(argv[4]));
218219 memcpy (zone_call, argv[4], strlen(argv[4]));
219220 zone_call[7] = 'G';
220221 if (argc == 6)
221222 {
222- if (!memcmp (argv[5], "SCAN", 4)) scan_sw = TRUE;
223- else if (!memcmp (argv[5], "NO_DAEMON", 9)) no_daemon = TRUE;
223+ if (!memcmp (argv[6], "SCAN", 4)) scan_sw = TRUE;
224+ else if (!memcmp (argv[6], "NO_DAEMON", 9)) no_daemon = TRUE;
224225 else
225226 {
226227 memcpy (zone_call, argv[5], strlen(argv[5]));
@@ -229,8 +230,8 @@ os_ok:
229230 }
230231 if (argc == 7)
231232 {
232- if (!memcmp (argv[6], "SCAN", 4)) scan_sw = TRUE;
233- else if (!memcmp (argv[6], "NO_DAEMON", 9)) no_daemon = TRUE;
233+ if (!memcmp (argv[7], "SCAN", 4)) scan_sw = TRUE;
234+ else if (!memcmp (argv[7], "NO_DAEMON", 9)) no_daemon = TRUE;
234235 }
235236
236237 if (argc >= 5) send_sw = TRUE;
--- a/repeater_mon.c
+++ b/repeater_mon.c
@@ -62,6 +62,7 @@ void prase (char str[])
6262 char callsign[8];
6363 char call[64];
6464 char ip_addr[20];
65+ char server_ip[20];
6566 int port;
6667 char rep_temp[128];
6768 char ur_call[8];
@@ -97,6 +98,19 @@ void prase (char str[])
9798 ip_addr[m++] = str[n];
9899 }
99100 }
101+ else if (!memcmp (&str[k], "server_ip", 9))
102+ {
103+ m = 0;
104+ for (n = k + 12; n < len ; n++)
105+ {
106+ if (str[n] == '"')
107+ {
108+ server_ip[m] = 0x00;
109+ break;
110+ }
111+ server_ip[m++] = str[n];
112+ }
113+ }
100114 else if (!memcmp (&str[k], "port", 4))
101115 {
102116 port = atoi (&str[k+6]);
@@ -209,21 +223,21 @@ void prase (char str[])
209223 rep_temp[l] = 0x00;
210224 if (status)
211225 {
212- 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",
213- rpt1_call, rpt2_call, ur_call, my_call, ip_addr, port, callsign, &rep_temp[8], zr_call, call, &rep_temp[8]);
226+ 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",
227+ rpt1_call, rpt2_call, ur_call, my_call, ip_addr, port, callsign, &rep_temp[8], server_ip, zr_call, call, &rep_temp[8]);
214228 if (active_col == 0)
215229 {
216230 fprintf (html_active_fd, "<table border=\"1\" style=\"font-size:1.0em;\">\n");
217231 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");
218232 }
219- 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",
233+ 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",
220234 ip_addr, port, callsign,
221-&rep_temp[8], zr_call, call, &rep_temp[8], zr_call, ur_call, my_call);
235+&rep_temp[8], zr_call, server_ip, call, &rep_temp[8], zr_call, ur_call, my_call);
222236 active_col++;
223237 }
224238 else
225- 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",
226- ip_addr, port, callsign, &rep_temp[8], zr_call, call, &rep_temp[8]);
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",
240+ ip_addr, port, callsign, &rep_temp[8], zr_call, server_ip, call, &rep_temp[8]);
227241
228242 goto mast_close;
229243 }
@@ -231,8 +245,8 @@ void prase (char str[])
231245 }
232246 if (status)
233247 {
234- 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",
235- rpt1_call, rpt2_call, ur_call, my_call, ip_addr, port, callsign, zr_call, call);
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",
249+ rpt1_call, rpt2_call, ur_call, my_call, ip_addr, port, callsign, zr_call, server_ip, call);
236250 if (active_col == 0)
237251 {
238252 fprintf (html_active_fd, "<table border=\"1\" style=\"font-size:0.9em;\">\n");
@@ -245,8 +259,8 @@ void prase (char str[])
245259 }
246260 else
247261 {
248- 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",
249- ip_addr, port, callsign, zr_call, call);
262+ 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",
263+ ip_addr, port, callsign, zr_call, server_ip, call);
250264 }
251265 mast_close:
252266 fprintf (conn_fd, "%8.8sdmonitor '%8.8s' %s %d '%8.8s' '%8.8s'\n", callsign, ConnectCall, ip_addr, port, callsign, zr_call);