From d81825cdbaf21840050276f407357ba5f80360f7 Mon Sep 17 00:00:00 2001 From: Mark Pizzolato Date: Mon, 24 Feb 2014 08:51:47 -0800 Subject: [PATCH] ETHER: Updated documentation for building with network support on Mac OS/X. Fix #112 --- 0readme_ethernet.txt | 16 ++++++++++++++-- README.md | 3 ++- sim_ether.c | 2 ++ 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/0readme_ethernet.txt b/0readme_ethernet.txt index 6eaae774..c4388b04 100644 --- a/0readme_ethernet.txt +++ b/0readme_ethernet.txt @@ -173,6 +173,10 @@ Linux (Ubuntu 11.10): # Build and Run simulator and: 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: @@ -284,7 +288,15 @@ Building on Linux, {Free|Net|Open}BSD, OS/X, Solaris, other *nix: # apt-get install libpcap-dev RedHat/Fedora Based distributions: # 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/ 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 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 - 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 components available and installed with the operating system. The packages diff --git a/README.md b/README.md index f0ec72ac..2179fe22 100644 --- a/README.md +++ b/README.md @@ -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 disks default to Autosize without regard to disk type 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 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 @@ -60,6 +60,7 @@ A remote console session will close when an EOF character is entered (i.e. ^D or #### PDP10 Enhancements 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 Added support for TCP connections using IPv4 and/or IPv6. diff --git a/sim_ether.c b/sim_ether.c index 40abf8d6..e62c3051 100644 --- a/sim_ether.c +++ b/sim_ether.c @@ -2965,9 +2965,11 @@ dev->read_callback = routine; /* dispatch read request to either receive a filtered packet or timeout */ do { switch (dev->eth_api) { +#ifdef HAVE_PCAP_NETWORK case ETH_API_PCAP: status = pcap_dispatch((pcap_t*)dev->handle, 1, &_eth_callback, (u_char*)dev); break; +#endif #ifdef HAVE_TAP_NETWORK case ETH_API_TAP: if (1) {