Commit Graph

943 Commits

Author SHA1 Message Date
shemminger 6d4662d4f7 From: Pablo Neira
Hi jamal,

I found some spare time to play around a bit more with you ipt action stuff.

I've tested the patch attached with the testcase here below. It works
fine here. It fixes broken target option checkings (final_check) and a
leak in the merge_options function. I've killed copy_options since I
didn't find any reason why we need it.

--- test.sh ---
tc qdisc del dev wlan0 ingress
tc qdisc add dev wlan0 ingress
tc filter add dev wlan0 parent ffff: protocol ip prio 6 u32 \
match ip src 192.168.0.2/32 flowid 1:16 \
action ipt -j TOS --set-tos Maximize-Reliability
sleep 3
tc -s filter ls dev wlan0 parent ffff:
--- end of test.sh ---

Results:

tablename: mangle hook: NF_IP_PRE_ROUTING
         target: TOS set Maximize-Reliability  index 0
filter protocol ip pref 6 u32
filter protocol ip pref 6 u32 fh 800: ht divisor 1
filter protocol ip pref 6 u32 fh 800::800 order 2048 key ht 800 bkt 0
flowid 1:16
   match c0a80002/ffffffff at 12
         action order 1: tablename: mangle  hook: NF_IP_PRE_ROUTING
         target TOS set Maximize-Reliability
         index 18 ref 1 bind 1 installed 3 sec used 0 sec
         Action statistics:
         Sent 725 bytes 7 pkt (dropped 0, overlimits 0 requeues 0)
         rate 0bit 0pps backlog 0b 0p requeues 0

Now, check if options passed to the target are correct.

# tc filter add dev wlan0 parent ffff: protocol ip prio 6 u32 \
match ip dst 192.168.0.2/32 flowid 1:16 \
action ipt -j TOS --set-tos
                             ^^^
                         missing parameter

ipt: option `--set-tos' requires an argument
tc-ipt v0.1: TOS target: Parameter --set-tos is required
Try `tc-ipt -h' or 'tc-ipt --help' for more information.

btw, how's your schedule ? did you finally get spare time to come to the
netfilter workshop in seville ?

bye,
Pablo
2005-06-23 17:36:38 +00:00
shemminger 08837cb2f5 ChangeLog update for Thomas's patches 2005-06-23 17:33:56 +00:00
shemminger dd3e90853d Fix off-by-one while generating argument vector 2005-06-23 17:32:22 +00:00
shemminger f6aa8e00ac Add cscope target to Makefile 2005-06-23 17:31:49 +00:00
shemminger 02d2ae55c6 IPv4 multipath algorithm selection support 2005-06-23 17:31:27 +00:00
shemminger 87773db551 Add ematch cleanup 2005-06-23 17:23:53 +00:00
shemminger 615a979b8c Add etc/iproute2/ematch_map 2005-06-23 17:22:43 +00:00
shemminger 9ddbb02e50 Add extended matches (nbyte, cmp, u32, meta) 2005-06-23 17:21:46 +00:00
shemminger ea8fc1047d Netem support for reorder
Update include files and add support for TCP_CONG
2005-06-22 18:27:49 +00:00
shemminger 2b4fad69ff Decnet documentation update 2005-06-13 18:47:56 +00:00
shemminger 8996a7fa4e Update snapshot 2005-06-07 22:17:21 +00:00
shemminger 99f830de2f Device indices are unsigned and use if_nametoindex as fallback 2005-06-07 22:15:48 +00:00
shemminger 9bec1a4363 Masahide NAKAMURA <nakam@linux-ipv6.org>
It fixes flush feature for IPsec(ip xfrm).
Jamal gave me comment about it. I've tested it on 2.6.11.7.
Please find the log below, check code and pull it:

bk://bk.skbuff.net:38000/iproute2-xfrm-flush


ChangeSet@1.182, 2005-04-13 21:19:44+09:00, nakam@linux-ipv6.org
  [ip] add "deleteall" command for xfrm;
  "flush" uses kernel's flush interface and
  "deleteall" uses legacy iproute2's flush feature like
  getting-and-deleting-for-each.
2005-06-07 21:58:25 +00:00
shemminger 90f93024a0 Monitor time patch from Masahide NAKAMURA 2005-06-07 21:55:55 +00:00
shemminger e445765dcb These two ChangeSets are for iproute2;
One adds timestamp option (-t) to ip's monitoring
like `ip -t monitor` or `ip -t xfrm monitor`. This is commented by Jamal.
The other is a minor fix for xfrm monitor.
2005-06-07 21:55:03 +00:00
shemminger f35e928982 CVS forgets permissions on files, so use sh to run configure 2005-06-07 21:48:09 +00:00
osdl.net!shemminger ec596427c1 add more changelog entries about what in to last release
(Logical change 1.184)
2005-04-01 19:56:29 +00:00
osdl.net!shemminger 0c5a3c7b9c ChangeLog:
add more changelog entries about what in to last release

BKrev: 424da76d4z6qfhZ7QZX861nvo__l7w
2005-04-01 19:56:29 +00:00
osdl.net!shemminger 24b5fdbfbf Fix build problem on 2.4
BKrev: 424af537WSbjQwKNDk8rE7lj52TmkA
2005-03-30 18:51:35 +00:00
osdl.net!shemminger 78615aaa1d Fix build problem on 2.4
(Logical change 1.183)
2005-03-30 18:51:35 +00:00
osdl.net!shemminger ca67c115af iproute2-ss050330
(Logical change 1.182)
2005-03-30 18:44:41 +00:00
osdl.net!shemminger 62f33f3691 SNAPSHOT.h:
iproute2-ss050330

BKrev: 424af399JQYu_2ttnS6tz5JSjXwvWQ
2005-03-30 18:44:41 +00:00
osdl.net!shemminger 206a04411c update to latest from 2.6.12-rc2
(Logical change 1.181)
2005-03-30 18:43:30 +00:00
osdl.net!shemminger 451d3b81e6 add action stats
(Logical change 1.181)
2005-03-30 18:43:30 +00:00
osdl.net!shemminger 3bb18bdc3e Updates from Jamal
BKrev: 424af35291CI65EqxI1ospOYj74TPw
2005-03-30 18:43:30 +00:00
osdl.net!shemminger 16bd7e0efe Updates from Jamal
(Logical change 1.181)
2005-03-30 18:43:30 +00:00
osdl.net!shemminger 6ce88ca61d Fix from jamal
2005/03/25 04:34:05-08:00 net[shemminger]!shemminger
Import patch p2_mirred

(Logical change 1.181)
2005-03-30 18:43:30 +00:00
osdl.net!shemminger b6d5f02e45 (Logical change 1.181) 2005-03-30 18:43:30 +00:00
net[shemminger]!shemminger 00b5831422 p_mipt
BKrev: 424aedcbBvlxDe6AqCwiiD1p-LouEA
2005-03-30 18:19:55 +00:00
net[shemminger]!shemminger 894b1c6687 Import patch p_mipt
(Logical change 1.180)
2005-03-30 18:19:55 +00:00
osdl.net!shemminger 0eb4942612 Fix netlink message alignment when the last routing attribute added
has a data length not aligned to RTA_ALIGNTO.

BKrev: 424aed64MzJYUabiev8JKIIUgAN3tw
2005-03-30 18:18:12 +00:00
osdl.net!shemminger 3819eb9569 Fix netlink message alignment when the last routing attribute added
has a data length not aligned to RTA_ALIGNTO.

(Logical change 1.179)
2005-03-30 18:18:12 +00:00
net[shemminger]!shemminger 3dabdbb3da Import patch netlink-align
(Logical change 1.179)
2005-03-30 18:18:12 +00:00
osdl.net!shemminger 56eb94cca6 utils.c, ipaddress.c, utils.h, ChangeLog:
Import patch addr-del

BKrev: 424aeceauOGm2wfD90ZInaZJ9gUbaw
2005-03-30 18:16:10 +00:00
net[shemminger]!shemminger f082b64fb4 Import patch addr-del
(Logical change 1.178)
2005-03-30 18:16:10 +00:00
osdl.net!shemminger 2cea8f2fb2 add comments about last changeset
(Logical change 1.177)
2005-03-30 18:14:55 +00:00
osdl.net!shemminger 3c1f9b033f ChangeLog:
add comments about last changeset

BKrev: 424aec9fwMMZcZ2_UlJ1Yvo4MO_9sQ
2005-03-30 18:14:55 +00:00
osdl.net!shemminger f8f9de56f2 Switch to stack (rather than calloc) for tables.
(Logical change 1.176)
2005-03-30 18:11:49 +00:00
osdl.net!shemminger e39a637db0 Merge bk://bk.skbuff.net:38000/iproute2-xfrm-monitor
into dxpl.pdx.osdl.net:/home/shemminger/projects/iproute2

2005/03/29 11:00:08-08:00 osdl.net!shemminger
Switch to stack (rather than calloc) for tables.

BKrev: 424aebe59PA_FODIRzXFOT7CncQsWw
2005-03-30 18:11:49 +00:00
linux-ipv6.org!nakam 15ac4cdc2f split printing state/policy info function for xfrm common use.
add xfrm monitor.

(Logical change 1.175)
2005-03-22 16:13:21 +00:00
linux-ipv6.org!nakam 48f1ef9f15 split printing state/policy info function for xfrm common use.
(Logical change 1.175)
2005-03-22 16:13:21 +00:00
linux-ipv6.org!nakam 56e8ad38cb split printing policy info function for xfrm common use.
(Logical change 1.175)
2005-03-22 16:13:21 +00:00
linux-ipv6.org!nakam fb7399b2ba allocspi feature support.
support to specify sequence number.
split printing state info function for xfrm common use.

(Logical change 1.175)
2005-03-22 16:13:21 +00:00
linux-ipv6.org!nakam beebd7aa04 add xfrm_monitor.o.
(Logical change 1.175)
2005-03-22 16:13:21 +00:00
linux-ipv6.org!nakam d48cd33681 [ip] xfrm allocspi and monitor support.
BKrev: 42404421XVrQJoHhGCmcVVwvMghiug
2005-03-22 16:13:21 +00:00
linux-ipv6.org!nakam f9cb3a2fe2 (Logical change 1.175) 2005-03-22 16:13:21 +00:00
linux-ipv6.org!nakam bf82c4c0d3 Initial revision 2005-03-22 16:13:21 +00:00
osdl.net!shemminger 12e0697072 update snapshot id
(Logical change 1.174)
2005-03-18 19:42:32 +00:00
osdl.net!shemminger 919e181c75 SNAPSHOT.h:
update snapshot id

BKrev: 423b2f28I7mUcVH8yK3-BDHpbJyt8A
2005-03-18 19:42:32 +00:00
osdl.net!shemminger 6610fd1405 Handle batch mode better.
Add comments midline and -force option.

BKrev: 423b2ec7qBteAhkVwR2g5BCthEVgUg
2005-03-18 19:40:55 +00:00