[src/trunk]: src/sys/net make LSE prepend the rest of the shims in they exist

[kefren <kefren%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/fc71b929ebc4
branches:  trunk
changeset: 766442:fc71b929ebc4
user:      kefren <kefren%NetBSD.org@localhost>
date:      Wed Jun 22 19:08:29 2011 +0000

description:
make LSE prepend the rest of the shims in they exist

diffstat:

 sys/net/if_mpls.c |  21 ++++++++++++++++++---
 1 files changed, 18 insertions(+), 3 deletions(-)

diffs (56 lines):

diff -r 9d2e858a01ee -r fc71b929ebc4 sys/net/if_mpls.c
--- a/sys/net/if_mpls.c Wed Jun 22 18:20:59 2011 +0000
+++ b/sys/net/if_mpls.c Wed Jun 22 19:08:29 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_mpls.c,v 1.6 2011/06/21 14:30:19 kefren Exp $ */
+/*     $NetBSD: if_mpls.c,v 1.7 2011/06/22 19:08:29 kefren Exp $ */
 
 /*
  * Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_mpls.c,v 1.6 2011/06/21 14:30:19 kefren Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_mpls.c,v 1.7 2011/06/22 19:08:29 kefren Exp $");
 
 #include "opt_inet.h"
 #include "opt_mpls.h"
@@ -218,7 +218,8 @@
 
        while (psize <= rt_gettag(rt)->sa_len - sizeof(mh)) {
                pms++;
-               m = mpls_prepend_shim(m, &mh);
+               if ((m = mpls_prepend_shim(m, &mh)) == NULL)
+                       return ENOBUFS;
                memset(&mh, 0, sizeof(mh));
                mh.s_addr = ntohl(pms->s_addr);
                mh.shim.bos = mh.shim.exp = 0;
@@ -305,6 +306,7 @@
        union mpls_shim tshim, *htag;
        struct rtentry *rt = NULL;
        int error = ENOBUFS;
+       uint psize = sizeof(struct sockaddr_mpls);
 
        if (m->m_len < sizeof(union mpls_shim) &&
            (m = m_pullup(m, sizeof(union mpls_shim))) == NULL)
@@ -382,6 +384,19 @@
        htag->shim.label = tshim.shim.label;
        htag->s_addr = htonl(htag->s_addr);
 
+       /* check if there is anything more to prepend */
+       htag = &((struct sockaddr_mpls*)rt_gettag(rt))->smpls_addr;
+       while (psize <= rt_gettag(rt)->sa_len - sizeof(tshim)) {
+               htag++;
+               memset(&tshim, 0, sizeof(tshim));
+               tshim.s_addr = ntohl(htag->s_addr);
+               tshim.shim.bos = tshim.shim.exp = 0;
+               tshim.shim.ttl = mpls_defttl;
+               if ((m = mpls_prepend_shim(m, &tshim)) == NULL)
+                       return ENOBUFS;
+               psize += sizeof(tshim);
+       }
+
        error = mpls_send_frame(m, rt->rt_ifp, rt);
 
 done: