Howtos/NewPacket: Small fixes

[senf.git] / PPI / Connectors.cti

diff --git a/PPI/Connectors.cti b/PPI/Connectors.cti
index c00d0c7..b8f5bf3 100644 (file)
--- a/PPI/Connectors.cti
+++ b/PPI/Connectors.cti
@@ -37,14 +37,15 @@ template <class Self, class PacketType>
 prefix_ typename senf::ppi::connector::detail::TypedInputMixin<Self,PacketType>::Type
 senf::ppi::connector::detail::TypedInputMixin<Self,PacketType>::operator()()
 {
-    return static_cast<Self*>(this)->InputConnector::operator()().template as<Type>();
+    return read();
 }
 
 template <class Self, class PacketType>
 prefix_ typename senf::ppi::connector::detail::TypedInputMixin<Self,PacketType>::Type
 senf::ppi::connector::detail::TypedInputMixin<Self,PacketType>::read()
 {
-    return static_cast<Self*>(this)->InputConnector::read().template as<Type>();
+    Packet p (static_cast<Self*>(this)->InputConnector::read());
+    return p ? p.as<Type>() : Type();
 }
 
 ///////////////////////////////////////////////////////////////////////////