author | Danek Duvall <danek.duvall@oracle.com> |
Tue, 31 Mar 2015 13:48:00 -0700 | |
changeset 4045 | c595d2a22c25 |
permissions | -rw-r--r-- |
4045
c595d2a22c25
PSARC 2008/161 MTR - My Traceroute
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
1 |
This has been filed upstream at: |
c595d2a22c25
PSARC 2008/161 MTR - My Traceroute
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
2 |
|
c595d2a22c25
PSARC 2008/161 MTR - My Traceroute
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
3 |
https://github.com/traviscross/mtr/issues/76 |
c595d2a22c25
PSARC 2008/161 MTR - My Traceroute
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
4 |
|
c595d2a22c25
PSARC 2008/161 MTR - My Traceroute
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
5 |
and fixed in |
c595d2a22c25
PSARC 2008/161 MTR - My Traceroute
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
6 |
|
c595d2a22c25
PSARC 2008/161 MTR - My Traceroute
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
7 |
https://github.com/traviscross/mtr/commit/effef18b359c78a968de28cb1090866e974bd34f |
c595d2a22c25
PSARC 2008/161 MTR - My Traceroute
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
8 |
https://github.com/traviscross/mtr/commit/0b782f6a31d999694554b670009698499e2c98cc |
c595d2a22c25
PSARC 2008/161 MTR - My Traceroute
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
9 |
|
c595d2a22c25
PSARC 2008/161 MTR - My Traceroute
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
10 |
These changes should be available in mtr 0.87. |
c595d2a22c25
PSARC 2008/161 MTR - My Traceroute
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
11 |
|
c595d2a22c25
PSARC 2008/161 MTR - My Traceroute
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
12 |
--- mtr-0.86/configure.ac Tue Dec 9 03:20:57 2014 |
c595d2a22c25
PSARC 2008/161 MTR - My Traceroute
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
13 |
+++ mtr-0.86/configure.ac Tue Mar 24 15:03:00 2015 |
c595d2a22c25
PSARC 2008/161 MTR - My Traceroute
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
14 |
@@ -20,20 +20,11 @@ |
c595d2a22c25
PSARC 2008/161 MTR - My Traceroute
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
15 |
AC_CHECK_HEADERS(ncurses.h ncurses/curses.h curses.h cursesX.h sys/types.h fcntl.h) |
c595d2a22c25
PSARC 2008/161 MTR - My Traceroute
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
16 |
AC_CHECK_HEADERS(socket.h sys/socket.h sys/xti.h arpa/nameser_compat.h) |
c595d2a22c25
PSARC 2008/161 MTR - My Traceroute
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
17 |
|
c595d2a22c25
PSARC 2008/161 MTR - My Traceroute
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
18 |
-# We don't refer to any symbols in termcap, but -lcurses on SunOS does. |
c595d2a22c25
PSARC 2008/161 MTR - My Traceroute
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
19 |
-# We have to trust the linker not to mess things up... (It should not |
c595d2a22c25
PSARC 2008/161 MTR - My Traceroute
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
20 |
-# pull in anything if we don't refer to anything in the lib). |
c595d2a22c25
PSARC 2008/161 MTR - My Traceroute
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
21 |
-AC_CHECK_LIB(termcap, tgetent) |
c595d2a22c25
PSARC 2008/161 MTR - My Traceroute
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
22 |
-AC_CHECK_LIB(tinfo, tgetent) |
c595d2a22c25
PSARC 2008/161 MTR - My Traceroute
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
23 |
+AC_SEARCH_LIBS(initscr, [ncurses curses cursesX], , |
c595d2a22c25
PSARC 2008/161 MTR - My Traceroute
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
24 |
+ AC_MSG_WARN(Building without curses display support) |
c595d2a22c25
PSARC 2008/161 MTR - My Traceroute
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
25 |
+ AC_DEFINE(NO_CURSES, 1, [Define if you don't have the curses libraries available.]) |
c595d2a22c25
PSARC 2008/161 MTR - My Traceroute
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
26 |
+ CURSES_OBJ=) |
c595d2a22c25
PSARC 2008/161 MTR - My Traceroute
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
27 |
|
c595d2a22c25
PSARC 2008/161 MTR - My Traceroute
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
28 |
-AC_CHECK_FUNC(initscr, , |
c595d2a22c25
PSARC 2008/161 MTR - My Traceroute
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
29 |
- AC_CHECK_LIB(ncurses, initscr, , |
c595d2a22c25
PSARC 2008/161 MTR - My Traceroute
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
30 |
- AC_CHECK_LIB(curses, initscr, , |
c595d2a22c25
PSARC 2008/161 MTR - My Traceroute
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
31 |
- AC_CHECK_LIB(cursesX, initscr, , |
c595d2a22c25
PSARC 2008/161 MTR - My Traceroute
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
32 |
- AC_MSG_WARN(Building without curses display support) |
c595d2a22c25
PSARC 2008/161 MTR - My Traceroute
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
33 |
- AC_DEFINE(NO_CURSES, 1, Define if you don't have the curses libraries available.) |
c595d2a22c25
PSARC 2008/161 MTR - My Traceroute
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
34 |
- CURSES_OBJ=)))) |
c595d2a22c25
PSARC 2008/161 MTR - My Traceroute
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
35 |
- |
c595d2a22c25
PSARC 2008/161 MTR - My Traceroute
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
36 |
AC_CHECK_FUNCS(attron fcntl) |
c595d2a22c25
PSARC 2008/161 MTR - My Traceroute
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
37 |
|
c595d2a22c25
PSARC 2008/161 MTR - My Traceroute
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
38 |
AC_CHECK_LIB(m, floor, , AC_MSG_ERROR(No math library found)) |
c595d2a22c25
PSARC 2008/161 MTR - My Traceroute
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
39 |
--- mtr-0.86/mtr.c Tue Dec 9 03:20:57 2014 |
c595d2a22c25
PSARC 2008/161 MTR - My Traceroute
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
40 |
+++ mtr-0.86/mtr.c Fri Mar 20 09:43:55 2015 |
c595d2a22c25
PSARC 2008/161 MTR - My Traceroute
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
41 |
@@ -89,7 +89,7 @@ |
c595d2a22c25
PSARC 2008/161 MTR - My Traceroute
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
42 |
int maxTTL = 30; /* inline with traceroute */ |
c595d2a22c25
PSARC 2008/161 MTR - My Traceroute
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
43 |
/* end ttl window stuff. */ |
c595d2a22c25
PSARC 2008/161 MTR - My Traceroute
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
44 |
int remoteport = 80; /* for TCP tracing */ |
c595d2a22c25
PSARC 2008/161 MTR - My Traceroute
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
45 |
-int timeout = 10 * 1000000; /* for TCP tracing */ |
c595d2a22c25
PSARC 2008/161 MTR - My Traceroute
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
46 |
+int tcp_timeout = 10 * 1000000; /* for TCP tracing */ |
c595d2a22c25
PSARC 2008/161 MTR - My Traceroute
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
47 |
|
c595d2a22c25
PSARC 2008/161 MTR - My Traceroute
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
48 |
|
c595d2a22c25
PSARC 2008/161 MTR - My Traceroute
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
49 |
/* default display field(defined by key in net.h) and order */ |
c595d2a22c25
PSARC 2008/161 MTR - My Traceroute
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
50 |
@@ -454,8 +454,8 @@ |
c595d2a22c25
PSARC 2008/161 MTR - My Traceroute
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
51 |
} |
c595d2a22c25
PSARC 2008/161 MTR - My Traceroute
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
52 |
break; |
c595d2a22c25
PSARC 2008/161 MTR - My Traceroute
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
53 |
case 'Z': |
c595d2a22c25
PSARC 2008/161 MTR - My Traceroute
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
54 |
- timeout = atoi(optarg); |
c595d2a22c25
PSARC 2008/161 MTR - My Traceroute
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
55 |
- timeout *= 1000000; |
c595d2a22c25
PSARC 2008/161 MTR - My Traceroute
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
56 |
+ tcp_timeout = atoi(optarg); |
c595d2a22c25
PSARC 2008/161 MTR - My Traceroute
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
57 |
+ tcp_timeout *= 1000000; |
c595d2a22c25
PSARC 2008/161 MTR - My Traceroute
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
58 |
break; |
c595d2a22c25
PSARC 2008/161 MTR - My Traceroute
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
59 |
case '4': |
c595d2a22c25
PSARC 2008/161 MTR - My Traceroute
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
60 |
af = AF_INET; |
c595d2a22c25
PSARC 2008/161 MTR - My Traceroute
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
61 |
--- mtr-0.86/net.c Fri Mar 20 09:43:55 2015 |
c595d2a22c25
PSARC 2008/161 MTR - My Traceroute
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
62 |
+++ mtr-0.86/net.c Fri Mar 20 09:43:55 2015 |
c595d2a22c25
PSARC 2008/161 MTR - My Traceroute
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
63 |
@@ -209,7 +209,7 @@ |
c595d2a22c25
PSARC 2008/161 MTR - My Traceroute
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
64 |
extern int af; /* address family of remote target */ |
c595d2a22c25
PSARC 2008/161 MTR - My Traceroute
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
65 |
extern int mtrtype; /* type of query packet used */ |
c595d2a22c25
PSARC 2008/161 MTR - My Traceroute
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
66 |
extern int remoteport; /* target port for TCP tracing */ |
c595d2a22c25
PSARC 2008/161 MTR - My Traceroute
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
67 |
-extern int timeout; /* timeout for TCP connections */ |
c595d2a22c25
PSARC 2008/161 MTR - My Traceroute
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
68 |
+extern int tcp_timeout; /* timeout for TCP connections */ |
c595d2a22c25
PSARC 2008/161 MTR - My Traceroute
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
69 |
#ifdef SO_MARK |
c595d2a22c25
PSARC 2008/161 MTR - My Traceroute
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
70 |
extern int mark; /* SO_MARK to set for ping packet*/ |
c595d2a22c25
PSARC 2008/161 MTR - My Traceroute
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
71 |
#endif |
c595d2a22c25
PSARC 2008/161 MTR - My Traceroute
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
72 |
@@ -1559,7 +1559,7 @@ |
c595d2a22c25
PSARC 2008/161 MTR - My Traceroute
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
73 |
} |
c595d2a22c25
PSARC 2008/161 MTR - My Traceroute
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
74 |
if (fd > 0) { |
c595d2a22c25
PSARC 2008/161 MTR - My Traceroute
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
75 |
utime = sequence[at].time.tv_sec * 1000000L + sequence[at].time.tv_usec; |
c595d2a22c25
PSARC 2008/161 MTR - My Traceroute
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
76 |
- if (unow - utime > timeout) { |
c595d2a22c25
PSARC 2008/161 MTR - My Traceroute
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
77 |
+ if (unow - utime > tcp_timeout) { |
c595d2a22c25
PSARC 2008/161 MTR - My Traceroute
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
78 |
close(fd); |
c595d2a22c25
PSARC 2008/161 MTR - My Traceroute
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
79 |
sequence[at].socket = 0; |
c595d2a22c25
PSARC 2008/161 MTR - My Traceroute
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
80 |
} |