/[packages]/cauldron/dhcp/current/SOURCES/dhcp-4.2.2-xen-checksum.patch
ViewVC logotype

Diff of /cauldron/dhcp/current/SOURCES/dhcp-4.2.2-xen-checksum.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 636553 by pterjan, Thu Jan 17 21:30:27 2013 UTC revision 636554 by luigiwalser, Sun Jun 15 15:59:35 2014 UTC
# Line 1  Line 1 
1  diff -up dhcp-4.2.2b1/common/bpf.c.xen dhcp-4.2.2b1/common/bpf.c  diff -up dhcp-4.2.2b1/common/bpf.c.xen dhcp-4.2.2b1/common/bpf.c
2  --- dhcp-4.2.2b1/common/bpf.c.xen       2009-11-20 02:48:59.000000000 +0100  --- dhcp-4.2.2b1/common/bpf.c.xen       2009-11-20 02:48:59.000000000 +0100
3  +++ dhcp-4.2.2b1/common/bpf.c   2011-07-01 14:00:16.936959001 +0200  +++ dhcp-4.2.2b1/common/bpf.c   2011-07-01 14:00:16.936959001 +0200
4  @@ -485,7 +485,7 @@ ssize_t receive_packet (interface, buf,  @@ -481,7 +481,7 @@
5                  offset = decode_udp_ip_header (interface,                  /* Decode the IP and UDP headers... */
6                                                 interface -> rbuf,                  offset = decode_udp_ip_header(interface, interface->rbuf,
7                                                 interface -> rbuf_offset,                                                 interface->rbuf_offset,
8  -                                              from, hdr.bh_caplen, &paylen);  -                                              from, hdr.bh_caplen, &paylen);
9  +                                              from, hdr.bh_caplen, &paylen, 0);  +                                              from, hdr.bh_caplen, &paylen, 0);
10    
11                  /* If the IP or UDP checksum was bad, skip the packet... */                  /* If the IP or UDP checksum was bad, skip the packet... */
12                  if (offset < 0) {                  if (offset < 0) {
# Line 25  diff -up dhcp-4.2.2b1/common/dlpi.c.xen Line 25  diff -up dhcp-4.2.2b1/common/dlpi.c.xen
25  diff -up dhcp-4.2.2b1/common/lpf.c.xen dhcp-4.2.2b1/common/lpf.c  diff -up dhcp-4.2.2b1/common/lpf.c.xen dhcp-4.2.2b1/common/lpf.c
26  --- dhcp-4.2.2b1/common/lpf.c.xen       2011-05-10 16:38:58.000000000 +0200  --- dhcp-4.2.2b1/common/lpf.c.xen       2011-05-10 16:38:58.000000000 +0200
27  +++ dhcp-4.2.2b1/common/lpf.c   2011-07-01 14:11:24.725748028 +0200  +++ dhcp-4.2.2b1/common/lpf.c   2011-07-01 14:11:24.725748028 +0200
28  @@ -29,19 +29,33 @@  @@ -29,24 +29,38 @@
29    
30   #include "dhcpd.h"   #include "dhcpd.h"
31   #if defined (USE_LPF_SEND) || defined (USE_LPF_RECEIVE)   #if defined (USE_LPF_SEND) || defined (USE_LPF_RECEIVE)
  #include <sys/ioctl.h>  
32  +#include <sys/socket.h>  +#include <sys/socket.h>
33   #include <sys/uio.h>   #include <sys/uio.h>
34   #include <errno.h>   #include <errno.h>
# Line 42  diff -up dhcp-4.2.2b1/common/lpf.c.xen d Line 42  diff -up dhcp-4.2.2b1/common/lpf.c.xen d
42   #include "includes/netinet/ip.h"   #include "includes/netinet/ip.h"
43   #include "includes/netinet/udp.h"   #include "includes/netinet/udp.h"
44   #include "includes/netinet/if_ether.h"   #include "includes/netinet/if_ether.h"
45     #endif
46    
47     #if defined (USE_LPF_RECEIVE) || defined (USE_LPF_HWADDR)
48     #include <sys/ioctl.h>
49   #include <net/if.h>   #include <net/if.h>
50     #endif
51    
52  +#ifndef PACKET_AUXDATA  +#ifndef PACKET_AUXDATA
53  +#define PACKET_AUXDATA 8  +#define PACKET_AUXDATA 8
# Line 57  diff -up dhcp-4.2.2b1/common/lpf.c.xen d Line 62  diff -up dhcp-4.2.2b1/common/lpf.c.xen d
62  +};  +};
63  +#endif  +#endif
64  +  +
65     #if defined (USE_LPF_SEND) || defined (USE_LPF_RECEIVE)
66   /* Reinitializes the specified interface after an address change.   This   /* Reinitializes the specified interface after an address change.   This
67      is not required for packet-filter APIs. */      is not required for packet-filter APIs. */
   
68  @@ -67,10 +81,14 @@ int if_register_lpf (info)  @@ -67,10 +81,14 @@ int if_register_lpf (info)
69          struct interface_info *info;          struct interface_info *info;
70   {   {
Legend:
Removed from v.636553  
changed lines
  Added in v.636554
  ViewVC Help
Powered by ViewVC 1.1.30