diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2005-09-04 20:30:31 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2005-09-04 20:30:31 +0000 |
| commit | bbf0fb6ddec7a7d5b2020be734311cca73271d8f (patch) | |
| tree | d7b64954afea70104eac925b15dc5eaac90729e1 /asn1/ros/packet-ros-template.c | |
| parent | d9e1a9c0bbf93cd8573f970ef151c65d41f34629 (diff) | |
From Graeme Lunt
I attach my RTSE dissector (in tar file) which requires the included ROS dissector, as well as a patch to the latest pres.{cnf,asn}. The ROS dissector uses a new field in the SESSION_DATA_STRUCTURE to pass the ROS operation to the sub-dissector, though this is also set by other dissectors (RTSE uses it in X.410 mode).
Note that X.400 P1 in X.410 mode doesn't use ROS, so it is useful not to explicitly include ROS in my X411 dissector. However, the inclusion of a ROS dissector won't effect any dissectors that currently implement their own ROS.
I also include dissectors for:
X.411 (P1) X.400 OSI Message Transfer Service
X.420 (P22) X.400 OSI Information Object
STANAG 4406 (P772) STANAG 4406 Military Message Extensions (to P22)
These rely on the RTSE and ROS dissectors.
Withs some changes to remove various warnings and errors.
svn path=/trunk/; revision=15680
Diffstat (limited to 'asn1/ros/packet-ros-template.c')
| -rw-r--r-- | asn1/ros/packet-ros-template.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/asn1/ros/packet-ros-template.c b/asn1/ros/packet-ros-template.c index 8d432e5dc7..6d50788596 100644 --- a/asn1/ros/packet-ros-template.c +++ b/asn1/ros/packet-ros-template.c @@ -35,7 +35,7 @@ #include <string.h> #include "packet-ber.h" -#include "packet-acse.h" +#include "packet-pres.h" #include "packet-ros.h" #define PNAME "X.880 OSI Remote Operations Service" @@ -56,8 +56,6 @@ static guint32 opcode; static gint ett_ros = -1; #include "packet-ros-ett.c" -#include "packet-ros-fn.c" - static dissector_table_t ros_oid_dissector_table=NULL; static GHashTable *oid_table=NULL; static gint ett_ros_unknown = -1; @@ -95,6 +93,9 @@ call_ros_oid_callback(const char *oid, tvbuff_t *tvb, int offset, packet_info *p return offset; } +#include "packet-ros-fn.c" + + /* * Dissect ROS PDUs inside a PPDU. */ |