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

Added sim_ether dynamic libpcap load support for platforms which need to use pcap_setnonblock.

Browse source
This commit is contained in:
Mark Pizzolato 2013-05-23 08:17:29 -07:00
parent c3479492a1
commit b755a71a60
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
sim_ether.c
View file

@ -965,6 +965,7 @@ static int (*p_pcap_fileno) (pcap_t *);
#endif
static int (*p_pcap_sendpacket) (pcap_t* handle, const u_char* msg, int len);
static int (*p_pcap_setfilter) (pcap_t *, struct bpf_program *);
static int (*p_pcap_setnonblock)(pcap_t* a, int nonblock, char *errbuf);
static char* (*p_pcap_lib_version) (void);
/* load function pointer from DLL */
@ -1040,6 +1041,7 @@ int load_pcap(void) {
#endif
load_function("pcap_sendpacket", (_func *) &p_pcap_sendpacket);
load_function("pcap_setfilter", (_func *) &p_pcap_setfilter);
load_function("pcap_setnonblock", (_func *) &p_pcap_setnonblock);
load_function("pcap_lib_version", (_func *) &p_pcap_lib_version);
if (lib_loaded == 1) {
@ -1063,8 +1065,8 @@ void pcap_close(pcap_t* a) {
}
}
/* OpenBSD and OS/X on PowerPC have an ancient declaration of pcap_compile which doesn't have a const in the bpf string argument */
#if defined (__OpenBSD__) || (defined (__APPLE__) && defined (__POWERPC__))
/* OpenBSD, AIX and OS/X on PowerPC have an ancient declaration of pcap_compile which doesn't have a const in the bpf string argument */
#if defined (__OpenBSD__) || defined (_AIX) || (defined (__APPLE__) && defined (__POWERPC__))
int pcap_compile(pcap_t* a, struct bpf_program* b, char* c, int d, bpf_u_int32 e) {
#else
int pcap_compile(pcap_t* a, struct bpf_program* b, const char* c, int d, bpf_u_int32 e) {
@ -1190,6 +1192,14 @@ int pcap_setfilter(pcap_t* a, struct bpf_program* b) {
return 0;
}
}
int pcap_setnonblock(pcap_t* a, int nonblock, char *errbuf) {
if (load_pcap() != 0) {
return p_pcap_setnonblock(a, nonblock, errbuf);
} else {
return 0;
}
}
#endif /* defined(USE_SHARED) && (defined(_WIN32) || defined(HAVE_DLOPEN)) */
/* Some platforms have always had pcap_sendpacket */