From patchwork Thu Oct 22 16:49:03 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark McLoughlin X-Patchwork-Id: 36720 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 850D4B7BB0 for ; Fri, 23 Oct 2009 04:39:11 +1100 (EST) Received: from localhost ([127.0.0.1]:52073 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1N11cv-0006dj-9y for incoming@patchwork.ozlabs.org; Thu, 22 Oct 2009 13:39:05 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1N10si-0006Gg-AH for qemu-devel@nongnu.org; Thu, 22 Oct 2009 12:51:20 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1N10sa-00066N-H4 for qemu-devel@nongnu.org; Thu, 22 Oct 2009 12:51:17 -0400 Received: from [199.232.76.173] (port=54103 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1N10sa-00065f-9c for qemu-devel@nongnu.org; Thu, 22 Oct 2009 12:51:12 -0400 Received: from mx1.redhat.com ([209.132.183.28]:57303) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1N10sY-000428-M3 for qemu-devel@nongnu.org; Thu, 22 Oct 2009 12:51:11 -0400 Received: from int-mx03.intmail.prod.int.phx2.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n9MGp9aE009212 for ; Thu, 22 Oct 2009 12:51:09 -0400 Received: from blaa.localdomain (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx03.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id n9MGp8xP019911; Thu, 22 Oct 2009 12:51:08 -0400 Received: by blaa.localdomain (Postfix, from userid 500) id 02FC35A25D; Thu, 22 Oct 2009 17:49:17 +0100 (IST) From: Mark McLoughlin To: qemu-devel@nongnu.org Date: Thu, 22 Oct 2009 17:49:03 +0100 Message-Id: <1256230156-29652-3-git-send-email-markmc@redhat.com> In-Reply-To: <1256230156-29652-1-git-send-email-markmc@redhat.com> References: <1256230156-29652-1-git-send-email-markmc@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.16 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: Mark McLoughlin Subject: [Qemu-devel] [PATCH 02/15] net: move net-checksum.c under net/ X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Also add a new net/checksum.h header Signed-off-by: Mark McLoughlin --- Makefile | 4 +- hw/e1000.c | 1 + hw/virtio-net.c | 1 + hw/xen_nic.c | 1 + net-checksum.c | 86 ------------------------------------------------------- net.h | 7 ---- net/checksum.c | 85 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ net/checksum.h | 29 ++++++++++++++++++ 8 files changed, 119 insertions(+), 95 deletions(-) delete mode 100644 net-checksum.c create mode 100644 net/checksum.c create mode 100644 net/checksum.h diff --git a/Makefile b/Makefile index 6fb89fb..c8c0b18 100644 --- a/Makefile +++ b/Makefile @@ -87,7 +87,7 @@ block-nested-$(CONFIG_CURL) += curl.o block-obj-y += $(addprefix block/, $(block-nested-y)) net-obj-y = net.o -net-nested-y = queue.o +net-nested-y = queue.o checksum.o net-obj-y += $(addprefix net/, $(net-nested-y)) ###################################################################### @@ -126,7 +126,7 @@ obj-$(CONFIG_SD) += sd.o obj-y += bt.o bt-host.o bt-vhci.o bt-l2cap.o bt-sdp.o bt-hci.o bt-hid.o usb-bt.o obj-y += bt-hci-csr.o obj-y += buffered_file.o migration.o migration-tcp.o qemu-sockets.o -obj-y += qemu-char.o aio.o net-checksum.o savevm.o +obj-y += qemu-char.o aio.o savevm.o obj-y += msmouse.o ps2.o obj-y += qdev.o qdev-properties.o obj-y += qint.o qstring.o qdict.o qlist.o qemu-config.o diff --git a/hw/e1000.c b/hw/e1000.c index f123bda..bf753f2 100644 --- a/hw/e1000.c +++ b/hw/e1000.c @@ -25,6 +25,7 @@ #include "hw.h" #include "pci.h" #include "net.h" +#include "net/checksum.h" #include "e1000_hw.h" diff --git a/hw/virtio-net.c b/hw/virtio-net.c index 15b6f45..9e0acaf 100644 --- a/hw/virtio-net.c +++ b/hw/virtio-net.c @@ -13,6 +13,7 @@ #include "virtio.h" #include "net.h" +#include "net/checksum.h" #include "qemu-timer.h" #include "virtio-net.h" diff --git a/hw/xen_nic.c b/hw/xen_nic.c index 75599d6..bcf161c 100644 --- a/hw/xen_nic.c +++ b/hw/xen_nic.c @@ -40,6 +40,7 @@ #include "hw.h" #include "net.h" +#include "net/checksum.h" #include "qemu-char.h" #include "xen_backend.h" diff --git a/net-checksum.c b/net-checksum.c deleted file mode 100644 index 4956c5c..0000000 --- a/net-checksum.c +++ /dev/null @@ -1,86 +0,0 @@ -/* - * IP checksumming functions. - * (c) 2008 Gerd Hoffmann - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; under version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, see . - */ - -#include "hw/hw.h" -#include "net.h" - -#define PROTO_TCP 6 -#define PROTO_UDP 17 - -uint32_t net_checksum_add(int len, uint8_t *buf) -{ - uint32_t sum = 0; - int i; - - for (i = 0; i < len; i++) { - if (i & 1) - sum += (uint32_t)buf[i]; - else - sum += (uint32_t)buf[i] << 8; - } - return sum; -} - -uint16_t net_checksum_finish(uint32_t sum) -{ - while (sum>>16) - sum = (sum & 0xFFFF)+(sum >> 16); - return ~sum; -} - -uint16_t net_checksum_tcpudp(uint16_t length, uint16_t proto, - uint8_t *addrs, uint8_t *buf) -{ - uint32_t sum = 0; - - sum += net_checksum_add(length, buf); // payload - sum += net_checksum_add(8, addrs); // src + dst address - sum += proto + length; // protocol & length - return net_checksum_finish(sum); -} - -void net_checksum_calculate(uint8_t *data, int length) -{ - int hlen, plen, proto, csum_offset; - uint16_t csum; - - if ((data[14] & 0xf0) != 0x40) - return; /* not IPv4 */ - hlen = (data[14] & 0x0f) * 4; - plen = (data[16] << 8 | data[17]) - hlen; - proto = data[23]; - - switch (proto) { - case PROTO_TCP: - csum_offset = 16; - break; - case PROTO_UDP: - csum_offset = 6; - break; - default: - return; - } - - if (plen < csum_offset+2) - return; - - data[14+hlen+csum_offset] = 0; - data[14+hlen+csum_offset+1] = 0; - csum = net_checksum_tcpudp(plen, proto, data+14+12, data+14+hlen); - data[14+hlen+csum_offset] = csum >> 8; - data[14+hlen+csum_offset+1] = csum & 0xff; -} diff --git a/net.h b/net.h index 9ebb978..86eb200 100644 --- a/net.h +++ b/net.h @@ -128,13 +128,6 @@ struct HCIInfo { struct HCIInfo *qemu_next_hci(void); -/* checksumming functions (net-checksum.c) */ -uint32_t net_checksum_add(int len, uint8_t *buf); -uint16_t net_checksum_finish(uint32_t sum); -uint16_t net_checksum_tcpudp(uint16_t length, uint16_t proto, - uint8_t *addrs, uint8_t *buf); -void net_checksum_calculate(uint8_t *data, int length); - /* from net.c */ extern const char *legacy_tftp_prefix; extern const char *legacy_bootp_filename; diff --git a/net/checksum.c b/net/checksum.c new file mode 100644 index 0000000..4046932 --- /dev/null +++ b/net/checksum.c @@ -0,0 +1,85 @@ +/* + * IP checksumming functions. + * (c) 2008 Gerd Hoffmann + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; under version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see . + */ + +#include "net/checksum.h" + +#define PROTO_TCP 6 +#define PROTO_UDP 17 + +uint32_t net_checksum_add(int len, uint8_t *buf) +{ + uint32_t sum = 0; + int i; + + for (i = 0; i < len; i++) { + if (i & 1) + sum += (uint32_t)buf[i]; + else + sum += (uint32_t)buf[i] << 8; + } + return sum; +} + +uint16_t net_checksum_finish(uint32_t sum) +{ + while (sum>>16) + sum = (sum & 0xFFFF)+(sum >> 16); + return ~sum; +} + +uint16_t net_checksum_tcpudp(uint16_t length, uint16_t proto, + uint8_t *addrs, uint8_t *buf) +{ + uint32_t sum = 0; + + sum += net_checksum_add(length, buf); // payload + sum += net_checksum_add(8, addrs); // src + dst address + sum += proto + length; // protocol & length + return net_checksum_finish(sum); +} + +void net_checksum_calculate(uint8_t *data, int length) +{ + int hlen, plen, proto, csum_offset; + uint16_t csum; + + if ((data[14] & 0xf0) != 0x40) + return; /* not IPv4 */ + hlen = (data[14] & 0x0f) * 4; + plen = (data[16] << 8 | data[17]) - hlen; + proto = data[23]; + + switch (proto) { + case PROTO_TCP: + csum_offset = 16; + break; + case PROTO_UDP: + csum_offset = 6; + break; + default: + return; + } + + if (plen < csum_offset+2) + return; + + data[14+hlen+csum_offset] = 0; + data[14+hlen+csum_offset+1] = 0; + csum = net_checksum_tcpudp(plen, proto, data+14+12, data+14+hlen); + data[14+hlen+csum_offset] = csum >> 8; + data[14+hlen+csum_offset+1] = csum & 0xff; +} diff --git a/net/checksum.h b/net/checksum.h new file mode 100644 index 0000000..1f05298 --- /dev/null +++ b/net/checksum.h @@ -0,0 +1,29 @@ +/* + * IP checksumming functions. + * (c) 2008 Gerd Hoffmann + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; under version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see . + */ + +#ifndef QEMU_NET_CHECKSUM_H +#define QEMU_NET_CHECKSUM_H + +#include + +uint32_t net_checksum_add(int len, uint8_t *buf); +uint16_t net_checksum_finish(uint32_t sum); +uint16_t net_checksum_tcpudp(uint16_t length, uint16_t proto, + uint8_t *addrs, uint8_t *buf); +void net_checksum_calculate(uint8_t *data, int length); + +#endif /* QEMU_NET_CHECKSUM_H */