← Back to branch summary

~ubuntu-branches/ubuntu/precise/iproute/precise

« back to all changes in this revision

Viewing changes to debian/patches/add-metrics.diff

  • Committer: Bazaar Package Importer
  • Author(s): Alexander Wirt, Andreas Henriksson, Justin B Rye, Alexander Wirt
  • Date: 2008-05-11 11:18:29 UTC
  • mfrom: (1.1.6 upstream)
  • Revision ID: james.westby@ubuntu.com-20080511111829-rfewew7s6kiev0bh
Tags: 20080417-1
http://bugs.debian.org/467557
http://bugs.debian.org/480173
http://bugs.debian.org/464521
[ Andreas Henriksson ]
* New upstream release, v2.6.25 a.k.a. snapshot 20080417.
  - Initial documentation for xfrm (Partially fixes #451337)
  - Fixes manpage error caught by lintian!
* Fix typos (syntax error) in ip(8) manpage.
  - Introduced by upstream, caught by lintian yet again!
* Don't ship useless headers in iproute-dev (Closes: #467557)
* Cherry-pick "Fix bad hash calculation because of signed address" from
  upstream. (Closes: #480173)

[ Justin B Rye ]
* Update package description (Closes: #464521)

[ Alexander Wirt ]
* Fix typo in short package description.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/add-metrics.diff
1
 
#! /bin/sh -e
2
 
## 
3
 
## All lines beginning with `## DP:' are a description of the patch.
4
 
## DP: show the \ really, see #285507
5
 
 
6
 
[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
7
 
patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
8
 
 
9
 
if [ $# -ne 1 ]; then
10
 
    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
11
 
    exit 1
12
 
fi
13
 
case "$1" in
14
 
       -patch) patch $patch_opts -p1 < $0;;
15
 
       -unpatch) patch $patch_opts -p1 -R < $0;;
16
 
        *)
17
 
                echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
18
 
                exit 1;;
19
 
esac
20
 
 
21
 
exit 0
22
 
@DPATCH@
23
 
--- iproute-20010824/ip/iproute.c
24
 
+++ iproute-20010824/ip/iproute.c
25
 
@@ -57,7 +57,7 @@
26
 
        fprintf(stderr, "OPTIONS := FLAGS [ mtu NUMBER ] [ advmss NUMBER ]\n");
27
 
        fprintf(stderr, "           [ rtt NUMBER ] [ rttvar NUMBER ]\n");
28
 
        fprintf(stderr, "           [ window NUMBER] [ cwnd NUMBER ] [ ssthresh REALM ]\n");
29
 
-       fprintf(stderr, "           [ realms REALM ]\n");
30
 
+       fprintf(stderr, "           [ realms REALM ] [ hoplimit NUMBER ] [ initcwnd NUMBER ]\n");
31
 
        fprintf(stderr, "TYPE := [ unicast | local | broadcast | multicast | throw |\n");
32
 
        fprintf(stderr, "          unreachable | prohibit | blackhole | nat ]\n");
33
 
        fprintf(stderr, "TABLE_ID := [ local | main | default | all | NUMBER ]\n");
34
 
@@ -481,6 +481,8 @@
35
 
                                "cwnd",
36
 
                                "advmss",
37
 
                                "reordering",
38
 
+                               "hoplimit",
39
 
+                               "initcwnd",
40
 
                        };
41
 
                        static int hz;
42
 
                        if (mxrta[i] == NULL)
43
 
@@ -750,6 +752,30 @@
44
 
                                invarg("\"reordering\" value is invalid\n", *argv);
45
 
                        rta_addattr32(mxrta, sizeof(mxbuf), RTAX_REORDERING, reord);
46
 
 #endif
47
 
+#ifdef RTAX_HOPLIMIT
48
 
+               } else if (strcmp(*argv, "hoplimit") == 0) {
49
 
+                       unsigned hoplim;
50
 
+                       NEXT_ARG();
51
 
+                       if (strcmp(*argv, "lock") == 0) {
52
 
+                               mxlock |= (1<<RTAX_HOPLIMIT);
53
 
+                               NEXT_ARG();
54
 
+                       }
55
 
+                       if (get_unsigned(&hoplim, *argv, 0))
56
 
+                               invarg("\"hoplimit\" value is invalid\n", *argv);
57
 
+                       rta_addattr32(mxrta, sizeof(mxbuf), RTAX_HOPLIMIT, hoplim);
58
 
+#endif
59
 
+#ifdef RTAX_INITCWND
60
 
+               } else if (strcmp(*argv, "initcwnd") == 0) {
61
 
+                       unsigned initcwnd;
62
 
+                       NEXT_ARG();
63
 
+                       if (strcmp(*argv, "lock") == 0) {
64
 
+                               mxlock |= (1<<RTAX_HOPLIMIT);
65
 
+                               NEXT_ARG();
66
 
+                       }
67
 
+                       if (get_unsigned(&initcwnd, *argv, 0))
68
 
+                               invarg("\"initcwnd\" value is invalid\n", *argv);
69
 
+                       rta_addattr32(mxrta, sizeof(mxbuf), RTAX_INITCWND, initcwnd);
70
 
+#endif
71
 
                } else if (strcmp(*argv, "rtt") == 0) {
72
 
                        unsigned rtt;
73
 
                        NEXT_ARG();
74
 
--- iproute-20010824.orig/doc/ip-cref.tex
75
 
+++ iproute-20010824/doc/ip-cref.tex
76
 
@@ -1324,2 +1324,15 @@
77
 
 
78
 
+\item \verb|hoplimit NUMBER|
79
 
+
80
 
+--- [2.5.74+ only] Hop limit on the path to this destination. If it is not
81
 
+    given, Linux uses the value selected with \verb|sysctl| variable
82
 
+    \verb|net/ipv4/ip_default_ttl|.
83
 
+
84
 
+\item \verb|initcwnd NUMBER|
85
 
+
86
 
+--- [2.5.70+ only] Initial congestion window size when establishing
87
 
+    connections to this destination. This value is multiplied with the
88
 
+    MSS (``Maximal Segment Size'') for the connection to get the actual
89
 
+    window size. If it is not given (or set to zero), Linux uses the
90
 
+    values specified in~\cite{RFC2414}.
91
 
 
92
 
@@ -2653,2 +2666,5 @@
93
 
 
94
 
+\bibitem{RFC2414}  M.~Allman, S.~Floyd, C.~Partridge.
95
 
+``Increasing TCP's Initial Window'', RFC-2414.
96
 
+
97
 
 \end{thebibliography}