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 720a2e8d990707749b2cafa77ab3cd2b8241ec47.

diff --git a/tc/m_police.c b/tc/m_police.c
index acdfd2236e2585482056a6d14b451053d96173f0..46c785b60cbd2c536d9857c0b18bcbeff6f084fe 100644 (file)
--- a/tc/m_police.c
+++ b/tc/m_police.c
@@ -37,7 +37,7 @@ static void usage(void)
        fprintf(stderr, "Usage: ... police rate BPS burst BYTES[/BYTES] [ mtu BYTES[/BYTES] ]\n");
        fprintf(stderr, "                [ peakrate BPS ] [ avrate BPS ]\n");
        fprintf(stderr, "                [ ACTIONTERM ]\n");
-       fprintf(stderr, "Old Syntax ACTIONTERM := <EXCEEDACT>[/NOTEXCEEDACT] \n");
+       fprintf(stderr, "Old Syntax ACTIONTERM := action <EXCEEDACT>[/NOTEXCEEDACT] \n");
        fprintf(stderr, "New Syntax ACTIONTERM := conform-exceed <EXCEEDACT>[/NOTEXCEEDACT] \n");
        fprintf(stderr, "Where: *EXCEEDACT := pipe | ok | reclassify | drop | continue \n");
        fprintf(stderr, "Where:  pipe is only valid for new syntax \n");
@@ -237,8 +237,7 @@ int act_parse_police(struct action_util *a,int *argc_p, char ***argv_p, int tca_
                } else if (strcmp(*argv, "help") == 0) {
                        usage();
                } else {
-                       fprintf(stderr, "What is \"%s\"?\n", *argv);
-                       return -1;
+                       break;
                }
                ok++;
                argc--; argv++;