protocol: add FILTER_DURATION_LONGER

Author: MaxKellermann

debian/changelog

@@ -1,6 +1,7 @@
 cm4all-pond (0.34) unstable; urgency=low
 
   * zeroconf: append the host name to the service name
+  * protocol: add FILTER_DURATION_LONGER
   * protocol: add attribute CONTENT_TYPE
 
  --   

libcommon

@@ -484,6 +484,22 @@ try {
 			throw SimplePondError{"Duplicate FILTER_GENERATOR"};
 
 		return BufferedResult::AGAIN;
+
+	case PondRequestCommand::FILTER_DURATION_LONGER:
+		if (!current.MatchId(id) ||
+		    current.command != PondRequestCommand::QUERY)
+			throw SimplePondError{"Misplaced FILTER_DURATION_LONGER"};
+
+		if (current.filter.duration.HasLonger())
+			throw SimplePondError{"Duplicate FILTER_DURATION_LONGER"};
+
+		if (payload.size() != sizeof(uint64_t))
+			throw SimplePondError{"Malformed FILTER_DURATION_LONGER"};
+
+		current.filter.duration.longer = Net::Log::Duration{FromBE64(*(const uint64_t *)(const void *)payload.data())};
+		if (!current.filter.duration.HasLonger())
+			throw SimplePondError{"Malformed FILTER_DURATION_LONGER"};
+		return BufferedResult::AGAIN;
 	}
 
 	throw SimplePondError{"Command not implemented"};

src/Connection.cxx

@@ -35,6 +35,7 @@ inline bool
 Filter::MatchMore(const Net::Log::Datagram &d) const noexcept
 {
 	return http_status(static_cast<uint16_t>(d.http_status)) &&
+		duration(d) &&
 		MatchFilter(d.host, hosts) &&
 		MatchFilter(d.generator, generators) &&
 		MatchHttpUriStartsWith(d.http_uri, http_uri_starts_with);

src/Filter.cxx

@@ -45,6 +45,24 @@ struct Filter {
 		}
 	} timestamp;
 
+	struct {
+		Net::Log::Duration longer = Net::Log::Duration::zero();
+
+		constexpr bool HasLonger() const noexcept {
+			return longer != Net::Log::Duration::zero();
+		}
+
+		constexpr operator bool() const noexcept {
+			return HasLonger();
+		}
+
+		constexpr bool operator()(const auto &d) const noexcept {
+			return !*this ||
+				(d.valid_duration && d.duration >= longer);
+
+		}
+	} duration;
+
 	Net::Log::Type type = Net::Log::Type::UNSPECIFIED;
 
 	struct {
@@ -74,6 +92,7 @@ private:
 	[[gnu::pure]]
 	bool NeedMore() const noexcept {
 		return http_status || !hosts.empty() ||
+			duration ||
 			!generators.empty() ||
 			!http_uri_starts_with.empty();
 	}

src/Filter.hxx

@@ -121,6 +121,12 @@ enum class PondRequestCommand : uint16_t {
 	 * the exact string to compare with.
 	 */
 	FILTER_GENERATOR = 18,
+
+	/**
+	 * Specify a filter on the "duration" attribute.  Payload is
+	 * a 64 bit unsigned integer [microseconds].
+	 */
+	FILTER_DURATION_LONGER = 19,
 };
 
 enum class PondResponseCommand : uint16_t {

src/Protocol.hxx

@@ -164,6 +164,9 @@ ParseFilterItem(Filter &filter, PondGroupSitePayload &group_site,
 			PrecedingMidnightLocal(std::chrono::system_clock::now());
 		filter.timestamp.since = Net::Log::FromSystem(midnight);
 		filter.timestamp.until = Net::Log::FromSystem(midnight + std::chrono::hours(24));
+	} else if (auto duration_longer = IsFilter(p, "duration_longer")) {
+		auto d = ParseDuration(duration_longer);
+		filter.duration.longer = std::chrono::duration_cast<Net::Log::Duration>(d.first);
 	} else if (auto type_string = IsFilter(p, "type")) {
 		filter.type = Net::Log::ParseType(type_string);
 		if (filter.type == Net::Log::Type::UNSPECIFIED)
@@ -338,6 +341,10 @@ Query(const PondServerSpecification &server, ConstBuffer<const char *> args)
 	if (filter.timestamp.HasUntil())
 		client.Send(id, PondRequestCommand::FILTER_UNTIL, filter.timestamp.until);
 
+	if (filter.duration.HasLonger())
+		client.Send(id, PondRequestCommand::FILTER_DURATION_LONGER,
+			    filter.duration.longer);
+
 	if (filter.http_status) {
 		PondFilterHttpStatusPayload status;
 		status.begin = ToBE16(filter.http_status.begin);