netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Magnus Bergroth <bergroth@nordu.net>
To: netdev@vger.kernel.org
Subject: iproute2 mpls max labels
Date: Sat, 16 Jul 2016 20:24:48 +0200	[thread overview]
Message-ID: <578A7BF0.2020107@nordu.net> (raw)


Wanted to use more than the default maximum of 8 mpls labels. Max labels
seems to be hardcode to 8 in two places.

--- iproute2-4.6.0/lib/utils.c    2016-05-18 20:56:02.000000000 +0200
+++ iproute2-4.6.0-bergroth/lib/utils.c    2016-07-16 20:12:10.714958071
+0200
@@ -476,7 +476,7 @@
         addr->bytelen = 4;
         addr->bitlen = 20;
         /* How many bytes do I need? */
-        for (i = 0; i < 8; i++) {
+        for (i = 0; i < MPLS_MAX_LABELS; i++) {
             if (ntohl(addr->data[i]) & MPLS_LS_S_MASK) {
                 addr->bytelen = (i + 1)*4;
                 break;


--- iproute2-4.6.0/include/utils.h    2016-05-18 20:56:02.000000000 +0200
+++ iproute2-4.6.0-bergroth/include/utils.h    2016-07-15
11:55:57.297681742 +0200
@@ -54,6 +54,9 @@
 #define NEXT_ARG_FWD() do { argv++; argc--; } while(0)
 #define PREV_ARG() do { argv--; argc++; } while(0)

+/* Maximum number of labels the mpls helpers support */
+#define MPLS_MAX_LABELS 8
+
 typedef struct
 {
     __u16 flags;
@@ -61,7 +64,7 @@
     __s16 bitlen;
     /* These next two fields match rtvia */
     __u16 family;
-    __u32 data[8];
+    __u32 data[MPLS_MAX_LABELS];
 } inet_prefix;

 #define PREFIXLEN_SPECIFIED 1
@@ -88,9 +91,6 @@
 # define AF_MPLS 28
 #endif

-/* Maximum number of labels the mpls helpers support */
-#define MPLS_MAX_LABELS 8
-
 __u32 get_addr32(const char *name);
 int get_addr_1(inet_prefix *dst, const char *arg, int family);
 int get_prefix_1(inet_prefix *dst, char *arg, int family);




Kindly

Magnus Bergroth

             reply	other threads:[~2016-07-16 18:34 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-07-16 18:24 Magnus Bergroth [this message]
2016-07-21 18:53 ` iproute2 mpls max labels Roopa Prabhu
2016-07-21 19:43   ` Magnus Bergroth
2016-07-23 23:04     ` Roopa Prabhu
2016-07-21 20:00   ` Eric W. Biederman
2016-07-21 21:08     ` Magnus Bergroth
2016-07-22 19:24       ` Eric W. Biederman
2016-07-22  6:16     ` Roopa Prabhu
2016-07-22 19:20       ` Eric W. Biederman
2016-07-23 23:03         ` Roopa Prabhu

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=578A7BF0.2020107@nordu.net \
    --to=bergroth@nordu.net \
    --cc=netdev@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).