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

Don't strip header from packets before input routine is called.

Browse Source
This commit is contained in:
mdodd 2003-03-15 23:08:40 +00:00
parent 08b4bf73c6
commit 30a8fe52b5
2 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
sys/net/if_iso88025subr.c
View File

@ -420,13 +420,22 @@ iso88025_output(ifp, m, dst, rt0)
* ISO 88025 de-encapsulation
*/
void
iso88025_input(ifp, th, m)
iso88025_input(ifp, m)
struct ifnet *ifp;
struct iso88025_header *th;
struct mbuf *m;
{
int isr;
struct iso88025_header *th;
struct llc *l;
int isr;
int mac_hdr_len;
m = m_pullup(m, ISO88025_HDR_LEN);
if (m == NULL) {
ifp->if_ierrors++;
goto dropanyway;
}
th = mtod(m, struct iso88025_header *);
m->m_pkthdr.header = (void *)th;
/*
* Discard packet if interface is not up.
@ -441,7 +450,7 @@ iso88025_input(ifp, th, m)
/*
* Update interface statistics.
*/
ifp->if_ibytes += m->m_pkthdr.len + sizeof(*th);
ifp->if_ibytes += m->m_pkthdr.len;
getmicrotime(&ifp->if_lastchange);
/*
@ -466,6 +475,19 @@ iso88025_input(ifp, th, m)
ifp->if_imcasts++;
}
mac_hdr_len = ISO88025_HDR_LEN;
/* Check for source routing info */
if (th->iso88025_shost[0] & TR_RII)
mac_hdr_len += TR_RCF_RIFLEN(th->rcf);
/* Strip off ISO88025 header. */
m_adj(m, mac_hdr_len);
m = m_pullup(m, LLC_SNAPFRAMELEN);
if (m == 0) {
ifp->if_ierrors++;
goto dropanyway;
}
l = mtod(m, struct llc *);
switch (l->llc_dsap) {

3
sys/net/iso88025.h
View File

@ -139,7 +139,6 @@ void iso88025_ifdetach (struct ifnet *, int);
int iso88025_ioctl (struct ifnet *, int , caddr_t );
int iso88025_output (struct ifnet *, struct mbuf *, struct sockaddr *,
struct rtentry *);
void iso88025_input (struct ifnet *, struct iso88025_header *,
struct mbuf *);
void iso88025_input (struct ifnet *, struct mbuf *);
#endif