• 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

Revision7b98ddcf7c5c7bbd135866705206637136942318 (tree)
Zeit2022-04-11 00:12:10
AutorSatoshi Yasuda <7m3tjz@jarl...>
CommiterSatoshi Yasuda

Log Message

modified: dmonitor.h
modified: dmonitor_utils.c
modified: dstar_data.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.74"
105+#define PACKAGE_STRING "dmonitor 01.75"
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.74"
114+#define PACKAGE_VERSION "01.75"
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.74"
120+#define VERSION "01.75"
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.74.
3+# Generated by GNU Autoconf 2.69 for dmonitor 01.75.
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.74'
584-PACKAGE_STRING='dmonitor 01.74'
583+PACKAGE_VERSION='01.75'
584+PACKAGE_STRING='dmonitor 01.75'
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.74 to adapt to many kinds of systems.
1280+\`configure' configures dmonitor 01.75 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.74:";;
1347+ short | recursive ) echo "Configuration of dmonitor 01.75:";;
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.74
1438+dmonitor configure 01.75
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.74, which was
1915+It was created by dmonitor $as_me 01.75, which was
19161916 generated by GNU Autoconf 2.69. Invocation command line was
19171917
19181918 $ $0 $@
@@ -2468,12 +2468,7 @@ program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
24682468 am_aux_dir=`cd "$ac_aux_dir" && pwd`
24692469
24702470 if test x"${MISSING+set}" != xset; then
2471- case $am_aux_dir in
2472- *\ * | *\ *)
2473- MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
2474- *)
2475- MISSING="\${SHELL} $am_aux_dir/missing" ;;
2476- esac
2471+ MISSING="\${SHELL} '$am_aux_dir/missing'"
24772472 fi
24782473 # Use eval to expand $SHELL
24792474 if eval "$MISSING --is-lightweight"; then
@@ -2778,7 +2773,7 @@ fi
27782773
27792774 # Define the identity of the package.
27802775 PACKAGE='dmonitor'
2781- VERSION='01.74'
2776+ VERSION='01.75'
27822777
27832778
27842779 cat >>confdefs.h <<_ACEOF
@@ -5048,7 +5043,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
50485043 # report actual input values of CONFIG_FILES etc. instead of their
50495044 # values after options handling.
50505045 ac_log="
5051-This file was extended by dmonitor $as_me 01.74, which was
5046+This file was extended by dmonitor $as_me 01.75, which was
50525047 generated by GNU Autoconf 2.69. Invocation command line was
50535048
50545049 CONFIG_FILES = $CONFIG_FILES
@@ -5114,7 +5109,7 @@ _ACEOF
51145109 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
51155110 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
51165111 ac_cs_version="\\
5117-dmonitor config.status 01.74
5112+dmonitor config.status 01.75
51185113 configured by $0, generated by GNU Autoconf 2.69,
51195114 with options \\"\$ac_cs_config\\"
51205115
@@ -5923,7 +5918,9 @@ $as_echo X/"$am_mf" |
59235918 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
59245919 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
59255920 as_fn_error $? "Something went wrong bootstrapping makefile fragments
5926- for automatic dependency tracking. Try re-running configure with the
5921+ for automatic dependency tracking. If GNU make was not used, consider
5922+ re-running the configure script with MAKE=\"gmake\" (or whatever is
5923+ necessary). You can also try re-running configure with the
59275924 '--disable-dependency-tracking' option to at least be able to build
59285925 the package (albeit without support for automatic dependency tracking).
59295926 See \`config.log' for more details" "$LINENO" 5; }
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
1+dmonitor (01.75) unstable; urgency=low
2+
3+ * update Closes: (#135)
4+ * bullseye
5+
6+ -- Satoshi Yasuda <7m3tjz@jarl.com> Sun, 10 Apr 2022 01:00:00 +0900
7+
18 dmonitor (01.74) unstable; urgency=low
29
310 * update Closes: (#134)
--- a/debian/install
+++ b/debian/install
@@ -67,8 +67,8 @@ simple.html /var/www/html
6767 scanStatus.html /var/www/html
6868 xmlhttp.js /var/www/html
6969 tool.html /var/www/html
70-localhost.index.html /var/www/html
71-localhost.simple.html /var/www/html
70+localhost.index.html /var/www/html/localhost
71+localhost.simple.html /var/www/html/localhost
7272 update.html /var/www/html
7373 update_log.html /var/www/html
7474 repDmon.html /var/www/html
@@ -80,15 +80,16 @@ error_msg.html.save /var/www/html
8080 short_msg.html.save /var/www/html
8181 010_www-data-nopasswd /etc/sudoers.d
8282 dmonitor_log /etc/logrotate.d
83+rpt_conn /etc/logrotate.d
8384 auto_repmon.service /etc/systemd/system
8485 rpt_conn.service /etc/systemd/system
8586 auto_repmon_light.service /etc/systemd/system
8687 dstar_ntpdate.service /etc/systemd/system
8788 jquery.cookie.js /usr/share/javascript/jquery/
88-lighttpd.conf.buster /var/tmp
89+lighttpd.conf.bullseye /var/tmp
8990 localhost.conf /var/tmp
90-10-cgi.conf.buster /var/tmp
91-10-expire.conf.buster /var/tmp
91+10-cgi.conf.bullseye /var/tmp
92+10-expire.conf.bullseye /var/tmp
9293 rc.local.new /var/tmp
9394 lighttpd.service /var/tmp
9495 connected_table.org /var/www/html
--- a/debian/rules
+++ b/debian/rules
@@ -94,6 +94,7 @@ override_dh_prep:
9494 cp /var/www/html/buff_hold.txt debian/tmp/
9595 cp /etc/sudoers.d/010_www-data-nopasswd debian/tmp/
9696 cp /etc/logrotate.d/dmonitor_log debian/tmp/
97+ cp /etc/logrotate.d/rpt_conn debian/tmp/
9798 cp /usr/bin/rig_port_check debian/tmp/
9899 cp /usr/bin/kill_dmonitor debian/tmp/
99100 cp /usr/bin/auto_repmon debian/tmp/
@@ -103,10 +104,10 @@ override_dh_prep:
103104 cp /etc/systemd/system/auto_repmon_light.service debian/tmp/
104105 cp /etc/systemd/system/dstar_ntpdate.service debian/tmp/
105106 cp /lib/systemd/system/lighttpd.service debian/tmp/
106- cp /etc/lighttpd/lighttpd.conf.buster debian/tmp/
107+ cp /etc/lighttpd/lighttpd.conf.bullseye debian/tmp/
107108 cp /etc/lighttpd/localhost.conf debian/tmp/
108- cp /etc/lighttpd/conf-available/10-cgi.conf.buster debian/tmp/
109- cp /etc/lighttpd/conf-available/10-expire.conf.buster debian/tmp/
109+ cp /etc/lighttpd/conf-available/10-cgi.conf.bullseye debian/tmp/
110+ cp /etc/lighttpd/conf-available/10-expire.conf.bullseye debian/tmp/
110111 cp /etc/rc.local.new debian/tmp/
111112 cp /var/www/html/connected_table.org debian/tmp/
112113 cp /var/www/html/error_msg.org debian/tmp/
--- a/dmonitor.h
+++ b/dmonitor.h
@@ -32,11 +32,11 @@
3232 #include "node.h"
3333 #include "config.h"
3434
35-//#define _DEBUG_DVAP
35+#define _DEBUG_DVAP
3636 //#define _DEBUG_DVMEGA
3737 //#define _SPECIFICATIO_CHECK
38-//#define _DEBUG_DVAP_SEND
39-//#define _DEBUG_DVAP_RECV
38+#define _DEBUG_DVAP_SEND
39+#define _DEBUG_DVAP_RECV
4040 //#define _DEBUG_DVAP_SQUELCH
4141 //#define _DEBUG_JITTER
4242 //#define _DEBUG_INET
--- a/dmonitor_utils.c
+++ b/dmonitor_utils.c
@@ -593,6 +593,7 @@ void connected_table(char str[])
593593 if (connected_fd)
594594 {
595595 fprintf (connected_fd, "</table></center></body></html>\n");
596+ fflush (connected_fd);
596597 fclose (connected_fd);
597598 sprintf (cmd, "/var/www/cgi-bin/file_check %s %s", CONNECTED_LIST_TEMP, CONNECTED_LIST);
598599 ret = system (cmd);
@@ -633,21 +634,16 @@ void error_msg (char str[])
633634 error_fd = fopen (ERROR_TEMP, "w");
634635 fprintf (error_fd, "<!DOCTYPE HTML>\n");
635636 fprintf (error_fd, "<html><head>\n");
636- fprintf (error_fd, "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\">\n");
637- fprintf (error_fd, "<script type=\"text/javascript\">\n");
638- if (!memcmp (&str[44], "未登録", 9))
639- {
640- fprintf (error_fd, "setTimeout (function() {location.reload() ;} , 5000) ;\n");
641- }
642- else
643- {
644- fprintf (error_fd, "setTimeout (function() {location.reload() ;} , 1000) ;\n");
645- }
646- fprintf (error_fd, "</script>\n");
637+ fprintf (error_fd, "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\">\n");
638+ fprintf (error_fd, "<meta http-equiv=\"Pragma\" content=\"no-cache\">\n");
639+ fprintf (error_fd, "<meta http-equiv=\"Cache-Control\" content=\"no-cache\">\n");
640+ fprintf (error_fd, "<meta name=\"expires\" content=\"0\">\n");
641+ fprintf (error_fd, "<meta http-equiv=\"refresh\" content=\"1;URL=./error_msg.html\">\n");
647642 fprintf (error_fd, "</head>\n");
648643 fprintf (error_fd, "<body style=\"background-color:#ff8c00;\">\n");
649644 fprintf (error_fd, "<center>%s</center>", &str[5]);
650645 fprintf (error_fd, "</body></html>");
646+ fflush (error_fd);
651647 fclose (error_fd);
652648 sprintf (cmd, "/var/www/cgi-bin/file_check %s %s", ERROR_TEMP, ERROR_MSG);
653649 ret = system (cmd);
--- a/dstar_data.c
+++ b/dstar_data.c
@@ -44,6 +44,7 @@ void short_msg_wrt (void)
4444 }
4545
4646 fprintf (ShortMsg_fd, "</body>\n</html>\n");
47+ fflush (ShortMsg_fd);
4748 fclose (ShortMsg_fd);
4849 sprintf (cmd, "/usr/bin/nkf -SX -xw16 --overwrite --oc=UTF-16BE-BOM %s ; mv %s %s", SHORT_TEMP, SHORT_TEMP, SHORT_MSG);
4950 //sprintf (cmd, "/var/www/cgi-bin/file_check %s %s", SHORT_TEMP, SHORT_MSG);
--- a/main.c
+++ b/main.c
@@ -121,19 +121,6 @@ int main(int argc, char *argv[])
121121 }
122122 fprintf (pid_file,"%d", getpid());
123123 fclose (pid_file);
124-#if 0
125- if (uname (&uts) == -1)
126- {
127- syslog (LOG_ERR, "uname error");
128- closelog ();
129- return -1;
130- }
131- syslog (LOG_INFO, "Node name: %s\n", uts.nodename);
132- syslog (LOG_INFO, "System name: %s\n", uts.sysname);
133- syslog (LOG_INFO, "Release: %s\n", uts.release);
134- syslog (LOG_INFO, "Version: %s\n", uts.version);
135- syslog (LOG_INFO, "Machine: %s\n", uts.machine);
136-#endif
137124 os_release_file = fopen (OS_RELEASE, "r");
138125 if (os_release_file == NULL)
139126 {
@@ -143,7 +130,7 @@ int main(int argc, char *argv[])
143130 }
144131 while (fgets (pg_path, sizeof(pg_path), os_release_file))
145132 {
146- syslog (LOG_INFO, "%s", pg_path);
133+ //syslog (LOG_INFO, "%s", pg_path);
147134 if (!memcmp (pg_path, "VERSION_CODENAME=bullseye", 25)) goto os_ok;
148135 }
149136 fclose (os_release_file);
@@ -199,7 +186,7 @@ os_ok:
199186 if (length <= 0 ) return -1;
200187 pg_path[length] = 0x00;
201188 if (ETagGen (pg_path, MD5_dmonitor) < 0) return 5;
202- memcpy (MD5_dmonitor, "5ebe211107266a57b1af14a7fdcd8480", 32);
189+ //memcpy (MD5_dmonitor, "5ebe211107266a57b1af14a7fdcd8480", 32);
203190
204191 Rp = malloc (sizeof (struct FifoPkt) - 1024);
205192 Wp = Rp;
@@ -284,7 +271,8 @@ os_ok:
284271 }
285272 else
286273 {
287- fprintf (status_fd, "Connected to %8.8s from %8.8s\n", area_call, connect_call);
274+ fprintf (status_fd, "Connected to %8.8s from %8.8s\n",
275+ area_call, connect_call);
288276 fprintf (status_fd, "Model : %s\n", pg_path);
289277 }
290278 memset (inet_frame_id, 0x00, 2);
@@ -590,17 +578,21 @@ skip:
590578 }
591579 used_call_sw = FALSE;
592580 }
593- if (sig_term) break;
581+ if (sig_term)
582+ {
583+ syslog (LOG_INFO, "sig terminate");
584+ break;
585+ }
594586 }
595587
596- if (send_msg) sleep (3);
588+ //if (send_msg) sleep (3);
597589 if (!rig_last_frame_send)
598590 {
599591 LastFrameSend();
600592 }
601593 connected_table_clean();
602594 if (!not_clear_error_msg) error_msg_clean();
603- if (rig_fd) rig_close();
595+ rig_close();
604596 dmonitor_close();
605597 wait_disconnect();
606598 if (!scan_sw)