//#include "TLVParser.ih"
// Custom includes
-#include <iomanip>
#include <senf/Utils/hexdump.hh>
#include <senf/Utils/Format.hh>
+#include <senf/Utils/String.hh>
#define prefix_
-///////////////////////////////cc.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
SENF_PACKET_TLV_REGISTRY_REGISTER( senf::MIHFSrcIdTLVParser );
SENF_PACKET_TLV_REGISTRY_REGISTER( senf::MIHFDstIdTLVParser );
SENF_PACKET_TLV_REGISTRY_REGISTER( senf::MIHStatusTLVParser );
SENF_PACKET_TLV_REGISTRY_REGISTER( senf::MIHValidTimeIntervalTLVParser );
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
+// MIHBaseTLVParser
+
+prefix_ void senf::MIHBaseTLVParser::validateType(boost::uint8_t expectedType)
+ const
+{
+ if (! check( 1 + senf::bytes(length_()) + length()) )
+ throw InvalidMIHPacketException("truncated TLV.") << " Type: " << senf::str(type());
+ if (type() != expectedType)
+ throw InvalidMIHPacketException("invalid TLV type: ") << senf::str(type());
+}
+
+prefix_ void senf::MIHBaseTLVParser::validateTypeLength(boost::uint8_t expectedType, MIHTLVLengthParser::value_type expectedLength)
+ const
+{
+ validateType( expectedLength);
+ if (length() != expectedLength)
+ throw InvalidMIHPacketException("invalid length in TLV.") << " Type: " << senf::str(type());
+}
+
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
+// senf::MIHBaseListTLVParser
+
+prefix_ void senf::MIHBaseListTLVParser::maxListSize(MIHTLVLengthParser::value_type maxl)
+ const
+{
+ protect(), listSize_().capacity( maxl);
+ maxLength( maxl + senf::bytes(listSize_()));
+}
+
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
// senf::MIHFIdTLVParser
prefix_ void senf::MIHFIdTLVParser::dump(std::ostream & os)
prefix_ void senf::MIHFIdTLVParser::finalize()
{
protect(), idLength_().finalize();
- length_() << idLength() + idLength_().bytes();
+ length_() << idLength() + senf::bytes(idLength_());
MIHBaseTLVParser::finalize();
}
-prefix_ void senf::MIHFIdTLVParser::maxIdLength(boost::uint8_t maxLength)
+prefix_ void senf::MIHFIdTLVParser::maxIdLength(boost::uint8_t maxl)
+ const
{
// the maximum length of a MIHF_ID is 253 octets (see F.3.11 in 802.21)
- if (maxLength > 253)
+ if (maxl > 253)
throw std::length_error("maximum length of a MIHF_ID is 253 octets");
- protect(), idLength_().maxValue( maxLength);
- maxLengthValue( maxLength + senf::bytes(idLength_()));
+ protect(), idLength_().capacity( maxl);
+ maxLength( maxl + senf::bytes(idLength_()));
}
prefix_ senf::safe_data_iterator senf::MIHFIdTLVParser::resizeValueField(
- MIHTLVLengthParser::value_type size)
+ MIHTLVLengthParser::value_type size)
{
MIHTLVLengthParser::value_type current_length ( idLength());
idLength_() << size;
{
size_type str_size (id.size());
// the maximum length of a MIHF_ID is 253 octets (see F.3.11 in 802.21)
- if (str_size > 253)
+ if (str_size > 253)
throw std::length_error("maximum length of a MIHF_ID is 253 octets");
- safe_data_iterator si = resizeValueField( str_size);
+ safe_data_iterator si = resizeValueField( str_size);
std::copy( id.begin(), id.end(), si);
}
{
if (length() == 0) return MIHFId();
switch (type) {
- case MIHFId::Empty:
+ case MIHFId::MulticastType:
return MIHFId();
case MIHFId::MACAddress:
return MIHFId( valueAsMACAddress());
}
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
// senf::MIHFSrcIdTLVParser
prefix_ void senf::MIHFSrcIdTLVParser::dump(std::ostream & os)
MIHFIdTLVParser::dump(os);
}
-///////////////////////////////////////////////////////////////////////////
+prefix_ void senf::MIHFSrcIdTLVParser::validate()
+ const
+{
+ if (! check( 1 + senf::bytes(length_()) + length()) )
+ throw InvalidMIHPacketException("truncated TLV.") << " Type: " << senf::str(type());
+ if (type() != typeId)
+ throw InvalidMIHPacketException("invalid TLV type: ") << senf::str(type());
+}
+
+
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
// senf::MIHFDstIdTLVParser
prefix_ void senf::MIHFDstIdTLVParser::dump(std::ostream & os)
MIHFIdTLVParser::dump(os);
}
-///////////////////////////////////////////////////////////////////////////
+prefix_ void senf::MIHFDstIdTLVParser::validate()
+ const
+{
+ if (! check( 1 + senf::bytes(length_()) + length()) )
+ throw InvalidMIHPacketException("truncated TLV.") << " Type: " << senf::str(type());
+ if (type() != typeId)
+ throw InvalidMIHPacketException("invalid TLV type: ") << senf::str(type());
+}
+
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
// senf::MIHStatusTLVParser
prefix_ void senf::MIHStatusTLVParser::dump(std::ostream & os)
case Success:
os << " (Success)" << std::endl;
return;
- case UnspecifiedFailure:
+ case UnspecifiedFailure:
os << " (Unspecified Failure)" << std::endl;
return;
case Rejected:
os << " (???; invalid value!)" << std::endl;
}
-///////////////////////////////////////////////////////////////////////////
+prefix_ void senf::MIHStatusTLVParser::validate()
+ const
+{
+ validateTypeLength( typeId, 1);
+ if (value() >= 4)
+ throw InvalidMIHPacketException("invalid value in MIHStatusTLV ") << senf::str(value());
+}
+
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
// senf::MIHRegisterReqCodeTLVParser
prefix_ void senf::MIHRegisterReqCodeTLVParser::dump(std::ostream & os)
os << " (???; invalid value!)" << std::endl;
}
-///////////////////////////////////////////////////////////////////////////
+prefix_ void senf::MIHRegisterReqCodeTLVParser::validate()
+ const
+{
+ validateTypeLength( typeId, 1);
+ if (value() >= 2)
+ throw InvalidMIHPacketException("invalid value in MIHRegisterReqCodeTLV ") << senf::str(value());
+}
+
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
// senf::MIHValidTimeIntervalTLVParser
prefix_ void senf::MIHValidTimeIntervalTLVParser::dump(std::ostream & os)
<< ( value()==0 ? " (infinite)" : " seconds") << std::endl;
}
-///////////////////////////////////////////////////////////////////////////
+prefix_ void senf::MIHValidTimeIntervalTLVParser::validate()
+ const
+{
+ validateTypeLength( typeId, 4);
+}
+
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
// senf::MIHTLVLengthParser
-prefix_ senf::MIHTLVLengthParser::value_type senf::MIHTLVLengthParser::value() const
+prefix_ senf::MIHTLVLengthParser::value_type senf::MIHTLVLengthParser::value() const
{
switch (bytes() ) {
case 1:
};
}
-prefix_ void senf::MIHTLVLengthParser::value(value_type const & v)
+prefix_ void senf::MIHTLVLengthParser::value(value_type const & v)
{
switch (bytes() ) {
case 1:
underflow_flag() = (v <= 128);
}
-prefix_ senf::MIHTLVLengthParser::value_type senf::MIHTLVLengthParser::maxValue()
+prefix_ senf::MIHTLVLengthParser::value_type senf::MIHTLVLengthParser::capacity()
const
{
switch (bytes() ) {
case 4:
return UInt24Parser::max_value + 128;
case 5:
- return UInt32Parser::max_value;
+ return UInt32Parser::max_value;
default:
throw( MIHTLVLengthException());
};
}
-prefix_ senf::MIHTLVLengthParser const & senf::MIHTLVLengthParser::operator= (value_type other)
+prefix_ senf::MIHTLVLengthParser const & senf::MIHTLVLengthParser::operator= (value_type other)
{
value(other);
- return *this;
+ return *this;
}
-prefix_ void senf::MIHTLVLengthParser::init() const
+prefix_ void senf::MIHTLVLengthParser::init() const
{
defaultInit();
extended_length_flag() = false;
if (b != 5) resize_(5);
}
-prefix_ void senf::MIHTLVLengthParser::maxValue(MIHTLVLengthParser::value_type v)
+prefix_ void senf::MIHTLVLengthParser::capacity(MIHTLVLengthParser::value_type v)
{
if (v <= 128)
return;
}
-///////////////////////////////cc.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
#undef prefix_
\f