8cb20bf3c8
- Remove perl Requires (#225691) - Make dhcp-devel depend on dhcp = e:v-r (#225691) - libdhcp4client-devel Requires pkgconfig (#225691) - Do not add to RPM_OPT_FLAGS, use COPTS variable instead (#225691) - Use %{buildroot} macro instead of RPM_BUILD_ROOT variable (#225691) - Preserve timestamps on all installed data files (#225691) - Remove dhcp-options.5.gz and dhcp-eval.5.gz symlinking in post (#225691) - Use %defattr(-,root,root,-) (#225691) - Do not flag init scripts as %config in %files section (#225691)
250 lines
8.1 KiB
Diff
250 lines
8.1 KiB
Diff
diff -ur dhcp-3.0.5.orig/common/bpf.c dhcp-3.0.5/common/bpf.c
|
|
--- dhcp-3.0.5.orig/common/bpf.c 2004-11-25 04:39:15.000000000 +1100
|
|
+++ dhcp-3.0.5/common/bpf.c 2007-01-10 15:39:38.000000000 +1100
|
|
@@ -478,7 +478,8 @@
|
|
interface -> rbuf,
|
|
interface -> rbuf_offset,
|
|
from,
|
|
- hdr.bh_caplen);
|
|
+ hdr.bh_caplen,
|
|
+ 0);
|
|
|
|
/* If the IP or UDP checksum was bad, skip the packet... */
|
|
if (offset < 0) {
|
|
diff -ur dhcp-3.0.5.orig/common/dlpi.c dhcp-3.0.5/common/dlpi.c
|
|
--- dhcp-3.0.5.orig/common/dlpi.c 2004-11-25 04:39:15.000000000 +1100
|
|
+++ dhcp-3.0.5/common/dlpi.c 2007-01-10 15:40:57.000000000 +1100
|
|
@@ -679,7 +679,7 @@
|
|
length -= offset;
|
|
#endif
|
|
offset = decode_udp_ip_header (interface, dbuf, bufix,
|
|
- from, length);
|
|
+ from, length, 0);
|
|
|
|
/* If the IP or UDP checksum was bad, skip the packet... */
|
|
if (offset < 0) {
|
|
diff -ur dhcp-3.0.5.orig/common/lpf.c dhcp-3.0.5/common/lpf.c
|
|
--- dhcp-3.0.5.orig/common/lpf.c 2007-01-10 15:49:04.000000000 +1100
|
|
+++ dhcp-3.0.5/common/lpf.c 2007-01-25 08:54:25.000000000 +1100
|
|
@@ -34,16 +34,31 @@
|
|
#include "dhcpd.h"
|
|
#if defined (USE_LPF_SEND) || defined (USE_LPF_RECEIVE)
|
|
#include <sys/ioctl.h>
|
|
+#include <sys/socket.h>
|
|
#include <sys/uio.h>
|
|
|
|
#include <asm/types.h>
|
|
#include <linux/filter.h>
|
|
#include <linux/if_ether.h>
|
|
+#include <linux/if_packet.h>
|
|
#include <netinet/in_systm.h>
|
|
#include "includes/netinet/ip.h"
|
|
#include "includes/netinet/udp.h"
|
|
#include "includes/netinet/if_ether.h"
|
|
|
|
+#ifndef PACKET_AUXDATA
|
|
+#define PACKET_AUXDATA 8
|
|
+
|
|
+struct tpacket_auxdata
|
|
+{
|
|
+ __u32 tp_status;
|
|
+ __u32 tp_len;
|
|
+ __u32 tp_snaplen;
|
|
+ __u16 tp_mac;
|
|
+ __u16 tp_net;
|
|
+};
|
|
+#endif
|
|
+
|
|
/* Reinitializes the specified interface after an address change. This
|
|
is not required for packet-filter APIs. */
|
|
|
|
@@ -69,10 +84,14 @@
|
|
struct interface_info *info;
|
|
{
|
|
int sock;
|
|
- struct sockaddr sa;
|
|
+ union {
|
|
+ struct sockaddr_ll ll;
|
|
+ struct sockaddr common;
|
|
+ } sa;
|
|
+ struct ifreq ifr;
|
|
|
|
/* Make an LPF socket. */
|
|
- if ((sock = socket(PF_PACKET, SOCK_PACKET,
|
|
+ if ((sock = socket(PF_PACKET, SOCK_RAW,
|
|
htons((short)ETH_P_ALL))) < 0) {
|
|
if (errno == ENOPROTOOPT || errno == EPROTONOSUPPORT ||
|
|
errno == ESOCKTNOSUPPORT || errno == EPFNOSUPPORT ||
|
|
@@ -87,11 +106,16 @@
|
|
log_fatal ("Open a socket for LPF: %m");
|
|
}
|
|
|
|
+ memset (&ifr, 0, sizeof ifr);
|
|
+ strncpy (ifr.ifr_name, (const char *)info -> ifp, sizeof ifr.ifr_name);
|
|
+ if (ioctl (sock, SIOCGIFINDEX, &ifr))
|
|
+ log_fatal ("Failed to get interface index: %m");
|
|
+
|
|
/* Bind to the interface name */
|
|
memset (&sa, 0, sizeof sa);
|
|
- sa.sa_family = AF_PACKET;
|
|
- strncpy (sa.sa_data, (const char *)info -> ifp, sizeof sa.sa_data);
|
|
- if (bind (sock, &sa, sizeof sa)) {
|
|
+ sa.ll.sll_family = AF_PACKET;
|
|
+ sa.ll.sll_ifindex = ifr.ifr_ifindex;
|
|
+ if (bind (sock, &sa.common, sizeof sa)) {
|
|
if (errno == ENOPROTOOPT || errno == EPROTONOSUPPORT ||
|
|
errno == ESOCKTNOSUPPORT || errno == EPFNOSUPPORT ||
|
|
errno == EAFNOSUPPORT || errno == EINVAL) {
|
|
@@ -171,9 +195,18 @@
|
|
void if_register_receive (info)
|
|
struct interface_info *info;
|
|
{
|
|
+ int val;
|
|
+
|
|
/* Open a LPF device and hang it on this interface... */
|
|
info -> rfdesc = if_register_lpf (info);
|
|
|
|
+ val = 1;
|
|
+ if (setsockopt (info -> rfdesc, SOL_PACKET, PACKET_AUXDATA, &val,
|
|
+ sizeof val) < 0) {
|
|
+ if (errno != ENOPROTOOPT)
|
|
+ log_fatal ("Failed to set auxiliary packet data: %m");
|
|
+ }
|
|
+
|
|
#if defined (HAVE_TR_SUPPORT)
|
|
if (info -> hw_address.hbuf [0] == HTYPE_IEEE802)
|
|
lpf_tr_filter_setup (info);
|
|
@@ -292,7 +325,6 @@
|
|
double hh [16];
|
|
double ih [1536 / sizeof (double)];
|
|
unsigned char *buf = (unsigned char *)ih;
|
|
- struct sockaddr sa;
|
|
int result;
|
|
int fudge;
|
|
|
|
@@ -310,15 +342,7 @@
|
|
(unsigned char *)raw, len);
|
|
memcpy (buf + ibufp, raw, len);
|
|
|
|
- /* For some reason, SOCK_PACKET sockets can't be connected,
|
|
- so we have to do a sentdo every time. */
|
|
- memset (&sa, 0, sizeof sa);
|
|
- sa.sa_family = AF_PACKET;
|
|
- strncpy (sa.sa_data,
|
|
- (const char *)interface -> ifp, sizeof sa.sa_data);
|
|
-
|
|
- result = sendto (interface -> wfdesc,
|
|
- buf + fudge, ibufp + len - fudge, 0, &sa, sizeof sa);
|
|
+ result = write (interface -> wfdesc, buf + fudge, ibufp + len - fudge);
|
|
if (result < 0)
|
|
log_error ("send_packet: %m");
|
|
return result;
|
|
@@ -335,13 +359,34 @@
|
|
{
|
|
int length = 0;
|
|
int offset = 0;
|
|
+ int nocsum = 0;
|
|
unsigned char ibuf [1536];
|
|
unsigned bufix = 0;
|
|
+ unsigned char cmsgbuf[CMSG_LEN(sizeof(struct tpacket_auxdata))];
|
|
+ struct iovec iov = {
|
|
+ .iov_base = ibuf,
|
|
+ .iov_len = sizeof ibuf,
|
|
+ };
|
|
+ struct msghdr msg = {
|
|
+ .msg_iov = &iov,
|
|
+ .msg_iovlen = 1,
|
|
+ .msg_control = cmsgbuf,
|
|
+ .msg_controllen = sizeof(cmsgbuf),
|
|
+ };
|
|
+ struct cmsghdr *cmsg;
|
|
|
|
- length = read (interface -> rfdesc, ibuf, sizeof ibuf);
|
|
+ length = recvmsg (interface -> rfdesc, &msg, 0);
|
|
if (length <= 0)
|
|
return length;
|
|
|
|
+ for (cmsg = CMSG_FIRSTHDR(&msg); cmsg; cmsg = CMSG_NXTHDR(&msg, cmsg)) {
|
|
+ if (cmsg->cmsg_level == SOL_PACKET &&
|
|
+ cmsg->cmsg_type == PACKET_AUXDATA) {
|
|
+ struct tpacket_auxdata *aux = (void *)CMSG_DATA(cmsg);
|
|
+ nocsum = aux->tp_status & TP_STATUS_CSUMNOTREADY;
|
|
+ }
|
|
+ }
|
|
+
|
|
bufix = 0;
|
|
/* Decode the physical header... */
|
|
offset = decode_hw_header (interface, ibuf, bufix, hfrom);
|
|
@@ -358,7 +403,7 @@
|
|
|
|
/* Decode the IP and UDP headers... */
|
|
offset = decode_udp_ip_header (interface, ibuf, bufix, from,
|
|
- (unsigned)length);
|
|
+ (unsigned)length, nocsum);
|
|
|
|
/* If the IP or UDP checksum was bad, skip the packet... */
|
|
if (offset < 0)
|
|
diff -ur dhcp-3.0.5.orig/common/nit.c dhcp-3.0.5/common/nit.c
|
|
--- dhcp-3.0.5.orig/common/nit.c 2004-11-25 04:39:15.000000000 +1100
|
|
+++ dhcp-3.0.5/common/nit.c 2007-01-10 15:39:47.000000000 +1100
|
|
@@ -370,7 +370,7 @@
|
|
|
|
/* Decode the IP and UDP headers... */
|
|
offset = decode_udp_ip_header (interface, ibuf, bufix,
|
|
- from, length);
|
|
+ from, length, 0);
|
|
|
|
/* If the IP or UDP checksum was bad, skip the packet... */
|
|
if (offset < 0)
|
|
diff -ur dhcp-3.0.5.orig/common/packet.c dhcp-3.0.5/common/packet.c
|
|
--- dhcp-3.0.5.orig/common/packet.c 2007-01-10 15:49:04.000000000 +1100
|
|
+++ dhcp-3.0.5/common/packet.c 2007-01-10 15:40:47.000000000 +1100
|
|
@@ -211,12 +211,13 @@
|
|
|
|
/* UDP header and IP header decoded together for convenience. */
|
|
|
|
-ssize_t decode_udp_ip_header (interface, buf, bufix, from, buflen)
|
|
+ssize_t decode_udp_ip_header (interface, buf, bufix, from, buflen, nocsum)
|
|
struct interface_info *interface;
|
|
unsigned char *buf;
|
|
unsigned bufix;
|
|
struct sockaddr_in *from;
|
|
unsigned buflen;
|
|
+ int nocsum;
|
|
{
|
|
unsigned char *data;
|
|
struct ip ip;
|
|
@@ -319,7 +320,7 @@
|
|
(u_int32_t)ulen))));
|
|
|
|
udp_packets_seen++;
|
|
- if (usum && usum != sum) {
|
|
+ if (!nocsum && usum && usum != sum) {
|
|
udp_packets_bad_checksum++;
|
|
if (udp_packets_seen > 4 &&
|
|
(udp_packets_seen / udp_packets_bad_checksum) < 2) {
|
|
diff -ur dhcp-3.0.5.orig/common/upf.c dhcp-3.0.5/common/upf.c
|
|
--- dhcp-3.0.5.orig/common/upf.c 2004-11-25 04:39:16.000000000 +1100
|
|
+++ dhcp-3.0.5/common/upf.c 2007-01-10 15:39:59.000000000 +1100
|
|
@@ -321,7 +321,7 @@
|
|
|
|
/* Decode the IP and UDP headers... */
|
|
offset = decode_udp_ip_header (interface, ibuf, bufix,
|
|
- from, length);
|
|
+ from, length, 0);
|
|
|
|
/* If the IP or UDP checksum was bad, skip the packet... */
|
|
if (offset < 0)
|
|
diff -ur dhcp-3.0.5.orig/includes/dhcpd.h dhcp-3.0.5/includes/dhcpd.h
|
|
--- dhcp-3.0.5.orig/includes/dhcpd.h 2007-01-10 15:49:04.000000000 +1100
|
|
+++ dhcp-3.0.5/includes/dhcpd.h 2007-01-10 15:41:08.000000000 +1100
|
|
@@ -1948,7 +1948,7 @@
|
|
unsigned, struct hardware *));
|
|
ssize_t decode_udp_ip_header PROTO ((struct interface_info *, unsigned char *,
|
|
unsigned, struct sockaddr_in *,
|
|
- unsigned));
|
|
+ unsigned, int));
|
|
|
|
/* ethernet.c */
|
|
void assemble_ethernet_header PROTO ((struct interface_info *, unsigned char *,
|