From 2885aea65c0ad6d8337b7e3ae4f2e6099f3eedda Mon Sep 17 00:00:00 2001 From: Adam Ierymenko Date: Tue, 7 Jun 2016 11:13:18 -0700 Subject: [PATCH] Only send new format netconf for PV>=6 --- controller/SqliteNetworkController.cpp | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/controller/SqliteNetworkController.cpp b/controller/SqliteNetworkController.cpp index 4d75620d5..a83807ca2 100644 --- a/controller/SqliteNetworkController.cpp +++ b/controller/SqliteNetworkController.cpp @@ -2134,12 +2134,17 @@ NetworkController::ResultCode SqliteNetworkController::_doNetworkConfigRequest(c return NETCONF_QUERY_INTERNAL_SERVER_ERROR; } - // First append the legacy dictionary and a terminating NULL, then serialize the new-format one. - // Newer clients will use the new-format dictionary and older ones will use the old one. - std::string legacyStr(legacy.toString()); - netconf.append((const void *)legacyStr.data(),(unsigned int)legacyStr.length()); + // Append legacy network config data for older devices + if (metaData.protocolVersion < 6) { + std::string legacyStr(legacy.toString()); + netconf.append((const void *)legacyStr.data(),(unsigned int)legacyStr.length()); + } netconf.append((uint8_t)0); - nc.serialize(netconf); + + // Append new format data for newer devices + if (metaData.protocolVersion >= 6) { + nc.serialize(netconf); + } return NetworkController::NETCONF_QUERY_OK; }