forked from osmocom/wireshark
epan: Finish converting endpoint_by_id to elements
Since the endpoint_by_id code uses elements and not the old endpoint structure, it shouldn't set pinfo->use_endpoint to TRUE when creating, and it should check if pinfo->conv_elements is NULL, not pinfo->conv_endpoint.
This commit is contained in:
parent
bd6808c4a0
commit
3e012e2a87
|
@ -1784,14 +1784,12 @@ conversation_create_endpoint_by_id(struct _packet_info *pinfo, endpoint_type ety
|
||||||
pinfo->conv_elements[1].uint_val = id;
|
pinfo->conv_elements[1].uint_val = id;
|
||||||
pinfo->conv_elements[1].type = CE_ENDPOINT;
|
pinfo->conv_elements[1].type = CE_ENDPOINT;
|
||||||
pinfo->conv_elements[1].endpoint_type_val = etype;
|
pinfo->conv_elements[1].endpoint_type_val = etype;
|
||||||
|
|
||||||
pinfo->use_endpoint = TRUE;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
guint32
|
guint32
|
||||||
conversation_get_endpoint_by_id(struct _packet_info *pinfo, endpoint_type etype, const guint options)
|
conversation_get_endpoint_by_id(struct _packet_info *pinfo, endpoint_type etype, const guint options)
|
||||||
{
|
{
|
||||||
if (pinfo->conv_endpoint == NULL) {
|
if (pinfo->conv_elements == NULL) {
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue