diff options
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | hw/e1000.c | 1 | ||||
| -rw-r--r-- | hw/virtio-net.c | 1 | ||||
| -rw-r--r-- | hw/xen_nic.c | 1 | ||||
| -rw-r--r-- | net.h | 7 | ||||
| -rw-r--r-- | net/checksum.c | 85 | ||||
| -rw-r--r-- | net/checksum.h | 29 |
7 files changed, 119 insertions, 9 deletions
diff --git a/Makefile b/Makefile index 2349620800..5a9de55ff1 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 07e663c7f2..a52433eee4 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 "loader.h" #include "e1000_hw.h" diff --git a/hw/virtio-net.c b/hw/virtio-net.c index 4acdd1201c..ac919e1e8a 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 75599d6744..bcf161c861 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.h b/net.h index 331782d36f..392c5a5efd 100644 --- a/net.h +++ b/net.h @@ -147,13 +147,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 0000000000..4046932e9d --- /dev/null +++ b/net/checksum.c @@ -0,0 +1,85 @@ +/* + * IP checksumming functions. + * (c) 2008 Gerd Hoffmann <kraxel@redhat.com> + * + * 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 <http://www.gnu.org/licenses/>. + */ + +#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 0000000000..1f052986e6 --- /dev/null +++ b/net/checksum.h @@ -0,0 +1,29 @@ +/* + * IP checksumming functions. + * (c) 2008 Gerd Hoffmann <kraxel@redhat.com> + * + * 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 <http://www.gnu.org/licenses/>. + */ + +#ifndef QEMU_NET_CHECKSUM_H +#define QEMU_NET_CHECKSUM_H + +#include <stdint.h> + +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 */ |