Commit 7a6dc5f2 authored by 神楽坂玲奈's avatar 神楽坂玲奈

new

parent d6454dd1
Pipeline #16665 failed with stages
in 17 seconds
...@@ -23,7 +23,7 @@ struct Config { ...@@ -23,7 +23,7 @@ struct Config {
std::vector<ConfigRouter> routers; std::vector<ConfigRouter> routers;
}; };
void from_json(const json& j, ConfigRouter& p) { void from_json(const json &j, ConfigRouter &p) {
j.at("remote_id").get_to(p.remote_id); j.at("remote_id").get_to(p.remote_id);
j.at("proto").get_to(p.proto); j.at("proto").get_to(p.proto);
j.at("mark").get_to(p.mark); j.at("mark").get_to(p.mark);
...@@ -34,7 +34,7 @@ void from_json(const json& j, ConfigRouter& p) { ...@@ -34,7 +34,7 @@ void from_json(const json& j, ConfigRouter& p) {
j.at("endpoint").get_to(p.endpoint); j.at("endpoint").get_to(p.endpoint);
} }
void from_json(const json& j, Config& p) { void from_json(const json &j, Config &p) {
j.at("local_id").get_to(p.local_id); j.at("local_id").get_to(p.local_id);
j.at("local_secret").get_to(p.local_secret); j.at("local_secret").get_to(p.local_secret);
j.at("routers").get_to(p.routers); j.at("routers").get_to(p.routers);
......
...@@ -59,7 +59,7 @@ void inbound(int raw) { ...@@ -59,7 +59,7 @@ void inbound(int raw) {
} }
// tun -> internet // tun -> internet
void outbound(Router* router) { void outbound(Router *router) {
unsigned char buffer[ETH_DATA_LEN]; unsigned char buffer[ETH_DATA_LEN];
auto meta = (Meta *) buffer; auto meta = (Meta *) buffer;
meta->src_id = config.local_id; meta->src_id = config.local_id;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment