libdnet when we can instead of our own home grown stuff. SConscript: separate the crc code into its own file base/inet.cc: move the crc stuff to crc.cc add generic code for calculating ip/tcp/udp checksums base/inet.hh: - move crc stuff to crc.hh - #include all of the libdnet stuff. (this makes base/inet.hh the only file you need to include if you want to use this kind of stuff.) - Wrap some of the libdnet structs to get easier access to structure members. These wrappers will automatically deal with masking/shifting/ byte-swapping. base/refcnt.hh: If one derives from RefCountingPtr, they should have access to the internal data pointer. build/SConstruct: make #include of dnet stuff work dev/etherlink.cc: dev/ethertap.cc: dev/ethertap.hh: EtherPacket -> PacketData dev/etherpkt.cc: EtherPacket -> PacketData add a function for populating extra info about a packet. Basically just gives pointers to ethernet/ip/tcp/udp headers if they exist. dev/etherpkt.hh: EtherPacket -> PacketData remove most of the packet header stuff from teh PacketData class and just add a few generic functions for grabbing various headers that may exist in the packet. The old functionality is contained in the headers. dev/ns_gige.cc: - IP -> Ip, UDP -> Udp, TCP ->Tcp when used in variable names - get rid of our own byte swapping functions. - whack checksum code and use libdnet version. - Get pointers to the various packet headers and grab info from those headers. (The byte swapping in the headers now.) - Add stats for Udp Checksums dev/ns_gige.hh: use libdnet for checksum code. IP -> Ip, TCP -> Tcp in variable names add stats for UDP checksums --HG-- extra : convert_revision : 96c4160e1967b7c0090acd456df4a76e1f3aab53
87 lines
2.7 KiB
C++
87 lines
2.7 KiB
C++
/*
|
|
* Copyright (c) 2002-2004 The Regents of The University of Michigan
|
|
* All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions are
|
|
* met: redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer;
|
|
* 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;
|
|
* neither the name of the copyright holders nor the names of its
|
|
* contributors may be used to endorse or promote products derived from
|
|
* this software without specific prior written permission.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 COPYRIGHT
|
|
* OWNER 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.
|
|
*/
|
|
|
|
/* @file
|
|
* Reference counted class containing ethernet packet data
|
|
*/
|
|
|
|
#ifndef __ETHERPKT_HH__
|
|
#define __ETHERPKT_HH__
|
|
|
|
#include <iosfwd>
|
|
#include <memory>
|
|
#include <assert.h>
|
|
|
|
#include "base/refcnt.hh"
|
|
#include "base/inet.hh"
|
|
#include "sim/host.hh"
|
|
|
|
/*
|
|
* Reference counted class containing ethernet packet data
|
|
*/
|
|
class Checkpoint;
|
|
class PacketData : public RefCounted
|
|
{
|
|
public:
|
|
uint8_t *data;
|
|
int length;
|
|
|
|
protected:
|
|
uint8_t *_eth;
|
|
uint8_t *_ip;
|
|
uint8_t *_tcp;
|
|
uint8_t *_udp;
|
|
|
|
void doext();
|
|
void ext()
|
|
{
|
|
if (_eth != data)
|
|
doext();
|
|
}
|
|
|
|
public:
|
|
PacketData() : data(NULL), length(0) { doext(); }
|
|
PacketData(std::auto_ptr<uint8_t> d, int l)
|
|
: data(d.release()), length(l) { doext(); }
|
|
~PacketData() { if (data) delete [] data; }
|
|
|
|
public:
|
|
EthHdr *eth() { ext(); return (EthHdr *)_eth; }
|
|
IpHdr *ip() { ext(); return (IpHdr *)_ip; }
|
|
TcpHdr *tcp() { ext(); return (TcpHdr *)_tcp; }
|
|
UdpHdr *udp() { ext(); return (UdpHdr *)_udp; }
|
|
|
|
public:
|
|
void serialize(std::ostream &os);
|
|
void unserialize(Checkpoint *cp, const std::string §ion);
|
|
};
|
|
|
|
typedef RefCountingPtr<PacketData> PacketPtr;
|
|
|
|
#endif // __ETHERPKT_HH__
|