diff options
author | Jeff Morriss <jeff.morriss.ws@gmail.com> | 2014-02-17 22:02:21 -0500 |
---|---|---|
committer | Jeff Morriss <jeff.morriss.ws@gmail.com> | 2014-02-18 03:05:28 +0000 |
commit | 8c608e6e82ac40543f139c71f472fdb10f862045 (patch) | |
tree | 026f0c3459942d89d1325f2ea3fc50c0d9a868e3 /epan/dissectors/packet-t38.c | |
parent | ff52d8b70f5838db4fc5df2b43a1ca15235ff57d (diff) |
Remove $Id$ from the ASN.1 dissectors and regenerate them.
Change-Id: Ie476c6f82f318188b41ed922b92c6fec119ea954
Reviewed-on: https://code.wireshark.org/review/244
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
Tested-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-t38.c')
-rw-r--r-- | epan/dissectors/packet-t38.c | 38 |
1 files changed, 18 insertions, 20 deletions
diff --git a/epan/dissectors/packet-t38.c b/epan/dissectors/packet-t38.c index a46b9aa7d9..76b2df43e8 100644 --- a/epan/dissectors/packet-t38.c +++ b/epan/dissectors/packet-t38.c @@ -12,8 +12,6 @@ * 2004 Alejandro Vaquero, add support Conversations for SDP * 2006 Alejandro Vaquero, add T30 reassemble and dissection * - * $Id$ - * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> * Copyright 1998 Gerald Combs @@ -151,7 +149,7 @@ static int hf_t38_fec_data = -1; /* T_fec_data */ static int hf_t38_fec_data_item = -1; /* OCTET_STRING */ /*--- End of included file: packet-t38-hf.c ---*/ -#line 124 "../../asn1/t38/packet-t38-template.c" +#line 122 "../../asn1/t38/packet-t38-template.c" /* T38 setup fields */ static int hf_t38_setup = -1; @@ -185,7 +183,7 @@ static gint ett_t38_T_fec_info = -1; static gint ett_t38_T_fec_data = -1; /*--- End of included file: packet-t38-ett.c ---*/ -#line 144 "../../asn1/t38/packet-t38-template.c" +#line 142 "../../asn1/t38/packet-t38-template.c" static gint ett_t38_setup = -1; static gint ett_data_fragment = -1; @@ -471,7 +469,7 @@ dissect_t38_T30_indicator(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, 16, &T30ind_value, TRUE, 7, NULL); -#line 31 "../../asn1/t38/t38.cnf" +#line 29 "../../asn1/t38/t38.cnf" if (primary_part){ col_append_fstr(actx->pinfo->cinfo, COL_INFO, " t30ind: %s", val_to_str(T30ind_value,t38_T30_indicator_vals,"<unknown>")); @@ -510,7 +508,7 @@ dissect_t38_T30_data(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, pr offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, 9, &Data_value, TRUE, 6, NULL); -#line 43 "../../asn1/t38/t38.cnf" +#line 41 "../../asn1/t38/t38.cnf" if (primary_part){ col_append_fstr(actx->pinfo->cinfo, COL_INFO, " data:%s:", val_to_str(Data_value,t38_T30_data_vals,"<unknown>")); @@ -543,7 +541,7 @@ dissect_t38_Type_of_msg(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, ett_t38_Type_of_msg, Type_of_msg_choice, &Type_of_msg_value); -#line 24 "../../asn1/t38/t38.cnf" +#line 22 "../../asn1/t38/t38.cnf" /* info for tap */ if (primary_part) t38_info->type_msg = Type_of_msg_value; @@ -574,7 +572,7 @@ dissect_t38_T_field_type(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_ offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, 8, &Data_Field_field_type_value, (use_pre_corrigendum_asn1_specification)?FALSE:TRUE, (use_pre_corrigendum_asn1_specification)?0:4, NULL); -#line 63 "../../asn1/t38/t38.cnf" +#line 61 "../../asn1/t38/t38.cnf" if (primary_part){ col_append_fstr(actx->pinfo->cinfo, COL_INFO, " %s", val_to_str(Data_Field_field_type_value,t38_T_field_type_vals,"<unknown>")); @@ -672,7 +670,7 @@ dissect_t38_T_field_type(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_ static int dissect_t38_T_field_data(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 155 "../../asn1/t38/t38.cnf" +#line 153 "../../asn1/t38/t38.cnf" tvbuff_t *value_tvb = NULL; guint32 value_len; @@ -683,7 +681,7 @@ dissect_t38_T_field_data(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_ -#line 162 "../../asn1/t38/t38.cnf" +#line 160 "../../asn1/t38/t38.cnf" if (primary_part){ if(value_len < 8){ col_append_fstr(actx->pinfo->cinfo, COL_INFO, "[%s]", @@ -770,7 +768,7 @@ dissect_t38_Data_Field_item(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_t38_Data_Field_item, Data_Field_item_sequence); -#line 55 "../../asn1/t38/t38.cnf" +#line 53 "../../asn1/t38/t38.cnf" if (primary_part) Data_Field_item_num++; return offset; @@ -811,7 +809,7 @@ dissect_t38_T_seq_number(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_ offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, 0U, 65535U, &seq_number, FALSE); -#line 242 "../../asn1/t38/t38.cnf" +#line 240 "../../asn1/t38/t38.cnf" /* info for tap */ if (primary_part) t38_info->seq_num = seq_number; @@ -825,12 +823,12 @@ dissect_t38_T_seq_number(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_ static int dissect_t38_T_primary_ifp_packet(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 250 "../../asn1/t38/t38.cnf" +#line 248 "../../asn1/t38/t38.cnf" primary_part = TRUE; offset = dissect_per_open_type(tvb, offset, actx, tree, hf_index, dissect_t38_IFPPacket); -#line 252 "../../asn1/t38/t38.cnf" +#line 250 "../../asn1/t38/t38.cnf" /* if is a valid t38 packet, add to tap */ if (p_t38_packet_conv && (!actx->pinfo->flags.in_error_pkt) && ((gint32) seq_number != p_t38_packet_conv_info->last_seqnum)) tap_queue_packet(t38_tap, actx->pinfo, t38_info); @@ -924,14 +922,14 @@ static const per_choice_t T_error_recovery_choice[] = { static int dissect_t38_T_error_recovery(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 260 "../../asn1/t38/t38.cnf" +#line 258 "../../asn1/t38/t38.cnf" primary_part = FALSE; offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_t38_T_error_recovery, T_error_recovery_choice, NULL); -#line 262 "../../asn1/t38/t38.cnf" +#line 260 "../../asn1/t38/t38.cnf" primary_part = TRUE; return offset; @@ -947,7 +945,7 @@ static const per_sequence_t UDPTLPacket_sequence[] = { static int dissect_t38_UDPTLPacket(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 236 "../../asn1/t38/t38.cnf" +#line 234 "../../asn1/t38/t38.cnf" /* Initialize to something else than data type */ Data_Field_field_type_value = 1; @@ -978,7 +976,7 @@ static int dissect_UDPTLPacket_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, pr /*--- End of included file: packet-t38-fn.c ---*/ -#line 393 "../../asn1/t38/packet-t38-template.c" +#line 391 "../../asn1/t38/packet-t38-template.c" /* initialize the tap t38_info and the conversation */ static void @@ -1334,7 +1332,7 @@ proto_register_t38(void) "OCTET_STRING", HFILL }}, /*--- End of included file: packet-t38-hfarr.c ---*/ -#line 672 "../../asn1/t38/packet-t38-template.c" +#line 670 "../../asn1/t38/packet-t38-template.c" { &hf_t38_setup, { "Stream setup", "t38.setup", FT_STRING, BASE_NONE, NULL, 0x0, "Stream setup, method and frame number", HFILL }}, @@ -1395,7 +1393,7 @@ proto_register_t38(void) &ett_t38_T_fec_data, /*--- End of included file: packet-t38-ettarr.c ---*/ -#line 719 "../../asn1/t38/packet-t38-template.c" +#line 717 "../../asn1/t38/packet-t38-template.c" &ett_t38_setup, &ett_data_fragment, &ett_data_fragments |