remove unneeded patches; pcap now includes these functions.
This commit is contained in:
parent
1ea3eea498
commit
1eba0ca93b
@ -1,9 +1,10 @@
|
||||
# $OpenBSD: Makefile,v 1.49 2005/10/24 15:53:26 fgsch Exp $
|
||||
# $OpenBSD: Makefile,v 1.50 2005/12/21 01:32:28 fgsch Exp $
|
||||
# $NetBSD: Makefile,v 1.2 1998/08/23 20:48:03 frueauf Exp $
|
||||
|
||||
COMMENT= "PDP, IBM 1401, Nova and other CPUs simulator"
|
||||
|
||||
DISTNAME= simh-3.5-1
|
||||
PKGNAME= ${DISTNAME}p0
|
||||
CATEGORIES= emulators
|
||||
MASTER_SITES= http://simh.trailing-edge.com/sources/
|
||||
DISTFILES= simhv35-1.zip
|
||||
|
@ -1,4 +1,4 @@
|
||||
$OpenBSD: patch-makefile,v 1.8 2005/06/19 03:47:25 david Exp $
|
||||
$OpenBSD: patch-makefile,v 1.9 2005/12/21 01:32:29 fgsch Exp $
|
||||
--- makefile.orig Thu Apr 7 16:56:36 2005
|
||||
+++ makefile Sat Jun 18 03:49:17 2005
|
||||
@@ -3,28 +3,29 @@
|
||||
@ -27,7 +27,7 @@ $OpenBSD: patch-makefile,v 1.8 2005/06/19 03:47:25 david Exp $
|
||||
+#ifeq ($(USE_NETWORK),)
|
||||
+#else
|
||||
+#NETWORK_OPT = -DUSE_NETWORK -isystem /usr/local/include /usr/local/lib/libpcap.a
|
||||
+NETWORK_OPT = -DUSE_NETWORK -DNEED_PCAP_SENDPACKET -DDONT_USE_PCAP_FINDALLDEVS -lpcap
|
||||
+NETWORK_OPT = -DUSE_NETWORK -DNEED_PCAP_SENDPACKET -lpcap
|
||||
+#endif
|
||||
+#else
|
||||
#Win32 Environments
|
||||
|
@ -1,32 +0,0 @@
|
||||
$OpenBSD: patch-sim_ether_c,v 1.4 2005/10/24 15:53:26 fgsch Exp $
|
||||
--- sim_ether.c.orig Wed Sep 7 08:50:26 2005
|
||||
+++ sim_ether.c Mon Oct 24 12:14:39 2005
|
||||
@@ -588,6 +588,12 @@ int pcap_sendpacket(pcap_t* handle, cons
|
||||
}
|
||||
#endif /* !HAS_PCAP_SENDPACKET */
|
||||
|
||||
+int pcap_setnonblock(pcap_t* handle, int nonblock, char *errbuf)
|
||||
+{
|
||||
+ fcntl(pcap_fileno(handle), F_SETFL, fcntl(pcap_fileno(handle), F_GETFL, 0) | O_NONBLOCK);
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
#if defined (USE_READER_THREAD)
|
||||
#include <pthread.h>
|
||||
|
||||
@@ -1155,12 +1161,13 @@ int eth_host_devices(int used, int max,
|
||||
|
||||
int eth_devices(int max, ETH_LIST* list)
|
||||
{
|
||||
+ int i = 0;
|
||||
+
|
||||
+#ifndef DONT_USE_PCAP_FINDALLDEVS
|
||||
pcap_if_t* alldevs;
|
||||
pcap_if_t* dev;
|
||||
- int i = 0;
|
||||
char errbuf[PCAP_ERRBUF_SIZE];
|
||||
|
||||
-#ifndef DONT_USE_PCAP_FINDALLDEVS
|
||||
/* retrieve the device list */
|
||||
if (pcap_findalldevs(&alldevs, errbuf) == -1) {
|
||||
char* msg = "Eth: error in pcap_findalldevs: %s\r\n";
|
Loading…
x
Reference in New Issue
Block a user