diff --git a/3B2/3b2_ni.c b/3B2/3b2_ni.c index 36a74cfaf..7e3011325 100644 --- a/3B2/3b2_ni.c +++ b/3B2/3b2_ni.c @@ -1096,9 +1096,10 @@ t_stat ni_help(FILE *st, DEVICE *dptr, UNIT *uptr, int32 flag, const char *cptr) "+sim> ATTACH %D en0\n" "1 Dependencies\n" #if defined(_WIN32) - " The WinPcap package must be installed in order to enable\n" - " communication with other computers on the local LAN.\n" + " The NPcap or WinPcap package must be installed in order to enable\n" + " communication with the host system or other computers on the local LAN.\n" "\n" + " The NPcap package is available from https://github.com/nmap/npcap\n" " The WinPcap package is available from http://www.winpcap.org/\n" #else " To build simulators with the ability to communicate to other computers\n" diff --git a/PDP11/pdp11_xq.c b/PDP11/pdp11_xq.c index b9ac51824..f7fe8766f 100644 --- a/PDP11/pdp11_xq.c +++ b/PDP11/pdp11_xq.c @@ -3379,7 +3379,7 @@ const char helpString[] = "1 Dependencies\n" #if defined(_WIN32) " The NPcap or WinPcap package must be installed in order to enable\n" - " communication with other computers on the local LAN.\n" + " communication with the host system or other computers on the local LAN.\n" "\n" " The NPcap package is available from https://github.com/nmap/npcap\n" " The WinPcap package is available from http://www.winpcap.org/\n" diff --git a/PDP11/pdp11_xu.c b/PDP11/pdp11_xu.c index a71ce099b..4c13a07a7 100644 --- a/PDP11/pdp11_xu.c +++ b/PDP11/pdp11_xu.c @@ -2059,7 +2059,7 @@ const char helpString[] = "1 Dependencies\n" #if defined(_WIN32) " The NPcap or WinPcap package must be installed in order to enable\n" - " communication with other computers on the local LAN.\n" + " communication with the host system or other computers on the local LAN.\n" "\n" " The NPcap package is available from https://github.com/nmap/npcap\n" " The WinPcap package is available from http://www.winpcap.org/\n" diff --git a/VAX/vax_nar.c b/VAX/vax_nar.c index 837fa59d1..0bb60e877 100644 --- a/VAX/vax_nar.c +++ b/VAX/vax_nar.c @@ -89,10 +89,13 @@ return SCPE_OK; t_stat nar_setmac (UNIT* uptr, int32 val, CONST char* cptr, void* desc) { t_stat status; +DEVICE *dptr = find_dev ("XS"); if (!cptr) return SCPE_IERR; -status = eth_mac_scan (&nar_mac, cptr); +if (uptr->flags & UNIT_ATT) + return sim_messagef (SCPE_ALATT, "Can't change MAC address after %s is attached\n", dptr->name); +status = eth_mac_scan_ex (&nar_mac, cptr, uptr); if (status != SCPE_OK) return status; nar_reset (&nar_dev); @@ -136,7 +139,8 @@ t_stat r; if (!nar_init) { /* set initial MAC */ nar_init = TRUE; - r = eth_mac_scan (&nar_mac, "08:00:2B:00:00:00/24"); + /* Set an initial MAC address in the DEC range */ + r = nar_setmac (dptr->units, 0, "08:00:2B:00:00:00/24", NULL); if (r != SCPE_OK) return r; } diff --git a/sim_ether.c b/sim_ether.c index fe16af357..db987ef22 100644 --- a/sim_ether.c +++ b/sim_ether.c @@ -67,7 +67,7 @@ Compaq Tru64 Unix ?? VMS Alpha/Itanium VMS only, needs VMS libpcap - WinPcap is no longer developed or supported by was available from: + WinPcap is no longer developed or supported but was available from: http://winpcap.polito.it/ Npcap is a complete replacement for systems running Windows7 and later and is available from: @@ -903,6 +903,7 @@ t_stat eth_show (FILE* st, UNIT* uptr, int32 val, CONST void* desc) ETH_LIST list[ETH_MAX_DEVICE]; int number; + fprintf(st, "Ethernet Packet Info: %s\n", eth_version()); number = eth_devices(ETH_MAX_DEVICE, list, FALSE); fprintf(st, "ETH devices:\n"); if (number == -1) @@ -2746,7 +2747,7 @@ t_stat eth_attach_help(FILE *st, DEVICE *dptr, UNIT *uptr, int32 flag, const cha { fprintf (st, "%s attach help\n\n", dptr->name); fprintf (st, " sim> SHOW ETHERNET\n"); -fprintf (st, " libpcap version 1.0.0\n"); +fprintf (st, " Ethernet Packet Info: NAT, TAP, VDE, UDP, PCAP: libpcap version 1.10.1 (with TPACKET_V3)\n"); fprintf (st, " ETH devices:\n"); fprintf (st, " eth0 en0 (No description available)\n"); #if defined(HAVE_TAP_NETWORK)