rpms/dhcp/devel dhcp-3.0-alignment.patch,1.2,1.3

[fedora-cvs-commits redhat com]

Author: jvdias

Update of /cvs/dist/rpms/dhcp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29507

Modified Files:
	dhcp-3.0-alignment.patch 
Log Message:
Upgrade to upstream version 3.0.3rc1

dhcp-3.0-alignment.patch:
 packet.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

Index: dhcp-3.0-alignment.patch
===================================================================
RCS file: /cvs/dist/rpms/dhcp/devel/dhcp-3.0-alignment.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- dhcp-3.0-alignment.patch	7 Jan 2005 00:06:41 -0000	1.2
+++ dhcp-3.0-alignment.patch	14 Jul 2005 16:52:09 -0000	1.3
@@ -1,24 +1,20 @@
---- dhcp-3.0.2/common/packet.c.alignment	2004-11-24 12:39:16.000000000 -0500
-+++ dhcp-3.0.2/common/packet.c	2005-01-06 17:51:43.435187000 -0500
-@@ -218,8 +218,8 @@
- 	unsigned buflen;
+--- dhcp-3.0.3rc1/common/packet.c.alignment	2005-03-03 11:55:23.000000000 -0500
++++ dhcp-3.0.3rc1/common/packet.c	2005-07-14 12:44:34.000000000 -0400
+@@ -219,7 +219,7 @@
  {
    unsigned char *data;
--  struct ip *ip;
+   struct ip ip;
 -  struct udphdr *udp;
-+  struct ip ipdat, *ip=&ipdat;
-+  struct udphdr udpdat, *udp=&udpdat;
++  struct udphdr udph, *udp=&udph;
    u_int32_t ip_len = (buf [bufix] & 0xf) << 2;
    u_int32_t sum, usum;
    static int ip_packets_seen;
-@@ -232,8 +232,8 @@
-   unsigned ulen;
+@@ -233,7 +233,7 @@
    int ignore = 0;
  
--  ip = (struct ip *)(buf + bufix);
+   memcpy(&ip, buf + bufix, sizeof (struct ip));
 -  udp = (struct udphdr *)(buf + bufix + ip_len);
-+  memcpy(ip, (struct ip *)(buf + bufix), sizeof(ipdat));
-+  memcpy(udp, (struct udphdr *)(buf + bufix + ip_len), sizeof(udpdat));
++  memcpy(udp, buf + bufix + ip_len, sizeof(struct udphdr));
  
  #ifdef USERLAND_FILTER
    /* Is it a UDP packet? */