merge ca config and client config, remove old format of probe
Change-Id: I73500f532f166851d82c1bf1cc008c7ffc241ef3
diff --git a/src/protocol-detail/probe.hpp b/src/protocol-detail/probe.hpp
index 41b73c8..126fba4 100644
--- a/src/protocol-detail/probe.hpp
+++ b/src/protocol-detail/probe.hpp
@@ -21,22 +21,18 @@
#ifndef NDNCERT_PROTOCOL_DETAIL_PROBE_HPP
#define NDNCERT_PROTOCOL_DETAIL_PROBE_HPP
-#include "../ca-config.hpp"
-#include "../client-config.hpp"
+#include "../configuration.hpp"
namespace ndn {
namespace ndncert {
class PROBE {
public:
- static std::vector<std::string>
- parseProbeComponents(const std::string& probe);
+ static Block
+ encodeApplicationParameters(std::vector<std::tuple<std::string, std::string>>&& parameters);
static Block
- encodeApplicationParametersFromProbeInfo(const ClientCaItem& ca, const std::string& probeInfo);
-
- static Block
- encodeDataContent(const Name& identifier, const std::string& m_probe, const Block& parameterTLV);
+ encodeDataContent(const std::vector<Name>& identifiers, boost::optional<size_t> maxSuffixLength);
};
} // namespace ndncert