• R/O
  • HTTP
  • SSH
  • HTTPS

Commit

Tags
Keine Tags

Frequently used words (click to add to your profile)

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

Commit MetaInfo

Revision7f776a9dadca31bf1466531245b3170b7ccb4e92 (tree)
Zeit2022-05-31 12:36:49
AutorSatoshi Yasuda <7m3tjz@jarl...>
CommiterSatoshi Yasuda

Log Message

modified: dmonitor.h
modified: extern_dmonitor.h
modified: inet_read.c
modified: main.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.75"
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.75"
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.75"
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.75.
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.75'
584-PACKAGE_STRING='dmonitor 01.75'
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.75 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.75:";;
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.75
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.75, 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.75'
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.75, 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.75
5112+dmonitor config.status 02.00
51135113 configured by $0, generated by GNU Autoconf 2.69,
51145114 with options \\"\$ac_cs_config\\"
51155115
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,26 @@
1+dmonitor (01.78) unstable; urgency=low
2+
3+ * update Closes: (#138)
4+ * changed assist rpt2
5+ * addes dmonitor_start script
6+
7+ -- Satoshi Yasuda <7m3tjz@jarl.com> Fri, 27 May 2022 15:20:00 +0900
8+
9+
10+dmonitor (01.77) unstable; urgency=low
11+
12+ * update Closes: (#137)
13+ * bug fixed arg of zone_call
14+
15+ -- Satoshi Yasuda <7m3tjz@jarl.com> Mon, 23 May 2022 23:20:00 +0900
16+
17+dmonitor (01.76) unstable; urgency=low
18+
19+ * update Closes: (#136)
20+ * added DVmega set (serial set)
21+
22+ -- Satoshi Yasuda <7m3tjz@jarl.com> Sun, 08 Apr 2022 19:00:00 +0900
23+
124 dmonitor (01.75) unstable; urgency=low
225
326 * update Closes: (#135)
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Homepage: http://app.d-star.info/
88
99 Package: dmonitor
1010 Architecture: armhf
11-Depends: ${shlibs:Depends}, ${perl:Depends}, monitorix, nkf, lighttpd, surf, wiringpi
11+Depends: ${shlibs:Depends}, ${perl:Depends}, libcgi-application-perl, nkf, lighttpd, surf, wiringpi
1212 Description: D-STAR repeater monitor
1313 D-STAR Rpeater monitor program
1414 access point multi_forward program
--- a/debian/install
+++ b/debian/install
@@ -36,7 +36,6 @@ DvmegaSet /var/www/cgi-bin
3636 DvmegaStore /var/www/cgi-bin
3737 NodeSet /var/www/cgi-bin
3838 NodeStore /var/www/cgi-bin
39-system_info /var/www/cgi-bin
4039 repDmon /var/www/cgi-bin
4140 tool_exec /var/www/cgi-bin
4241 debug_dmonitor_log /var/www/cgi-bin
@@ -80,7 +79,7 @@ error_msg.html.save /var/www/html
8079 short_msg.html.save /var/www/html
8180 010_www-data-nopasswd /etc/sudoers.d
8281 dmonitor_log /etc/logrotate.d
83-rpt_conn /etc/logrotate.d
82+rpt_conn_log /etc/logrotate.d
8483 auto_repmon.service /etc/systemd/system
8584 rpt_conn.service /etc/systemd/system
8685 auto_repmon_light.service /etc/systemd/system
@@ -105,7 +104,7 @@ dvap.conf.save /var/www
105104 dvmega.conf.save /var/www
106105 node.conf.save /var/www
107106 99-dstar.rules /var/tmp
108-monitorix.conf /var/tmp
109-resize_dmon.sh.org /var/tmp
107+#resize_dmon.sh.org /var/tmp
110108 dmonitor_update /var/tmp
111109 dmonitor_update_surf /var/tmp
110+dmonitor_start /var/tmp
--- a/debian/rules
+++ b/debian/rules
@@ -74,7 +74,6 @@ override_dh_prep:
7474 cp /var/www/cgi-bin/DvmegaStore debian/tmp/
7575 cp /var/www/cgi-bin/NodeSet debian/tmp/
7676 cp /var/www/cgi-bin/NodeStore debian/tmp/
77- cp /var/www/cgi-bin/system_info debian/tmp/
7877 cp /var/www/cgi-bin/repDmon debian/tmp/
7978 cp /var/www/cgi-bin/debug_dmonitor_log debian/tmp/
8079 cp /var/www/cgi-bin/debug_rpt_conn_log debian/tmp/
@@ -94,7 +93,7 @@ override_dh_prep:
9493 cp /var/www/html/buff_hold.txt debian/tmp/
9594 cp /etc/sudoers.d/010_www-data-nopasswd debian/tmp/
9695 cp /etc/logrotate.d/dmonitor_log debian/tmp/
97- cp /etc/logrotate.d/rpt_conn debian/tmp/
96+ cp /etc/logrotate.d/rpt_conn_log debian/tmp/
9897 cp /usr/bin/rig_port_check debian/tmp/
9998 cp /usr/bin/kill_dmonitor debian/tmp/
10099 cp /usr/bin/auto_repmon debian/tmp/
@@ -117,7 +116,7 @@ override_dh_prep:
117116 cp /var/www/rpt_mast.txt debian/tmp/
118117 cp /etc/udev/rules.d/99-dstar.rules debian/tmp/
119118 cp /usr/share/javascript/jquery/jquery.cookie.js debian/tmp/
120- cp /etc/monitorix/monitorix.conf debian/tmp/
121- cp /usr/local/bin/resize_dmon.sh.org debian/tmp/
119+ #cp /usr/local/bin/resize_dmon.sh.org debian/tmp/
122120 cp /usr/local/bin/dmonitor_update debian/tmp/
123121 cp /usr/local/bin/dmonitor_update_surf debian/tmp/
122+ cp /usr/local/bin/dmonitor_start debian/tmp/
--- a/dmonitor.h
+++ b/dmonitor.h
@@ -235,7 +235,7 @@ int alt_header_pnt;
235235 int gw_on;
236236
237237 char cmd[256];
238-unsigned char recvBuff[256];
238+unsigned char recvBuff[1024];
239239 int code_sq;
240240
241241 unsigned char msg_temp[21];
--- a/extern_dmonitor.h
+++ b/extern_dmonitor.h
@@ -235,7 +235,7 @@ extern int alt_header_pnt;
235235 extern int gw_on;
236236
237237 extern char cmd[256];
238-extern unsigned char recvBuff[256];
238+extern unsigned char recvBuff[1024];
239239 extern int code_sq;
240240
241241 extern unsigned char msg_temp[21];
--- a/inet_read.c
+++ b/inet_read.c
@@ -149,6 +149,8 @@ void inet_read (void)
149149 #ifdef _DEBUG_INET
150150 syslog (LOG_DEBUG, "inet read %d", length);
151151 #endif
152+ length = recvBuff[8] << 8 | recvBuff[9];
153+ length += 10;
152154 if ((inet_frame_id[0] == 0xff) && (inet_frame_id[1] == 0xff))
153155 {
154156 if (length == 58)
@@ -183,7 +185,9 @@ void inet_read (void)
183185 if (recvBuff[7] & GW) syslog (LOG_DEBUG, "GW area:%8.8s rpt2:%8.8s rpt1:%8.8s", area_call, &recvBuff[20], &recvBuff[28]);
184186 if (recvBuff[7] & ZR) syslog (LOG_DEBUG, "ZR area:%8.8s rpt2:%8.8s rpt1:%8.8s", area_call, &recvBuff[20], &recvBuff[28]);
185187 #endif
186- if (((recvBuff[7] & ZR) && !memcmp (area_call, &recvBuff[28], 8)) || scan_sw
188+ if (((recvBuff[7] & ZR) && !memcmp (area_call, &recvBuff[28], 8))
189+ || ((recvBuff[7] & ZR) && !memcmp (area_call, &recvBuff[20], 8))
190+ || scan_sw
187191 || ((recvBuff[7] & GW) && !memcmp (area_call, &recvBuff[20], 8)))
188192 {
189193 while (getFifo(buff)) ;
--- 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;
@@ -223,7 +223,7 @@ os_ok:
223223 else if (!memcmp (argv[5], "NO_DAEMON", 9)) no_daemon = TRUE;
224224 else
225225 {
226- memcpy (zone_call, argv[4], strlen(argv[5]));
226+ memcpy (zone_call, argv[5], strlen(argv[5]));
227227 zone_call[7] = 'G';
228228 }
229229 }