From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1KNqfK-0002To-Uz for qemu-devel@nongnu.org; Tue, 29 Jul 2008 10:59:07 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1KNqfK-0002SL-6U for qemu-devel@nongnu.org; Tue, 29 Jul 2008 10:59:06 -0400 Received: from [199.232.76.173] (port=54320 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1KNqfJ-0002S3-UY for qemu-devel@nongnu.org; Tue, 29 Jul 2008 10:59:06 -0400 Received: from mx1.redhat.com ([66.187.233.31]:49827) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1KNqfJ-0007US-7i for qemu-devel@nongnu.org; Tue, 29 Jul 2008 10:59:05 -0400 Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id m6TEx4gV009476 for ; Tue, 29 Jul 2008 10:59:04 -0400 Received: from pobox.stuttgart.redhat.com (pobox.stuttgart.redhat.com [172.16.2.10]) by int-mx1.corp.redhat.com (8.13.1/8.13.1) with ESMTP id m6TEx3Nb029173 for ; Tue, 29 Jul 2008 10:59:03 -0400 Received: from zweiblum.travel.kraxel.org (vpn-4-92.str.redhat.com [10.32.4.92]) by pobox.stuttgart.redhat.com (8.13.1/8.13.1) with ESMTP id m6TEx2wu004489 for ; Tue, 29 Jul 2008 10:59:02 -0400 Message-ID: <488F3036.9030604@redhat.com> Date: Tue, 29 Jul 2008 16:59:02 +0200 From: Gerd Hoffmann MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="------------030404000000080703030207" Subject: [Qemu-devel] [PATCH v2] Add IP checksuming functions to qemu. Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org This is a multi-part message in MIME format. --------------030404000000080703030207 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Hi folks, This patch adds IP checksumming functions to qemu, so not every nic driver needs do to it on its own. This time with copyright & license as requested by Anthony. cheers, Gerd --------------030404000000080703030207 Content-Type: text/x-patch; name="0004-Add-IP-checksumming-functions-to-qemu.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="0004-Add-IP-checksumming-functions-to-qemu.patch" >>From 3ecf2b734d2d1c6e4362d752c23f5ec1ccc50bdc Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Tue, 29 Jul 2008 13:25:12 +0200 Subject: [PATCH 04/22] Add IP checksumming functions to qemu. Signed-off-by: Gerd Hoffmann --- Makefile.target | 2 +- net-checksum.c | 87 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ net.h | 7 ++++ 3 files changed, 95 insertions(+), 1 deletions(-) create mode 100644 net-checksum.c diff --git a/Makefile.target b/Makefile.target index ff105c1..42162c3 100644 --- a/Makefile.target +++ b/Makefile.target @@ -472,7 +472,7 @@ endif #CONFIG_DARWIN_USER # System emulator target ifndef CONFIG_USER_ONLY -OBJS=vl.o osdep.o monitor.o pci.o loader.o isa_mmio.o machine.o +OBJS=vl.o osdep.o monitor.o pci.o loader.o isa_mmio.o machine.o net-checksum.o ifdef CONFIG_WIN32 OBJS+=block-raw-win32.o else diff --git a/net-checksum.c b/net-checksum.c new file mode 100644 index 0000000..a480655 --- /dev/null +++ b/net-checksum.c @@ -0,0 +1,87 @@ +/* + * 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, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#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 d00910f..5212b48 100644 --- a/net.h +++ b/net.h @@ -48,4 +48,11 @@ struct NICInfo { extern int nb_nics; extern NICInfo nd_table[MAX_NICS]; +/* 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); + #endif -- 1.5.4.1 --------------030404000000080703030207--