: Convert udp conntrack protocol to skb_header_pointer

This patch converts the remaining parts of the udp conntrack protocol to skb_header_pointer. Most was already done, but the conntrack error API patch added a couple of new skb_copy_bits calls.

# This is a BitKeeper generated diff -Nru style patch. #
# ChangeSet
# 2004/09/26 23:18:51+02:00 [email protected]
# [NETFILTER]: Convert udp conntrack protocol to skb_header_pointer
#
# Signed-off-by: Patrick McHardy <[email protected]>
#

# net/ipv4/netfilter/ip_conntrack_proto_udp.c
#   2004/09/26 23:18:26+02:00 [email protected] +5 -4
#   [NETFILTER]: Convert udp conntrack protocol to skb_header_pointer
#   
#   Signed-off-by: Patrick McHardy <[email protected]>
# 
diff -Nru a/net/ipv4/netfilter/ip_conntrack_proto_udp.c b/net/ipv4/netfilter/ip_conntrack_proto_udp.c
--- a/net/ipv4/netfilter/ip_conntrack_proto_udp.c	2004-09-26 23:23:20 +02:00
+++ b/net/ipv4/netfilter/ip_conntrack_proto_udp.c	2004-09-26 23:23:20 +02:00
@@ -91,10 +91,11 @@
 {
 	struct iphdr *iph = skb->nh.iph;
 	unsigned int udplen = skb->len - iph->ihl * 4;
-	struct udphdr hdr;
+	struct udphdr _hdr, *hdr;

/* Header is too small? */
- if (skb_copy_bits(skb, iph->ihl*4, &hdr, sizeof(hdr)) != 0) {
+ hdr = skb_header_pointer(skb, iph->ihl*4, sizeof(_hdr), &_hdr);
+ if (hdr == NULL) {
if (LOG_INVALID(IPPROTO_UDP))
nf_log_packet(PF_INET, 0, skb, NULL, NULL,
"ip_ct_udp: short packet ");
@@ -102,7 +103,7 @@
}

/* Truncated/malformed packets */
- if (ntohs(hdr.len) > udplen || ntohs(hdr.len) < sizeof(hdr)) {
+ if (ntohs(hdr->len) > udplen || ntohs(hdr->len) < sizeof(*hdr)) {
if (LOG_INVALID(IPPROTO_UDP))
nf_log_packet(PF_INET, 0, skb, NULL, NULL,
"ip_ct_udp: truncated/malformed packet ");
@@ -110,7 +111,7 @@
}

/* Packet with no checksum */
- if (!hdr.check)
+ if (!hdr->check)
return NF_ACCEPT;

/* Checksum invalid? Ignore.