along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- $Id: route.c,v 1.1.2.47 2003/03/29 21:51:21 guus Exp $
+ $Id: route.c,v 1.1.2.49 2003/03/29 22:11:22 guus Exp $
*/
#include "config.h"
uint16_t *p = data;
uint32_t checksum = prevsum ^ 0xFFFF;
- len /= 2;
-
- while(len--)
+ while(len >= 2) {
checksum += *p++;
+ len -= 2;
+ }
+
+ if(len)
+ checksum += *(unsigned char *)p;
while(checksum >> 16)
checksum = (checksum & 0xFFFF) + (checksum >> 16);
/* Remember original source and destination */
- memcpy(&pseudo.ip6_src, &hdr->ip6_src, 16);
- memcpy(&pseudo.ip6_dst, &hdr->ip6_dst, 16);
+ memcpy(&pseudo.ip6_src, &hdr->ip6_dst, 16);
+ memcpy(&pseudo.ip6_dst, &hdr->ip6_src, 16);
pseudo.length = ntohs(hdr->ip6_plen) + sizeof(*hdr);
if(pseudo.length >= IP_MSS - sizeof(*hdr) - sizeof(*icmp))
hdr->ip6_plen = htons(sizeof(*icmp) + pseudo.length);
hdr->ip6_nxt = IPPROTO_ICMPV6;
hdr->ip6_hlim = 255;
- memcpy(&hdr->ip6_dst, &pseudo.ip6_src, 16);
- memcpy(&hdr->ip6_src, &pseudo.ip6_dst, 16);
+ memcpy(&hdr->ip6_dst, &pseudo.ip6_dst, 16);
+ memcpy(&hdr->ip6_src, &pseudo.ip6_src, 16);
/* Fill in ICMP header */
/* Create pseudo header */
- memcpy(&pseudo.ip6_src, &hdr->ip6_src, 16);
- memcpy(&pseudo.ip6_dst, &hdr->ip6_dst, 16);
pseudo.length = htonl(sizeof(*icmp) + pseudo.length);
pseudo.next = htonl(IPPROTO_ICMPV6);