X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fprotocol.cpp;h=3e7d479b52407f4bca47f3057fdeef7ed507fd96;hb=65b029e8334d4dfc9a6161fc04740b03d56a8e2f;hp=147077cc1253c3c60e7c9ab049951b0e3223445b;hpb=a81c41acd873cda7f40bca634782230d9e57dc4f;p=libs%2Fnet.git

diff --git a/source/protocol.cpp b/source/protocol.cpp
index 147077c..3e7d479 100644
--- a/source/protocol.cpp
+++ b/source/protocol.cpp
@@ -1,5 +1,6 @@
 #include <cstring>
 #include <string>
+#include <msp/core/maputils.h>
 #include <msp/strings/lexicalcast.h>
 #include "protocol.h"
 
@@ -123,18 +124,12 @@ void Protocol::add_packet(PacketDefBase &pdef)
 
 const Protocol::PacketDefBase &Protocol::get_packet_by_class(unsigned id) const
 {
-	PacketMap::const_iterator i = packet_class_defs.find(id);
-	if(i==packet_class_defs.end())
-		throw KeyError("Unknown packet class", lexical_cast(id));
-	return *i->second;
+	return *get_item(packet_class_defs, id);
 }
 
 const Protocol::PacketDefBase &Protocol::get_packet_by_id(unsigned id) const
 {
-	PacketMap::const_iterator i = packet_id_defs.find(id);
-	if(i==packet_id_defs.end())
-		throw KeyError("Unknown packet ID", lexical_cast(id));
-	return *i->second;
+	return *get_item(packet_id_defs, id);
 }
 
 unsigned Protocol::disassemble(ReceiverBase &rcv, const char *data, unsigned size) const