← Back to branch summary

~ubuntu-branches/ubuntu/saucy/suricata/saucy-proposed

~ubuntu-branches/ubuntu/saucy/suricata/saucy-proposed

« back to all changes in this revision

Viewing changes to src/detect-within.c

Committer: Package Import Robot
Author(s): Pierre Chifflier
Date: 2013-05-21 12:42:45 UTC
mfrom: (1.1.19)
Revision ID: package-import@ubuntu.com-20130521124245-f083fzuw7z2w1db4

Tags: 1.4.1-1

http://bugs.debian.org/700547

http://bugs.debian.org/697928

* Imported Upstream version 1.4.1
* Install python control script (add dependency on python, and use
  dh_python2 for build)
* Bump Standards Version to 3.9.4
* Fix removal of pid file in init script (Closes: #700547)
  Thanks to Игорь Козинов <madvampik@gmail.com>.
* Add support for af-packet mode in init script (Closes: #697928).
  Thanks to Jamie Strandboge <jamie@ubuntu.com>.

files added:
scripts/suricatasc/setup.py

scripts/suricatasc/src

scripts/suricatasc/src/__init__.py

scripts/suricatasc/src/suricatasc.py

src/detect-engine-hhhd.c

src/detect-engine-hhhd.h

src/detect-engine-hrhhd.c

src/detect-engine-hrhhd.h

src/detect-geoip.c

src/detect-geoip.h

src/detect-http-hh.c

src/detect-http-hh.h

src/detect-http-hrh.c

src/detect-http-hrh.h

files modified:
ChangeLog

Makefile.in

aclocal.m4

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

debian/changelog

debian/control

debian/rules

debian/suricata.default

debian/suricata.init

doc/Makefile.in

libhtp/aclocal.m4

libhtp/configure

libhtp/configure.ac

libhtp/htp.pc.in

libhtp/htp/htp.h

libhtp/htp/htp_config.c

libhtp/htp/htp_util.c

qa/Makefile.in

qa/coccinelle/Makefile.in

rules/Makefile.in

scripts/Makefile.in

scripts/suricatasc/Makefile.am

scripts/suricatasc/Makefile.in

scripts/suricatasc/suricatasc.in

src/Makefile.am

src/Makefile.in

src/alert-unified2-alert.c

src/app-layer-dcerpc.c

src/app-layer-dcerpc.h

src/app-layer-detect-proto.c

src/app-layer-htp.c

src/app-layer-parser.c

src/app-layer-smb.c

src/app-layer-smb.h

src/app-layer-ssl.c

src/app-layer-ssl.h

src/conf.c

src/conf.h

src/counters.c

src/counters.h

src/decode-teredo.c

src/detect-csum.c

src/detect-depth.c

src/detect-distance.c

src/detect-engine-address-ipv4.c

src/detect-engine-address-ipv6.c

src/detect-engine-address.c

src/detect-engine-content-inspection.h

src/detect-engine-iponly.c

src/detect-engine-mpm.c

src/detect-engine-mpm.h

src/detect-engine-payload.c

src/detect-engine-port.c

src/detect-engine-siggroup.c

src/detect-engine-sigorder.c

src/detect-engine-sigorder.h

src/detect-engine-state.c

src/detect-engine-state.h

src/detect-engine.c

src/detect-fast-pattern.c

src/detect-filemd5.c

src/detect-ftpbounce.c

src/detect-icmp-id.c

src/detect-isdataat.c

src/detect-nocase.c

src/detect-offset.c

src/detect-parse.c

src/detect-pcre.c

src/detect-pcre.h

src/detect-reference.c

src/detect-within.c

src/detect.c

src/detect.h

src/flow-manager.c

src/flow-timeout.c

src/log-pcap.c

src/log-tlslog.c

src/reputation.c

src/runmode-af-packet.c

src/runmode-napatech.c

src/runmode-pcap.c

src/runmode-pfring.c

src/runmode-unix-socket.c

src/runmodes.c

src/runmodes.h

src/source-af-packet.c

src/source-ipfw.c

src/source-napatech.c

src/source-napatech.h

src/source-pcap-file.c

src/source-pcap.c

src/source-pcap.h

src/source-pfring.c

src/suricata-common.h

src/suricata.c

src/suricata.h

src/threadvars.h

src/tm-threads.c

src/tm-threads.h

src/unix-manager.c

src/util-cuda-handlers.c

src/util-error.c

src/util-error.h

src/util-mem.h

src/util-threshold-config.c

suricata.yaml.in

Show diffs side-by-side

added added

removed removed

src/detect-within.c

165

165

}

166

166

}

167

167

} else {

168

pm = SigMatchGetLastSMFromLists(s, 24,

168

pm = SigMatchGetLastSMFromLists(s, 28,

169

169

DETECT_CONTENT, s->sm_lists_tail[DETECT_SM_LIST_PMATCH],

170

170

DETECT_CONTENT, s->sm_lists_tail[DETECT_SM_LIST_UMATCH],

171

171

DETECT_CONTENT, s->sm_lists_tail[DETECT_SM_LIST_HCBDMATCH],

177

177

DETECT_CONTENT, s->sm_lists_tail[DETECT_SM_LIST_HSMDMATCH],

178

178

DETECT_CONTENT, s->sm_lists_tail[DETECT_SM_LIST_HSCDMATCH],

179

179

DETECT_CONTENT, s->sm_lists_tail[DETECT_SM_LIST_HRUDMATCH],

180

DETECT_CONTENT, s->sm_lists_tail[DETECT_SM_LIST_HUADMATCH]);

180

DETECT_CONTENT, s->sm_lists_tail[DETECT_SM_LIST_HUADMATCH],

181

DETECT_CONTENT, s->sm_lists_tail[DETECT_SM_LIST_HHHDMATCH],

182

DETECT_CONTENT, s->sm_lists_tail[DETECT_SM_LIST_HRHHDMATCH]);

181

183

if (pm == NULL) {

182

184

SCLogError(SC_ERR_WITHIN_MISSING_CONTENT, "\"within\" requires "

183

185

"preceding content, uricontent, http_client_body, "

184

186

"http_server_body, http_header, http_raw_header, "

185

187

"http_method, http_cookie, http_raw_uri, "

186

"http_stat_msg, http_stat_code or http_user_agent "

187

"option");

188

"http_stat_msg, http_stat_code, http_user_agent, "

189

"http_host or http_raw_host option");

188

190

if (dubbed)

189

191

SCFree(str);

190

192

return -1;

Older »