forked from osmocom/wireshark
Have a filled COL_INFO, even if tree is NULL
svn path=/trunk/; revision=23966
This commit is contained in:
parent
39dfc7b4db
commit
3f431f9dfb
|
@ -2304,12 +2304,10 @@ dissect_pcep_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
||||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "PCEP");
|
col_set_str(pinfo->cinfo, COL_PROTOCOL, "PCEP");
|
||||||
|
|
||||||
/* Clear out stuff in the info column */
|
/* Clear out stuff in the info column */
|
||||||
if(check_col(pinfo->cinfo,COL_INFO))
|
if (check_col(pinfo->cinfo,COL_INFO))
|
||||||
col_clear(pinfo->cinfo,COL_INFO);
|
col_clear(pinfo->cinfo,COL_INFO);
|
||||||
|
|
||||||
if (tree) {
|
dissect_pcep_msg_tree(tvb, tree, ett_pcep, pinfo);
|
||||||
dissect_pcep_msg_tree(tvb, tree, ett_pcep, pinfo);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
@ -2319,7 +2317,7 @@ dissect_pcep(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
||||||
dissect_pcep_pdu);
|
dissect_pcep_pdu);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*Register le protocol with wireshark*/
|
/*Register the protocol with wireshark*/
|
||||||
void
|
void
|
||||||
proto_register_pcep(void){
|
proto_register_pcep(void){
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue