Commit Graph

869 Commits

Author SHA1 Message Date
Patrick McHardy 9932abb498 Add flow classifier support
[IPROUTE]: Add flow classifier support

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: Stephen Hemminger <stephen.hemminger@vyatta.com>
2008-01-31 22:28:11 -08:00
Patrick McHardy 5626a24a8b Add support for SFQ xstats
[IPROUTE]: Add support for SFQ xstats

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: Stephen Hemminger <stephen.hemminger@vyatta.com>
2008-01-31 22:28:10 -08:00
Stephen Hemminger f31a37f79d fix problem caused by rtnl_send checks
Some usages of rtnl_send could cause errors (ie flush requests)
others do a listen afterwards.

Signed-off-by: Stephen Hemminger <stephen.hemminger@vyatta.com>
2008-01-31 21:38:58 -08:00
Stephen Hemminger 42169181b8 whitespace typo in tc_common.h
minor whitespace typo.
2008-01-31 21:26:00 -08:00
Stephen Hemminger 54bb35c69c poll for errors after rtnl_send
This fixes the problem where a bulk operation (like ip flush)
is performed as non-root user.  The kernel will only send a response
if there is an error, so check for it.
2008-01-26 11:09:42 -08:00
Stephen Hemminger 1fb0a998e1 remove extra newline from perror() calls
perror error adds a newline, so don't split error message
across two lines.
2008-01-26 11:08:31 -08:00
Stephen Hemminger aa8032e628 libnetlink: don't spin forever on receive error
If there is a problem talking to kernel, don't retry except in the
special case of signal or -EAGAIN

Signed-off-by: Stephen Hemminger <stephen.hemminger@vyatta.com>
2008-01-25 15:39:09 -08:00
Stephen Hemminger 8055063afe Merge branch 'net-2.6.25' 2008-01-25 14:27:19 -08:00
Stephen Hemminger 9becb950e9 vlan meta tag match
Signed-off-by: Stephen Hemminger <stephen.hemminger@vyatta.com>
2008-01-24 13:16:41 -08:00
Stephen Hemminger fb8cc5b268 update headers to current net-2.6.25
Signed-off-by: Stephen Hemminger <stephen.hemminger@vyatta.com>
2008-01-24 13:14:28 -08:00
Stephen Hemminger 692e075787 fix typo in ip batch error message
Signed-off-by: Stephen Hemminger <stephen.hemminger@vyatta.com>
2008-01-21 13:46:08 -08:00
Stephen Hemminger 6f313868ae release v2.6.24-080108
Signed-off-by: Stephen Hemminger <stephen.hemminger@vyatta.com>
2008-01-08 08:59:32 -08:00
Stephen Hemminger ef1d6f97ec Revert "TC action parsing bug fix"
This reverts commit 720a2e8d99.

After further investigation it seems clear to me that reverting the
commit 720a2e8d990707749b2... is the correct thing to do, since the real
fix for the problem this commit was supposed to fix was instead fixed in
commit c29391c7c68f031e246c...

Whatever you specify after a u32 police you will now get a syntax error,
and according to "tc filter add u32 help" there are several things that
you are supposed to be able to specify after a police.

So, Steven, please revert 720a2e8d990707749b2...
2008-01-02 16:34:58 -08:00
Andreas Henriksson 21561e71d3 iproute2: add synonyms for ip rule options to ip(8) manpage.
commit 355e1438f73602fbac029d28891dfa889471b679
Author: Andreas Henriksson <andreas@fatal.se>
Date:   Wed Jan 2 23:21:59 2008 +0100

    Add synonyms for ip rule options to ip(8) manpage.

    See:
    http://bugs.debian.org/433507
    http://bugs.debian.org/213673

Signed-off-by: Stephen Hemminger <stephen.hemminger@vyatta.com>
2008-01-02 16:33:27 -08:00
Andreas Henriksson ed6a021a92 iproute2: revert syntax help text mistake.
Sorry. The pref and prio options are actually synonyms.
This reverts part of commit 576c63ee59.

Signed-off-by: Andreas Henriksson <andreas@fatal.se>
Signed-off-by: Stephen Hemminger <stephen.hemminger@vyatta.com>
2008-01-02 16:33:24 -08:00
Andreas Henriksson 74fe05a2f6 iproute2: add synonyms for ip rule options to ip(8) manpage.
commit 355e1438f73602fbac029d28891dfa889471b679
Author: Andreas Henriksson <andreas@fatal.se>
Date:   Wed Jan 2 23:21:59 2008 +0100

    Add synonyms for ip rule options to ip(8) manpage.

    See:
    http://bugs.debian.org/433507
    http://bugs.debian.org/213673

Signed-off-by: Stephen Hemminger <stephen.hemminger@vyatta.com>
2008-01-02 16:31:21 -08:00
Andreas Henriksson fbaa3dedd9 iproute2: revert syntax help text mistake.
Sorry. The pref and prio options are actually synonyms.
This reverts part of commit 576c63ee59.

Signed-off-by: Andreas Henriksson <andreas@fatal.se>
Signed-off-by: Stephen Hemminger <stephen.hemminger@vyatta.com>
2008-01-02 16:31:17 -08:00
Stephen Hemminger d21dd573e7 Revert "TC action parsing bug fix"
[...]
> Commands like "tc filter add dev ppp0 parent ffff: protocol ip prio 50
> u32 match ip src 0.0.0.0/0 police rate 4mbit burst 10k drop flowid :1"
> apparently no longer works. The flowid is not accepted anymore.
> Reverting commit 720a2e8d99... which you authored seems to "fix" this.
[...]

After further investigation it seems clear to me that reverting the
commit 720a2e8d990707749b2... is the correct thing to do, since the real
fix for the problem this commit was supposed to fix was instead fixed in
commit c29391c7c68f031e246c...

Whatever you specify after a u32 police you will now get a syntax error,
and according to "tc filter add u32 help" there are several things that
you are supposed to be able to specify after a police.

This reverts commit 720a2e8d99.
2008-01-02 09:29:30 -08:00
Stephen Hemminger a849d4c868 Merge branch 'master' into net-2.6.25 2007-12-31 12:56:31 -08:00
Stephen Hemminger 76e5d2c392 add include/netinet/tcp.h
ss.c needs lastest version of netinet/tcp.h which probably isn't
on most distro's yet.

Signed-off-by: Stephen Hemminger <stephen.hemminger@vyatta.com>
2007-12-31 12:56:08 -08:00
Stephen Hemminger bfe594fe31 Update header files from net-2.6.25
Signed-off-by: Stephen Hemminger <stephen.hemminger@vyatta.com>
2007-12-31 12:54:18 -08:00
Stephen Hemminger 4c7abb271b Merge branch 'master' into net-2.6.25 2007-12-31 12:51:15 -08:00
Denys Fedoryshchenko 53c017880b iptables compatiablity
New iptables 1.4.0 has some library names changed from libipt to libxt.
It is prefferable also to open libxt_ first, as newer "style".

Signed-off-by: Denys Fedoryshchenko <nuclearcat@nuclearcat.com>
Signed-off-by: Jamal Hadi Salim <hadi@cyberus.ca>
Signed-off-by: Stephen Hemminger <stephen.hemminger@vyatta.com>
2007-12-31 11:15:29 -08:00
Jesper Dangaard Brouer eeee367d91 Change the rate table calc of transmit cost to use upper bound value.
Patrick McHardy, Cite: 'its better to overestimate than underestimate
to stay in control of the queue'.

Illustrating the rate table array:
 Legend description
   rtab[x]   : Array index x of rtab[x]
   xmit_sz   : Transmit size contained in rtab[x] (normally transmit time)
   maps[a-b] : Packet sizes from a to b, will map into rtab[x]

Current/old rate table mapping (cell_log:3):
 rtab[0]:=xmit_sz:0  maps[0-7]
 rtab[1]:=xmit_sz:8  maps[8-15]
 rtab[2]:=xmit_sz:16 maps[16-23]
 rtab[3]:=xmit_sz:24 maps[24-31]
 rtab[4]:=xmit_sz:32 maps[32-39]
 rtab[5]:=xmit_sz:40 maps[40-47]
 rtab[6]:=xmit_sz:48 maps[48-55]

New rate table mapping, with kernel cell_align support.
 rtab[0]:=xmit_sz:8  maps[0-8]
 rtab[1]:=xmit_sz:16 maps[9-16]
 rtab[2]:=xmit_sz:24 maps[17-24]
 rtab[3]:=xmit_sz:32 maps[25-32]
 rtab[4]:=xmit_sz:40 maps[33-40]
 rtab[5]:=xmit_sz:48 maps[41-48]
 rtab[6]:=xmit_sz:56 maps[49-56]

New TC util on a kernel WITHOUT support for cell_align
 rtab[0]:=xmit_sz:8 maps[0-7]
 rtab[1]:=xmit_sz:16 maps[8-15]
 rtab[2]:=xmit_sz:24 maps[16-23]
 rtab[3]:=xmit_sz:32 maps[24-31]
 rtab[4]:=xmit_sz:40 maps[32-39]
 rtab[5]:=xmit_sz:48 maps[40-47]
 rtab[6]:=xmit_sz:56 maps[48-55]

Signed-off-by: Jesper Dangaard Brouer <hawk@comx.dk>
Signed-off-by: Stephen Hemminger <stephen.hemminger@vyatta.com>
2007-12-31 11:08:08 -08:00
Jesper Dangaard Brouer d5f46f9cc3 Cleanup: tc_calc_rtable().
Change tc_calc_rtable() to take a tc_ratespec struct as an
argument. (cell_log still needs to be passed on as a parameter,
because -1 indicate that the cell_log needs to be computed by the
function.).

Signed-off-by: Jesper Dangaard Brouer <hawk@comx.dk>
Signed-off-by: Stephen Hemminger <stephen.hemminger@vyatta.com>
2007-12-31 11:08:04 -08:00
Jesper Dangaard Brouer bccd014b86 Overhead calculation is now done in the kernel.
The only current user is HTB. HTB overhead argument is now passed on
to the kernel (in the struct tc_ratespec). Also correct the data
types.

Signed-off-by: Jesper Dangaard Brouer <hawk@comx.dk>
Signed-off-by: Stephen Hemminger <stephen.hemminger@vyatta.com>
2007-12-31 11:07:58 -08:00
Stephen Hemminger 77aa4d03a7 Use netinet/tcp.h (with correction) rather than kernel headers
Fix the userspace header file rather than importing more
kernel headers.

Signed-off-by: Stephen Hemminger <stephen.hemminger@vyatta.com>
2007-12-31 10:41:18 -08:00
Stephen Hemminger 2188a84d1c snapshot 31 Dec 2007
Signed-off-by: Stephen Hemminger <stephen.hemminger@vyatta.com>
2007-12-31 10:30:40 -08:00
Stephen Hemminger 6b1ac654e9 add decode of match rules
Show ip address etc when decoding output of tc filter show

Signed-off-by: Stephen Hemminger <stephen.hemminger@vyatta.com>
2007-12-31 10:29:52 -08:00
Stephen Hemminger ea5dd59c03 Manual page fixes
These are from debian sid.

Signed-off-by: Stephen Hemminger <stephen.hemminger@vyatta.com>
2007-12-31 10:15:03 -08:00
Stephen Hemminger 118c923cc0 veth.h move to linux/
Move veth.h to linux/ since it is an API.

Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
2007-12-25 12:38:08 -08:00
Stephen Hemminger 235ac6a41d snapshot target
Add Makefile target to create snapshot file.

Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
2007-12-21 09:53:45 -08:00
Stephen Hemminger c595fda55b veth: use kernel header file
Use santized kernel header for veth.h and put in correct place
to prevent possible future problems with API.

Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
2007-12-21 09:37:30 -08:00
Vitaliy Gusev f9329ccaf9 veth device link management
Signed-off-by: Vitaliy Gusev <vgusev@openvz.org>
Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
2007-12-21 09:24:12 -08:00
Pavel Emelyanov 909dfe2c7e iplink_parse() routine
This routine parses CLI attributes, describing generic link
parameters such as name, address, etc.

This is mostly copy-pasted from iplink_modify().

Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Acked-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
2007-12-21 09:23:40 -08:00
Vitaliy Gusev d84914a0c5 Fix lost export-dynamic
get_link_kind() fails for statically linked modules (vlan, veth, etc.) if "ip"
was linked without "export-dynamic".

Signed-off-by: Vitaliy Gusev <vgusev@openvz.org>

--
Thank,
Vitaliy Gusev
Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
2007-12-21 09:16:51 -08:00
YOSHIFUJI Hideaki / 吉藤英明 7c73e1bd21 rto_min value display overflow
Reported by: Satoru SATOH <satoru.satoh@gmail.com>
"ip route show" does not print correct value when larger rto_min is
set (e.g. 3sec).

This problem is because of overflow in print_route() and
the patch below is a workaround fix for that.

[root test]# ./iproute2.git.org/ip/ip route show dev eth1
192.168.140.0/24  proto kernel  scope link  src 192.168.140.130
169.254.0.0/16  scope link
[root test]# ./iproute2.git.org/ip/ip route change 192.168.140.0/24
dev eth1 rto_min 3s
[root test]# ./iproute2.git.org/ip/ip route show dev eth1
192.168.140.0/24  scope link  rto_min lock 2ms     <-- wrong
169.254.0.0/16  scope link
[root test]# ./iproute2.git/ip/ip route show dev eth1  # patched version
192.168.140.0/24  scope link  rto_min lock 3000ms  <-- correct
169.254.0.0/16  scope link

This is a simpler fix.

Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
2007-12-21 09:13:36 -08:00
Stephen Hemminger c1b81cb5fe netem potential dist table overflow
Fix possible stack overflow when given distribution table that is
too large.

Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
2007-12-12 15:02:51 -08:00
Templin, Fred L 0bd17929bc iproute2-2.6.23: RFC4214 Support (v2.5)
This patch includes support for the Intra-Site Automatic Tunnel
Addressing Protocol (ISATAP) per RFC4214.

The following diffs are specific to the iproute2-2.6.23
software distribution. This message includes the full and
patchable diff text; please use this version to apply patches.

Signed-off-by: Fred L. Templin <fred.l.templin@boeing.com>
Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
2007-12-11 10:12:49 -08:00
Stephen Hemminger e50e9f9123 Merge branch 'master' into net-2.6.25 2007-12-11 10:04:33 -08:00
Stephen Hemminger 4b270b172a Fix dotted quad for bit order
Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
2007-12-11 10:03:28 -08:00
Andreas Henriksson 5a0d1cbf69 iproute2: support dotted-quad netmask notation.
On tor, 2007-12-06 at 11:53 -0800, Stephen Hemminger wrote:
> On Tue, 4 Dec 2007 14:58:18 +0100
> Andreas Henriksson <andreas@fatal.se> wrote:
>
> > Suggested patch for allowing netmask to be specified in dotted quad format.
> > See http://bugs.debian.org/357172
> >
> > (Known problem: this will not prevent some invalid syntaxes,
> > ie. "255.0.255.0" will be treated as "255.255.255.0")
> >
> > Comments? Suggestions? Improvements?
>
> Fix the bug you mentioned?
>
> [... snip example code ...]

Updated patch, added your netmask validation code but without the check
that made 0.0.0.0 (default) and 255.255.255.255 (one address) invalid
netmasks as they are permitted in CIDR format.

Signed-off-by: Andreas Henriksson <andreas@fatal.se>
Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
2007-12-11 10:02:34 -08:00
François Delawarde e22b42a2c1 tc mask patch
Hello Stephen,

As the current maintainer of iproute2 package, you could be interested
in including the attached patch that allow using masks in the fw filter
of the tc utility (very useful at least for me). AFAK, it works at least
from iproute2 version 2.6.20-?. Feel free to make the appropriate
cleaning changes if necessary, or contact me if you see any trouble.

Best regards,
François Delawarde.

Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
2007-12-11 09:35:49 -08:00
Tomas Janousek e17b7337f1 Correct documentation regarding PROMISC and ALLMULTI.
The ip util would happily change these flags, it's just not recommended.
Reflect that in the doc.

The behaviour of ifconfig is exactly the same as of ip, delete the note about
it.

Signed-off-by: Tomas Janousek <tjanouse@redhat.com>
Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
2007-12-11 09:35:12 -08:00
Herbert Xu ec30dcce71 Add NAT action
Here's a patch to add support for the nat action which is now
in the kernel.

Thanks,
--
Visit Openswan at http://www.openswan.org/
Email: Herbert Xu ~{PmV>HI~} <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
--

Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
2007-12-11 09:35:07 -08:00
Herbert Xu fc2d02069b Add NAT action
Here's a patch to add support for the nat action which is now
in the kernel.

Thanks,
--
Visit Openswan at http://www.openswan.org/
Email: Herbert Xu ~{PmV>HI~} <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
--

Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
2007-12-11 09:33:55 -08:00
Stephen Hemminger 7ca30b789d rlim qdisc support
Add support for new rate limit qdisc

Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
2007-12-10 13:10:20 -08:00
Stephen Hemminger 037c635eee Fix off by one in nested attribute management.
Fixes segv in:
  tc qdisc show dev eth1
due to uninitialized attribute table.

Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
2007-12-10 11:34:40 -08:00
Stephen Hemminger be8d89d3bf Fix breakage from netfilter/ip_tables header change.
Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
2007-12-10 09:45:39 -08:00
Stephen Hemminger ece02ea0a3 Fix breakage from netfilter/ip_tables header change.
Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
2007-12-10 09:40:45 -08:00