From 11bbe7fd11d5b39e2a136f9d29acef02ce33bf00 Mon Sep 17 00:00:00 2001 From: Denys Fedoryshchenko Date: Wed, 30 Jul 2008 17:34:07 +0300 Subject: [PATCH 1/3] long/ulong iproute-git fix This patch fixes bug in Metadata ematch attributes parser strtoul on error return ULONG_MAX, not LONG_MAX Patch attached as file --- tc/em_meta.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tc/em_meta.c b/tc/em_meta.c index f12be7fa..ee6034fb 100644 --- a/tc/em_meta.c +++ b/tc/em_meta.c @@ -262,7 +262,7 @@ parse_object(struct bstr *args, struct bstr *arg, struct tcf_meta_val *obj, } num = bstrtoul(arg); - if (num != LONG_MAX) { + if (num != ULONG_MAX) { obj->kind = TCF_META_TYPE_INT << 12; obj->kind |= TCF_META_ID_VALUE; *dst = (unsigned long) num; @@ -320,7 +320,7 @@ compatible: a = bstr_next(a); shift = bstrtoul(a); - if (shift == LONG_MAX) { + if (shift == ULONG_MAX) { PARSE_ERR(a, "meta: invalid shift, must " \ "be numeric"); return PARSE_FAILURE; @@ -338,7 +338,7 @@ compatible: a = bstr_next(a); mask = bstrtoul(a); - if (mask == LONG_MAX) { + if (mask == ULONG_MAX) { PARSE_ERR(a, "meta: invalid mask, must be " \ "numeric"); return PARSE_FAILURE; From 488f1c77fec1b283ef5237943d397786f90d2fe5 Mon Sep 17 00:00:00 2001 From: Andreas Henriksson Date: Sat, 26 Jul 2008 21:54:42 +0200 Subject: [PATCH 2/3] fix syntax errors in ip(8) manpage. Fix syntax errors in ip(8) manpage. lintian said: W: iproute: manpage-has-errors-from-man usr/share/man/man8/ip.8.gz 2167: warning: `RP' not defined Signed-off-by: Andreas Henriksson Signed-off-by: Stephen Hemminger --- man/man8/ip.8 | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/man/man8/ip.8 b/man/man8/ip.8 index 2097317c..e948d03f 100644 --- a/man/man8/ip.8 +++ b/man/man8/ip.8 @@ -2164,19 +2164,16 @@ flag is equivalent to the combination .B It isn't work. Don't use it. .TP -.RP -.BI dscp inherit +.BR "dscp inherit" .RB ( " only IPv6 tunnels " ) Inherit DS field between inner and outer header. .TP -.RP .BI encaplim " ELIM" .RB ( " only IPv6 tunnels " ) set a fixed encapsulation limit. Default is 4. .TP -.RP .BI flowlabel " FLOWLABEL" .RB ( " only IPv6 tunnels " ) set a fixed flowlabel. From a908898c18c68ba09cb7ce90a95237ed4a6e1fab Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Fri, 5 Sep 2008 15:28:37 -0700 Subject: [PATCH 3/3] Add DSCP values for RFC2597 Most newer documentation refers to these values already. --- etc/iproute2/rt_dsfield | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/etc/iproute2/rt_dsfield b/etc/iproute2/rt_dsfield index b0683469..496ef662 100644 --- a/etc/iproute2/rt_dsfield +++ b/etc/iproute2/rt_dsfield @@ -12,3 +12,16 @@ 0xa0 critical 0xc0 internet 0xe0 network +# Newer RFC2597 values +0x28 AF11 +0x30 AF12 +0x38 AF13 +0x48 AF21 +0x50 AF22 +0x58 AF23 +0x68 AF31 +0x70 AF32 +0x78 AF33 +0x88 AF41 +0x90 AF42 +0x98 AF43