diff options
Diffstat (limited to 'epan/dissectors/packet-hl7.c')
| -rw-r--r-- | epan/dissectors/packet-hl7.c | 118 |
1 files changed, 59 insertions, 59 deletions
diff --git a/epan/dissectors/packet-hl7.c b/epan/dissectors/packet-hl7.c index ed8d49a4..5c0898c8 100644 --- a/epan/dissectors/packet-hl7.c +++ b/epan/dissectors/packet-hl7.c @@ -53,29 +53,29 @@ struct msh { // typical/default values dissector_handle_t hl7_handle; -static int proto_hl7 = -1; +static int proto_hl7; -static gint hf_hl7_raw = -1; -static gint hf_hl7_raw_segment = -1; -static gint hf_hl7_llp_sob = -1; -static gint hf_hl7_llp_eob = -1; -static gint hf_hl7_message_type = -1; -static gint hf_hl7_event_type = -1; -static gint hf_hl7_segment = -1; -static gint hf_hl7_field = -1; +static int hf_hl7_raw; +static int hf_hl7_raw_segment; +static int hf_hl7_llp_sob; +static int hf_hl7_llp_eob; +static int hf_hl7_message_type; +static int hf_hl7_event_type; +static int hf_hl7_segment; +static int hf_hl7_field; -static gint ett_hl7 = -1; -static gint ett_hl7_segment = -1; +static int ett_hl7; +static int ett_hl7_segment; -static expert_field ei_hl7_malformed = EI_INIT; +static expert_field ei_hl7_malformed; /* FF: global_hl7_raw determines whether we are going to display * the raw text of the HL7 message (like SIP and MEGACO dissectors) */ -static gboolean global_hl7_raw = FALSE; +static bool global_hl7_raw; /* FF: global_hl7_llp determines whether we are going to display * the LLP block markers */ -static gboolean global_hl7_llp = FALSE; +static bool global_hl7_llp; /* as per Health Level Seven, Version 2.6, appendix A */ static const string_string hl7_msg_type_vals[] = { @@ -675,19 +675,19 @@ static const string_string hl7_event_type_vals[] = { { NULL, NULL } }; -static gboolean +static bool event_present(const struct msh *msh) { - return msh->trigger_event[0] == 0 ? FALSE : TRUE; + return msh->trigger_event[0] == 0 ? false : true; } static int -parse_msh(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, gint offset, +parse_msh(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, int offset, struct msh *msh) { - gint segment_len = -1; - gint end_of_segment_offset = -1; - gint field_separator_offset = -1; - gint field_number = 0; + int segment_len = -1; + int end_of_segment_offset = -1; + int field_separator_offset = -1; + int field_number = 0; /* initialize msh */ msh->trigger_event[0] ='\0'; @@ -696,22 +696,22 @@ parse_msh(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, gint offset, /* e.g. MSH|^~\&|||||||XZY^IJK|||||||\r */ field_number = 1; offset += 3; // skip 'MSH' - msh->field_separator = tvb_get_guint8(tvb, offset); + msh->field_separator = tvb_get_uint8(tvb, offset); offset += 1; - msh->component_separator = tvb_get_guint8(tvb, offset); + msh->component_separator = tvb_get_uint8(tvb, offset); offset += 1; - msh->repetition_separator = tvb_get_guint8(tvb, offset); + msh->repetition_separator = tvb_get_uint8(tvb, offset); offset += 1; - msh->escape_character = tvb_get_guint8(tvb, offset); + msh->escape_character = tvb_get_uint8(tvb, offset); offset += 1; - msh->subcomponent_separator = tvb_get_guint8(tvb, offset); + msh->subcomponent_separator = tvb_get_uint8(tvb, offset); offset += 1; field_number++; /* FF: even if HL7 2.3.1 says each segment must be terminated with CR * we look either for a CR or an LF or both (I did find a system out * there that uses both) */ - segment_len = tvb_find_line_end(tvb, offset, -1, NULL, TRUE); + segment_len = tvb_find_line_end(tvb, offset, -1, NULL, true); if (segment_len == -1) { expert_add_info_format(pinfo, NULL, &ei_hl7_malformed, "Segments must be terminated with CR"); @@ -721,7 +721,7 @@ parse_msh(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, gint offset, while (offset < end_of_segment_offset) { field_separator_offset = - tvb_find_guint8(tvb, offset, end_of_segment_offset - offset, + tvb_find_uint8(tvb, offset, end_of_segment_offset - offset, msh->field_separator); if (field_separator_offset == -1) { if (field_number < 9) { @@ -733,7 +733,7 @@ parse_msh(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, gint offset, } field_number++; offset = field_separator_offset + 1; - if (tvb_get_guint8(tvb, offset) == msh->field_separator) { + if (tvb_get_uint8(tvb, offset) == msh->field_separator) { /* skip the empty field '||' */ continue; } @@ -746,7 +746,7 @@ parse_msh(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, gint offset, ENC_ASCII); proto_item_set_hidden(hidden_item); } - if (tvb_get_guint8(tvb, offset + 3) == msh->component_separator) { + if (tvb_get_uint8(tvb, offset + 3) == msh->component_separator) { tvb_get_raw_bytes_as_string(tvb, offset + 4, msh->trigger_event, 4); if (tree) { proto_item *hidden_item; @@ -763,19 +763,19 @@ parse_msh(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, gint offset, static void dissect_hl7_segment(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree _U_, - gint offset, gint segment_len, gint segment_len_crlf _U_, + int offset, int segment_len, int segment_len_crlf _U_, const struct msh *msh _U_) { /* segment layout xyz|a|b||||c|d\rxyz|a|b|c||||d... */ proto_tree *segment_tree = NULL; proto_item *ti = NULL; char *field_str = NULL; - gint end_of_segment_offset = 0; - gint field_separator_offset = 0; - gint field_num = 0; - gint field_len = 0; - gint segment_consumed = 0; - gboolean last_field = FALSE; + int end_of_segment_offset = 0; + int field_separator_offset = 0; + int field_num = 0; + int field_len = 0; + int segment_consumed = 0; + bool last_field = false; /* calculate where the segment ends */ end_of_segment_offset = offset + segment_len; @@ -787,7 +787,7 @@ dissect_hl7_segment(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree _U_, /* get next '|' offset */ field_separator_offset = - tvb_find_guint8(tvb, offset, + tvb_find_uint8(tvb, offset, segment_len - segment_consumed, msh->field_separator); @@ -795,7 +795,7 @@ dissect_hl7_segment(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree _U_, /* we do not have a field separator */ if (segment_consumed != segment_len) { /* this is the last field */ - last_field = TRUE; + last_field = true; field_len = segment_len - segment_consumed; segment_consumed += field_len + 1; } else { @@ -850,12 +850,12 @@ dissect_hl7_segment(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree _U_, } static void -dissect_hl7_message(tvbuff_t *tvb, guint tvb_offset, gint len, +dissect_hl7_message(tvbuff_t *tvb, unsigned tvb_offset, int len, packet_info *pinfo, proto_tree *tree, void *data _U_) { - guint offset = tvb_offset; - guint sob_offset = offset; - guint eob_offset = offset + len - 2; + unsigned offset = tvb_offset; + unsigned sob_offset = offset; + unsigned eob_offset = offset + len - 2; proto_tree *hl7_tree = NULL; proto_item *ti = NULL; struct msh msh = {0}; @@ -907,13 +907,13 @@ dissect_hl7_message(tvbuff_t *tvb, guint tvb_offset, gint len, /* body */ while (offset < eob_offset) { - gint next_offset = -1; - gint segment_len = -1; - gint segment_len_crlf = -1; + int next_offset = -1; + int segment_len = -1; + int segment_len_crlf = -1; /* FF: even if HL7 2.3.1 says each segment must be terminated with CR * we look either for a CR or an LF or both (I did find a system out * there that uses both) */ - segment_len = tvb_find_line_end(tvb, offset, -1, &next_offset, TRUE); + segment_len = tvb_find_line_end(tvb, offset, -1, &next_offset, true); if (segment_len == -1) { expert_add_info_format(pinfo, NULL, &ei_hl7_malformed, "Segments must be terminated with CR"); @@ -934,11 +934,11 @@ dissect_hl7_message(tvbuff_t *tvb, guint tvb_offset, gint len, static int dissect_hl7(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) { - guint offset = 0; + unsigned offset = 0; while (offset < tvb_reported_length(tvb)) { - gint available = tvb_reported_length_remaining(tvb, offset); - gint llp_eob_offset = tvb_find_guint16(tvb, offset, offset + available, LLP_EOB); + int available = tvb_reported_length_remaining(tvb, offset); + int llp_eob_offset = tvb_find_uint16(tvb, offset, offset + available, LLP_EOB); if (llp_eob_offset == -1) { /* we ran out of data: ask for more */ @@ -949,13 +949,13 @@ dissect_hl7(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) /* tvb_find_ utilities return the *start* of the signature, here we * take care of the LLP_EOB bytes */ - gint llp_block_len = llp_eob_offset - offset + 2; + int llp_block_len = llp_eob_offset - offset + 2; /* FF: nasty case, check whether the capture started after the SOB * transmission. If this is the case we display these trailing bytes * as 'Data' and we will dissect the next complete message. */ - if (tvb_get_guint8(tvb, 0) != LLP_SOB) { + if (tvb_get_uint8(tvb, 0) != LLP_SOB) { tvbuff_t *new_tvb = tvb_new_subset_remaining(tvb, offset); call_data_dissector(new_tvb, pinfo, tree); return (offset + available); @@ -964,7 +964,7 @@ dissect_hl7(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) /* FF: ok we got a complete LLP block '0x0B HL7-message 0x1C 0x0D', * do the dissection */ dissect_hl7_message(tvb, offset, llp_block_len, pinfo, tree, data); - offset += (guint)llp_block_len; + offset += (unsigned)llp_block_len; } /* if we get here, then the end of the tvb matched with the end of a @@ -972,7 +972,7 @@ dissect_hl7(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) return tvb_captured_length(tvb); } -static gboolean +static bool dissect_hl7_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree _U_, void *data _U_) { conversation_t *conversation = NULL; @@ -980,9 +980,9 @@ dissect_hl7_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree _U_, void * /* heuristic is based on first 5 bytes analisys, we assume 0x0B + "MSH|" is good enough */ if ((tvb_reported_length_remaining(tvb, 0) < 5) || - (tvb_get_guint8(tvb, 0) != LLP_SOB) || + (tvb_get_uint8(tvb, 0) != LLP_SOB) || (tvb_strncaseeql(tvb, 1, "MSH|", 4) != 0)) { - return FALSE; + return false; } /* heuristic test passed, associate the non-heuristic port based @@ -1002,14 +1002,14 @@ dissect_hl7_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree _U_, void * * to continue the next processing from the beginning of the PDU * (desegment_offset = 0) because we did not consume/dissect * anything in this cycle. */ - gint llp_eob_offset = tvb_find_guint16(tvb, 0, -1, LLP_EOB); + int llp_eob_offset = tvb_find_uint16(tvb, 0, -1, LLP_EOB); if (llp_eob_offset == -1) { pinfo->desegment_offset = 0; pinfo->desegment_len = DESEGMENT_ONE_MORE_SEGMENT; } - return TRUE; + return true; } void @@ -1065,7 +1065,7 @@ proto_register_hl7(void) }, }; - static gint *ett[] = { + static int *ett[] = { &ett_hl7, &ett_hl7_segment, }; |