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

ETHER: Allow clean build with USE_NETWORK and not USE_READER_THREAD

Browse source
This commit is contained in:
Mark Pizzolato 2017-06-04 11:13:37 -07:00
parent 3b67a8658d
commit e058b0124b
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
sim_ether.c
View file

@ -1703,8 +1703,6 @@ _eth_callback((u_char *)opaque, &header, buf);
#endif #endif
#if defined (USE_READER_THREAD) #if defined (USE_READER_THREAD)
#include <pthread.h>
static void * static void *
_eth_reader(void *arg) _eth_reader(void *arg)
{ {
@ -3617,7 +3615,6 @@ t_stat eth_filter_hash(ETH_DEV* dev, int addr_count, ETH_MAC* const addresses,
{ {
int i; int i;
char buf[116+66*ETH_FILTER_MAX]; char buf[116+66*ETH_FILTER_MAX];
char errbuf[PCAP_ERRBUF_SIZE];
char mac[20]; char mac[20];
char* buf2; char* buf2;
t_stat status; t_stat status;
@ -3762,6 +3759,7 @@ sim_debug(dev->dbit, dev->dptr, "BPF string is: |%s|\n", buf);
#ifdef USE_BPF #ifdef USE_BPF
if (dev->eth_api == ETH_API_PCAP) { if (dev->eth_api == ETH_API_PCAP) {
char errbuf[PCAP_ERRBUF_SIZE];
bpf_u_int32 bpf_subnet, bpf_netmask; bpf_u_int32 bpf_subnet, bpf_netmask;
if (pcap_lookupnet(dev->name, &bpf_subnet, &bpf_netmask, errbuf)<0) if (pcap_lookupnet(dev->name, &bpf_subnet, &bpf_netmask, errbuf)<0)
@ -3824,11 +3822,12 @@ int eth_host_devices(int used, int max, ETH_LIST* list)
{ {
pcap_t* conn = NULL; pcap_t* conn = NULL;
int i, j, datalink = 0; int i, j, datalink = 0;
char errbuf[PCAP_ERRBUF_SIZE];
for (i=0; i<used; ++i) { for (i=0; i<used; ++i) {
/* Cull any non-ethernet interface types */ /* Cull any non-ethernet interface types */
#if defined(HAVE_PCAP_NETWORK) #if defined(HAVE_PCAP_NETWORK)
char errbuf[PCAP_ERRBUF_SIZE];
conn = pcap_open_live(list[i].name, ETH_MAX_PACKET, ETH_PROMISC, PCAP_READ_TIMEOUT, errbuf); conn = pcap_open_live(list[i].name, ETH_MAX_PACKET, ETH_PROMISC, PCAP_READ_TIMEOUT, errbuf);
if (NULL != conn) if (NULL != conn)
datalink = pcap_datalink(conn), pcap_close(conn); datalink = pcap_datalink(conn), pcap_close(conn);
@ -3925,7 +3924,7 @@ return used;
int eth_devices(int max, ETH_LIST* list) int eth_devices(int max, ETH_LIST* list)
{ {
int i = 0; int i = 0;
char errbuf[PCAP_ERRBUF_SIZE]; char errbuf[PCAP_ERRBUF_SIZE] = "";
#ifndef DONT_USE_PCAP_FINDALLDEVS #ifndef DONT_USE_PCAP_FINDALLDEVS
pcap_if_t* alldevs; pcap_if_t* alldevs;
pcap_if_t* dev; pcap_if_t* dev;

3
sim_ether.h
View file

@ -104,6 +104,7 @@ extern "C" {
/* set related values to have correct relationships */ /* set related values to have correct relationships */
#if defined (USE_READER_THREAD) #if defined (USE_READER_THREAD)
#include <pthread.h>
#if defined (USE_SETNONBLOCK) #if defined (USE_SETNONBLOCK)
#undef USE_SETNONBLOCK #undef USE_SETNONBLOCK
#endif /* USE_SETNONBLOCK */ #endif /* USE_SETNONBLOCK */
@ -112,6 +113,8 @@ extern "C" {
#if (!defined (xBSD) && !defined(_WIN32) && !defined(VMS) && !defined(__CYGWIN__)) || defined (HAVE_TAP_NETWORK) || defined (HAVE_VDE_NETWORK) #if (!defined (xBSD) && !defined(_WIN32) && !defined(VMS) && !defined(__CYGWIN__)) || defined (HAVE_TAP_NETWORK) || defined (HAVE_VDE_NETWORK)
#define MUST_DO_SELECT 1 #define MUST_DO_SELECT 1
#endif #endif
#else
#include <time.h>
#endif /* USE_READER_THREAD */ #endif /* USE_READER_THREAD */
/* give priority to USE_NETWORK over USE_SHARED */ /* give priority to USE_NETWORK over USE_SHARED */