1 files changed, 5 insertions, 6 deletions
diff --git a/gr-digital/lib/packet_headerparser_b_impl.cc b/gr-digital/lib/packet_headerparser_b_impl.cc
index f7593d5fb2..c461bd8160 100644
--- a/gr-digital/lib/packet_headerparser_b_impl.cc
+++ b/gr-digital/lib/packet_headerparser_b_impl.cc
@@ -27,8 +27,6 @@
 #include <gnuradio/io_signature.h>
 #include "packet_headerparser_b_impl.h"
 
-#define msg_port_id     pmt::mp("header_data")
-
 namespace gr {
   namespace digital {
 
@@ -51,9 +49,10 @@ namespace gr {
       : sync_block("packet_headerparser_b",
 		      io_signature::make(1, 1, sizeof (unsigned char)),
 		      io_signature::make(0, 0, 0)),
-      d_header_formatter(header_formatter)
+        d_header_formatter(header_formatter),
+        d_port(pmt::mp("header_data"))
     {
-      message_port_register_out(msg_port_id);
+      message_port_register_out(d_port);
       set_output_multiple(header_formatter->header_len());
     }
 
@@ -81,13 +80,13 @@ namespace gr {
 
       if (!d_header_formatter->header_parser(in, tags)) {
 	GR_LOG_INFO(d_logger, boost::format("Detected an invalid packet at item %1%") % nitems_read(0));
-	message_port_pub(msg_port_id, pmt::PMT_F);
+	message_port_pub(d_port, pmt::PMT_F);
       } else {
 	pmt::pmt_t dict(pmt::make_dict());
 	for (unsigned i = 0; i < tags.size(); i++) {
 	  dict = pmt::dict_add(dict, tags[i].key, tags[i].value);
 	}
-	message_port_pub(msg_port_id, dict);
+	message_port_pub(d_port, dict);
       }
 
       return d_header_formatter->header_len();