aboutsummaryrefslogtreecommitdiffstats
path: root/asn1/acse/packet-acse-template.c
diff options
context:
space:
mode:
authorAnders Broman <anders.broman@ericsson.com>2005-08-31 20:20:56 +0000
committerAnders Broman <anders.broman@ericsson.com>2005-08-31 20:20:56 +0000
commit5dd38628752ff74c50b6adbe2ea8e32d95883b24 (patch)
tree79724962824779630df52ad30aa5d0d8ca168170 /asn1/acse/packet-acse-template.c
parentdc7c32454703d551df94ee7683ab70a08b7996f8 (diff)
Upadte to call Data dissector from PRES based on OID in Presentation Context,
based on the code in ACSE. svn path=/trunk/; revision=15643
Diffstat (limited to 'asn1/acse/packet-acse-template.c')
-rw-r--r--asn1/acse/packet-acse-template.c19
1 files changed, 8 insertions, 11 deletions
diff --git a/asn1/acse/packet-acse-template.c b/asn1/acse/packet-acse-template.c
index f13834eba1..ad51c59bd9 100644
--- a/asn1/acse/packet-acse-template.c
+++ b/asn1/acse/packet-acse-template.c
@@ -182,11 +182,11 @@ dissect_acse(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
/* data pdu is not ACSE pdu and has to go directly to app dissector */
switch(session->spdu_type){
case SES_CONNECTION_REQUEST: /* AARQ */
- case SES_CONNECTION_ACCEPT: /* AARE */
- case SES_REFUSE: /* RLRE */
- case SES_DISCONNECT: /* RLRQ */
- case SES_FINISH: /* RLRE */
- case SES_ABORT: /* ABRT */
+ case SES_CONNECTION_ACCEPT: /* AARE */
+ case SES_REFUSE: /* RLRE */
+ case SES_DISCONNECT: /* RLRQ */
+ case SES_FINISH: /* RLRE */
+ case SES_ABORT: /* ABRT */
break;
case SES_DATA_TRANSFER:
oid=find_oid_by_ctx_id(pinfo, indir_ref);
@@ -225,7 +225,7 @@ dissect_acse(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
switch(session->spdu_type){
case SES_CONNECTION_REQUEST: /* AARQ */
- case SES_CONNECTION_ACCEPT: /* AARE */
+ case SES_CONNECTION_ACCEPT: /* AARE */
/* these two functions are used to set up the association
between a presentation identifier (indir_ref) and
a protocol identified by a oid.
@@ -266,10 +266,7 @@ void proto_register_acse(void) {
/*--- proto_reg_handoff_acse -------------------------------------------*/
void proto_reg_handoff_acse(void) {
/*#include "packet-acse-dis-tab.c"*/
-
- register_ber_oid_name("2.2.3.1.1","aCSE-id");
- register_ber_oid_name("2.2.1.0.1","acse-as-id");
-
-
+ register_ber_oid_dissector("2.2.3.1.1", dissect_acse, proto_acse, "acse");
+ register_ber_oid_dissector("2.2.1.0.1", dissect_acse, proto_acse, "acse-as-id");
}