Don't guard col_set_str (COL_INFO/COL_PROTOCOL) with col_check

[obnox/wireshark/wip.git] / epan / dissectors / packet-nhrp.c

diff --git a/epan/dissectors/packet-nhrp.c b/epan/dissectors/packet-nhrp.c
index 0b2b16e7fabc6016a2e8deb015cd3d27abfefb87..e3ceef7af0075d35473732b632de1113d83085a2 100644 (file)
--- a/epan/dissectors/packet-nhrp.c
+++ b/epan/dissectors/packet-nhrp.c
@@ -840,9 +840,7 @@ void dissect_nhrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
        proto_tree *nhrp_tree = NULL;
        oui_info_t *oui_info;
                
-       if (check_col(pinfo->cinfo, COL_PROTOCOL)) {
-               col_set_str(pinfo->cinfo, COL_PROTOCOL, "NHRP");
-       }
+       col_set_str(pinfo->cinfo, COL_PROTOCOL, "NHRP");
        if (check_col(pinfo->cinfo, COL_INFO)) {
                col_clear(pinfo->cinfo, COL_INFO);
        }
@@ -940,7 +938,7 @@ proto_register_nhrp(void)
                { &hf_nhrp_src_nbma_addr,
                  { "Source NBMA Address",                      "nhrp.src.nbma.addr",FT_IPv4,   BASE_NONE, NULL, 0x0, NULL, HFILL }},
                { &hf_nhrp_src_nbma_saddr,
-                 { "Source NBMA Sub Address",          "nhrp.src.nbma.saddr",FT_UINT_BYTES,BASE_HEX, NULL, 0x0, NULL, HFILL }},
+                 { "Source NBMA Sub Address",          "nhrp.src.nbma.saddr",FT_UINT_BYTES,BASE_NONE, NULL, 0x0, NULL, HFILL }},
                { &hf_nhrp_src_prot_addr,
                  { "Source Protocol Address",          "nhrp.src.prot.addr",FT_IPv4,   BASE_NONE, NULL, 0x0, NULL, HFILL }},
                { &hf_nhrp_dst_prot_addr,
@@ -975,7 +973,7 @@ proto_register_nhrp(void)
                { &hf_nhrp_client_nbma_addr,
                  { "Client NBMA Address",              "nhrp.client.nbma.addr", FT_IPv4,               BASE_NONE, NULL, 0x0, NULL, HFILL }},
                { &hf_nhrp_client_nbma_saddr,
-                 { "Client NBMA Sub Address",  "nhrp.client.nbma.saddr",FT_UINT_BYTES, BASE_HEX,  NULL, 0x0, NULL, HFILL }},
+                 { "Client NBMA Sub Address",  "nhrp.client.nbma.saddr",FT_UINT_BYTES, BASE_NONE,  NULL, 0x0, NULL, HFILL }},
                { &hf_nhrp_client_prot_addr,
                  { "Client Protocol Address",  "nhrp.client.prot.addr", FT_IPv4,               BASE_NONE, NULL, 0x0, NULL, HFILL }},
 
@@ -986,12 +984,12 @@ proto_register_nhrp(void)
                { &hf_nhrp_ext_len,
                  { "Extension length",                 "nhrp.ext.len",                 FT_UINT16,      BASE_DEC, NULL, 0x0, NULL, HFILL }},
                { &hf_nhrp_ext_value,
-                 { "Extension Value",                  "nhrp.ext.val",                 FT_UINT_BYTES,BASE_HEX, NULL, 0x0, NULL, HFILL }},
+                 { "Extension Value",                  "nhrp.ext.val",                 FT_UINT_BYTES,BASE_NONE, NULL, 0x0, NULL, HFILL }},
 
                { &hf_nhrp_error_offset,
                  { "Error Offset",                     "nhrp.err.offset",              FT_UINT16,      BASE_DEC, NULL, 0x0, NULL, HFILL }},
                { &hf_nhrp_error_packet,
-                 { "Errored Packet",                   "nhrp.err.pkt",                 FT_UINT_BYTES,BASE_HEX, NULL, 0x0, NULL, HFILL }},
+                 { "Errored Packet",                   "nhrp.err.pkt",                 FT_UINT_BYTES,BASE_NONE, NULL, 0x0, NULL, HFILL }},
        };
        
        static gint *ett[] = {