iproute: Set ip/ip6 lwtunnel flags

[mirror_iproute2.git] / tc / p_ip.c

diff --git a/tc/p_ip.c b/tc/p_ip.c
index e56eb39317baa6c6b672eefdc268e4d2bde19398..c385ac6dbcaa312a7fd477820a1411825e60a5ac 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>
@@ -52,7 +51,7 @@ parse_ip(int *argc_p, char ***argv_p,
        }
        /* jamal - look at these and make them either old or new
        ** scheme given diffserv
-       ** dont forget the CE bit
+       ** don't forget the CE bit
        */
        if (strcmp(*argv, "tos") == 0 || matches(*argv, "dsfield") == 0) {
                NEXT_ARG();
@@ -66,6 +65,12 @@ parse_ip(int *argc_p, char ***argv_p,
                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;
@@ -150,23 +155,7 @@ done:
        return res;
 }
 
-static int
-parse_ip6(int *argc_p, char ***argv_p,
-         struct m_pedit_sel *sel, struct m_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,
+       .id = "ip",
+       .parse_peopt = parse_ip,
 };