diff options
| author | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2003-10-09 20:52:57 +0000 |
|---|---|---|
| committer | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2003-10-09 20:52:57 +0000 |
| commit | b4f74879c9f39eb982a2c05a48bee21833ce109f (patch) | |
| tree | e46771a4a4404405620014ac6931c3984185ca3e /packet-t38.c | |
| parent | 0edc4d9e3edabddbe8df9638d9825c1b0a25425d (diff) | |
Prefix OPTIONAL and NOT_OPTIONAL with ASN1_, to avoid collisions with
other definitions of OPTIONAL (such as the one in Windows).
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@8650 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'packet-t38.c')
| -rw-r--r-- | packet-t38.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/packet-t38.c b/packet-t38.c index b8d20e613e..746047ec08 100644 --- a/packet-t38.c +++ b/packet-t38.c @@ -2,7 +2,7 @@ * Routines for T.38 packet dissection * 2003 Hans Viens * - * $Id: packet-t38.c,v 1.1 2003/09/11 13:36:04 sahlberg Exp $ + * $Id: packet-t38.c,v 1.2 2003/10/09 20:52:57 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -310,9 +310,9 @@ dissect_t38_Data_Field_field_data(tvbuff_t *tvb, int offset, packet_info *pinfo, } static per_sequence_t Data_Field_item_sequence[] = { - { "field-type", NO_EXTENSIONS, NOT_OPTIONAL, + { "field-type", NO_EXTENSIONS, ASN1_NOT_OPTIONAL, dissect_t38_Data_Field_field_type }, - { "field-data", NO_EXTENSIONS, OPTIONAL, + { "field-data", NO_EXTENSIONS, ASN1_OPTIONAL, dissect_t38_Data_Field_field_data }, { NULL, 0, 0, NULL } }; @@ -336,9 +336,9 @@ dissect_t38_Data_Field(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree } static per_sequence_t IFPPacket_sequence[] = { - { "type-of-msg", NO_EXTENSIONS, NOT_OPTIONAL, + { "type-of-msg", NO_EXTENSIONS, ASN1_NOT_OPTIONAL, dissect_t38_Type_of_msg }, - { "data-field", NO_EXTENSIONS, OPTIONAL, + { "data-field", NO_EXTENSIONS, ASN1_OPTIONAL, dissect_t38_Data_Field }, { NULL, 0, 0, NULL } }; @@ -427,9 +427,9 @@ dissect_t38_fec_data(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree * } static per_sequence_t fec_info_sequence[] = { - { "fec-npackets", NO_EXTENSIONS, NOT_OPTIONAL, + { "fec-npackets", NO_EXTENSIONS, ASN1_NOT_OPTIONAL, dissect_t38_fec_npackets }, - { "fec-data", NO_EXTENSIONS, NOT_OPTIONAL, + { "fec-data", NO_EXTENSIONS, ASN1_NOT_OPTIONAL, dissect_t38_fec_data }, { NULL, 0, 0, NULL } }; @@ -467,11 +467,11 @@ dissect_t38_error_recovery(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_ } static per_sequence_t UDPTLPacket_sequence[] = { - { "seq-number", NO_EXTENSIONS, NOT_OPTIONAL, + { "seq-number", NO_EXTENSIONS, ASN1_NOT_OPTIONAL, dissect_t38_seq_number }, - { "primary-ifp-packet", NO_EXTENSIONS, NOT_OPTIONAL, + { "primary-ifp-packet", NO_EXTENSIONS, ASN1_NOT_OPTIONAL, dissect_t38_primary_ifp_packet }, - { "error-recovery", NO_EXTENSIONS, NOT_OPTIONAL, + { "error-recovery", NO_EXTENSIONS, ASN1_NOT_OPTIONAL, dissect_t38_error_recovery }, { NULL, 0, 0, NULL } }; |