diff options
| author | Guy Harris <guy@alum.mit.edu> | 2007-04-30 06:41:53 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2007-04-30 06:41:53 +0000 |
| commit | 2f88e4ca818072353adcebf06fa90e1a924d0979 (patch) | |
| tree | c112653d9c6a20ac45b07ac780e54f9d32531a6f /asn1/q932 | |
| parent | 3dd386cc35aefd6df481c142671c819fc99ea985 (diff) | |
The Q.932 dissector doesn't need to include <string.h>; the Q.932 ROS
dissector does.
The fix to the Makefile to generate packet-q932-ros.c changed the
protocol name in some cases; change it uniformly.
svn path=/trunk/; revision=21622
Diffstat (limited to 'asn1/q932')
| -rw-r--r-- | asn1/q932/packet-q932-ros-template.c | 8 | ||||
| -rw-r--r-- | asn1/q932/packet-q932-template.c | 10 |
2 files changed, 9 insertions, 9 deletions
diff --git a/asn1/q932/packet-q932-ros-template.c b/asn1/q932/packet-q932-ros-template.c index 35aa700ef0..de6570646b 100644 --- a/asn1/q932/packet-q932-ros-template.c +++ b/asn1/q932/packet-q932-ros-template.c @@ -27,6 +27,8 @@ # include "config.h" #endif +#include <string.h> + #include <epan/packet.h> #include <epan/prefs.h> #include <epan/strutil.h> @@ -36,8 +38,8 @@ #include "packet-q932-ros.h" #define PNAME "Q.932 Operations Service Element" -#define PSNAME "Q932.ROS" -#define PFNAME "q932.ros" +#define PSNAME "Q932-ROS" +#define PFNAME "q932-ros" /* Initialize the protocol and registered fields */ int proto_rose = -1; @@ -99,4 +101,4 @@ void proto_reg_handoff_rose(void) { data_handle = find_dissector("data"); } -/*---------------------------------------------------------------------------*/
\ No newline at end of file +/*---------------------------------------------------------------------------*/ diff --git a/asn1/q932/packet-q932-template.c b/asn1/q932/packet-q932-template.c index 64822c5cb5..46a3f65140 100644 --- a/asn1/q932/packet-q932-template.c +++ b/asn1/q932/packet-q932-template.c @@ -27,8 +27,6 @@ # include "config.h" #endif -#include <string.h> - #include <epan/packet.h> #include <epan/prefs.h> #include <epan/strutil.h> @@ -313,10 +311,10 @@ void proto_register_q932(void) { proto_register_subtree_array(ett, array_length(ett)); /* Register dissector tables */ - q932_rose_ctx.arg_global_dissector_table = register_dissector_table("q932.ros.global.arg", "Q.932 Operation Argument (global opcode)", FT_STRING, BASE_NONE); - q932_rose_ctx.res_global_dissector_table = register_dissector_table("q932.ros.global.res", "Q.932 Operation Result (global opcode)", FT_STRING, BASE_NONE); - q932_rose_ctx.arg_local_dissector_table = register_dissector_table("q932.ros.local.arg", "Q.932 Operation Argument (local opcode)", FT_UINT32, BASE_HEX); - q932_rose_ctx.res_local_dissector_table = register_dissector_table("q932.ros.local.res", "Q.932 Operation Result (local opcode)", FT_UINT32, BASE_HEX); + q932_rose_ctx.arg_global_dissector_table = register_dissector_table("q932-ros.global.arg", "Q.932 Operation Argument (global opcode)", FT_STRING, BASE_NONE); + q932_rose_ctx.res_global_dissector_table = register_dissector_table("q932-ros.global.res", "Q.932 Operation Result (global opcode)", FT_STRING, BASE_NONE); + q932_rose_ctx.arg_local_dissector_table = register_dissector_table("q932-ros.local.arg", "Q.932 Operation Argument (local opcode)", FT_UINT32, BASE_HEX); + q932_rose_ctx.res_local_dissector_table = register_dissector_table("q932-ros.local.res", "Q.932 Operation Result (local opcode)", FT_UINT32, BASE_HEX); } /*--- proto_reg_handoff_q932 ------------------------------------------------*/ |