nfqws,tpws: fix invalid port filter message

5 months ago · 1a722c1b78
2 changed files with 8 additions and 4 deletions
--- a/nfq/nfqws.c
+++ b/nfq/nfqws.c
@ -673,6 +673,7 @@ static bool parse_pf_list(char *opt, struct port_filters_head *pfl)
 {
 	char *e,*p,c;
 	port_filter pf;
+	bool b;

 	for (p=opt ; p ; )
 	{
@ -682,9 +683,10 @@ static bool parse_pf_list(char *opt, struct port_filters_head *pfl)
 			*e=0;
 		}

-		if (!pf_parse(p,&pf) || !port_filter_add(pfl,&pf)) return false;
-
+		b = pf_parse(p,&pf) && port_filter_add(pfl,&pf);
 		if (e) *e++=c;
+		if (!b) return false;
+
 		p = e;
 	}
 	return true;
--- a/tpws/tpws.c
+++ b/tpws/tpws.c
@ -335,6 +335,7 @@ static bool parse_pf_list(char *opt, struct port_filters_head *pfl)
 {
 	char *e,*p,c;
 	port_filter pf;
+	bool b;

 	for (p=opt ; p ; )
 	{
@ -344,9 +345,10 @@ static bool parse_pf_list(char *opt, struct port_filters_head *pfl)
 			*e=0;
 		}

-		if (!pf_parse(p,&pf) || !port_filter_add(pfl,&pf)) return false;
-
+		b = pf_parse(p,&pf) && port_filter_add(pfl,&pf);
 		if (e) *e++=c;
+		if (!b) return false;
+
 		p = e;
 	}
 	return true;