/*
- * Copyright (c) 2008, 2009 Nicira Networks.
+ * Copyright (c) 2008, 2009, 2010 Nicira Networks.
*
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
*
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
#include <config.h>
#include "csum.h"
+#include "unaligned.h"
/* Returns the IP checksum of the 'n' bytes in 'data'.
*
{
const uint16_t *data = data_;
- for (; n > 1; n -= 2) {
- partial = csum_add16(partial, *data++);
+ for (; n > 1; n -= 2, data++) {
+ partial = csum_add16(partial, get_unaligned_u16(data));
}
if (n) {
partial += *(uint8_t *) data;
uint16_t
csum_finish(uint32_t partial)
{
- return ~((partial & 0xffff) + (partial >> 16));
+ while (partial >> 16) {
+ partial = (partial & 0xffff) + (partial >> 16);
+ }
+ return ~partial;
}
/* Returns the new checksum for a packet in which the checksum field previously
uint16_t m_complement = ~old_u16;
uint16_t m_prime = new_u16;
uint32_t sum = hc_complement + m_complement + m_prime;
- uint16_t hc_prime_complement = sum + (sum >> 16);
- return ~hc_prime_complement;
+ return csum_finish(sum);
}
/* Returns the new checksum for a packet in which the checksum field previously