X-Git-Url: https://git.saurik.com/apple/network_cmds.git/blobdiff_plain/b7080c8e96625177072137d504eb8e9c9d748e49..9dc66a05cc4adb91b19bae0373afae7fac34ede8:/alias/alias_util.c

diff --git a/alias/alias_util.c b/alias/alias_util.c
index fe07653..28ea257 100644
--- a/alias/alias_util.c
+++ b/alias/alias_util.c
@@ -1,5 +1,55 @@
 /*
-    Alias_util.h contains general utilities used by other functions
+ * Copyright (c) 2000-2002 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
+ * 
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+/*-
+ * Copyright (c) 2001 Charles Mott <cmott@scientech.com>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * Based upon:
+ * $FreeBSD: src/lib/libalias/alias_util.c,v 1.4.2.2 2001/06/04 14:59:06 brian Exp $
+ */
+
+/*
+    Alias_util.c contains general utilities used by other functions
     in the packet aliasing module.  At the moment, there are functions
     for computing IP header and TCP packet checksums.
 
@@ -15,7 +65,7 @@
 
 /*
 Note: the checksum routines assume that the actual checksum word has
-been zeroed out.  If the checksum workd is filled with the proper value,
+been zeroed out.  If the checksum word is filled with the proper value,
 then these routines will give a result of zero (useful for testing
 purposes);
 */
@@ -43,7 +93,8 @@ PacketAliasInternetChecksum(u_short *ptr, int nbytes)
     if (nbytes == 1)
     {
         oddbyte = 0;
-        *((u_char *) &oddbyte) = *(u_char *) ptr;
+        ((u_char *) &oddbyte)[0] = *(u_char *) ptr;
+        ((u_char *) &oddbyte)[1] = 0;
         sum += oddbyte;
     }
     sum = (sum >> 16) + (sum & 0xffff);
@@ -84,7 +135,8 @@ TcpChecksum(struct ip *pip)
     if (nbytes == 1)
     {
         oddbyte = 0;
-        *((u_char *) &oddbyte) = *(u_char *) ptr;
+        ((u_char *) &oddbyte)[0] = *(u_char *) ptr;
+        ((u_char *) &oddbyte)[1] = 0;
         sum += oddbyte;
     }