a58b834c8e
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
105 lines
3.1 KiB
C++
105 lines
3.1 KiB
C++
/*
|
|
* Copyright (c) 2003-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
|
|
* Interface to connect a simulated ethernet device to the real world
|
|
*/
|
|
|
|
#ifndef __ETHERTAP_HH__
|
|
#define __ETHERTAP_HH__
|
|
|
|
#include <queue>
|
|
#include <string>
|
|
|
|
#include "dev/etherint.hh"
|
|
#include "dev/etherpkt.hh"
|
|
#include "sim/eventq.hh"
|
|
#include "base/pollevent.hh"
|
|
#include "sim/sim_object.hh"
|
|
|
|
/*
|
|
* Interface to connect a simulated ethernet device to the real world
|
|
*/
|
|
class EtherTap : public EtherInt
|
|
{
|
|
protected:
|
|
friend class TapEvent;
|
|
TapEvent *event;
|
|
|
|
protected:
|
|
friend class TapListener;
|
|
TapListener *listener;
|
|
int socket;
|
|
char *buffer;
|
|
int buflen;
|
|
int32_t buffer_offset;
|
|
int32_t data_len;
|
|
|
|
EtherDump *dump;
|
|
|
|
void attach(int fd);
|
|
void detach();
|
|
|
|
protected:
|
|
std::string device;
|
|
std::queue<PacketPtr> packetBuffer;
|
|
|
|
void process(int revent);
|
|
void enqueue(PacketData *packet);
|
|
void retransmit();
|
|
|
|
/*
|
|
*/
|
|
class TxEvent : public Event
|
|
{
|
|
protected:
|
|
EtherTap *tap;
|
|
|
|
public:
|
|
TxEvent(EtherTap *_tap)
|
|
: Event(&mainEventQueue), tap(_tap) {}
|
|
void process() { tap->retransmit(); }
|
|
virtual const char *description() { return "retransmit event"; }
|
|
};
|
|
|
|
friend class TxEvent;
|
|
TxEvent txEvent;
|
|
|
|
public:
|
|
EtherTap(const std::string &name, EtherDump *dump, int port, int bufsz);
|
|
virtual ~EtherTap();
|
|
|
|
virtual bool recvPacket(PacketPtr &packet);
|
|
virtual void sendDone();
|
|
|
|
virtual void serialize(std::ostream &os);
|
|
virtual void unserialize(Checkpoint *cp, const std::string §ion);
|
|
};
|
|
|
|
#endif // __ETHERTAP_HH__
|