diff options
| author | Michele Marchetto <michele@cvs.openbsd.org> | 2008-11-01 16:37:56 +0000 |
|---|---|---|
| committer | Michele Marchetto <michele@cvs.openbsd.org> | 2008-11-01 16:37:56 +0000 |
| commit | f723c9f48787cea7734d262afdc442af3bb26d38 (patch) | |
| tree | 1fa67bae3f7963de2b83ce699ba4e25c66163a53 /sys/netmpls/mpls_input.c | |
| parent | 80e890cd112608c6aca701f2a0ecf679ae37e447 (diff) | |
Introduced Uniform Model for TTL handling.
MPLS TTL is mapped into network layer one as the packet exits the LSP.
Just IPv4 support for now.
Added the relevant sysctls to enable this behaviour.
Input and OK claudio@
Diffstat (limited to 'sys/netmpls/mpls_input.c')
| -rw-r--r-- | sys/netmpls/mpls_input.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/netmpls/mpls_input.c b/sys/netmpls/mpls_input.c index 39ff4c621b6..e267fd9ea1b 100644 --- a/sys/netmpls/mpls_input.c +++ b/sys/netmpls/mpls_input.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mpls_input.c,v 1.14 2008/10/14 20:43:33 michele Exp $ */ +/* $OpenBSD: mpls_input.c,v 1.15 2008/11/01 16:37:55 michele Exp $ */ /* * Copyright (c) 2008 Claudio Jeker <claudio@openbsd.org> @@ -71,9 +71,9 @@ mpls_input(struct mbuf *m) struct ifnet *ifp = m->m_pkthdr.rcvif; struct sockaddr_mpls *smpls; struct sockaddr_mpls sa_mpls; - struct shim_hdr *shim; + struct shim_hdr *shim; struct rtentry *rt = NULL; - u_int32_t ttl; + u_int8_t ttl; int i, hasbos; if (!mpls_enable) { @@ -111,7 +111,7 @@ mpls_input(struct mbuf *m) m_freem(m); return; } - ttl = htonl(ttl - 1); + ttl--; for (i = 0; i < mpls_inkloop; i++) { bzero(&sa_mpls, sizeof(sa_mpls)); @@ -219,7 +219,7 @@ mpls_input(struct mbuf *m) } /* write back TTL */ - shim->shim_label = (shim->shim_label & ~MPLS_TTL_MASK) | ttl; + shim->shim_label = (shim->shim_label & ~MPLS_TTL_MASK) | htonl(ttl); #ifdef MPLS_DEBUG printf("MPLS: sending on %s outlabel %x dst af %d in %d out %d\n", |