git ssb - Enable PCRE as RegEx Library

John Regan committed on 8/13/2015, 6:28:17 PM
Parent: 4cbaf447b5a634f703bc571bf0e12f3ae1514d8a

MakefileView
		@@ -1,9 +1,10 @@
1	1	# Configuration
2	2
3	3	VERSION=$(shell ./genver.sh -r)
	4	+ENABLE_REGEX=1 # Enable regex probes
4	5	USELIBCONFIG=1 # Use libconfig? (necessary to use configuration files)
5		-USELIBPCRE=1 # Use libpcre? (necessary to use regex probe)
	6	+USELIBPCRE=1 # Use libpcre? (needed for regex on musl)
6	7	USELIBWRAP?= # Use libwrap?
7	8	USELIBCAP= # Use libcap?
8	9	COV_TEST= # Perform test coverage?
9	10	PREFIX?=/usr
		@@ -29,10 +30,15 @@
29	30	LIBS:=$(LIBS) -lwrap
30	31	CPPFLAGS+=-DLIBWRAP
31	32	endif
32	33
	34	+ifneq ($(strip $(ENABLE_REGEX)),)
	35	+ CPPFLAGS+=-DENABLE_REGEX
	36	+endif
	37	+
33	38	ifneq ($(strip $(USELIBPCRE)),)
34	39	CPPFLAGS+=-DLIBPCRE
	40	+ LIBS:=$(LIBS) -lpcre
35	41	endif
36	42
37	43	ifneq ($(strip $(USELIBCONFIG)),)
38	44	LIBS:=$(LIBS) -lconfig

probe.cView
		@@ -20,11 +20,15 @@
20	20	*/
21	21
22	22	#define _GNU_SOURCE
23	23	#include <stdio.h>
	24	+#ifdef ENABLE_REGEX
24	25	#ifdef LIBPCRE
	26	+#include <pcreposix.h>
	27	+#else
25	28	#include <regex.h>
26	29	#endif
	30	+#endif
27	31	#include <ctype.h>
28	32	#include "probe.h"
29	33
30	34
		@@ -274,9 +278,9 @@
274	278	}
275	279
276	280	static int regex_probe(const char p, int len, struct proto proto)
277	281	{
278		-#ifdef LIBPCRE
	282	+#ifdef ENABLE_REGEX
279	283	regex_t **probe = proto->data;
280	284	regmatch_t pos = { 0, len };
281	285
282	286	for (; probe && regexec(probe, p, 0, &pos, REG_STARTEND); probe++)

sslh-main.cView
		@@ -24,11 +24,15 @@
24	24	#define _GNU_SOURCE
25	25	#ifdef LIBCONFIG
26	26	#include <libconfig.h>
27	27	#endif
	28	+#ifdef ENABLE_REGEX
28	29	#ifdef LIBPCRE
	30	+#include <pcreposix.h>
	31	+#else
29	32	#include <regex.h>
30	33	#endif
	34	+#endif
31	35
32	36	#include "common.h"
33	37	#include "probe.h"
34	38
		@@ -175,9 +179,9 @@
175	179
176	180	#ifdef LIBCONFIG
177	181	static void setup_regex_probe(struct proto p, config_setting_t probes)
178	182	{
179		-#ifdef LIBPCRE
	183	+#ifdef ENABLE_REGEX
180	184	int num_probes, errsize, i, res;
181	185	char *err;
182	186	const char * expr;
183	187	regex_t** probe_list;

cel / sslh