Remove hints
Change-Id: I537619fefad6ffb6b46c5dc618f0fdcc15884d6e
diff --git a/src/clients/query.hpp b/src/clients/query.hpp
index d1bba0b..bf76684 100644
--- a/src/clients/query.hpp
+++ b/src/clients/query.hpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/**
- * Copyright (c) 2014, Regents of the University of California.
+ * Copyright (c) 2014-2016, Regents of the University of California.
*
* This file is part of NDNS (Named Data Networking Domain Name Service).
* See AUTHORS.md for complete list of NDNS authors and contributors.
@@ -33,14 +33,14 @@
*
* Query is an Interest whose name follows the format:
*
- * <hint> /xF0. <zone> [<KEY>|<NDNS>|<NDNS-R>] <rrLabel> <rrType>
+ * <zone> [<KEY>|<NDNS>|<NDNS-R>] <rrLabel> <rrType>
*/
class Query : noncopyable
{
public:
Query();
- Query(const Name& hint, const Name& zone, const name::Component& queryType);
+ Query(const Name& zone, const name::Component& queryType);
/**
* @brief construct an Interest according to the query abstraction
@@ -51,18 +51,17 @@
/**
* @brief extract the query information (rrLabel, rrType) from a Interest
*
- * @param hint Forwarding hint
* @param zone NDNS zone
- * @param interest The Interest to parse; the Interest must have correct hint and zone,
+ * @param interest The Interest to parse; the Interest must have correct zone,
* otherwise it's undefined behavior
*/
bool
- fromInterest(const Name& hint, const Name& zone, const Interest& interest);
+ fromInterest(const Name& zone, const Interest& interest);
bool
operator==(const Query& other) const
{
- return (getHint() == other.getHint() && getZone() == other.getZone() &&
+ return (getZone() == other.getZone() &&
getQueryType() == other.getQueryType() && getRrLabel() == other.getRrLabel() &&
getRrType() == other.getRrType());
}
@@ -76,27 +75,6 @@
public:
/**
- * @brief get forwarding hint. default empty hint (empty() == True),
- * hint won't add to the name
- */
- const Name&
- getHint() const
- {
- return m_hint;
- }
-
- /**
- * @brief set forwarding hint. default empty hint (empty() == True),
- * hint won't add to the name
- */
- void
- setHint(const Name& hint)
- {
- m_hint = hint;
- }
-
-
- /**
* @brief get name of authoritative zone
*/
const Name&
@@ -188,7 +166,6 @@
}
private:
- Name m_hint;
Name m_zone;
name::Component m_queryType;
Name m_rrLabel;