diff options
| author | Andrey V. Elsukov <ae@FreeBSD.org> | 2015-05-12 07:37:27 +0000 |
|---|---|---|
| committer | Andrey V. Elsukov <ae@FreeBSD.org> | 2015-05-12 07:37:27 +0000 |
| commit | eccfe69a5c486bfc7d7877d66d98e928c2191351 (patch) | |
| tree | f1c878482abb06e942d871316149ceffb7479b15 /sys/net/if_gre.c | |
| parent | 0a23444a57b962959c35d5f9035105f0dc4e1bcd (diff) | |
| download | src-eccfe69a5c486bfc7d7877d66d98e928c2191351.tar.gz src-eccfe69a5c486bfc7d7877d66d98e928c2191351.zip | |
Add new socket ioctls SIOC[SG]TUNFIB to set FIB number of encapsulated
packets on tunnel interfaces. Add support of these ioctls to gre(4),
gif(4) and me(4) interfaces. For incoming packets M_SETFIB() should use
if_fib value from ifnet structure, use proper value in gre(4) and me(4).
Differential Revision: https://reviews.freebsd.org/D2462
No objection from: #network
MFC after: 2 weeks
Sponsored by: Yandex LLC
Notes
Notes:
svn path=/head/; revision=282809
Diffstat (limited to 'sys/net/if_gre.c')
| -rw-r--r-- | sys/net/if_gre.c | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/sys/net/if_gre.c b/sys/net/if_gre.c index 3162c6f61008..c38ec3ad4038 100644 --- a/sys/net/if_gre.c +++ b/sys/net/if_gre.c @@ -64,6 +64,7 @@ __FBSDID("$FreeBSD$"); #include <net/if_types.h> #include <net/netisr.h> #include <net/vnet.h> +#include <net/route.h> #include <netinet/in.h> #ifdef INET @@ -441,6 +442,17 @@ gre_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) #endif } break; + case SIOCGTUNFIB: + ifr->ifr_fib = sc->gre_fibnum; + break; + case SIOCSTUNFIB: + if ((error = priv_check(curthread, PRIV_NET_GRE)) != 0) + break; + if (ifr->ifr_fib >= rt_numfibs) + error = EINVAL; + else + sc->gre_fibnum = ifr->ifr_fib; + break; case GRESKEY: if ((error = priv_check(curthread, PRIV_NET_GRE)) != 0) break; @@ -454,7 +466,8 @@ gre_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) } break; case GREGKEY: - error = copyout(&sc->gre_key, ifr->ifr_data, sizeof(sc->gre_key)); + error = copyout(&sc->gre_key, ifr->ifr_data, + sizeof(sc->gre_key)); break; case GRESOPTS: if ((error = priv_check(curthread, PRIV_NET_GRE)) != 0) @@ -725,7 +738,7 @@ gre_input(struct mbuf **mp, int *offp, int proto) m_adj(m, *offp + hlen); m_clrprotoflags(m); m->m_pkthdr.rcvif = ifp; - M_SETFIB(m, sc->gre_fibnum); + M_SETFIB(m, ifp->if_fib); #ifdef MAC mac_ifnet_create_mbuf(ifp, m); #endif |