Implemented dnsmasq.postconf scripts

Author: paldier

release/src/router/rc/services.c

@@ -1672,10 +1672,12 @@ void start_dnsmasq(void)
 #elif (defined(RTCONFIG_TR069) && !defined(RTCONFIG_TR181))
 	fprintf(fp, "dhcp-script=/sbin/dhcpc_lease\n");
 #endif
-
+	append_custom_config("dnsmasq.conf", fp);
 	/* close fp move to the last */
 	fclose(fp);
-
+	use_custom_config("dnsmasq.conf", "/etc/dnsmasq.conf");
+	run_postconf("dnsmasq", "/etc/dnsmasq.conf");
+	chmod("/etc/dnsmasq.conf", 0644);
 	/* Create resolv.conf with empty nameserver list */
 	f_write(dmresolv, NULL, 0, FW_APPEND, 0666);
 	/* Create resolv.dnsmasq with empty server list */

release/src/router/shared/shared.h

@@ -1686,6 +1686,8 @@ extern int discover_interface(const char *current_wan_ifname, int dhcp_det);
 extern int discover_all(int wan_unit);
 
 // strings.c
+extern int replace_char(char *str, const char from, const char to);
+extern int str_escape_quotes(const char *output, const char *input, int outsize);
 extern int char_to_ascii_safe(const char *output, const char *input, int outsize);
 extern void char_to_ascii(const char *output, const char *input);
 #if defined(RTCONFIG_UTF8_SSID)
@@ -1844,7 +1846,6 @@ void set_macfilter_all(FILE *fp);
 #else
 static inline char *get_wsup_drvname(__attribute__ ((unused)) int band) { return ""; }
 #endif
-extern int replace_char(char *str, const char from, const char to);
 #ifdef RTCONFIG_TRAFFIC_LIMITER
 extern unsigned int traffic_limiter_read_bit(const char *type);
 extern void traffic_limiter_set_bit(const char *type, int unit);

release/src/router/shared/strings.c

@@ -17,17 +17,6 @@
 #include "shutils.h"
 #include "shared.h"
 
-int replace_char(char *str, const char from, const char to)
-{
-	char *p = str;
-	while (*p) {
-		if (*p == from)
-			*p = to;
-		p++;
-	}
-	return 1;
-}
-
 #if defined(RTCONFIG_UTF8_SSID)
 int is_utf8(const char * string)
 {
@@ -327,6 +316,44 @@ int remove_word(char *buffer, const char *word)
 	return 1;
 }
 
+int replace_char(char *str, const char from, const char to)
+{
+	char *p = str;
+	while (*p) {
+		if (*p == from)
+			*p = to;
+		p++;
+	}
+	return 1;
+}
+
+/* Escape characters that could break a Javascript array */
+int str_escape_quotes(const char *output, const char *input, int outsize)
+{
+	char *src = (char *)input;
+	char *dst = (char *)output;
+	char *end = (char *)output + outsize - 1;
+	char *escape = "'\"\\";
+
+	if (src == NULL || dst == NULL || outsize <= 0)
+		return 0;
+
+	for ( ; *src && dst < end; src++) {
+		if (strchr(escape, *src)) {
+			if (dst + 2 > end)
+				break;
+			*dst++ = '\\';
+			*dst++ = *src;
+		} else {
+			*dst++ = *src;
+		}
+	}
+	if (dst <= end)
+		*dst = '\0';
+
+	return dst - output;
+}
+
 void trim_space(char *str)
 {
 	char *pt;