folkert/simh-testsetgenerator
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ETHER: Updated documentation for building with network support on Mac OS/X. Fix #112

Browse source
This commit is contained in:
Mark Pizzolato 2014-02-24 08:51:47 -08:00
parent 44f66e90eb
commit d81825cdba
3 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
0readme_ethernet.txt
View file

@ -173,6 +173,10 @@ Linux (Ubuntu 11.10):
# Build and Run simulator and: # Build and Run simulator and:
sim> attach xq vde:/tmp/switch1 #simulator uses IP address 192.168.6.2 sim> attach xq vde:/tmp/switch1 #simulator uses IP address 192.168.6.2
OSX:
The macports package manager (http://www.macports.org) can be used to
install the net/vde2 package.
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
Windows notes: Windows notes:
@ -284,7 +288,15 @@ Building on Linux, {Free|Net|Open}BSD, OS/X, Solaris, other *nix:
# apt-get install libpcap-dev # apt-get install libpcap-dev
RedHat/Fedora Based distributions: RedHat/Fedora Based distributions:
# yum install libpcap-devel # yum install libpcap-devel
OS/X : Apple Developer's site?
OS/X : The libpcap components are installed as part of the Xcode
developer package. Instructions to install Xcode on various
OSX versions are available at:
https://guide.macports.org/chunked/installing.xcode.html
Be sure to install the command line tools which are installed
with the command "xcode-select --install" in more recent
versions of the Apple developer support.
HP-UX : ftp://hpux.connect.org.uk/hpux/Networking/Admin/ HP-UX : ftp://hpux.connect.org.uk/hpux/Networking/Admin/
NOTE: The repositories for older versions of these platforms NOTE: The repositories for older versions of these platforms
@ -314,7 +326,7 @@ Building on Linux, {Free|Net|Open}BSD, OS/X, Solaris, other *nix:
you want to force direct libpcap linking during a build you do so by you want to force direct libpcap linking during a build you do so by
typing 'make USE_NETWORK=1'. You must build with gcc to do this. There typing 'make USE_NETWORK=1'. You must build with gcc to do this. There
is no observable benefit to statically linking against libpcap and as is no observable benefit to statically linking against libpcap and as
such support for this ia deprecated. such support for this ia deprecated and will be removed in the future.
4. Some platforms (HP-UX in particular) may not have vendor supplied libpcap 4. Some platforms (HP-UX in particular) may not have vendor supplied libpcap
components available and installed with the operating system. The packages components available and installed with the operating system. The packages

3
README.md
View file

@ -42,7 +42,7 @@ A remote console session will close when an EOF character is entered (i.e. ^D or
RQ device has a settable controller type (RQDX3, UDA50, KLESI, RUX50) RQ device has a settable controller type (RQDX3, UDA50, KLESI, RUX50)
RQ disks default to Autosize without regard to disk type RQ disks default to Autosize without regard to disk type
RQ disks on PDP11 can have RAUSER size beyond 2GB RQ disks on PDP11 can have RAUSER size beyond 2GB
DMC11/DMR11 DDCMP DECnet device simulation. Up to 8 DMC devices are supported. DMC11/DMR11 DDCMP DECnet device simulation. Up to 8 DMC devices are supported. Packet transport is via TCP or UDP connections.
KDP11 on PDP11 for DECnet KDP11 on PDP11 for DECnet
DUP11 on PDP11 for DECnet connectivity to talk to DMC, KDP or other DUP devices DUP11 on PDP11 for DECnet connectivity to talk to DMC, KDP or other DUP devices
DZ on Unibus systems can have up to 256 ports (default of 32), on DZ on Unibus systems can have up to 256 ports (default of 32), on
@ -60,6 +60,7 @@ A remote console session will close when an EOF character is entered (i.e. ^D or
#### PDP10 Enhancements #### PDP10 Enhancements
KDP11 (from Timothe Litt) for DECnet connectivity to simulators with DMC, DUP or KDP devices KDP11 (from Timothe Litt) for DECnet connectivity to simulators with DMC, DUP or KDP devices
DMR11 for DECnet connectivity to simulators with DMC, DUP or KDP devices on TOPS10.
#### Terminal Multiplexer additions #### Terminal Multiplexer additions
Added support for TCP connections using IPv4 and/or IPv6. Added support for TCP connections using IPv4 and/or IPv6.

2
sim_ether.c
View file

@ -2965,9 +2965,11 @@ dev->read_callback = routine;
/* dispatch read request to either receive a filtered packet or timeout */ /* dispatch read request to either receive a filtered packet or timeout */
do { do {
switch (dev->eth_api) { switch (dev->eth_api) {
#ifdef HAVE_PCAP_NETWORK
case ETH_API_PCAP: case ETH_API_PCAP:
status = pcap_dispatch((pcap_t*)dev->handle, 1, &_eth_callback, (u_char*)dev); status = pcap_dispatch((pcap_t*)dev->handle, 1, &_eth_callback, (u_char*)dev);
break; break;
#endif
#ifdef HAVE_TAP_NETWORK #ifdef HAVE_TAP_NETWORK
case ETH_API_TAP: case ETH_API_TAP:
if (1) { if (1) {