Skip to content

Commit 6b74bf2

Browse files
committed
fix assign mode json
1 parent fe221b9 commit 6b74bf2

File tree

1 file changed

+15
-2
lines changed

1 file changed

+15
-2
lines changed

nonfree/controller/PubSubListener.cpp

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -330,14 +330,27 @@ nlohmann::json toJson(const pbmessages::NetworkChange_Network& nc, pbmessages::N
330330
if (nc.has_ipv4_assign_mode()) {
331331
nlohmann::json ipv4mode;
332332
ipv4mode["zt"] = nc.ipv4_assign_mode().zt();
333-
out["ipv4AssignMode"] = ipv4mode;
333+
out["v4AssignMode"] = ipv4mode;
334334
}
335+
else {
336+
nlohmann::json ipv4mode = nlohmann::json::object();
337+
out["zt"] = false;
338+
out["v4AssignMode"] = ipv4mode;
339+
}
340+
335341
if (nc.has_ipv6_assign_mode()) {
336342
nlohmann::json ipv6mode;
337343
ipv6mode["6plane"] = nc.ipv6_assign_mode().six_plane();
338344
ipv6mode["rfc4193"] = nc.ipv6_assign_mode().rfc4193();
339345
ipv6mode["zt"] = nc.ipv6_assign_mode().zt();
340-
out["ipv6AssignMode"] = ipv6mode;
346+
out["v6AssignMode"] = ipv6mode;
347+
}
348+
else {
349+
nlohmann::json ipv6mode = nlohmann::json::object();
350+
ipv6mode["6plane"] = false;
351+
ipv6mode["rfc4193"] = false;
352+
ipv6mode["zt"] = false;
353+
out["v6AssignMode"] = ipv6mode;
341354
}
342355

343356
if (nc.assignment_pools_size() > 0) {

0 commit comments

Comments
 (0)