// Custom includes
#include <senf/Utils/hexdump.hh>
#include <senf/Utils/Format.hh>
-#include <senf/Utils/String.hh>
+#include "Exceptions.hh"
#define prefix_
//-/////////////////////////////////////////////////////////////////////////////////////////////////
//-/////////////////////////////////////////////////////////////////////////////////////////////////
// MIHBaseTLVParser
-prefix_ std::pair<bool, std::string> senf::MIHBaseTLVParser::validateTL(boost::uint8_t expectedType, MIHTLVLengthParser::value_type expectedLength)
+prefix_ void senf::MIHBaseTLVParser::validateType(boost::uint8_t expectedType)
const
{
if (! check( 1 + senf::bytes(length_()) + length()) )
- return std::make_pair(false, "truncated TLV. Type: " + senf::str(type()));
+ throw InvalidMIHPacketException("truncated TLV.") << " Type: " << unsigned(type());
if (type() != expectedType)
- return std::make_pair(false, "invalid TLV type: " + senf::str(type()));
+ throw InvalidMIHPacketException("wrong TLV type. expected ") << unsigned(expectedType) << " got " << unsigned(type());
+}
+
+prefix_ void senf::MIHBaseTLVParser::validateTypeLength(boost::uint8_t expectedType, MIHTLVLengthParser::value_type expectedLength)
+ const
+{
+ validateType( expectedType);
if (length() != expectedLength)
- return std::make_pair(false, "invalid length in TLV. Type: " + senf::str(type()));
- return std::make_pair(true, "");
+ throw InvalidMIHPacketException("invalid length in TLV.") << " Type: " << unsigned(type());
}
//-/////////////////////////////////////////////////////////////////////////////////////////////////
maxLength( maxl + senf::bytes(listSize_()));
}
-
//-/////////////////////////////////////////////////////////////////////////////////////////////////
// senf::MIHFIdTLVParser
MIHFIdTLVParser::dump(os);
}
-prefix_ std::pair<bool, std::string> senf::MIHFSrcIdTLVParser::validate()
+prefix_ void senf::MIHFSrcIdTLVParser::validate()
const
{
- if (! check( 1 + senf::bytes(length_()) + length()) )
- return std::make_pair(false, "truncated TLV. Type: " + senf::str(type()));
- if (type() != typeId)
- return std::make_pair(false, "invalid TLV type: " + senf::str(type()));
- return std::make_pair(true, "");
+ validateType( typeId);
}
MIHFIdTLVParser::dump(os);
}
-prefix_ std::pair<bool, std::string> senf::MIHFDstIdTLVParser::validate()
+prefix_ void senf::MIHFDstIdTLVParser::validate()
const
{
- if (! check( 1 + senf::bytes(length_()) + length()) )
- return std::make_pair(false, "truncated TLV. Type: " + senf::str(type()));
- if (type() != typeId)
- return std::make_pair(false, "invalid TLV type: " + senf::str(type()));
- return std::make_pair(true, "");
+ validateType( typeId);
}
//-/////////////////////////////////////////////////////////////////////////////////////////////////
os << " (???; invalid value!)" << std::endl;
}
-prefix_ std::pair<bool, std::string> senf::MIHStatusTLVParser::validate()
+prefix_ void senf::MIHStatusTLVParser::validate()
const
{
- if (! validateTL( typeId, 1).first)
- return validateTL( typeId, 1);
+ validateTypeLength( typeId, 1);
if (value() >= 4)
- return std::make_pair(false, "invalid value in MIHStatusTLV " + senf::str(value()));
- return std::make_pair(true, "");
+ throw InvalidMIHPacketException("invalid value in MIHStatusTLV ") << unsigned( value());
}
//-/////////////////////////////////////////////////////////////////////////////////////////////////
os << " (???; invalid value!)" << std::endl;
}
-prefix_ std::pair<bool, std::string> senf::MIHRegisterReqCodeTLVParser::validate()
+prefix_ void senf::MIHRegisterReqCodeTLVParser::validate()
const
{
- if (! validateTL( typeId, 1).first)
- return validateTL( typeId, 1);
+ validateTypeLength( typeId, 1);
if (value() >= 2)
- return std::make_pair(false, "invalid value in MIHRegisterReqCodeTLV " + senf::str(value()));
- return std::make_pair(true, "");
+ throw InvalidMIHPacketException("invalid value in MIHRegisterReqCodeTLV ") << unsigned( value());
}
//-/////////////////////////////////////////////////////////////////////////////////////////////////
<< ( value()==0 ? " (infinite)" : " seconds") << std::endl;
}
-prefix_ std::pair<bool, std::string> senf::MIHValidTimeIntervalTLVParser::validate()
+prefix_ void senf::MIHValidTimeIntervalTLVParser::validate()
const
{
- if (! validateTL( typeId, 4).first) return validateTL( typeId, 4);
- return std::make_pair(true, "");
+ validateTypeLength( typeId, 4);
}
//-/////////////////////////////////////////////////////////////////////////////////////////////////