diff options
| author | Claudio Jeker <claudio@cvs.openbsd.org> | 2010-05-07 13:33:18 +0000 |
|---|---|---|
| committer | Claudio Jeker <claudio@cvs.openbsd.org> | 2010-05-07 13:33:18 +0000 |
| commit | 043b0fc8cb63b379ff2757ab2d64bf2b4c8c2cb7 (patch) | |
| tree | 18ea5d2f321a9a8ea43ecdd326acada9de6ae943 /sys/netmpls | |
| parent | 6bcd6fa8c9cab428fd9f7d850e1771ff3f94d451 (diff) | |
Start cleaning up the mess called rtalloc*. Kill rtalloc2, make rtalloc1
accept flags for report and nocloning. Move the rtableid into struct route
(with a minor twist for now) and make a few more codepathes rdomain aware.
Appart from the pf.c and route.c bits the diff is mostly mechanical.
More to come...
OK michele, henning
Diffstat (limited to 'sys/netmpls')
| -rw-r--r-- | sys/netmpls/mpls_input.c | 5 | ||||
| -rw-r--r-- | sys/netmpls/mpls_output.c | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/sys/netmpls/mpls_input.c b/sys/netmpls/mpls_input.c index 1e34fa4d989..51608cf2bb1 100644 --- a/sys/netmpls/mpls_input.c +++ b/sys/netmpls/mpls_input.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mpls_input.c,v 1.21 2009/04/29 19:26:52 michele Exp $ */ +/* $OpenBSD: mpls_input.c,v 1.22 2010/05/07 13:33:17 claudio Exp $ */ /* * Copyright (c) 2008 Claudio Jeker <claudio@openbsd.org> @@ -173,8 +173,7 @@ mpls_input(struct mbuf *m) /* Other cases are not handled for now */ } - rt = rtalloc1(smplstosa(smpls), 1, 0); - + rt = rtalloc1(smplstosa(smpls), RT_REPORT, 0); if (rt == NULL) { /* no entry for this label */ #ifdef MPLS_DEBUG diff --git a/sys/netmpls/mpls_output.c b/sys/netmpls/mpls_output.c index 0116fe50f77..ced18879ddc 100644 --- a/sys/netmpls/mpls_output.c +++ b/sys/netmpls/mpls_output.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mpls_output.c,v 1.7 2009/07/09 12:55:35 michele Exp $ */ +/* $OpenBSD: mpls_output.c,v 1.8 2010/05/07 13:33:17 claudio Exp $ */ /* * Copyright (c) 2008 Claudio Jeker <claudio@openbsd.org> @@ -62,7 +62,7 @@ mpls_output(struct mbuf *m, struct rtentry *rt0) smpls->smpls_len = sizeof(*smpls); smpls->smpls_label = shim->shim_label & MPLS_LABEL_MASK; - rt = rtalloc1(smplstosa(smpls), 1, 0); + rt = rtalloc1(smplstosa(smpls), RT_REPORT, 0); if (rt == NULL) { /* no entry for this label */ #ifdef MPLS_DEBUG |