Module Name: src
Committed By: kefren
Date: Wed Jun 22 19:08:29 UTC 2011
Modified Files:
src/sys/net: if_mpls.c
Log Message:
make LSE prepend the rest of the shims in they exist
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/net/if_mpls.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/net/if_mpls.c
diff -u src/sys/net/if_mpls.c:1.6 src/sys/net/if_mpls.c:1.7
--- src/sys/net/if_mpls.c:1.6 Tue Jun 21 14:30:19 2011
+++ src/sys/net/if_mpls.c Wed Jun 22 19:08:29 2011
@@ -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:
