~ubuntu-branches/ubuntu/utopic/suricata/utopic-proposed

« back to all changes in this revision

Viewing changes to src/source-pfring.c

Committer: Package Import Robot
Author(s): Pierre Chifflier
Date: 2014-06-29 18:27:56 UTC
mfrom: (1.1.26)
Revision ID: package-import@ubuntu.com-20140629182756-2tv7awjwgu4dxude

Tags: 2.0.2-1

Imported Upstream version 2.0.2

files added:
libhtp/VERSION

libhtp/get-version.sh

libhtp/test/files/88-response-multiple-cl-mismatch.t

src/runmode-nflog.c

src/runmode-nflog.h

src/source-nflog.c

src/source-nflog.h

files modified:
ChangeLog

Makefile.in

config.h.in

configure

configure.ac

contrib/Makefile.in

contrib/file_processor/Action/Makefile.in

contrib/file_processor/Makefile.in

contrib/file_processor/Processor/Makefile.in

contrib/tile_pcie_logd/Makefile.in

debian/changelog

doc/Makefile.in

libhtp/ChangeLog

libhtp/Makefile.am

libhtp/Makefile.in

libhtp/configure

libhtp/htp/htp_request.c

libhtp/htp/htp_response.c

libhtp/htp/htp_response_generic.c

libhtp/htp/htp_version.h

libhtp/test/Makefile.am

libhtp/test/Makefile.in

libhtp/test/test_main.cpp

qa/Makefile.in

qa/coccinelle/Makefile.in

qa/drmemory.suppress

rules/Makefile.in

rules/tls-events.rules

scripts/Makefile.in

scripts/suricatasc/Makefile.am

scripts/suricatasc/Makefile.in

src/Makefile.am

src/Makefile.in

src/alert-debuglog.c

src/alert-fastlog.c

src/alert-syslog.c

src/alert-unified2-alert.c

src/app-layer-detect-proto.c

src/app-layer-dns-common.c

src/app-layer-dns-common.h

src/app-layer-dns-udp.c

src/app-layer-htp.c

src/app-layer-parser.c

src/app-layer-parser.h

src/app-layer-ssl.c

src/app-layer-ssl.h

src/app-layer.c

src/counters.c

src/counters.h

src/decode-icmpv6.c

src/decode-ipv6.c

src/decode-ipv6.h

src/decode.c

src/decode.h

src/defrag-config.c

src/defrag.c

src/detect-app-layer-event.c

src/detect-app-layer-protocol.c

src/detect-byte-extract.c

src/detect-bytejump.c

src/detect-dce-iface.c

src/detect-engine-content-inspection.c

src/detect-engine-payload.c

src/detect-engine-payload.h

src/detect-engine-state.c

src/detect-engine-state.h

src/detect-engine.c

src/detect-ftpbounce.c

src/detect-luajit-extensions.c

src/detect-luajit-extensions.h

src/detect-luajit.c

src/detect-luajit.h

src/detect-parse.c

src/detect-pcre.c

src/detect-ssh-proto-version.c

src/detect-ssh-software-version.c

src/detect-ssl-state.c

src/detect-ssl-version.c

src/detect-tls-version.c

src/detect-tls.c

src/detect.c

src/log-dnslog.c

src/log-droplog.c

src/log-file.c

src/log-httplog.c

src/log-tlslog.c

src/output-file.c

src/output-file.h

src/output-filedata.c

src/output-filedata.h

src/output-json-alert.c

src/output-json-dns.c

src/output-json-drop.c

src/output-json-file.c

src/output-json-http.c

src/output-json-ssh.c

src/output-json-tls.c

src/output-json.c

src/output-packet.c

src/output-packet.h

src/output-tx.c

src/output-tx.h

src/output.c

src/output.h

src/respond-reject.c

src/runmode-tile.c

src/runmode-unix-socket.c

src/runmodes.c

src/runmodes.h

src/source-af-packet.c

src/source-erf-dag.c

src/source-erf-file.c

src/source-ipfw.c

src/source-mpipe.c

src/source-napatech.c

src/source-nfq.c

src/source-pcap-file.c

src/source-pcap.c

src/source-pfring.c

src/stream-tcp-private.h

src/stream-tcp-reassemble.c

src/stream-tcp-reassemble.h

src/stream-tcp.c

src/stream-tcp.h

src/suricata.c

src/suricata.h

src/threadvars.h

src/tm-modules.c

src/tm-threads-common.h

src/tmqh-packetpool.c

src/unix-manager.c

src/util-buffer.h

src/util-device.c

src/util-device.h

src/util-error.c

src/util-error.h

src/util-ioctl.c

src/util-logopenfile.c

src/util-logopenfile.h

src/util-mpm-ac-tile-small.c

src/util-profiling-keywords.c

src/util-rohash.c

src/util-threshold-config.c

suricata.yaml.in

Show diffs side-by-side

added added

removed removed

src/source-pfring.c

TmEcode DecodePfringThreadInit(ThreadVars *, void *, void **);

TmEcode DecodePfring(ThreadVars *, Packet *, void *, PacketQueue *, PacketQueue *);

TmEcode DecodePfringThreadDeinit(ThreadVars *tv, void *data);

extern int max_pending_packets;

extern uint8_t suricata_ctl_flags;

183

184

tmm_modules[TMM_DECODEPFRING].ThreadInit = DecodePfringThreadInit;

184

185

tmm_modules[TMM_DECODEPFRING].Func = DecodePfring;

185

186

tmm_modules[TMM_DECODEPFRING].ThreadExitPrintStats = NULL;

186

tmm_modules[TMM_DECODEPFRING].ThreadDeinit = NULL;

187

tmm_modules[TMM_DECODEPFRING].ThreadDeinit = DecodePfringThreadDeinit;

187

188

tmm_modules[TMM_DECODEPFRING].RegisterTests = NULL;

188

189

tmm_modules[TMM_DECODEPFRING].flags = TM_FLAG_DECODE_TM;

189

190

}

471

472

473

if ((ptv->threads == 1) && (strncmp(ptv->interface, "dna", 3) == 0)) {

473

474

SCLogInfo("DNA interface detected, not adding thread to cluster");

475

} else if (strncmp(ptv->interface, "zc", 2) == 0) {

476

SCLogInfo("ZC interface detected, not adding thread to cluster");

474

477

} else {

475

478

#ifdef HAVE_PFRING_CLUSTER_TYPE

476

479

ptv->ctype = pfconf->ctype;

662

665

663

666

return TM_ECODE_OK;

664

667

}

668

669

TmEcode DecodePfringThreadDeinit(ThreadVars *tv, void *data)

670

{

671

if (data != NULL)

672

DecodeThreadVarsFree(data);

673

SCReturnInt(TM_ECODE_OK);

674

}

675

676

665

677

#endif /* HAVE_PFRING */

666

678

/* eof */

Older »