d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Restore Ethernet-within-IP Encapsulation support that was broken after

Browse Source 
r273087. Move all checks from gif_output() into gif_transmit(). Previously
they were checked always, because if_start always called gif_output.
Now gif_transmit() can be called directly from if_bridge() code and we need
do checks here.

PR:		196646
MFC after:	1 week
This commit is contained in:
Andrey V. Elsukov 2015-01-10 08:28:50 +00:00
parent 47ce3e5326
commit 9c0265c6fd
1 changed files with 18 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
sys/net/if_gif.c
View File

@ -118,6 +118,7 @@ void (*ng_gif_input_orphan_p)(struct ifnet *ifp, struct mbuf *m, int af);
void (*ng_gif_attach_p)(struct ifnet *ifp); void (*ng_gif_attach_p)(struct ifnet *ifp);
void (*ng_gif_detach_p)(struct ifnet *ifp); void (*ng_gif_detach_p)(struct ifnet *ifp);
static int gif_check_nesting(struct ifnet *, struct mbuf *);
static int gif_set_tunnel(struct ifnet *, struct sockaddr *, static int gif_set_tunnel(struct ifnet *, struct sockaddr *,
struct sockaddr *); struct sockaddr *);
static void gif_delete_tunnel(struct ifnet *); static void gif_delete_tunnel(struct ifnet *);
@ -351,18 +352,32 @@ gif_transmit(struct ifnet *ifp, struct mbuf *m)
uint8_t proto, ecn; uint8_t proto, ecn;
int error; int error;
#ifdef MAC
error = mac_ifnet_check_transmit(ifp, m);
if (error) {
m_freem(m);
goto err;
}
#endif
error = ENETDOWN; error = ENETDOWN;
sc = ifp->if_softc; sc = ifp->if_softc;
if (sc->gif_family == 0) { if ((ifp->if_flags & IFF_MONITOR) != 0 ||
(ifp->if_flags & IFF_UP) == 0 ||
sc->gif_family == 0 ||
(error = gif_check_nesting(ifp, m)) != 0) {
m_freem(m); m_freem(m);
goto err; goto err;
} }
/* Now pull back the af that we stashed in the csum_data. */ /* Now pull back the af that we stashed in the csum_data. */
af = m->m_pkthdr.csum_data; if (ifp->if_bridge)
af = AF_LINK;
else
af = m->m_pkthdr.csum_data;
m->m_flags &= ~(M_BCAST|M_MCAST);
M_SETFIB(m, sc->gif_fibnum);
BPF_MTAP2(ifp, &af, sizeof(af), m); BPF_MTAP2(ifp, &af, sizeof(af), m);
if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1); if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
if_inc_counter(ifp, IFCOUNTER_OBYTES, m->m_pkthdr.len); if_inc_counter(ifp, IFCOUNTER_OBYTES, m->m_pkthdr.len);
M_SETFIB(m, sc->gif_fibnum);
/* inner AF-specific encapsulation */ /* inner AF-specific encapsulation */
ecn = 0; ecn = 0;
switch (af) { switch (af) {
@ -488,28 +503,11 @@ gif_output(struct ifnet *ifp, struct mbuf *m, const struct sockaddr *dst,
struct route *ro) struct route *ro)
{ {
uint32_t af; uint32_t af;
int error = 0;
#ifdef MAC
error = mac_ifnet_check_transmit(ifp, m);
if (error)
goto err;
#endif
if ((ifp->if_flags & IFF_MONITOR) != 0 ||
(ifp->if_flags & IFF_UP) == 0) {
error = ENETDOWN;
goto err;
}
error = gif_check_nesting(ifp, m);
if (error != 0)
goto err;
m->m_flags &= ~(M_BCAST|M_MCAST);
if (dst->sa_family == AF_UNSPEC) if (dst->sa_family == AF_UNSPEC)
bcopy(dst->sa_data, &af, sizeof(af)); bcopy(dst->sa_data, &af, sizeof(af));
else else
af = dst->sa_family; af = dst->sa_family;
if (ifp->if_bridge)
af = AF_LINK;
/* /*
* Now save the af in the inbound pkt csum data, this is a cheat since * Now save the af in the inbound pkt csum data, this is a cheat since
* we are using the inbound csum_data field to carry the af over to * we are using the inbound csum_data field to carry the af over to
@ -517,10 +515,6 @@ gif_output(struct ifnet *ifp, struct mbuf *m, const struct sockaddr *dst,
*/ */
m->m_pkthdr.csum_data = af; m->m_pkthdr.csum_data = af;
return (ifp->if_transmit(ifp, m)); return (ifp->if_transmit(ifp, m));
err:
if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
m_freem(m);
return (error);
} }
void void