From 683254a0dbd208ed1570d36275e5164b2a8885ad Mon Sep 17 00:00:00 2001 From: Adam Ierymenko Date: Tue, 7 Jun 2016 11:17:38 -0700 Subject: Don't bother signing if we are not using the legacy netconf. --- controller/SqliteNetworkController.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/controller/SqliteNetworkController.cpp b/controller/SqliteNetworkController.cpp index a83807ca..799b30f8 100644 --- a/controller/SqliteNetworkController.cpp +++ b/controller/SqliteNetworkController.cpp @@ -2130,15 +2130,14 @@ NetworkController::ResultCode SqliteNetworkController::_doNetworkConfigRequest(c } } - if (!legacy.sign(signingId,now)) { - return NETCONF_QUERY_INTERNAL_SERVER_ERROR; - } - // Append legacy network config data for older devices if (metaData.protocolVersion < 6) { + if (!legacy.sign(signingId,now)) + return NETCONF_QUERY_INTERNAL_SERVER_ERROR; std::string legacyStr(legacy.toString()); netconf.append((const void *)legacyStr.data(),(unsigned int)legacyStr.length()); } + netconf.append((uint8_t)0); // Append new format data for newer devices -- cgit v1.2.3