KekenoBSD/src
3
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Remove NetBSD'isms (add FreeBSD'isms?), which makes gre(4) working again.

Browse Source
This commit is contained in:
Maxim Sobolev
2004-01-30 09:03:01 +00:00
parent 9148fa21dd
commit 4c83789253
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sys/net/if_gre.c
+2 -3
View File
@@ -351,8 +351,7 @@ gre_output(struct ifnet *ifp, struct mbuf *m, struct sockaddr *dst,
gh = mtod(m, struct greip *); gh = mtod(m, struct greip *);
if (sc->g_proto == IPPROTO_GRE) { if (sc->g_proto == IPPROTO_GRE) {
/* we don't have any GRE flags for now */ /* we don't have any GRE flags for now */
memset((void *)gh, 0, sizeof(struct greip));
memset((void *)&gh->gi_g, 0, sizeof(struct gre_h));
gh->gi_ptype = htons(etype); gh->gi_ptype = htons(etype);
} }
@@ -364,7 +363,7 @@ gre_output(struct ifnet *ifp, struct mbuf *m, struct sockaddr *dst,
((struct ip*)gh)->ip_ttl = GRE_TTL; ((struct ip*)gh)->ip_ttl = GRE_TTL;
((struct ip*)gh)->ip_tos = ip->ip_tos; ((struct ip*)gh)->ip_tos = ip->ip_tos;
((struct ip*)gh)->ip_id = ip->ip_id; ((struct ip*)gh)->ip_id = ip->ip_id;
gh->gi_len = htons(m->m_pkthdr.len); gh->gi_len = m->m_pkthdr.len;
} }
ifp->if_opackets++; ifp->if_opackets++;
sys/netinet/ip_gre.c
+1 -1
View File
@@ -204,8 +204,8 @@ gre_input2(struct mbuf *m ,int hlen, u_char proto)
m_freem(m); m_freem(m);
return (EINVAL); return (EINVAL);
} }
/* Unlike NetBSD, in FreeBSD m_adj() adjusts m->m_pkthdr.len as well */
m_adj(m, hlen); m_adj(m, hlen);
m->m_pkthdr.len -= hlen;
if (sc->sc_if.if_bpf) { if (sc->sc_if.if_bpf) {
u_int32_t af = AF_INET; u_int32_t af = AF_INET;