* Built from the gsm-map dissector Copyright 2004, Anders Broman <anders.broman@ericsson.com>
*
* $Id$
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
* References: ETSI 300 374
+ * ITU Q.1218
*/
#ifdef HAVE_CONFIG_H
#include <glib.h>
#include <epan/packet.h>
#include <epan/prefs.h>
-#include <epan/conversation.h>
+#include <epan/oids.h>
+#include "epan/expert.h"
+#include <epan/asn1.h>
#include <stdio.h>
#include <string.h>
#include "packet-inap.h"
#include "packet-q931.h"
#include "packet-e164.h"
+#include "packet-isup.h"
+#include "packet-tcap.h"
-#define PNAME "INAP"
+#define PNAME "Intelligent Network Application Protocol"
#define PSNAME "INAP"
#define PFNAME "inap"
/* Initialize the protocol and registered fields */
int proto_inap = -1;
-static int hf_inap_invokeCmd = -1; /* Opcode */
-static int hf_inap_invokeid = -1; /* INTEGER */
-static int hf_inap_linkedid = -1; /* INTEGER */
-static int hf_inap_absent = -1; /* NULL */
-static int hf_inap_invokeId = -1; /* InvokeId */
-static int hf_inap_invoke = -1; /* InvokePDU */
-static int hf_inap_ReturnError = -1; /* InvokePDU */
-static int hf_inap_returnResult = -1; /* InvokePDU */
-static int hf_inap_returnResult_result = -1;
-static int hf_inap_getPassword = -1;
-static int hf_inap_currentPassword = -1;
-static int hf_inap_genproblem = -1;
+
+/* include constants */
+#include "packet-inap-val.h"
+
#include "packet-inap-hf.c"
-static guint tcap_itu_ssn = 106;
-static guint tcap_itu_ssn1 = 241;
+#define MAX_SSN 254
+static range_t *global_ssn_range;
+static dissector_handle_t inap_handle;
+
+/* Global variables */
+static guint32 opcode=0;
+static guint32 errorCode=0;
-static guint global_tcap_itu_ssn = 1;
-static guint global_tcap_itu_ssn1 = 1;
+static int inap_opcode_type;
+#define INAP_OPCODE_INVOKE 1
+#define INAP_OPCODE_RETURN_RESULT 2
+#define INAP_OPCODE_RETURN_ERROR 3
+#define INAP_OPCODE_REJECT 4
/* Initialize the subtree pointers */
static gint ett_inap = -1;
-static gint ett_inap_InvokeId = -1;
-static gint ett_inap_InvokePDU = -1;
-static gint ett_inap_ReturnErrorPDU = -1;
-static gint ett_inap_ReturnResultPDU = -1;
-static gint ett_inap_ReturnResult_result = -1;
-static gint ett_inap_INAPPDU = -1;
static gint ett_inapisup_parameter = -1;
#include "packet-inap-ett.c"
-static int dissect_invokeCmd(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset);
-
-#include "packet-inap-fn.c"
-
-
-const value_string inap_opr_code_strings[] = {
-
-{16, "AssistRequestInstructions"},
-{44, "CallInformationReport"},
-{45, "CallInformationRequest"},
-{53, "Cancel"},
-{20, "Connect"},
-{18, "DisconnectForwardConnection"},
- {19,"ConnectToResource"},
- {17,"EstablishTemporaryConnection"},
- {24,"EventReportBCSM"},
- {34,"FurnishChargingInformation"},
- {0,"InitialDP"},
- {47,"PlayAnnouncement"},
- {48,"PromptAndCollectUserInformation"},
- {99,"ReceivedInformation"}, /*???????*/
- {33,"ResetTimer"},
- {23,"RequestReportBCSMEvent"},
- {49,"SpecializedResourceReport"},
- {22,"ReleaseCall"},
-{0, NULL}
-};
-
-const value_string inap_error_code_strings[] = {
-
-{0,"cancelled"},
-{1,"cancelFailed"},
-{3,"etcFailed"},
-{4,"improperCallerResponse"},
-{6,"missingCustomerRecord"},
-{7,"missingParameter"},
-{8,"parameterOutOfRange"},
-{10,"RequestedInfoError"},
-{11,"SystemFailure"},
-{12,"TaskRefused"},
-{13,"UnavailableResource"},
-{14,"UnexpectedComponentSequence"},
-{15,"UnexpectedDataValue"},
-{16,"UnexpectedParameter"},
-{17,"UnknownLegID"},
-{0, NULL}
-};
+#include "packet-inap-table.c"
const value_string inap_general_problem_strings[] = {
{0,"General Problem Unrecognized Component"},
{0, NULL}
};
+/* Forvard declarations */
+static int dissect_invokeData(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_);
+static int dissect_returnResultData(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_);
+static int dissect_returnErrorData(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx);
+#include "packet-inap-fn.c"
+/*
+TC-Invokable OPERATION ::=
+ {activateServiceFiltering | activityTest | analysedInformation |
+ analyseInformation | applyCharging | applyChargingReport |
+ assistRequestInstructions | callGap | callInformationReport |
+ callInformationRequest | cancel | cancelStatusReportRequest |
+ collectedInformation | collectInformation | connect | connectToResource |
+ continue | disconnectForwardConnection | establishTemporaryConnection |
+ eventNotificationCharging | eventReportBCSM | furnishChargingInformation |
+ holdCallInNetwork | initialDP | initiateCallAttempt | oAnswer |
+ oCalledPartyBusy | oDisconnect | oMidCall | oNoAnswer |
+ originationAttemptAuthorized | releaseCall | requestCurrentStatusReport |
+ requestEveryStatusChangeReport | requestFirstStatusMatchReport |
+ requestNotificationChargingEvent | requestReportBCSMEvent | resetTimer |
+ routeSelectFailure | selectFacility | selectRoute | sendChargingInformation
+ | serviceFilteringResponse | statusReport | tAnswer | tBusy | tDisconnect |
+ termAttemptAuthorized | tMidCall | tNoAnswer | playAnnouncement |
+ promptAndCollectUserInformation}
+*/
+
+#include "packet-inap-table2.c"
-static guint32 opcode=0;
-
-static int
-dissect_inap_Opcode(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
- offset = dissect_ber_integer(FALSE, pinfo, tree, tvb, offset, hf_index, &opcode);
-
- if (check_col(pinfo->cinfo, COL_INFO)){
- col_set_str(pinfo->cinfo, COL_INFO, val_to_str(opcode, inap_opr_code_strings, "Unknown Inap (%u)"));
- }
-
- return offset;
-}
-
-
-
-static int
-dissect_inap_errorCode(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
- offset = dissect_ber_integer(FALSE, pinfo, tree, tvb, offset, hf_index, &opcode);
-
- if (check_col(pinfo->cinfo, COL_INFO)){
- col_set_str(pinfo->cinfo, COL_INFO, val_to_str(opcode, inap_error_code_strings, "Unknown Inap (%u)"));
- }
-
- return offset;
-}
-
-
-static int dissect_invokeData(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
- switch(opcode){
- case 16: /*AssistRequestInstructions*/
- offset=dissect_inap_AssistRequestInstructionsarg(FALSE, tvb, offset, pinfo, tree, -1);
- break;
- case 44: /*CallInformationReport*/
- offset=dissect_inap_CallInformationReportarg(FALSE, tvb, offset, pinfo, tree, -1);
- break;
- case 45: /*CallInformationRequest*/
- offset=dissect_inap_CallInformationRequestarg(FALSE, tvb, offset, pinfo, tree, -1);
- break;
- case 53: /*Cancel*/
- offset=dissect_inap_Cancelarg(FALSE, tvb, offset, pinfo, tree, -1);
- break;
- case 20: /*Connect*/
- offset=dissect_inap_Connectarg(FALSE, tvb, offset, pinfo, tree, -1);
- break;
- case 18: /*DisconnectForwardConnections*/
- proto_tree_add_text(tree, tvb, offset, -1, "Disconnect Forward Connection");
- break;
- case 19: /*ConnectToResource*/
- offset=dissect_inap_ConnectToResource(FALSE, tvb, offset, pinfo, tree, -1);
- break;
- case 17: /*EstablishTemporaryConnection*/
- offset=dissect_inap_EstablishTemporaryConnection(FALSE, tvb, offset, pinfo, tree, -1);
- break;
- case 24: /*EventReportBCSM*/
- offset=dissect_inap_EventReportBCSM(FALSE, tvb, offset, pinfo, tree, -1);
- break;
- case 34: /*FurnishChargingInformation*/
- offset=dissect_inap_FurnishChargingInformationarg(FALSE, tvb, offset, pinfo, tree, -1);
- break;
- case 0: /*InitialDP*/
- offset=dissect_inap_InitialDP(FALSE, tvb, offset, pinfo, tree, -1);
- break;
-
- case 23: /*InitialDP*/
- offset=dissect_inap_RequestReportBCSMEvent(FALSE, tvb, offset, pinfo, tree, -1);
- break;
-
- case 47: /*PlayAnnouncement*/
- offset=dissect_inap_PlayAnnouncement(FALSE, tvb, offset, pinfo, tree, -1);
- break;
- case 48: /*PromptAndCollectUserInformation*/
- offset=dissect_inap_PromptAndCollectUserInformationarg(FALSE, tvb, offset, pinfo, tree, -1);
- break;
- case 33: /*ResetTimer*/
- offset=dissect_inap_ResetTimer(FALSE, tvb, offset, pinfo, tree, -1);
- break;
- case 22: /*ResetTimer*/
- offset=dissect_inap_ReleaseCallArg(FALSE, tvb, offset, pinfo, tree, -1);
- break;
- default:
- proto_tree_add_text(tree, tvb, offset, -1, "Unknown invokeData blob");
- /* todo call the asn.1 dissector */
- }
- return offset;
-}
-
-
-static int dissect_returnResultData(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
- switch(opcode){
- case 48: /*PromptAndCollectUserInformation*/
- offset=dissect_inap_PromptAndCollectUserInformationres(FALSE, tvb, offset, pinfo, tree, -1);
- break;
- default:
- proto_tree_add_text(tree, tvb, offset, -1, "Unknown returnResultData blob");
- }
- return offset;
-}
-
-static int
-dissect_invokeCmd(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
- return dissect_inap_Opcode(FALSE, tvb, offset, pinfo, tree, hf_inap_invokeCmd);
-}
-
-
-static int
-dissect_errorCode(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
- return dissect_inap_errorCode(FALSE, tvb, offset, pinfo, tree, hf_inap_ReturnError);
-}
-
-static int dissect_invokeid(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
- return dissect_ber_integer(FALSE, pinfo, tree, tvb, offset, hf_inap_invokeid, NULL);
-}
-
-
-static const value_string InvokeId_vals[] = {
- { 0, "invokeid" },
- { 1, "absent" },
- { 0, NULL }
-};
-
-static int dissect_absent(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
- return dissect_inap_NULL(FALSE, tvb, offset, pinfo, tree, hf_inap_absent);
-}
-
-
-static const ber_choice_t InvokeId_choice[] = {
- { 0, BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_invokeid },
- { 1, BER_CLASS_UNI, BER_UNI_TAG_NULL, BER_FLAGS_NOOWNTAG, dissect_absent },
- { 0, 0, 0, 0, NULL }
-};
-
-static int
-dissect_inap_InvokeId(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
- offset = dissect_ber_choice(pinfo, tree, tvb, offset,
- InvokeId_choice, hf_index, ett_inap_InvokeId, NULL);
-
- return offset;
-}
-static int dissect_invokeId(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
- return dissect_inap_InvokeId(FALSE, tvb, offset, pinfo, tree, hf_inap_invokeId);
-}
-static int dissect_linkedID_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
- return dissect_ber_integer(TRUE, pinfo, tree, tvb, offset, hf_inap_linkedid, NULL);
-}
-
-
-static const ber_sequence_t InvokePDU_sequence[] = {
- { BER_CLASS_UNI, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_invokeId },
- { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_linkedID_impl },
- { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_invokeCmd },
- { BER_CLASS_UNI, -1/*depends on Cmd*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_invokeData },
- { 0, 0, 0, NULL }
-};
-
-static int
-dissect_inap_InvokePDU(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
- offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
- InvokePDU_sequence, hf_index, ett_inap_InvokePDU);
-
- return offset;
-}
-
-
-static const ber_sequence_t returnErrorPDU_sequence[] = {
- { BER_CLASS_UNI, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_invokeId },
- { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_errorCode },
- { 0, 0, 0, NULL }
-};
-
-static int
-dissect_inap_returnErrorPDU(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
- offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
- returnErrorPDU_sequence, hf_index, ett_inap_ReturnErrorPDU);
-
- return offset;
-}
-
-
-static int dissect_invoke_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
- return dissect_inap_InvokePDU(TRUE, tvb, offset, pinfo, tree, hf_inap_invoke);
-}
-
-static int dissect_returnError_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
- return dissect_inap_returnErrorPDU(TRUE, tvb, offset, pinfo, tree, hf_inap_invoke);
-}
-
-static const ber_sequence_t ReturnResult_result_sequence[] = {
- { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_invokeCmd },
- { BER_CLASS_UNI, -1/*depends on Cmd*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_returnResultData },
- { 0, 0, 0, NULL }
-};
-static int
-dissect_returnResult_result(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
- offset = dissect_ber_sequence(FALSE, pinfo, tree, tvb, offset,
- ReturnResult_result_sequence, hf_inap_returnResult_result, ett_inap_ReturnResult_result);
-
- return offset;
-}
-
-static const ber_sequence_t ReturnResultPDU_sequence[] = {
- { BER_CLASS_UNI, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_invokeId },
- { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_returnResult_result },
- { 0, 0, 0, NULL }
-};
-
-static int
-dissect_inap_returnResultPDU(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
- offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
- ReturnResultPDU_sequence, hf_index, ett_inap_ReturnResultPDU);
-
- return offset;
-}
-static int dissect_returnResult_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
- return dissect_inap_returnResultPDU(TRUE, tvb, offset, pinfo, tree, hf_inap_returnResult);
-}
-
-
-static int dissect_reject_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
- return dissect_inap_RejectPDU(TRUE, tvb, offset, pinfo, tree, -1);
-}
-
-static const value_string INAPPDU_vals[] = {
- { 1, "invoke" },
- { 2, "returnResult" },
- { 3, "returnError" },
- { 4, "reject" },
- { 0, NULL }
-};
-
-static const ber_choice_t INAPPDU_choice[] = {
- { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_invoke_impl },
- { 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_returnResult_impl },
- { 3, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_returnError_impl },
- { 4, BER_CLASS_CON, 4, BER_FLAGS_IMPLTAG, dissect_reject_impl },
- { 0, 0, 0, 0, NULL }
-};
static guint8 inap_pdu_type = 0;
static guint8 inap_pdu_size = 0;
-static int
-dissect_inap_INAPPDU(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
-
- inap_pdu_type = tvb_get_guint8(tvb, offset)&0x0f;
- /* Get the length and add 2 */
- inap_pdu_size = tvb_get_guint8(tvb, offset+1)+2;
-
- offset = dissect_ber_choice(pinfo, tree, tvb, offset,
- INAPPDU_choice, hf_index, ett_inap_INAPPDU, NULL);
-
- if (check_col(pinfo->cinfo, COL_INFO)){
- col_prepend_fstr(pinfo->cinfo, COL_INFO, val_to_str(opcode, inap_opr_code_strings, "Unknown INAP (%u)"));
- }
-
- return offset;
-}
-
-
-
static void
dissect_inap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
{
proto_item *item=NULL;
proto_tree *tree=NULL;
+ int offset = 0;
+ asn1_ctx_t asn1_ctx;
+ asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
-
- if (check_col(pinfo->cinfo, COL_PROTOCOL))
- {
- col_set_str(pinfo->cinfo, COL_PROTOCOL, "INAP");
- }
+ col_set_str(pinfo->cinfo, COL_PROTOCOL, "INAP");
/* create display subtree for the protocol */
if(parent_tree){
item = proto_tree_add_item(parent_tree, proto_inap, tvb, 0, -1, FALSE);
tree = proto_item_add_subtree(item, ett_inap);
}
-
- dissect_inap_INAPPDU(FALSE, tvb, 0, pinfo, tree, -1);
+ inap_pdu_type = tvb_get_guint8(tvb, offset)&0x0f;
+ /* Get the length and add 2 */
+ inap_pdu_size = tvb_get_guint8(tvb, offset+1)+2;
+ opcode = 0;
+ offset = dissect_inap_ROS(TRUE, tvb, offset, &asn1_ctx, tree, -1);
}
/*--- proto_reg_handoff_inap ---------------------------------------*/
+static void range_delete_callback(guint32 ssn)
+{
+ if (ssn) {
+ delete_itu_tcap_subdissector(ssn, inap_handle);
+ }
+}
+
+static void range_add_callback(guint32 ssn)
+{
+ if (ssn) {
+ add_itu_tcap_subdissector(ssn, inap_handle);
+ }
+}
+
void proto_reg_handoff_inap(void) {
- dissector_handle_t inap_handle;
- static int inap_prefs_initialized = FALSE;
-
- inap_handle = create_dissector_handle(dissect_inap, proto_inap);
-
- if (!inap_prefs_initialized) {
- inap_prefs_initialized = TRUE;
- }
- else {
- dissector_delete("tcap.itu_ssn", tcap_itu_ssn, inap_handle);
- dissector_delete("tcap.itu_ssn", tcap_itu_ssn1, inap_handle);
- }
- tcap_itu_ssn = global_tcap_itu_ssn;
- tcap_itu_ssn1 = global_tcap_itu_ssn1;
- dissector_add("tcap.itu_ssn", global_tcap_itu_ssn, inap_handle);
- dissector_add("tcap.itu_ssn", global_tcap_itu_ssn1, inap_handle);
-
+
+ static gboolean inap_prefs_initialized = FALSE;
+ static range_t *ssn_range;
+
+ if (!inap_prefs_initialized) {
+ inap_prefs_initialized = TRUE;
+ inap_handle = find_dissector("inap");
+ oid_add_from_string("Core-INAP-CS1-Codes","0.4.0.1.1.0.3.0");
+ }
+ else {
+ range_foreach(ssn_range, range_delete_callback);
+ g_free(ssn_range);
+ }
+
+ ssn_range = range_copy(global_ssn_range);
+
+ range_foreach(ssn_range, range_add_callback);
+
}
module_t *inap_module;
/* List of fields */
static hf_register_info hf[] = {
- { &hf_inap_invokeCmd,
- { "invokeCmd", "inap.invokeCmd",
- FT_UINT32, BASE_DEC, VALS(inap_opr_code_strings), 0,
- "InvokePDU/invokeCmd", HFILL }},
- { &hf_inap_ReturnError,
- { "ReturnError", "inap.ReturnError",
- FT_UINT32, BASE_DEC, VALS(inap_error_code_strings), 0,
- "InvokePDU/ReturnError", HFILL }},
- { &hf_inap_invokeid,
- { "invokeid", "inap.invokeid",
- FT_INT32, BASE_DEC, NULL, 0,
- "InvokeId/invokeid", HFILL }},
- { &hf_inap_linkedid,
- { "linkedid", "inap.linkedid",
- FT_INT32, BASE_DEC, NULL, 0,
- "LinkedId/linkedid", HFILL }},
-
- { &hf_inap_absent,
- { "absent", "inap.absent",
- FT_NONE, BASE_NONE, NULL, 0,
- "InvokeId/absent", HFILL }},
- { &hf_inap_invokeId,
- { "invokeId", "inap.invokeId",
- FT_UINT32, BASE_DEC, VALS(InvokeId_vals), 0,
- "InvokePDU/invokeId", HFILL }},
- { &hf_inap_invoke,
- { "invoke", "inap.invoke",
- FT_NONE, BASE_NONE, NULL, 0,
- "INAPPDU/invoke", HFILL }},
- { &hf_inap_returnResult,
- { "returnResult", "inap.returnResult",
- FT_NONE, BASE_NONE, NULL, 0,
- "INAPPDU/returnResult", HFILL }},
-
+
+
#include "packet-inap-hfarr.c"
};
/* List of subtrees */
static gint *ett[] = {
&ett_inap,
- &ett_inap_InvokeId,
- &ett_inap_InvokePDU,
- &ett_inap_ReturnErrorPDU,
- &ett_inap_ReturnResultPDU,
- &ett_inap_ReturnResult_result,
- &ett_inap_INAPPDU,
- &ett_inapisup_parameter,
+ &ett_inapisup_parameter,
#include "packet-inap-ettarr.c"
};
/* Register protocol */
proto_inap = proto_register_protocol(PNAME, PSNAME, PFNAME);
-/*XXX register_dissector("inap", dissect_inap, proto_inap);*/
+ register_dissector("inap", dissect_inap, proto_inap);
/* Register fields and subtrees */
proto_register_field_array(proto_inap, hf, array_length(hf));
proto_register_subtree_array(ett, array_length(ett));
-
-
+
+ /* Set default SSNs */
+ range_convert_str(&global_ssn_range, "106,241", MAX_SSN);
+
inap_module = prefs_register_protocol(proto_inap, proto_reg_handoff_inap);
-
- prefs_register_uint_preference(inap_module, "tcap.itu_ssn",
- "Subsystem number used for INAP",
- "Set Subsystem number used for INAP",
- 10, &global_tcap_itu_ssn);
- prefs_register_uint_preference(inap_module, "tcap.itu_ssn1",
- "Subsystem number used for INAP",
- "Set Subsystem number used for INAP",
- 10, &global_tcap_itu_ssn1);
+ prefs_register_obsolete_preference(inap_module, "tcap.itu_ssn");
+
+ prefs_register_obsolete_preference(inap_module, "tcap.itu_ssn1");
+ prefs_register_range_preference(inap_module, "ssn", "TCAP SSNs",
+ "TCAP Subsystem numbers used for INAP",
+ &global_ssn_range, MAX_SSN);
}
git.samba.org / obnox / wireshark / wip.git / blobdiff