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

Correct a cast to make it compile on 64bit platforms (noticed by tinderbox)

Browse Source 
and remove two unneccessary variable initializations.
Make the introduction comment more clear with regard which parts of
the packet are touched.

Requested by:	luigi
This commit is contained in:
andre 2003-11-15 17:03:37 +00:00
parent 91fb8e3f9c
commit ccae1a80af
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sys/netinet/ip_fastfwd.c
View File

@ -36,8 +36,10 @@
* driver calls ip_fastforward, we do our routing table lookup and directly
* send it off to the outgoing interface which DMAs the packet to the
* network card. The only part of the packet we touch with the CPU is the
* IP header. We are essentially limited by bus bandwidth and how fast the
* network card/driver can set up receives and transmits.
* IP header (unless there are complex firewall rules touching other parts
* of the packet, but that is up to you). We are essentially limited by bus
* bandwidth and how fast the network card/driver can set up receives and
* transmits.
*
* We handle basic errors, ip header errors, checksum errors,
* destination unreachable, fragmentation and fragmentation needed and
@ -344,7 +346,6 @@ ip_fastforward(struct mbuf *m)
if (fw_enable && IPFW_LOADED) {
bzero(&args, sizeof(args));
args.m = m;
ipfw = 0;
ipfw = ip_fw_chk_ptr(&args);
m = args.m;
@ -528,10 +529,9 @@ ip_fastforward(struct mbuf *m)
dest = ip->ip_dst.s_addr;
#endif
if (fw_enable && IPFW_LOADED && !args.next_hop) {
bzero(&args, sizeof(args));
bzero(&args, sizeof(args));
args.m = m;
args.oif = ifp;
ipfw = 0;
ipfw = ip_fw_chk_ptr(&args);
m = args.m;
@ -567,7 +567,7 @@ ip_fastforward(struct mbuf *m)
goto drop;
}
tag->m_flags = PACKET_TAG_DIVERT;
tag->m_data = (caddr_t)(u_int32_t)args.divert_rule;
tag->m_data = (caddr_t)(u_long)args.divert_rule;
tag->m_next = m;
/* XXX: really bloody hack, see ip_input */
tag->m_nextpkt = (struct mbuf *)1;