diff options
| author | kukosa <kukosa@f5534014-38df-0310-8fa8-9805f1628bb7> | 2011-11-24 15:18:11 +0000 |
|---|---|---|
| committer | kukosa <kukosa@f5534014-38df-0310-8fa8-9805f1628bb7> | 2011-11-24 15:18:11 +0000 |
| commit | ca1de23928c0a64851de23f699590c891de56acc (patch) | |
| tree | c6b03030378a27cdc829f5809d7ffcee459ba9f9 /asn1 | |
| parent | e7c9586d94f2bdb1734d571c409cf4f0e17ce416 (diff) | |
Fix H.460.18 and H.460.19 integration into H.245
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39998 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'asn1')
| -rw-r--r-- | asn1/h245/h245.cnf | 6 | ||||
| -rw-r--r-- | asn1/h460/packet-h460-template.c | 14 |
2 files changed, 13 insertions, 7 deletions
diff --git a/asn1/h245/h245.cnf b/asn1/h245/h245.cnf index 83cedc7b4a..42e2106172 100644 --- a/asn1/h245/h245.cnf +++ b/asn1/h245/h245.cnf @@ -631,12 +631,16 @@ if (h245_pi != NULL) } %(DEFAULT_BODY)s + if (gefx) { + gefx->subid = ep_strdup_printf("%%u", subMessageIdentifer); + gef_ctx_update_key(gef_ctx_get(actx->private_data)); + /* DEBUG */ /*proto_tree_add_text(tree, tvb, offset>>3, 0, "*** DEBUG CapabilityIdentifier: %%s", gef_ctx_get(actx->private_data)->key);*/ + } if (hf_index == hf_h245_subMessageIdentifier_standard) { col_append_fstr(actx->pinfo->cinfo, COL_INFO, "%%s", val_to_str(subMessageIdentifer, h245_h239subMessageIdentifier_vals, "<unknown>") ); g_snprintf(h245_pi->frame_label, 50, "%%s", val_to_str(subMessageIdentifer, h245_h239subMessageIdentifier_vals, "<unknown>")); } - if (gefx) gefx->subid = ep_strdup_printf("%%u", subMessageIdentifer); #.END #.FN_HDR GenericMessage/messageContent/_item diff --git a/asn1/h460/packet-h460-template.c b/asn1/h460/packet-h460-template.c index d227cac061..4a4c790dca 100644 --- a/asn1/h460/packet-h460-template.c +++ b/asn1/h460/packet-h460-template.c @@ -174,17 +174,19 @@ static h460_feature_t h460_feature_tab[] = { { GD|FD, "17", "RAS over H.225.0", NULL, FFILL }, { GD|FD, "17/1", "RAS message", dissect_ras, FFILL }, /* H.460.18 */ - { GD|FD|GM, "18", "Signalling Traversal", NULL, FFILL }, + { GD|FD , "18", "Signalling Traversal", NULL, FFILL }, { GD|FD , "18/1", "IncomingCallIndication", dissect_h460_18_IncomingCallIndication_PDU, FFILL }, { GD|FD , "18/2", "LRQKeepAliveData", dissect_h460_18_LRQKeepAliveData_PDU, FFILL }, - { GM, "18-1", "connectionCorrelation", NULL, FFILL }, - { GM, "18-1/1", "callIdentifier", NULL, FFILL }, - { GM, "18-1/2", "answerCall", NULL, FFILL }, + { GM, "0.0.8.460.18.0.1", "Signalling Traversal", NULL, FFILL }, + { GM, "0.0.8.460.18.0.1-1", "connectionCorrelation", NULL, FFILL }, + { GM, "0.0.8.460.18.0.1-1/1", "callIdentifier", NULL, FFILL }, + { GM, "0.0.8.460.18.0.1-1/2", "answerCall", NULL, FFILL }, /* H.460.19 */ - { GD|FD|GI, "19", "mediaNATFWTraversal", NULL, FFILL }, + { GD|FD , "19", "mediaNATFWTraversal", NULL, FFILL }, { GD|FD , "19/1", "supportTransmitMultiplexedMedia", NULL, FFILL }, { GD|FD , "19/2", "mediaTraversalServer", NULL, FFILL }, - { GI, "19/1", "Traversal Parameters", dissect_h460_19_TraversalParameters_PDU, FFILL }, + { GI, "0.0.8.460.19.0.1", "mediaNATFWTraversal", NULL, FFILL }, + { GI, "0.0.8.460.19.0.1/1", "Traversal Parameters", dissect_h460_19_TraversalParameters_PDU, FFILL }, /* H.460.20 */ { GD|FD, "20", "LocationSourceAddress", NULL, FFILL }, { GD|FD, "20/1", "LocationSourceAddress", dissect_h225_ExtendedAliasAddress_PDU, FFILL }, |