Skip to content
Snippets Groups Projects
Commit c92d236c authored by Adrien Béraud's avatar Adrien Béraud
Browse files

c wrapper: handle null string in config

parent b680407e
Branches
No related tags found
No related merge requests found
...@@ -168,7 +168,8 @@ void dht_runner_run_config(dht_runner* r, in_port_t port, const dht_runner_confi ...@@ -168,7 +168,8 @@ void dht_runner_run_config(dht_runner* r, in_port_t port, const dht_runner_confi
config.dht_config.node_config.maintain_storage = conf->dht_config.node_config.maintain_storage; config.dht_config.node_config.maintain_storage = conf->dht_config.node_config.maintain_storage;
config.dht_config.node_config.node_id = *reinterpret_cast<const dht::InfoHash*>(&conf->dht_config.node_config.node_id); config.dht_config.node_config.node_id = *reinterpret_cast<const dht::InfoHash*>(&conf->dht_config.node_config.node_id);
config.dht_config.node_config.network = conf->dht_config.node_config.network; config.dht_config.node_config.network = conf->dht_config.node_config.network;
config.dht_config.node_config.persist_path = conf->dht_config.node_config.persist_path; config.dht_config.node_config.persist_path = conf->dht_config.node_config.persist_path
? std::string(conf->dht_config.node_config.persist_path) : std::string{};
if (conf->dht_config.id.privkey) if (conf->dht_config.id.privkey)
config.dht_config.id.first = *reinterpret_cast<const PrivkeySp*>(conf->dht_config.id.privkey); config.dht_config.id.first = *reinterpret_cast<const PrivkeySp*>(conf->dht_config.id.privkey);
...@@ -177,9 +178,9 @@ void dht_runner_run_config(dht_runner* r, in_port_t port, const dht_runner_confi ...@@ -177,9 +178,9 @@ void dht_runner_run_config(dht_runner* r, in_port_t port, const dht_runner_confi
config.dht_config.id.second = *reinterpret_cast<const CertSp*>(conf->dht_config.id.certificate); config.dht_config.id.second = *reinterpret_cast<const CertSp*>(conf->dht_config.id.certificate);
config.threaded = conf->threaded; config.threaded = conf->threaded;
config.proxy_server = conf->proxy_server; config.proxy_server = conf->proxy_server ? std::string(conf->proxy_server) : std::string{};
config.push_node_id = conf->push_node_id; config.push_node_id = conf->push_node_id ? std::string(conf->push_node_id) : std::string{};
config.push_token = conf->push_token; config.push_token = conf->push_token ? std::string(conf->push_token) : std::string{};
config.peer_discovery = conf->peer_discovery; config.peer_discovery = conf->peer_discovery;
config.peer_publish = conf->peer_publish; config.peer_publish = conf->peer_publish;
runner->run(port, config); runner->run(port, config);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment