cec9135e9f
"bx_bool" which is always defined as Bit32u on all platforms. In Carbon specific code, Boolean is still used because the Carbon header files define it to unsigned char. - this fixes bug [ 623152 ] MacOSX: Triple Exception Booting win95. The bug was that some code in Bochs depends on Boolean to be a 32 bit value. (This should be fixed, but I don't know all the places where it needs to be fixed yet.) Because Carbon defined Boolean as an unsigned char, Bochs just followed along and used the unsigned char definition to avoid compile problems. This exposed the dependency on 32 bit Boolean on MacOS X only and led to major simulation problems, that could only be reproduced and debugged on that platform. - On the mailing list we debated whether to make all Booleans into "bool" or our own type. I chose bx_bool for several reasons. 1. Unlike C++'s bool, we can guarantee that bx_bool is the same size on all platforms, which makes it much less likely to have more platform-specific simulation differences in the future. (I spent hours on a borrowed MacOSX machine chasing bug 618388 before discovering that different sized Booleans were the problem, and I don't want to repeat that.) 2. We still have at least one dependency on 32 bit Booleans which must be fixed some time, but I don't want to risk introducing new bugs into the simulation just before the 2.0 release. Modified Files: bochs.h config.h.in gdbstub.cc logio.cc main.cc pc_system.cc pc_system.h plugin.cc plugin.h bios/rombios.c cpu/apic.cc cpu/arith16.cc cpu/arith32.cc cpu/arith64.cc cpu/arith8.cc cpu/cpu.cc cpu/cpu.h cpu/ctrl_xfer16.cc cpu/ctrl_xfer32.cc cpu/ctrl_xfer64.cc cpu/data_xfer16.cc cpu/data_xfer32.cc cpu/data_xfer64.cc cpu/debugstuff.cc cpu/exception.cc cpu/fetchdecode.cc cpu/flag_ctrl_pro.cc cpu/init.cc cpu/io_pro.cc cpu/lazy_flags.cc cpu/lazy_flags.h cpu/mult16.cc cpu/mult32.cc cpu/mult64.cc cpu/mult8.cc cpu/paging.cc cpu/proc_ctrl.cc cpu/segment_ctrl_pro.cc cpu/stack_pro.cc cpu/tasking.cc debug/dbg_main.cc debug/debug.h debug/sim2.cc disasm/dis_decode.cc disasm/disasm.h doc/docbook/Makefile docs-html/cosimulation.html fpu/wmFPUemu_glue.cc gui/amigaos.cc gui/beos.cc gui/carbon.cc 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/siminterface.cc gui/siminterface.h gui/term.cc gui/win32.cc gui/wx.cc gui/wxmain.cc gui/wxmain.h gui/x.cc instrument/example0/instrument.cc instrument/example0/instrument.h instrument/example1/instrument.cc instrument/example1/instrument.h instrument/stubs/instrument.cc instrument/stubs/instrument.h iodev/cdrom.cc iodev/cdrom.h iodev/cdrom_osx.cc iodev/cmos.cc iodev/devices.cc iodev/dma.cc iodev/dma.h iodev/eth_arpback.cc iodev/eth_packetmaker.cc iodev/eth_packetmaker.h iodev/floppy.cc iodev/floppy.h iodev/guest2host.h iodev/harddrv.cc iodev/harddrv.h iodev/ioapic.cc iodev/ioapic.h iodev/iodebug.cc iodev/iodev.h iodev/keyboard.cc iodev/keyboard.h iodev/ne2k.h iodev/parallel.h iodev/pci.cc iodev/pci.h iodev/pic.h iodev/pit.cc iodev/pit.h iodev/pit_wrap.cc iodev/pit_wrap.h iodev/sb16.cc iodev/sb16.h iodev/serial.cc iodev/serial.h iodev/vga.cc iodev/vga.h memory/memory.h memory/misc_mem.cc
210 lines
6.4 KiB
C++
210 lines
6.4 KiB
C++
/////////////////////////////////////////////////////////////////////////
|
|
// $Id: eth_arpback.cc,v 1.8 2002-10-25 11:44:39 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_arpback.cc - basic ethernet packetmover, only responds to ARP
|
|
|
|
// Various networking docs:
|
|
// http://www.graphcomp.com/info/rfc/
|
|
// rfc0826: arp
|
|
// rfc0903: rarp
|
|
|
|
#include "bochs.h"
|
|
|
|
#ifdef ETH_ARPBACK
|
|
|
|
#include "crc32.h"
|
|
#include "eth_packetmaker.h"
|
|
#define LOG_THIS bx_ne2k.
|
|
|
|
|
|
//static const Bit8u external_mac[]={0xB0, 0xC4, 0x20, 0x20, 0x00, 0x00, 0x00};
|
|
//static const Bit8u internal_mac[]={0xB0, 0xC4, 0x20, 0x00, 0x00, 0x00, 0x00};
|
|
//static const Bit8u external_ip[]={ 192, 168, 0, 2, 0x00 };
|
|
//static const Bit8u broadcast_mac[]={0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00};
|
|
//static const Bit8u ethtype_arp[]={0x08, 0x06, 0x00};
|
|
|
|
#define MAX_FRAME_SIZE 2048
|
|
|
|
//
|
|
// Define the class. This is private to this module
|
|
//
|
|
class bx_arpback_pktmover_c : public eth_pktmover_c {
|
|
public:
|
|
bx_arpback_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 *);
|
|
void rx_timer(void);
|
|
FILE *txlog, *txlog_txt;
|
|
//Bit8u arpbuf[MAX_FRAME_SIZE];
|
|
//Bit32u buflen;
|
|
//bx_bool bufvalid;
|
|
//CRC_Generator mycrc;
|
|
eth_ETHmaker packetmaker;
|
|
};
|
|
|
|
|
|
//
|
|
// Define the static class that registers the derived pktmover class,
|
|
// and allocates one on request.
|
|
//
|
|
class bx_arpback_locator_c : public eth_locator_c {
|
|
public:
|
|
bx_arpback_locator_c(void) : eth_locator_c("arpback") {}
|
|
protected:
|
|
eth_pktmover_c *allocate(const char *netif, const char *macaddr,
|
|
eth_rx_handler_t rxh,
|
|
void *rxarg) {
|
|
return (new bx_arpback_pktmover_c(netif, macaddr, rxh, rxarg));
|
|
}
|
|
} bx_arpback_match;
|
|
|
|
|
|
//
|
|
// Define the methods for the bx_arpback_pktmover derived class
|
|
//
|
|
|
|
// the constructor
|
|
bx_arpback_pktmover_c::bx_arpback_pktmover_c(const char *netif,
|
|
const char *macaddr,
|
|
eth_rx_handler_t rxh,
|
|
void *rxarg)
|
|
{
|
|
this->rx_timer_index =
|
|
bx_pc_system.register_timer(this, this->rx_timer_handler, 1000,
|
|
1, 1, "eth_arpback"); // continuous, active
|
|
this->rxh = rxh;
|
|
this->rxarg = rxarg;
|
|
//bufvalid=0;
|
|
packetmaker.init();
|
|
#if BX_ETH_NULL_LOGGING
|
|
// Start the rx poll
|
|
// 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, "arpback 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_arpback_pktmover_c::sendpkt(void *buf, unsigned io_len)
|
|
{
|
|
if(io_len<MAX_FRAME_SIZE) {
|
|
eth_packet barney;
|
|
memcpy(barney.buf,buf,io_len);
|
|
barney.len=io_len;
|
|
if(packetmaker.ishandler(barney)) {
|
|
packetmaker.sendpacket(barney);
|
|
}
|
|
/*
|
|
if(( (!memcmp(buf, external_mac, 6)) || (!memcmp(buf, broadcast_mac, 6)) )
|
|
&& (!memcmp(((Bit8u *)buf)+12, ethtype_arp, 2)) ) {
|
|
Bit32u tempcrc;
|
|
memcpy(arpbuf,buf,io_len); //move to temporary buffer
|
|
memcpy(arpbuf, arpbuf+6, 6); //set destination to sender
|
|
memcpy(arpbuf+6, external_mac, 6); //set sender to us
|
|
memcpy(arpbuf+32, arpbuf+22, 10); //move destination to sender
|
|
memcpy(arpbuf+22, external_mac, 6); //set sender to us
|
|
memcpy(arpbuf+28, external_ip, 4); //set sender to us
|
|
arpbuf[21]=2; //make this a reply and not a request
|
|
tempcrc=mycrc.get_CRC(arpbuf,io_len);
|
|
memcpy(arpbuf+io_len, &tempcrc, 4);
|
|
buflen=io_len;//+4
|
|
bufvalid=1;
|
|
}
|
|
*/
|
|
}
|
|
#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.
|
|
int n = fwrite (buf, io_len, 1, txlog);
|
|
if (n != 1) BX_ERROR (("fwrite to txlog failed", 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_arpback_pktmover_c::rx_timer_handler (void * this_ptr)
|
|
{
|
|
#if BX_ETH_NULL_LOGGING
|
|
BX_DEBUG (("rx_timer_handler"));
|
|
#endif
|
|
bx_arpback_pktmover_c *class_ptr = ((bx_arpback_pktmover_c *)this_ptr);
|
|
|
|
class_ptr->rx_timer();
|
|
}
|
|
|
|
void bx_arpback_pktmover_c::rx_timer (void)
|
|
{
|
|
int nbytes = 0;
|
|
struct bpf_hdr *bhdr;
|
|
eth_packet rubble;
|
|
|
|
if(packetmaker.getpacket(rubble)) {
|
|
//bufvalid=0;
|
|
void * buf=rubble.buf;
|
|
unsigned io_len=rubble.len;
|
|
Bit32u n;
|
|
fprintf (txlog_txt, "NE2K receiving 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");
|
|
fflush (txlog_txt);
|
|
|
|
(*rxh)(rxarg, buf, io_len);
|
|
}
|
|
}
|
|
|
|
#endif
|
|
|