5e520261db
BRANCH_PLUGINS branch! Authors: Bryce Denney Christophe Bothamy Kevin Lawton (we grabbed a lot of plugin code from plex86) Testing help from: Volker Ruppert Don Becker (Psyon) Jeremy Parsons (Br'fin) The change log is too long to paste in here. To read the change log, do cvs log patches/patch.final-from-BRANCH_PLUGINS.gz All the changes and a detailed description are contained in a patch called patch.final-from-BRANCH_PLUGINS.gz. To look at the complete patch, do cvs upd -r1.1 patches/patch.final-from-BRANCH_PLUGINS.gz Then you will have a local copy of the patch, which you can gunzip and play with however you want. Modified Files: .bochsrc Makefile.in aclocal.m4 bochs.h config.h.in configure configure.in gdbstub.cc logio.cc main.cc pc_system.cc pc_system.h state_file.h bios/Makefile.in bios/rombios.c cpu/Makefile.in cpu/access.cc cpu/apic.cc cpu/arith16.cc cpu/arith32.cc cpu/arith8.cc cpu/cpu.cc cpu/cpu.h cpu/ctrl_xfer32.cc cpu/exception.cc cpu/fetchdecode.cc cpu/fetchdecode64.cc cpu/flag_ctrl.cc cpu/flag_ctrl_pro.cc cpu/init.cc cpu/io.cc cpu/logical16.cc cpu/logical32.cc cpu/logical8.cc cpu/paging.cc cpu/proc_ctrl.cc cpu/protect_ctrl.cc cpu/segment_ctrl_pro.cc cpu/shift16.cc cpu/shift32.cc cpu/stack64.cc cpu/string.cc cpu/tasking.cc debug/Makefile.in debug/dbg_main.cc disasm/Makefile.in doc/docbook/user/user.dbk dynamic/Makefile.in fpu/Makefile.in gui/Makefile.in gui/amigaos.cc gui/beos.cc gui/carbon.cc gui/control.cc gui/control.h gui/gui.cc gui/gui.h gui/keymap.cc gui/keymap.h gui/macintosh.cc gui/nogui.cc gui/rfb.cc gui/sdl.cc gui/sdlkeys.h gui/siminterface.cc gui/siminterface.h gui/term.cc gui/win32.cc gui/wx.cc gui/wxdialog.cc gui/wxdialog.h gui/wxmain.cc gui/wxmain.h gui/x.cc gui/keymaps/sdl-pc-de.map gui/keymaps/sdl-pc-us.map gui/keymaps/x11-pc-de.map instrument/example0/instrument.h instrument/example1/instrument.h instrument/stubs/instrument.cc instrument/stubs/instrument.h iodev/Makefile.in iodev/biosdev.cc iodev/biosdev.h iodev/cdrom.cc iodev/cmos.cc iodev/cmos.h iodev/devices.cc iodev/dma.cc iodev/dma.h iodev/eth_fbsd.cc iodev/eth_linux.cc iodev/eth_null.cc iodev/eth_tap.cc iodev/floppy.cc iodev/floppy.h iodev/guest2host.cc iodev/guest2host.h iodev/harddrv.cc iodev/harddrv.h iodev/iodebug.cc iodev/iodebug.h iodev/iodev.h iodev/keyboard.cc iodev/keyboard.h iodev/ne2k.cc iodev/ne2k.h iodev/parallel.cc iodev/parallel.h iodev/pci.cc iodev/pci.h iodev/pci2isa.cc iodev/pci2isa.h iodev/pic.cc iodev/pic.h iodev/pit.cc iodev/pit.h iodev/pit_wrap.cc iodev/pit_wrap.h iodev/sb16.cc iodev/sb16.h iodev/scancodes.cc iodev/scancodes.h iodev/serial.cc iodev/serial.h iodev/slowdown_timer.cc iodev/slowdown_timer.h iodev/unmapped.cc iodev/unmapped.h iodev/vga.cc iodev/vga.h memory/Makefile.in memory/memory.cc memory/memory.h memory/misc_mem.cc misc/bximage.c misc/niclist.c Added Files: README-plugins extplugin.h ltdl.c ltdl.h ltdlconf.h.in ltmain.sh plugin.cc plugin.h
156 lines
5.1 KiB
C++
156 lines
5.1 KiB
C++
/////////////////////////////////////////////////////////////////////////
|
|
// $Id: eth_null.cc,v 1.10 2002-10-24 21:07:28 bdenney Exp $
|
|
/////////////////////////////////////////////////////////////////////////
|
|
//
|
|
// Copyright (C) 2001 MandrakeSoft S.A.
|
|
//
|
|
// MandrakeSoft S.A.
|
|
// 43, rue d'Aboukir
|
|
// 75002 Paris - France
|
|
// http://www.linux-mandrake.com/
|
|
// http://www.mandrakesoft.com/
|
|
//
|
|
// This library is free software; you can redistribute it and/or
|
|
// modify it under the terms of the GNU Lesser General Public
|
|
// License as published by the Free Software Foundation; either
|
|
// version 2 of the License, or (at your option) any later version.
|
|
//
|
|
// This library 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
|
|
// Lesser General Public License for more details.
|
|
//
|
|
// You should have received a copy of the GNU Lesser General Public
|
|
// License along with this library; if not, write to the Free Software
|
|
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
|
|
// eth_null.cc - skeleton code for an ethernet pktmover
|
|
|
|
// Various networking docs:
|
|
// http://www.graphcomp.com/info/rfc/
|
|
// rfc0826: arp
|
|
// rfc0903: rarp
|
|
|
|
#include "bochs.h"
|
|
#define LOG_THIS bx_ne2k.
|
|
|
|
|
|
//
|
|
// Define the class. This is private to this module
|
|
//
|
|
class bx_null_pktmover_c : public eth_pktmover_c {
|
|
public:
|
|
bx_null_pktmover_c(const char *netif, const char *macaddr,
|
|
eth_rx_handler_t rxh,
|
|
void *rxarg);
|
|
void sendpkt(void *buf, unsigned io_len);
|
|
private:
|
|
int rx_timer_index;
|
|
static void rx_timer_handler(void *);
|
|
FILE *txlog, *txlog_txt, *rxlog, *rxlog_txt;
|
|
};
|
|
|
|
|
|
//
|
|
// Define the static class that registers the derived pktmover class,
|
|
// and allocates one on request.
|
|
//
|
|
class bx_null_locator_c : public eth_locator_c {
|
|
public:
|
|
bx_null_locator_c(void) : eth_locator_c("null") {}
|
|
protected:
|
|
eth_pktmover_c *allocate(const char *netif, const char *macaddr,
|
|
eth_rx_handler_t rxh,
|
|
void *rxarg) {
|
|
return (new bx_null_pktmover_c(netif, macaddr, rxh, rxarg));
|
|
}
|
|
} bx_null_match;
|
|
|
|
|
|
//
|
|
// Define the methods for the bx_null_pktmover derived class
|
|
//
|
|
|
|
// the constructor
|
|
bx_null_pktmover_c::bx_null_pktmover_c(const char *netif,
|
|
const char *macaddr,
|
|
eth_rx_handler_t rxh,
|
|
void *rxarg)
|
|
{
|
|
#if BX_ETH_NULL_LOGGING
|
|
// Start the rx poll
|
|
this->rx_timer_index =
|
|
bx_pc_system.register_timer(this, this->rx_timer_handler, 1000,
|
|
1, 1, "eth_null"); // continuous, active
|
|
this->rxh = rxh;
|
|
this->rxarg = rxarg;
|
|
// eventually Bryce wants txlog to dump in pcap format so that
|
|
// tcpdump -r FILE can read it and interpret packets.
|
|
txlog = fopen ("ne2k-tx.log", "wb");
|
|
if (!txlog) BX_PANIC (("open ne2k-tx.log failed"));
|
|
txlog_txt = fopen ("ne2k-txdump.txt", "wb");
|
|
if (!txlog_txt) BX_PANIC (("open ne2k-txdump.txt failed"));
|
|
fprintf (txlog_txt, "null packetmover readable log file\n");
|
|
fprintf (txlog_txt, "net IF = %s\n", netif);
|
|
fprintf (txlog_txt, "MAC address = ");
|
|
for (int i=0; i<6; i++)
|
|
fprintf (txlog_txt, "%02x%s", 0xff & macaddr[i], i<5?":" : "");
|
|
fprintf (txlog_txt, "\n--\n");
|
|
fflush (txlog_txt);
|
|
#endif
|
|
}
|
|
|
|
void
|
|
bx_null_pktmover_c::sendpkt(void *buf, unsigned io_len)
|
|
{
|
|
#if BX_ETH_NULL_LOGGING
|
|
BX_DEBUG (("sendpkt length %u", io_len));
|
|
// dump raw bytes to a file, eventually dump in pcap format so that
|
|
// tcpdump -r FILE can interpret them for us.
|
|
unsigned int n = fwrite (buf, io_len, 1, txlog);
|
|
if (n != 1) BX_ERROR (("fwrite to txlog failed, io_len = %u", io_len));
|
|
// dump packet in hex into an ascii log file
|
|
fprintf (txlog_txt, "NE2K transmitting a packet, length %u\n", io_len);
|
|
Bit8u *charbuf = (Bit8u *)buf;
|
|
for (n=0; n<io_len; n++) {
|
|
if (((n % 16) == 0) && n>0)
|
|
fprintf (txlog_txt, "\n");
|
|
fprintf (txlog_txt, "%02x ", charbuf[n]);
|
|
}
|
|
fprintf (txlog_txt, "\n--\n");
|
|
// flush log so that we see the packets as they arrive w/o buffering
|
|
fflush (txlog);
|
|
fflush (txlog_txt);
|
|
#endif
|
|
}
|
|
|
|
void bx_null_pktmover_c::rx_timer_handler (void *this_ptr)
|
|
{
|
|
#if BX_ETH_NULL_LOGGING
|
|
/// hey wait there is no receive data with a NULL ethernet, is there....
|
|
|
|
int io_len = 0;
|
|
Bit8u buf[1];
|
|
bx_null_pktmover_c *class_ptr = (bx_null_pktmover_c *) this_ptr;
|
|
if (io_len > 0) {
|
|
BX_DEBUG (("receive packet length %u", io_len));
|
|
// dump raw bytes to a file, eventually dump in pcap format so that
|
|
// tcpdump -r FILE can interpret them for us.
|
|
int n = fwrite (buf, io_len, 1, class_ptr->rxlog);
|
|
if (n != 1) BX_ERROR (("fwrite to rxlog failed, io_len = %u", io_len));
|
|
// dump packet in hex into an ascii log file
|
|
fprintf (class_ptr->rxlog_txt, "NE2K transmitting a packet, length %u\n", io_len);
|
|
Bit8u *charbuf = (Bit8u *)buf;
|
|
for (n=0; n<io_len; n++) {
|
|
if (((n % 16) == 0) && n>0)
|
|
fprintf (class_ptr->rxlog_txt, "\n");
|
|
fprintf (class_ptr->rxlog_txt, "%02x ", charbuf[n]);
|
|
}
|
|
fprintf (class_ptr->rxlog_txt, "\n--\n");
|
|
// flush log so that we see the packets as they arrive w/o buffering
|
|
fflush (class_ptr->rxlog);
|
|
fflush (class_ptr->rxlog_txt);
|
|
}
|
|
#endif
|
|
}
|