Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Where mbuf data may be read-only/shared, use mtod(m, const ...).

Browse Source 
Annotate a comparison and m_pullup() that seem unnecessary.
This commit is contained in:
dyoung 2006-07-28 16:30:55 +00:00
parent 788c34d9d0
commit ae0b3d534e
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sys/netinet/in_gif.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: in_gif.c,v 1.47 2006/06/07 22:34:00 kardel Exp $ */ /* $NetBSD: in_gif.c,v 1.48 2006/07/28 16:30:55 dyoung Exp $ */
/* $KAME: in_gif.c,v 1.66 2001/07/29 04:46:09 itojun Exp $ */ /* $KAME: in_gif.c,v 1.66 2001/07/29 04:46:09 itojun Exp $ */
/* /*
@ -31,7 +31,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: in_gif.c,v 1.47 2006/06/07 22:34:00 kardel Exp $"); __KERNEL_RCSID(0, "$NetBSD: in_gif.c,v 1.48 2006/07/28 16:30:55 dyoung Exp $");
#include "opt_inet.h" #include "opt_inet.h"
#include "opt_iso.h" #include "opt_iso.h"
@ -114,7 +114,7 @@ in_gif_output(struct ifnet *ifp, int family, struct mbuf *m)
#ifdef INET #ifdef INET
case AF_INET: case AF_INET:
{ {
struct ip *ip; const struct ip *ip;
proto = IPPROTO_IPV4; proto = IPPROTO_IPV4;
if (m->m_len < sizeof(*ip)) { if (m->m_len < sizeof(*ip)) {
@ -122,7 +122,7 @@ in_gif_output(struct ifnet *ifp, int family, struct mbuf *m)
if (!m) if (!m)
return ENOBUFS; return ENOBUFS;
} }
ip = mtod(m, struct ip *); ip = mtod(m, const struct ip *);
tos = ip->ip_tos; tos = ip->ip_tos;
break; break;
} }
@ -130,14 +130,14 @@ in_gif_output(struct ifnet *ifp, int family, struct mbuf *m)
#ifdef INET6 #ifdef INET6
case AF_INET6: case AF_INET6:
{ {
struct ip6_hdr *ip6; const struct ip6_hdr *ip6;
proto = IPPROTO_IPV6; proto = IPPROTO_IPV6;
if (m->m_len < sizeof(*ip6)) { if (m->m_len < sizeof(*ip6)) {
m = m_pullup(m, sizeof(*ip6)); m = m_pullup(m, sizeof(*ip6));
if (!m) if (!m)
return ENOBUFS; return ENOBUFS;
} }
ip6 = mtod(m, struct ip6_hdr *); ip6 = mtod(m, const struct ip6_hdr *);
tos = (ntohl(ip6->ip6_flow) >> 20) & 0xff; tos = (ntohl(ip6->ip6_flow) >> 20) & 0xff;
break; break;
} }
@ -191,6 +191,7 @@ in_gif_output(struct ifnet *ifp, int family, struct mbuf *m)
/* prepend new IP header */ /* prepend new IP header */
M_PREPEND(m, sizeof(struct ip), M_DONTWAIT); M_PREPEND(m, sizeof(struct ip), M_DONTWAIT);
/* XXX Is m_pullup really necessary after M_PREPEND? */
if (m && m->m_len < sizeof(struct ip)) if (m && m->m_len < sizeof(struct ip))
m = m_pullup(m, sizeof(struct ip)); m = m_pullup(m, sizeof(struct ip));
if (m == NULL) if (m == NULL)