lib: introduce print_nl

[mirror_iproute2.git] / tc / p_ip.c

diff --git a/tc/p_ip.c b/tc/p_ip.c
index 10e4bebc71d942bc5e1fc91a9d5757a5b7ec47e6..81ac8d95d3a1cb9ec258cfe5cb9823aebfd82ccd 100644 (file)
--- a/tc/p_ip.c
+++ b/tc/p_ip.c
@@ -1,5 +1,5 @@
 /*
- * m_pedit.c           packet editor: IPV4/6 header
+ * p_ip.c              packet editor: IPV4 header
  *
  *             This program is free software; you can distribute it and/or
  *             modify it under the terms of the GNU General Public License
@@ -13,7 +13,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include <syslog.h>
 #include <fcntl.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
@@ -24,7 +23,8 @@
 #include "m_pedit.h"
 
 static int
-parse_ip(int *argc_p, char ***argv_p,struct tc_pedit_sel *sel,struct tc_pedit_key *tkey)
+parse_ip(int *argc_p, char ***argv_p,
+        struct m_pedit_sel *sel, struct m_pedit_key *tkey)
 {
        int res = -1;
        int argc = *argc_p;
@@ -33,16 +33,20 @@ parse_ip(int *argc_p, char ***argv_p,struct tc_pedit_sel *sel,struct tc_pedit_ke
        if (argc < 2)
                return -1;
 
+       tkey->htype = sel->extended ?
+               TCA_PEDIT_KEY_EX_HDR_TYPE_IP4 :
+               TCA_PEDIT_KEY_EX_HDR_TYPE_NETWORK;
+
        if (strcmp(*argv, "src") == 0) {
                NEXT_ARG();
                tkey->off = 12;
-               res = parse_cmd(&argc, &argv, 4, TIPV4,RU32,sel,tkey);
+               res = parse_cmd(&argc, &argv, 4, TIPV4, RU32, sel, tkey);
                goto done;
        }
        if (strcmp(*argv, "dst") == 0) {
                NEXT_ARG();
                tkey->off = 16;
-               res = parse_cmd(&argc, &argv, 4, TIPV4,RU32,sel,tkey);
+               res = parse_cmd(&argc, &argv, 4, TIPV4, RU32, sel, tkey);
                goto done;
        }
        /* jamal - look at these and make them either old or new
@@ -52,108 +56,107 @@ parse_ip(int *argc_p, char ***argv_p,struct tc_pedit_sel *sel,struct tc_pedit_ke
        if (strcmp(*argv, "tos") == 0 || matches(*argv, "dsfield") == 0) {
                NEXT_ARG();
                tkey->off = 1;
-               res = parse_cmd(&argc, &argv,  1, TU32,RU8,sel,tkey);
+               res = parse_cmd(&argc, &argv, 1, TU32, RU8, sel, tkey);
                goto done;
        }
        if (strcmp(*argv, "ihl") == 0) {
                NEXT_ARG();
                tkey->off = 0;
-               res = parse_cmd(&argc, &argv, 1, TU32,0x0f,sel,tkey);
+               res = parse_cmd(&argc, &argv, 1, TU32, 0x0f, sel, tkey);
+               goto done;
+       }
+       if (strcmp(*argv, "ttl") == 0) {
+               NEXT_ARG();
+               tkey->off = 8;
+               res = parse_cmd(&argc, &argv, 1, TU32, RU8, sel, tkey);
                goto done;
        }
        if (strcmp(*argv, "protocol") == 0) {
                NEXT_ARG();
                tkey->off = 9;
-               res = parse_cmd(&argc, &argv, 1, TU32,RU8,sel,tkey);
+               res = parse_cmd(&argc, &argv, 1, TU32, RU8, sel, tkey);
                goto done;
        }
        /* jamal - fix this */
        if (matches(*argv, "precedence") == 0) {
                NEXT_ARG();
                tkey->off = 1;
-               res = parse_cmd(&argc, &argv, 1, TU32,RU8,sel,tkey);
+               res = parse_cmd(&argc, &argv, 1, TU32, RU8, sel, tkey);
                goto done;
        }
        /* jamal - validate this at some point */
        if (strcmp(*argv, "nofrag") == 0) {
                NEXT_ARG();
                tkey->off = 6;
-               res = parse_cmd(&argc, &argv, 1, TU32,0x3F,sel,tkey);
+               res = parse_cmd(&argc, &argv, 1, TU32, 0x3F, sel, tkey);
                goto done;
        }
        /* jamal - validate this at some point */
        if (strcmp(*argv, "firstfrag") == 0) {
                NEXT_ARG();
                tkey->off = 6;
-               res = parse_cmd(&argc, &argv, 1, TU32,0x1F,sel,tkey);
+               res = parse_cmd(&argc, &argv, 1, TU32, 0x1F, sel, tkey);
                goto done;
        }
        if (strcmp(*argv, "ce") == 0) {
                NEXT_ARG();
                tkey->off = 6;
-               res = parse_cmd(&argc, &argv, 1, TU32,0x80,sel,tkey);
+               res = parse_cmd(&argc, &argv, 1, TU32, 0x80, sel, tkey);
                goto done;
        }
        if (strcmp(*argv, "df") == 0) {
                NEXT_ARG();
                tkey->off = 6;
-               res = parse_cmd(&argc, &argv, 1, TU32,0x40,sel,tkey);
+               res = parse_cmd(&argc, &argv, 1, TU32, 0x40, sel, tkey);
                goto done;
        }
        if (strcmp(*argv, "mf") == 0) {
                NEXT_ARG();
                tkey->off = 6;
-               res = parse_cmd(&argc, &argv, 1, TU32,0x20,sel,tkey);
+               res = parse_cmd(&argc, &argv, 1, TU32, 0x20, sel, tkey);
                goto done;
        }
+
+       if (sel->extended)
+               return -1; /* fields located outside IP header should be
+                           * addressed using the relevant header type in
+                           * extended pedit kABI
+                           */
+
        if (strcmp(*argv, "dport") == 0) {
                NEXT_ARG();
                tkey->off = 22;
-               res = parse_cmd(&argc, &argv, 2, TU32,RU16,sel,tkey);
+               res = parse_cmd(&argc, &argv, 2, TU32, RU16, sel, tkey);
                goto done;
        }
        if (strcmp(*argv, "sport") == 0) {
                NEXT_ARG();
                tkey->off = 20;
-               res = parse_cmd(&argc, &argv, 2, TU32,RU16,sel,tkey);
+               res = parse_cmd(&argc, &argv, 2, TU32, RU16, sel, tkey);
                goto done;
        }
        if (strcmp(*argv, "icmp_type") == 0) {
                NEXT_ARG();
                tkey->off = 20;
-               res = parse_cmd(&argc, &argv, 1, TU32,RU8,sel,tkey);
+               res = parse_cmd(&argc, &argv, 1, TU32, RU8, sel, tkey);
                goto done;
        }
        if (strcmp(*argv, "icmp_code") == 0) {
                NEXT_ARG();
                tkey->off = 20;
-               res = parse_cmd(&argc, &argv, 1, TU32,RU8,sel,tkey);
+               res = parse_cmd(&argc, &argv, 1, TU32, RU8, sel, tkey);
                goto done;
        }
        return -1;
 
-      done:
+done:
        *argc_p = argc;
        *argv_p = argv;
        return res;
 }
 
-static int
-parse_ip6(int *argc_p, char ***argv_p,struct tc_pedit_sel *sel,struct tc_pedit_key *tkey)
-{
-       int res = -1;
-       return res;
-}
-
 struct m_pedit_util p_pedit_ip = {
        NULL,
        "ip",
        parse_ip,
 };
-
-
-struct m_pedit_util p_pedit_ip6 = {
-       NULL,
-       "ip6",
-       parse_ip6,
-};