diff options
| -rw-r--r-- | netsniff-ng.c | 9 | ||||
| -rw-r--r-- | pcap_io.h | 1 | ||||
| -rw-r--r-- | pcap_mm.c | 6 | ||||
| -rw-r--r-- | pcap_rw.c | 6 | ||||
| -rw-r--r-- | pcap_sg.c | 8 |
5 files changed, 23 insertions, 7 deletions
diff --git a/netsniff-ng.c b/netsniff-ng.c index eaf2416..25f59ac 100644 --- a/netsniff-ng.c +++ b/netsniff-ng.c @@ -187,6 +187,9 @@ static void pcap_to_xmit(struct ctx *ctx) fd = open_or_die(ctx->device_in, O_RDONLY | O_LARGEFILE | O_NOATIME); } + if (__pcap_io->init_once_pcap) + __pcap_io->init_once_pcap(); + ret = __pcap_io->pull_fhdr_pcap(fd, &ctx->magic, &ctx->link_type); if (ret) panic("Error reading pcap header!\n"); @@ -545,6 +548,9 @@ static void read_pcap(struct ctx *ctx) fd = open_or_die(ctx->device_in, O_RDONLY | O_LARGEFILE | O_NOATIME); } + if (__pcap_io->init_once_pcap) + __pcap_io->init_once_pcap(); + ret = __pcap_io->pull_fhdr_pcap(fd, &ctx->magic, &ctx->link_type); if (ret) panic("Error reading pcap header!\n"); @@ -866,6 +872,9 @@ static void recv_only_or_dump(struct ctx *ctx) if (ctx->promiscuous) ifflags = enter_promiscuous_mode(ctx->device_in); + if (dump_to_pcap(ctx) && __pcap_io->init_once_pcap) + __pcap_io->init_once_pcap(); + drop_privileges(ctx->enforce, ctx->uid, ctx->gid); if (dump_to_pcap(ctx)) { @@ -115,6 +115,7 @@ enum pcap_mode { }; struct pcap_file_ops { + void (*init_once_pcap)(void); int (*pull_fhdr_pcap)(int fd, uint32_t *magic, uint32_t *linktype); int (*push_fhdr_pcap)(int fd, uint32_t magic, uint32_t linktype); int (*prepare_access_pcap)(int fd, enum pcap_mode mode, bool jumbo); @@ -148,10 +148,13 @@ static void __pcap_mm_prepare_access_rd(int fd) ptr_va_curr = ptr_va_start + sizeof(struct pcap_filehdr); } -static int pcap_mm_prepare_access(int fd, enum pcap_mode mode, bool jumbo) +static void pcap_mm_init_once(void) { set_ioprio_be(); +} +static int pcap_mm_prepare_access(int fd, enum pcap_mode mode, bool jumbo) +{ switch (mode) { case PCAP_MODE_RD: __pcap_mm_prepare_access_rd(fd); @@ -187,6 +190,7 @@ static void pcap_mm_prepare_close(int fd, enum pcap_mode mode) } const struct pcap_file_ops pcap_mm_ops = { + .init_once_pcap = pcap_mm_init_once, .pull_fhdr_pcap = pcap_generic_pull_fhdr, .push_fhdr_pcap = pcap_generic_push_fhdr, .prepare_access_pcap = pcap_mm_prepare_access, @@ -57,11 +57,9 @@ static ssize_t pcap_rw_read(int fd, pcap_pkthdr_t *phdr, enum pcap_type type, return hdrsize + hdrlen; } -static int pcap_rw_prepare_access(int fd, enum pcap_mode mode, bool jumbo) +static void pcap_rw_init_once(void) { set_ioprio_rt(); - - return 0; } static void pcap_rw_fsync(int fd) @@ -70,9 +68,9 @@ static void pcap_rw_fsync(int fd) } const struct pcap_file_ops pcap_rw_ops = { + .init_once_pcap = pcap_rw_init_once, .pull_fhdr_pcap = pcap_generic_pull_fhdr, .push_fhdr_pcap = pcap_generic_push_fhdr, - .prepare_access_pcap = pcap_rw_prepare_access, .read_pcap = pcap_rw_read, .write_pcap = pcap_rw_write, .fsync_pcap = pcap_rw_fsync, @@ -146,6 +146,11 @@ static void pcap_sg_fsync(int fd) fdatasync(fd); } +static void pcap_sg_init_once(void) +{ + set_ioprio_rt(); +} + static int pcap_sg_prepare_access(int fd, enum pcap_mode mode, bool jumbo) { int i, ret; @@ -160,8 +165,6 @@ static int pcap_sg_prepare_access(int fd, enum pcap_mode mode, bool jumbo) iov[i].iov_len = len; } - set_ioprio_rt(); - if (mode == PCAP_MODE_RD) { ret = readv(fd, iov, array_size(iov)); if (ret <= 0) @@ -183,6 +186,7 @@ static void pcap_sg_prepare_close(int fd, enum pcap_mode mode) } const struct pcap_file_ops pcap_sg_ops = { + .init_once_pcap = pcap_sg_init_once, .pull_fhdr_pcap = pcap_generic_pull_fhdr, .push_fhdr_pcap = pcap_generic_push_fhdr, .prepare_access_pcap = pcap_sg_prepare_access, |