tests: merge DummyFace::LinkService with DummyReceiveLinkService
Change-Id: I0b45d80055085278bbe028ef95898d68c6e3f824
diff --git a/daemon/face/generic-link-service.cpp b/daemon/face/generic-link-service.cpp
index e2f7e0e..55ec6ee 100644
--- a/daemon/face/generic-link-service.cpp
+++ b/daemon/face/generic-link-service.cpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
- * Copyright (c) 2014-2018, Regents of the University of California,
+ * Copyright (c) 2014-2019, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -34,6 +34,10 @@
NFD_LOG_INIT(GenericLinkService);
+constexpr size_t CONGESTION_MARK_SIZE = tlv::sizeOfVarNumber(lp::tlv::CongestionMark) + // type
+ tlv::sizeOfVarNumber(sizeof(uint64_t)) + // length
+ tlv::sizeOfNonNegativeInteger(UINT64_MAX); // value
+
constexpr uint32_t DEFAULT_CONGESTION_THRESHOLD_DIVISOR = 2;
GenericLinkService::GenericLinkService(const GenericLinkService::Options& options)
diff --git a/daemon/face/generic-link-service.hpp b/daemon/face/generic-link-service.hpp
index 9bbe1b8..c440932 100644
--- a/daemon/face/generic-link-service.hpp
+++ b/daemon/face/generic-link-service.hpp
@@ -288,9 +288,6 @@
lp::Sequence m_lastSeqNo;
PUBLIC_WITH_TESTS_ELSE_PRIVATE:
- /// CongestionMark TLV-TYPE (3 octets) + CongestionMark TLV-LENGTH (1 octet) + sizeof(uint64_t)
- static constexpr size_t CONGESTION_MARK_SIZE = 3 + 1 + sizeof(uint64_t);
-
/// Time to mark next packet due to send queue congestion
time::steady_clock::TimePoint m_nextMarkTime;
/// Time last packet was marked