osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

From Anders Broman: 

Add recently lost support for the h.323 conversations tap in the h225 dissector.

svn path=/trunk/; revision=13092
This commit is contained in:
Lars Roland 2005-01-17 21:52:30 +00:00
parent 421737d210
commit 5a483e3abe
2 changed files with 30 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
asn1/h225/h225.cnf
View File

@ -262,12 +262,28 @@ guint32 value_len;
#.END
#----------------------------------------------------------------------------------------
#.FN_HDR H323-UU-PDU/h323-message-body/setup
contains_faststart = FALSE;
#.FN_HDR Setup-UUIE
contains_faststart = FALSE;
#.END
#----------------------------------------------------------------------------------------
#.FN_FTR H323-UU-PDU/h323-message-body/setup
h225_pi.cs_type = H225_SETUP;
#.FN_FTR Setup-UUIE
h225_pi.cs_type = H225_SETUP;
#.END
#----------------------------------------------------------------------------------------
#.FN_FTR CallProceeding-UUIE
h225_pi.cs_type = H225_CALL_PROCEDING;
#.END
#----------------------------------------------------------------------------------------
#.FN_FTR Alerting-UUIE
h225_pi.cs_type = H225_ALERTING;
#.END
#----------------------------------------------------------------------------------------
#.FN_FTR ReleaseComplete-UUIE
h225_pi.cs_type = H225_RELEASE_COMPLET;
#.END
#----------------------------------------------------------------------------------------
#.FN_FTR Connect-UUIE
h225_pi.cs_type = H225_CONNECT;
#.END
#----------------------------------------------------------------------------------------
#.FN_HDR H245TransportAddress
@ -420,6 +436,7 @@ guint32 value_len;
1U, 65535U, &(h225_pi.requestSeqNum), NULL, FALSE);
#----------------------------------------------------------------------------------------
#.TYPE_ATTR
H221NonStandard/t35CountryCode TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(T35CountryCode_vals)
TransportAddress/ipAddress/ip TYPE = FT_IPv4 DISPLAY = BASE_NONE STRINGS = NULL

21
epan/dissectors/packet-h225.c
View File

@ -109,7 +109,7 @@ static int hf_h225_user_data = -1; /* T_user_data */
static int hf_h225_protocol_discriminator = -1; /* INTEGER_0_255 */
static int hf_h225_user_information = -1; /* OCTET_STRING_SIZE_1_131 */
static int hf_h225_h323_message_body = -1; /* T_h323_message_body */
static int hf_h225_setup = -1; /* T_setup */
static int hf_h225_setup = -1; /* Setup_UUIE */
static int hf_h225_callProceeding = -1; /* CallProceeding_UUIE */
static int hf_h225_connect = -1; /* Connect_UUIE */
static int hf_h225_alerting = -1; /* Alerting_UUIE */
@ -5256,23 +5256,15 @@ static const per_sequence_t Setup_UUIE_sequence[] = {
static int
dissect_h225_Setup_UUIE(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
contains_faststart = FALSE;
offset = dissect_per_sequence(tvb, offset, pinfo, tree, hf_index,
ett_h225_Setup_UUIE, Setup_UUIE_sequence);
return offset;
}
static int
dissect_h225_T_setup(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
contains_faststart = FALSE;
offset = dissect_h225_Setup_UUIE(tvb, offset, pinfo, tree, hf_index);
h225_pi.cs_type = H225_SETUP;
h225_pi.cs_type = H225_SETUP;
return offset;
}
static int dissect_setup(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) {
return dissect_h225_T_setup(tvb, offset, pinfo, tree, hf_h225_setup);
return dissect_h225_Setup_UUIE(tvb, offset, pinfo, tree, hf_h225_setup);
}
static const per_sequence_t FeatureSet_sequence[] = {
@ -5315,6 +5307,7 @@ dissect_h225_CallProceeding_UUIE(tvbuff_t *tvb, int offset, packet_info *pinfo _
offset = dissect_per_sequence(tvb, offset, pinfo, tree, hf_index,
ett_h225_CallProceeding_UUIE, CallProceeding_UUIE_sequence);
h225_pi.cs_type = H225_CALL_PROCEDING;
return offset;
}
static int dissect_callProceeding(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) {
@ -5349,6 +5342,7 @@ dissect_h225_Connect_UUIE(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, pro
offset = dissect_per_sequence(tvb, offset, pinfo, tree, hf_index,
ett_h225_Connect_UUIE, Connect_UUIE_sequence);
h225_pi.cs_type = H225_CONNECT;
return offset;
}
static int dissect_connect(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) {
@ -5381,6 +5375,7 @@ dissect_h225_Alerting_UUIE(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, pr
offset = dissect_per_sequence(tvb, offset, pinfo, tree, hf_index,
ett_h225_Alerting_UUIE, Alerting_UUIE_sequence);
h225_pi.cs_type = H225_ALERTING;
return offset;
}
static int dissect_alerting(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) {
@ -5562,6 +5557,7 @@ dissect_h225_ReleaseComplete_UUIE(tvbuff_t *tvb, int offset, packet_info *pinfo
offset = dissect_per_sequence(tvb, offset, pinfo, tree, hf_index,
ett_h225_ReleaseComplete_UUIE, ReleaseComplete_UUIE_sequence);
h225_pi.cs_type = H225_RELEASE_COMPLET;
return offset;
}
static int dissect_releaseComplete(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) {
@ -6294,6 +6290,7 @@ dissect_h225_RequestSeqNum(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, pr
1U, 65535U, &(h225_pi.requestSeqNum), NULL, FALSE);
return offset;
}
static int dissect_requestSeqNum(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) {