migrate from pcre to pcre2

PCRE is not supported anymore and removed from several distros

2 files changed, 75 insertions, 47 deletions

diff --git a/accel-pppd/ctrl/ipoe/ipoe.c b/accel-pppd/ctrl/ipoe/ipoe.c
index 95ff8568..6139d24e 100644
--- a/accel-pppd/ctrl/ipoe/ipoe.c
+++ b/accel-pppd/ctrl/ipoe/ipoe.c
@@ -20,8 +20,6 @@
 #endif
 #include <linux/route.h>
 
-#include <pcre.h>
-
 #include "events.h"
 #include "list.h"
 #include "triton.h"
@@ -56,7 +54,7 @@
 #define SESSION_TERMINATED "Session was terminated"
 
 struct iplink_arg {
-	pcre *re;
+	pcre2_code *re;
 	const char *opt;
 	long *arg1;
 };
@@ -2804,10 +2802,10 @@ void ipoe_vlan_mon_notify(int ifindex, int vid, int vlan_ifindex)
 	struct ifreq ifr;
 	char *ptr;
 	int len, r, svid;
-	pcre *re = NULL;
-	const char *pcre_err;
+	pcre2_code *re = NULL;
+	int pcre_err;
 	char *pattern;
-	int pcre_offset;
+	PCRE2_SIZE pcre_offset;
 	char ifname[IFNAMSIZ];
 
 	if (!sect)
@@ -2905,15 +2903,17 @@ void ipoe_vlan_mon_notify(int ifindex, int vid, int vlan_ifindex)
 			memcpy(pattern, opt->val + 3, ptr - (opt->val + 3));
 			pattern[ptr - (opt->val + 3)] = 0;
 
-			re = pcre_compile2(pattern, 0, NULL, &pcre_err, &pcre_offset, NULL);
+			re = pcre2_compile((PCRE2_SPTR)pattern, PCRE2_ZERO_TERMINATED, 0, &pcre_err, &pcre_offset, NULL);
 
 			_free(pattern);
 
 			if (!re)
 				continue;
 
-			r = pcre_exec(re, NULL, ifname, len, 0, 0, NULL, 0);
-			pcre_free(re);
+			pcre2_match_data *match_data = pcre2_match_data_create(0, NULL);
+			r = pcre2_match(re, (PCRE2_SPTR)ifname, len, 0, 0, match_data, NULL);
+			pcre2_match_data_free(match_data);
+			pcre2_code_free(re);
 
 			if (r < 0)
 				continue;
@@ -3358,8 +3358,12 @@ static void load_interface(const char *opt)
 
 static int __load_interface_re(int index, int flags, const char *name, int iflink, int vid, struct iplink_arg *arg)
 {
-	if (pcre_exec(arg->re, NULL, name, strlen(name), 0, 0, NULL, 0) < 0)
+	pcre2_match_data *match_data = pcre2_match_data_create(0, NULL);
+	if (pcre2_match(arg->re, (PCRE2_SPTR)name, strlen(name), 0, 0, match_data, NULL) < 0) {
+		pcre2_match_data_free(match_data);
 		return 0;
+	}
+	pcre2_match_data_free(match_data);
 
 	add_interface(name, index, arg->opt, iflink, vid, 0);
 
@@ -3368,11 +3372,11 @@ static int __load_interface_re(int index, int flags, const char *name, int iflin
 
 static void load_interface_re(const char *opt)
 {
-	pcre *re = NULL;
-	const char *pcre_err;
+	pcre2_code *re = NULL;
+	int pcre_err;
 	char *pattern;
 	const char *ptr;
-	int pcre_offset;
+	PCRE2_SIZE pcre_offset;
 	struct iplink_arg arg;
 	struct ipoe_serv *serv;
 
@@ -3382,10 +3386,12 @@ static void load_interface_re(const char *opt)
 	memcpy(pattern, opt + 3, ptr - (opt + 3));
 	pattern[ptr - (opt + 3)] = 0;
 
-	re = pcre_compile2(pattern, 0, NULL, &pcre_err, &pcre_offset, NULL);
+	re = pcre2_compile((PCRE2_SPTR)pattern, PCRE2_ZERO_TERMINATED, 0, &pcre_err, &pcre_offset, NULL);
 
 	if (!re) {
-		log_error("ipoe: '%s': %s at %i\r\n", pattern, pcre_err, pcre_offset);
+		PCRE2_UCHAR err_msg[64];
+		pcre2_get_error_message(pcre_err, err_msg, sizeof(err_msg));
+		log_error("ipoe: '%s': %s at %i\r\n", pattern, err_msg, (int)pcre_offset);
 		return;
 	}
 
@@ -3398,11 +3404,13 @@ static void load_interface_re(const char *opt)
 		if (serv->active)
 			continue;
 
-		if (pcre_exec(re, NULL, serv->ifname, strlen(serv->ifname), 0, 0, NULL, 0) >= 0)
+		pcre2_match_data *match_data = pcre2_match_data_create(0, NULL);
+		if (pcre2_match(re, (PCRE2_SPTR)serv->ifname, strlen(serv->ifname), 0, 0, match_data, NULL) >= 0)
 			add_interface(serv->ifname, serv->ifindex, opt, 0, 0, 0);
+		pcre2_match_data_free(match_data);
 	}
 
-	pcre_free(re);
+	pcre2_code_free(re);
 	_free(pattern);
 }
 
@@ -3670,8 +3678,12 @@ static int __load_vlan_mon_re(int index, int flags, const char *name, int iflink
 	long mask1[4096/8/sizeof(long)];
 	struct ipoe_serv *serv;
 
-	if (pcre_exec(arg->re, NULL, name, strlen(name), 0, 0, NULL, 0) < 0)
+	pcre2_match_data *match_data = pcre2_match_data_create(0, NULL);
+	if (pcre2_match(arg->re, (PCRE2_SPTR)name, strlen(name), 0, 0, match_data, NULL) < 0) {
+		pcre2_match_data_free(match_data);
 		return 0;
+	}
+	pcre2_match_data_free(match_data);
 
 	if (!(flags & IFF_UP)) {
 		memset(&ifr, 0, sizeof(ifr));
@@ -3701,11 +3713,11 @@ static int __load_vlan_mon_re(int index, int flags, const char *name, int iflink
 
 static void load_vlan_mon_re(const char *opt, long *mask, int len)
 {
-	pcre *re = NULL;
-	const char *pcre_err;
+	pcre2_code *re = NULL;
+	int pcre_err;
 	char *pattern;
 	const char *ptr;
-	int pcre_offset;
+	PCRE2_SIZE pcre_offset;
 	struct iplink_arg arg;
 
 	for (ptr = opt; *ptr && *ptr != ','; ptr++);
@@ -3714,10 +3726,12 @@ static void load_vlan_mon_re(const char *opt, long *mask, int len)
 	memcpy(pattern, opt + 3, ptr - (opt + 3));
 	pattern[ptr - (opt + 3)] = 0;
 
-	re = pcre_compile2(pattern, 0, NULL, &pcre_err, &pcre_offset, NULL);
+	re = pcre2_compile((PCRE2_SPTR)pattern, PCRE2_ZERO_TERMINATED, 0, &pcre_err, &pcre_offset, NULL);
 
 	if (!re) {
-		log_error("ipoe: '%s': %s at %i\r\n", pattern, pcre_err, pcre_offset);
+		PCRE2_UCHAR err_msg[64];
+		pcre2_get_error_message(pcre_err, err_msg, sizeof(err_msg));
+		log_error("ipoe: '%s': %s at %i\r\n", pattern, err_msg, (int)pcre_offset);
 		return;
 	}
 
@@ -3727,7 +3741,7 @@ static void load_vlan_mon_re(const char *opt, long *mask, int len)
 
 	iplink_list((iplink_list_func)__load_vlan_mon_re, &arg);
 
-	pcre_free(re);
+	pcre2_code_free(re);
 	_free(pattern);
 
 }
diff --git a/accel-pppd/ctrl/pppoe/pppoe.c b/accel-pppd/ctrl/pppoe/pppoe.c
index 8678db80..c8007414 100644
--- a/accel-pppd/ctrl/pppoe/pppoe.c
+++ b/accel-pppd/ctrl/pppoe/pppoe.c
@@ -83,7 +83,7 @@ struct padi_t
 };
 
 struct iplink_arg {
-	pcre *re;
+	pcre2_code *re;
 	const char *opt;
 	void *cli;
 	long *arg1;
@@ -1368,8 +1368,12 @@ out_err:
 
 static int __pppoe_add_interface_re(int index, int flags, const char *name, int iflink, int vid, struct iplink_arg *arg)
 {
-	if (pcre_exec(arg->re, NULL, name, strlen(name), 0, 0, NULL, 0) < 0)
+	pcre2_match_data *match_data = pcre2_match_data_create(0, NULL);
+	if (pcre2_match(arg->re, (PCRE2_SPTR)name, strlen(name), 0, 0, match_data, NULL) < 0) {
+		pcre2_match_data_free(match_data);
 		return 0;
+	}
+	pcre2_match_data_free(match_data);
 
 	__pppoe_server_start(name, arg->opt, arg->cli, iflink, vid, 0);
 
@@ -1378,11 +1382,11 @@ static int __pppoe_add_interface_re(int index, int flags, const char *name, int
 
 static void pppoe_add_interface_re(const char *opt, void *cli)
 {
-	pcre *re = NULL;
-	const char *pcre_err;
+	pcre2_code *re = NULL;
+	int pcre_err;
 	char *pattern;
 	const char *ptr;
-	int pcre_offset;
+	PCRE2_SIZE pcre_offset;
 	struct iplink_arg arg;
 
 	for (ptr = opt; *ptr && *ptr != ','; ptr++);
@@ -1391,12 +1395,14 @@ static void pppoe_add_interface_re(const char *opt, void *cli)
 	memcpy(pattern, opt + 3, ptr - (opt + 3));
 	pattern[ptr - (opt + 3)] = 0;
 
-	re = pcre_compile2(pattern, 0, NULL, &pcre_err, &pcre_offset, NULL);
+	re = pcre2_compile((PCRE2_SPTR)pattern, PCRE2_ZERO_TERMINATED, 0, &pcre_err, &pcre_offset, NULL);
 
 	if (!re) {
-        if (cli)
-			cli_sendv(cli, "pppoe: %s at %i\r\n", pcre_err, pcre_offset);
-		log_error("pppoe: %s at %i\r\n", pcre_err, pcre_offset);
+		PCRE2_UCHAR err_msg[64];
+		pcre2_get_error_message(pcre_err, err_msg, sizeof(err_msg));
+		if (cli)
+			cli_sendv(cli, "pppoe: %s at %i\r\n", err_msg, (int)pcre_offset);
+		log_error("pppoe: %s at %i\r\n", err_msg, (int)pcre_offset);
 		return;
 	}
 
@@ -1406,7 +1412,7 @@ static void pppoe_add_interface_re(const char *opt, void *cli)
 
 	iplink_list((iplink_list_func)__pppoe_add_interface_re, &arg);
 
-	pcre_free(re);
+	pcre2_code_free(re);
 	_free(pattern);
 }
 
@@ -1678,10 +1684,10 @@ void pppoe_vlan_mon_notify(int ifindex, int vid, int vlan_ifindex)
 	struct ifreq ifr;
 	char *ptr;
 	int len, r, svid;
-	pcre *re = NULL;
-	const char *pcre_err;
+	pcre2_code *re = NULL;
+	int pcre_err;
 	char *pattern;
-	int pcre_offset;
+	PCRE2_SIZE pcre_offset;
 	char ifname[IFNAMSIZ];
 
 	if (!sect)
@@ -1779,15 +1785,17 @@ void pppoe_vlan_mon_notify(int ifindex, int vid, int vlan_ifindex)
 			memcpy(pattern, opt->val + 3, ptr - (opt->val + 3));
 			pattern[ptr - (opt->val + 3)] = 0;
 
-			re = pcre_compile2(pattern, 0, NULL, &pcre_err, &pcre_offset, NULL);
+			re = pcre2_compile((PCRE2_SPTR)pattern, PCRE2_ZERO_TERMINATED, 0, &pcre_err, &pcre_offset, NULL);
 
 			_free(pattern);
 
 			if (!re)
 				continue;
 
-			r = pcre_exec(re, NULL, ifr.ifr_name, len, 0, 0, NULL, 0);
-			pcre_free(re);
+			pcre2_match_data *match_data = pcre2_match_data_create(0, NULL);
+			r = pcre2_match(re, (PCRE2_SPTR)ifr.ifr_name, len, 0, 0, match_data, NULL);
+			pcre2_match_data_free(match_data);
+			pcre2_code_free(re);
 
 			if (r < 0)
 				continue;
@@ -1862,8 +1870,12 @@ static int __load_vlan_mon_re(int index, int flags, const char *name, int iflink
 	long mask1[4096/8/sizeof(long)];
 	struct pppoe_serv_t *serv;
 
-	if (pcre_exec(arg->re, NULL, name, strlen(name), 0, 0, NULL, 0) < 0)
+	pcre2_match_data *match_data = pcre2_match_data_create(0, NULL);
+	if (pcre2_match(arg->re, (PCRE2_SPTR)name, strlen(name), 0, 0, match_data, NULL) < 0) {
+		pcre2_match_data_free(match_data);
 		return 0;
+	}
+	pcre2_match_data_free(match_data);
 
 	memset(&ifr, 0, sizeof(ifr));
 	strcpy(ifr.ifr_name, name);
@@ -1896,11 +1908,11 @@ static int __load_vlan_mon_re(int index, int flags, const char *name, int iflink
 
 static void load_vlan_mon_re(const char *opt, long *mask, int len)
 {
-	pcre *re = NULL;
-	const char *pcre_err;
+	pcre2_code *re = NULL;
+	int pcre_err;
 	char *pattern;
 	const char *ptr;
-	int pcre_offset;
+	PCRE2_SIZE pcre_offset;
 	struct iplink_arg arg;
 
 	for (ptr = opt; *ptr && *ptr != ','; ptr++);
@@ -1909,10 +1921,12 @@ static void load_vlan_mon_re(const char *opt, long *mask, int len)
 	memcpy(pattern, opt + 3, ptr - (opt + 3));
 	pattern[ptr - (opt + 3)] = 0;
 
-	re = pcre_compile2(pattern, 0, NULL, &pcre_err, &pcre_offset, NULL);
+	re = pcre2_compile((PCRE2_SPTR)pattern, PCRE2_ZERO_TERMINATED, 0, &pcre_err, &pcre_offset, NULL);
 
 	if (!re) {
-		log_error("pppoe: '%s': %s at %i\r\n", pattern, pcre_err, pcre_offset);
+		PCRE2_UCHAR err_msg[64];
+		pcre2_get_error_message(pcre_err, err_msg, sizeof(err_msg));
+		log_error("pppoe: '%s': %s at %i\r\n", pattern, err_msg, (int)pcre_offset);
 		return;
 	}
 
@@ -1922,7 +1936,7 @@ static void load_vlan_mon_re(const char *opt, long *mask, int len)
 
 	iplink_list((iplink_list_func)__load_vlan_mon_re, &arg);
 
-	pcre_free(re);
+	pcre2_code_free(re);
 	_free(pattern);
 
 }