**breaking** consolidate src/tlv/*lsa* into src/lsa/*lsa*
Lsa de/serialize functions are replaced by wireEncode/Decode.
Update LSA wire formats. Change TLV assignments as required.
Update nlsrc to print using new encoding.
refs: #4787
Change-Id: Ie8d40b7836d51ea5bb444c8db208dc2b3a0d1cec
diff --git a/src/tlv/tlv-nlsr.hpp b/src/tlv/tlv-nlsr.hpp
index 265b2c6..e7d2253 100644
--- a/src/tlv/tlv-nlsr.hpp
+++ b/src/tlv/tlv-nlsr.hpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
- * Copyright (c) 2014-2019, The University of Memphis,
+ * Copyright (c) 2014-2020, The University of Memphis,
* Regents of the University of California,
* Arizona Board of Regents.
*
@@ -34,24 +34,23 @@
* used in the LSDB Status Dataset.
*/
enum {
- LsaInfo = 128,
- OriginRouter = 129,
- SequenceNumber = 130,
- AdjacencyLsa = 131,
- Adjacency = 132,
- CoordinateLsa = 133,
- CostDouble = 134,
- HyperbolicRadius = 135,
- HyperbolicAngle = 136,
- NameLsa = 137,
- LsdbStatus = 138,
- ExpirationPeriod = 139,
- Cost = 140,
- Uri = 141,
- Destination = 142,
- NextHop = 143,
- RoutingTable = 144,
- RouteTableEntry = 145,
+ Lsa = 128,
+ SequenceNumber = 130,
+ AdjacencyLsa = 131,
+ Adjacency = 132,
+ CoordinateLsa = 133,
+ CostDouble = 134,
+ HyperbolicRadius = 135,
+ HyperbolicAngle = 136,
+ NameLsa = 137,
+ LsdbStatus = 138,
+ ExpirationTime = 139,
+ Cost = 140,
+ Uri = 141,
+ Destination = 142,
+ NextHop = 143,
+ RoutingTable = 144,
+ RoutingTableEntry = 145
};
} // namespace nlsr