janis/aes67-daemon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: mdns_enabled parameter encoded as JSON boolean instead of JSON string

Browse Source
This commit is contained in:
Andrea Bondavalli 2020-04-02 19:50:35 +02:00
parent e37c615cd8
commit 85c36c3fd6
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
daemon/json.cpp
View File

@ -91,7 +91,7 @@ std::string config_to_json(const Config& config) {
<< ",\n \"syslog_server\": \"" << escape_json(config.get_syslog_server()) << "\"" << ",\n \"syslog_server\": \"" << escape_json(config.get_syslog_server()) << "\""
<< ",\n \"status_file\": \"" << escape_json(config.get_status_file()) << "\"" << ",\n \"status_file\": \"" << escape_json(config.get_status_file()) << "\""
<< ",\n \"interface_name\": \"" << escape_json(config.get_interface_name()) << "\"" << ",\n \"interface_name\": \"" << escape_json(config.get_interface_name()) << "\""
<< ",\n \"mdns_enabled\": \"" << std::boolalpha << config.get_mdns_enabled() << "\"" << ",\n \"mdns_enabled\": " << std::boolalpha << config.get_mdns_enabled()
<< ",\n \"mac_addr\": \"" << escape_json(config.get_mac_addr_str()) << "\"" << ",\n \"mac_addr\": \"" << escape_json(config.get_mac_addr_str()) << "\""
<< ",\n \"ip_addr\": \"" << escape_json(config.get_ip_addr_str()) << "\"" << ",\n \"ip_addr\": \"" << escape_json(config.get_ip_addr_str()) << "\""
<< "\n}\n"; << "\n}\n";
@ -290,14 +290,14 @@ Config json_to_config_(std::istream& js, Config& config) {
config.set_sap_mcast_addr(remove_undesired_chars(val.get_value<std::string>())); config.set_sap_mcast_addr(remove_undesired_chars(val.get_value<std::string>()));
} else if (key == "sap_interval") { } else if (key == "sap_interval") {
config.set_sap_interval(val.get_value<uint16_t>()); config.set_sap_interval(val.get_value<uint16_t>());
} else if (key == "mdns_enabled") {
config.set_mdns_enabled(val.get_value<bool>());
} else if (key == "status_file") { } else if (key == "status_file") {
config.set_status_file(remove_undesired_chars(val.get_value<std::string>())); config.set_status_file(remove_undesired_chars(val.get_value<std::string>()));
} else if (key == "syslog_proto") { } else if (key == "syslog_proto") {
config.set_syslog_proto(remove_undesired_chars(val.get_value<std::string>())); config.set_syslog_proto(remove_undesired_chars(val.get_value<std::string>()));
} else if (key == "syslog_server") { } else if (key == "syslog_server") {
config.set_syslog_server(remove_undesired_chars(val.get_value<std::string>())); config.set_syslog_server(remove_undesired_chars(val.get_value<std::string>()));
} else if (key == "mdns_enabled") {
config.set_mdns_enabled(val.get_value<bool>());
} else if (key == "mac_addr" || key == "ip_addr") { } else if (key == "mac_addr" || key == "ip_addr") {
/* ignored */ /* ignored */
} else { } else {

2
daemon/tests/daemon.conf
View File

@ -16,7 +16,7 @@
"syslog_server": "255.255.255.254:1234", "syslog_server": "255.255.255.254:1234",
"status_file": "", "status_file": "",
"interface_name": "lo", "interface_name": "lo",
"mdns_enabled": "false", "mdns_enabled": false,
"mac_addr": "00:00:00:00:00:00", "mac_addr": "00:00:00:00:00:00",
"ip_addr": "127.0.0.1" "ip_addr": "127.0.0.1"
} }