• R/O
  • R/O (HTTP)
  • R/W (SSH)
  • R/W (HTTPS)

dv-ap: Commit


Commit MetaInfo

Revisiond47de42faeb2258149dc85eed463870f90168264 (tree)
Time2017-01-11 10:11:49
AuthorSatoshi Yasuda <jk1zrw@user...>
CommiterSatoshi Yasuda

Log Message

modified: Makefile
modified: aprs.c
modified: config.h
modified: configure
modified: configure.ac
modified: debian/changelog
modified: dv_ap.h
modified: init.c
modified: main.c
modified: upnp.c

Change Summary

Incremental Difference

--- a/Makefile
+++ b/Makefile
@@ -216,15 +216,15 @@ OBJEXT = o
216216 PACKAGE = dv_ap
217217 PACKAGE_BUGREPORT = 7m3tjz@jarl.com
218218 PACKAGE_NAME = dv_ap
219-PACKAGE_STRING = dv_ap 00.36
219+PACKAGE_STRING = dv_ap 00.37
220220 PACKAGE_TARNAME = dv_ap
221221 PACKAGE_URL =
222-PACKAGE_VERSION = 00.36
222+PACKAGE_VERSION = 00.37
223223 PATH_SEPARATOR = :
224224 SET_MAKE =
225225 SHELL = /bin/bash
226226 STRIP =
227-VERSION = 00.36
227+VERSION = 00.37
228228 abs_builddir = /home/yasuda/dv_ap
229229 abs_srcdir = /home/yasuda/dv_ap
230230 abs_top_builddir = /home/yasuda/dv_ap
--- a/aprs.c
+++ b/aprs.c
@@ -171,7 +171,12 @@ int aprs (void)
171171 time (&atime);
172172 if ((atime - Timer) > 30)
173173 {
174- if (ReDprsConnectCnt++ > 20) return FALSE;
174+ if (ReDprsConnectCnt++ > 20)
175+ {
176+ fprintf (log_file, "%24.24s autolink max wait error\n", ctime(&atime));
177+ fflush (log_file);
178+ return FALSE;
179+ }
175180 DprsState = DPRS_OPEN_AUTOLINK;
176181 }
177182 break;
--- a/config.h
+++ b/config.h
@@ -77,7 +77,7 @@
7777 #define PACKAGE_NAME "dv_ap"
7878
7979 /* Define to the full name and version of this package. */
80-#define PACKAGE_STRING "dv_ap 00.36"
80+#define PACKAGE_STRING "dv_ap 00.37"
8181
8282 /* Define to the one symbol short name of this package. */
8383 #define PACKAGE_TARNAME "dv_ap"
@@ -86,10 +86,10 @@
8686 #define PACKAGE_URL ""
8787
8888 /* Define to the version of this package. */
89-#define PACKAGE_VERSION "00.36"
89+#define PACKAGE_VERSION "00.37"
9090
9191 /* Define to 1 if you have the ANSI C header files. */
9292 #define STDC_HEADERS 1
9393
9494 /* Version number of package */
95-#define VERSION "00.36"
95+#define VERSION "00.37"
--- 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 dv_ap 00.36.
3+# Generated by GNU Autoconf 2.69 for dv_ap 00.37.
44 #
55 # Report bugs to <7m3tjz@jarl.com>.
66 #
@@ -580,8 +580,8 @@ MAKEFLAGS=
580580 # Identity of this package.
581581 PACKAGE_NAME='dv_ap'
582582 PACKAGE_TARNAME='dv_ap'
583-PACKAGE_VERSION='00.36'
584-PACKAGE_STRING='dv_ap 00.36'
583+PACKAGE_VERSION='00.37'
584+PACKAGE_STRING='dv_ap 00.37'
585585 PACKAGE_BUGREPORT='7m3tjz@jarl.com'
586586 PACKAGE_URL=''
587587
@@ -1266,7 +1266,7 @@ if test "$ac_init_help" = "long"; then
12661266 # Omit some internal or obsolete options to make the list less imposing.
12671267 # This message is too long to be a string in the A/UX 3.1 sh.
12681268 cat <<_ACEOF
1269-\`configure' configures dv_ap 00.36 to adapt to many kinds of systems.
1269+\`configure' configures dv_ap 00.37 to adapt to many kinds of systems.
12701270
12711271 Usage: $0 [OPTION]... [VAR=VALUE]...
12721272
@@ -1332,7 +1332,7 @@ fi
13321332
13331333 if test -n "$ac_init_help"; then
13341334 case $ac_init_help in
1335- short | recursive ) echo "Configuration of dv_ap 00.36:";;
1335+ short | recursive ) echo "Configuration of dv_ap 00.37:";;
13361336 esac
13371337 cat <<\_ACEOF
13381338
@@ -1423,7 +1423,7 @@ fi
14231423 test -n "$ac_init_help" && exit $ac_status
14241424 if $ac_init_version; then
14251425 cat <<\_ACEOF
1426-dv_ap configure 00.36
1426+dv_ap configure 00.37
14271427 generated by GNU Autoconf 2.69
14281428
14291429 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1792,7 +1792,7 @@ cat >config.log <<_ACEOF
17921792 This file contains any messages produced by compilers while
17931793 running configure, to aid debugging if configure makes a mistake.
17941794
1795-It was created by dv_ap $as_me 00.36, which was
1795+It was created by dv_ap $as_me 00.37, which was
17961796 generated by GNU Autoconf 2.69. Invocation command line was
17971797
17981798 $ $0 $@
@@ -2658,7 +2658,7 @@ fi
26582658
26592659 # Define the identity of the package.
26602660 PACKAGE='dv_ap'
2661- VERSION='00.36'
2661+ VERSION='00.37'
26622662
26632663
26642664 cat >>confdefs.h <<_ACEOF
@@ -4835,7 +4835,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
48354835 # report actual input values of CONFIG_FILES etc. instead of their
48364836 # values after options handling.
48374837 ac_log="
4838-This file was extended by dv_ap $as_me 00.36, which was
4838+This file was extended by dv_ap $as_me 00.37, which was
48394839 generated by GNU Autoconf 2.69. Invocation command line was
48404840
48414841 CONFIG_FILES = $CONFIG_FILES
@@ -4901,7 +4901,7 @@ _ACEOF
49014901 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
49024902 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
49034903 ac_cs_version="\\
4904-dv_ap config.status 00.36
4904+dv_ap config.status 00.37
49054905 configured by $0, generated by GNU Autoconf 2.69,
49064906 with options \\"\$ac_cs_config\\"
49074907
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
22 # Process this file with autoconf to produce a configure script.
33
44 AC_PREREQ([2.69])
5-AC_INIT(dv_ap, 00.36, 7m3tjz@jarl.com)
5+AC_INIT(dv_ap, 00.37, 7m3tjz@jarl.com)
66 AC_CONFIG_SRCDIR([config.h.in])
77 AC_CONFIG_HEADERS([config.h])
88 AM_INIT_AUTOMAKE
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
1-dv-ap (00.36) unstable; urgency=low
1+dv-ap (00.37) unstable; urgency=low
22
33 * Initial release (Closes: #nnnn) <nnnn is the bug number of your ITP>
44
--- a/dv_ap.h
+++ b/dv_ap.h
@@ -143,8 +143,6 @@ int node_gw_resp_sw;
143143 int dvap_gw_resp_sw;
144144 struct timeval dvap_in_time;
145145
146-
147-
148146 struct addrinfo hints;
149147 struct addrinfo *gateway_in;
150148 struct addrinfo *gateway_out;
--- a/init.c
+++ b/init.c
@@ -11,11 +11,11 @@ int init(int argc, char **argv)
1111 sig_init();
1212 uname (&uname_buf);
1313 tzset();
14- if (daemon (0, 0) < 0)
14+ //if (daemon (0, 0) < 0)
1515 {
1616
17- printf ("Please run root privilage mode!\n");
18- return 0;
17+ //printf ("Please run root privilage mode!\n");
18+ //return 0;
1919 }
2020 node_NoRespReply_sw = FALSE;
2121 dvap_NoRespReply_sw = FALSE;
--- a/main.c
+++ b/main.c
@@ -170,7 +170,15 @@ int main(int argc, char **argv)
170170 GatewayIpUpdate();
171171 }
172172 if (upnp_sw) upnp();
173- if (aprs_port) aprs();
173+ if (aprs_port)
174+ {
175+ if (!aprs())
176+ {
177+ fprintf (log_file, "%24.24s aprs error\n", ctime(&cur_time));
178+ fflush (log_file);
179+ aprs_port = 0;
180+ }
181+ }
174182 if (sig_term) break;
175183 }
176184 }
--- a/upnp.c
+++ b/upnp.c
@@ -38,12 +38,12 @@ char upnp_urn[128];
3838
3939 void send_msearch_gateway(void)
4040 {
41- char upnp_msg_gateway[138] =
41+ char upnp_msg_gateway[] =
4242 {"M-SEARCH * HTTP/1.1\r\n" \
4343 "HOST: 239.255.255.250:1900\r\n" \
4444 "ST: urn:schemas-upnp-org:device:InternetGatewayDevice:1\r\n" \
4545 "MAN: \"ssdp:discover\"\r\n" \
46- "MX: 2\r\n\r\n\0"
46+ "MX: 2\r\n\r\n"
4747 };
4848
4949 time(&cur_time);
@@ -60,12 +60,12 @@ void send_msearch_gateway(void)
6060
6161 void send_msearch_ppp(void)
6262 {
63- char upnp_msg_ppp[134] =
63+ char upnp_msg_ppp[] =
6464 {"M-SEARCH * HTTP/1.1\r\n" \
6565 "HOST: 239.255.255.250:1900\r\n" \
6666 "ST: urn:schemas-upnp-org:service:WANPPPConnection:1\r\n" \
6767 "MAN: \"ssdp:discover\"\r\n" \
68- "MX: 2\r\n\r\n\0"
68+ "MX: 2\r\n\r\n"
6969 };
7070
7171 time(&cur_time);
@@ -82,12 +82,12 @@ void send_msearch_ppp(void)
8282
8383 void send_msearch_ip(void)
8484 {
85- char upnp_msg_ip[133] =
85+ char upnp_msg_ip[] =
8686 {"M-SEARCH * HTTP/1.1\r\n" \
8787 "HOST: 239.255.255.250:1900\r\n" \
8888 "ST: urn:schemas-upnp-org:service:WANIPConnection:1\r\n" \
8989 "MAN: \"ssdp:discover\"\r\n" \
90- "MX: 2\r\n\r\n\0"
90+ "MX: 2\r\n\r\n"
9191 };
9292
9393 time(&cur_time);
@@ -104,12 +104,12 @@ void send_msearch_ip(void)
104104
105105 void send_msearch_root(void)
106106 {
107- char upnp_msg_root[102] =
107+ char upnp_msg_root[] =
108108 {"M-SEARCH * HTTP/1.1\r\n" \
109109 "HOST: 239.255.255.250:1900\r\n" \
110110 "ST: upnp:rootdevice\r\n" \
111111 "MAN: \"ssdp:discover\"\r\n" \
112- "MX: 2\r\n\r\n\0"
112+ "MX: 2\r\n\r\n"
113113 };
114114
115115 time(&cur_time);
@@ -303,7 +303,7 @@ void upnp (void)
303303
304304 case UPNP_RECV_HTTP:
305305 time (&cur_time);
306- if ((cur_time - upnp_send_time) > 5)
306+ if ((cur_time - upnp_send_time) > 30)
307307 {
308308 if (upnp_http_sd >= 0)
309309 {
@@ -328,7 +328,7 @@ void upnp (void)
328328
329329 case UPNP_RECV_PORTMAP_INFO:
330330 time (&cur_time);
331- if ((cur_time - upnp_send_time) > 5)
331+ if ((cur_time - upnp_send_time) > 30)
332332 {
333333 if (upnp_http_sd >= 0)
334334 {
@@ -353,7 +353,7 @@ void upnp (void)
353353
354354 case UPNP_RECV_PORTMAP_ADD:
355355 time (&cur_time);
356- if ((cur_time - upnp_send_time) > 5)
356+ if ((cur_time - upnp_send_time) > 30)
357357 {
358358 if (upnp_http_sd >= 0)
359359 {
@@ -379,7 +379,7 @@ void upnp (void)
379379
380380 case UPNP_RECV_PORTMAP_DEL:
381381 time (&cur_time);
382- if ((cur_time - upnp_send_time) > 5)
382+ if ((cur_time - upnp_send_time) > 30)
383383 {
384384 if (upnp_http_sd >= 0)
385385 {
Show on old repository browser