rpms/dhcp/FC-3 dhcp-3.0-alignment.patch,1.1,1.1.2.1

[fedora-cvs-commits at redhat.com]

Author: jvdias

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

Modified Files:
      Tag: dhcp-3_0_3-4_FC3
	dhcp-3.0-alignment.patch 
Log Message:


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/FC-3/dhcp-3.0-alignment.patch,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- dhcp-3.0-alignment.patch	9 Sep 2004 04:11:53 -0000	1.1
+++ dhcp-3.0-alignment.patch	29 Aug 2005 23:41:28 -0000	1.1.2.1
@@ -1,24 +1,20 @@
---- dhcp-3.0pl1/common/packet.c.sopwith	2002-07-12 16:41:48.000000000 -0400
-+++ dhcp-3.0pl1/common/packet.c	2002-07-12 17:45:52.000000000 -0400
-@@ -227,8 +227,8 @@
- 	unsigned char *data;
- 	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 @@
  {
--  struct ip *ip;
+   unsigned char *data;
+   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;
-@@ -241,8 +241,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? */