forked from osmocom/wireshark
Only enable the Linux kernel BPF JIT compiler if we're on Linux.
Unless we're going to do something if that fails, there's no point in having enable_kernel_bpf_jit_compiler() return a success/failure indication. Fix indentation. svn path=/trunk/; revision=51475
This commit is contained in:
parent
4409bc2877
commit
347ea71bae
30
dumpcap.c
30
dumpcap.c
|
@ -171,24 +171,30 @@ static void capture_loop_stop(void);
|
||||||
/** Close a pipe, or socket if \a from_socket is TRUE */
|
/** Close a pipe, or socket if \a from_socket is TRUE */
|
||||||
static void cap_pipe_close(int pipe_fd, gboolean from_socket _U_);
|
static void cap_pipe_close(int pipe_fd, gboolean from_socket _U_);
|
||||||
|
|
||||||
/* Enable kernel BPF jit compiler if available */
|
#ifdef __linux__
|
||||||
int enable_kernel_bpf_jit_compiler(void)
|
/*
|
||||||
|
* Enable kernel BPF JIT compiler if available.
|
||||||
|
* If any calls fail, just drive on - the JIT compiler might not be
|
||||||
|
* enabled, but filtering will still work, and it's not clear what
|
||||||
|
* we could do if the calls fail; should we just report the error
|
||||||
|
* and not continue to capture, should we report it as a warning, or
|
||||||
|
* what?
|
||||||
|
*/
|
||||||
|
void
|
||||||
|
enable_kernel_bpf_jit_compiler(void)
|
||||||
{
|
{
|
||||||
int fd;
|
int fd;
|
||||||
ssize_t ret;
|
static const char file[] = "/proc/sys/net/core/bpf_jit_enable";
|
||||||
|
|
||||||
const char *file = "/proc/sys/net/core/bpf_jit_enable";
|
|
||||||
|
|
||||||
fd = open(file, O_WRONLY);
|
fd = open(file, O_WRONLY);
|
||||||
if (fd < 0)
|
if (fd < 0)
|
||||||
return -1;
|
return;
|
||||||
|
|
||||||
ret = write(fd, "1", (unsigned int)strlen("1"));
|
write(fd, "1", strlen("1"));
|
||||||
|
|
||||||
close(fd);
|
close(fd);
|
||||||
return ret;
|
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
#if !defined (__linux__)
|
#if !defined (__linux__)
|
||||||
#ifndef HAVE_PCAP_BREAKLOOP
|
#ifndef HAVE_PCAP_BREAKLOOP
|
||||||
|
@ -238,6 +244,10 @@ int enable_kernel_bpf_jit_compiler(void)
|
||||||
/* whatever the deal with pcap_breakloop, linux doesn't support timeouts
|
/* whatever the deal with pcap_breakloop, linux doesn't support timeouts
|
||||||
* in pcap_dispatch(); on the other hand, select() works just fine there.
|
* in pcap_dispatch(); on the other hand, select() works just fine there.
|
||||||
* Hence we use a select for that come what may.
|
* Hence we use a select for that come what may.
|
||||||
|
*
|
||||||
|
* XXX - with TPACKET_V1 and TPACKET_V2, it currently uses select()
|
||||||
|
* internally, and, with TPACKET_V3, once that's supported, it'll
|
||||||
|
* support timeouts, at least as I understand the way the code works.
|
||||||
*/
|
*/
|
||||||
#define MUST_DO_SELECT
|
#define MUST_DO_SELECT
|
||||||
#endif
|
#endif
|
||||||
|
@ -4403,7 +4413,9 @@ main(int argc, char *argv[])
|
||||||
#endif /* SIGINFO */
|
#endif /* SIGINFO */
|
||||||
#endif /* _WIN32 */
|
#endif /* _WIN32 */
|
||||||
|
|
||||||
|
#ifdef __linux__
|
||||||
enable_kernel_bpf_jit_compiler();
|
enable_kernel_bpf_jit_compiler();
|
||||||
|
#endif
|
||||||
|
|
||||||
/* ----------------------------------------------------------------- */
|
/* ----------------------------------------------------------------- */
|
||||||
/* Privilege and capability handling */
|
/* Privilege and capability handling */
|
||||||
|
|
Loading…
Reference in New Issue