git ssb - Added Makefile option to build without libpcre

Yves Rutschle committed on 7/9/2015, 1:31:42 PM
Parent: ba945f1a8f77d414f5e48f9c4166f5759ca7ece4

ChangeLogView
		@@ -1,4 +1,8 @@
	1	+vNEXT:
	2	+ Added USELIBPCRE to make use of regex engine
	3	+ optional.
	4	+
1	5	v1.17: 09MAR2015
2	6	Support RFC5952-style IPv6 addresses, e.g. [::]:443.
3	7
4	8	Transparant proxy support for FreeBSD.

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

probe.cView
		@@ -20,9 +20,11 @@
20	20	*/
21	21
22	22	#define _GNU_SOURCE
23	23	#include <stdio.h>
	24	+#ifdef LIBPCRE
24	25	#include <regex.h>
	26	+#endif
25	27	#include <ctype.h>
26	28	#include "probe.h"
27	29
28	30
		@@ -243,15 +245,21 @@
243	245	}
244	246
245	247	static int regex_probe(const char p, int len, struct proto proto)
246	248	{
	249	+#ifdef LIBPCRE
247	250	regex_t **probe = proto->data;
248	251	regmatch_t pos = { 0, len };
249	252
250	253	for (; probe && regexec(probe, p, 0, &pos, REG_STARTEND); probe++)
251	254	/* try them all */;
252	255
253	256	return (*probe != NULL);
	257	+#else
	258	+ /* Should never happen as we check when loading config file */
	259	+ fprintf(stderr, "FATAL: regex probe called but not built in\n");
	260	+ exit(5);
	261	+#endif
254	262	}
255	263
256	264	/*
257	265	* Read the beginning of data coming from the client connection and check if

sslh-main.cView
		@@ -24,9 +24,11 @@
24	24	#define _GNU_SOURCE
25	25	#ifdef LIBCONFIG
26	26	#include <libconfig.h>
27	27	#endif
	28	+#ifdef LIBPCRE
28	29	#include <regex.h>
	30	+#endif
29	31
30	32	#include "common.h"
31	33	#include "probe.h"
32	34
		@@ -173,8 +175,9 @@
173	175
174	176	#ifdef LIBCONFIG
175	177	static void setup_regex_probe(struct proto p, config_setting_t probes)
176	178	{
	179	+#ifdef LIBPCRE
177	180	int num_probes, errsize, i, res;
178	181	char *err;
179	182	const char * expr;
180	183	regex_t** probe_list;
		@@ -200,8 +203,12 @@
200	203	free(err);
201	204	exit(1);
202	205	}
203	206	}
	207	+#else
	208	+ fprintf(stderr, "line %d: regex probe specified but not compiled in\n", config_setting_source_line(probes));
	209	+ exit(5);
	210	+#endif
204	211	}
205	212	#endif
206	213
207	214	/* Extract configuration for protocols to connect to.

cel / sslh