diff options
author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2016-01-05 13:46:26 +0100 |
---|---|---|
committer | Michael Mann <mmann78@netscape.net> | 2016-01-05 21:29:01 +0000 |
commit | 0fa5a78a867cb683c6b83c2514c77b152f1b4e1f (patch) | |
tree | 156f4a9b92cda547301c363f4527bb171574bacf /epan | |
parent | 8d4422180d13c4d79b37061c57412b4fdd407eff (diff) |
INAP: fix indent (use 2spaces and modelines)
Change-Id: I4d54b851e3bd316e10edea29d1d7e311be338c71
Reviewed-on: https://code.wireshark.org/review/13054
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan')
-rw-r--r-- | epan/dissectors/packet-inap.c | 124 |
1 files changed, 67 insertions, 57 deletions
diff --git a/epan/dissectors/packet-inap.c b/epan/dissectors/packet-inap.c index f0710ad081..d2f523d534 100644 --- a/epan/dissectors/packet-inap.c +++ b/epan/dissectors/packet-inap.c @@ -9364,80 +9364,80 @@ static guint8 inap_pdu_size = 0; static int dissect_inap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void *data _U_) { - 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); + 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); - 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, ENC_NA); - tree = proto_item_add_subtree(item, ett_inap); - } - 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; - dissect_inap_ROS(TRUE, tvb, offset, &asn1_ctx, tree, -1); + /* create display subtree for the protocol */ + if(parent_tree){ + item = proto_tree_add_item(parent_tree, proto_inap, tvb, 0, -1, ENC_NA); + tree = proto_item_add_subtree(item, ett_inap); + } + 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; + dissect_inap_ROS(TRUE, tvb, offset, &asn1_ctx, tree, -1); - return inap_pdu_size; + return inap_pdu_size; } /*--- proto_reg_handoff_inap ---------------------------------------*/ static void range_delete_callback(guint32 ssn) { - if (ssn) { - delete_itu_tcap_subdissector(ssn, inap_handle); - } + 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); - } + if (ssn) { + add_itu_tcap_subdissector(ssn, inap_handle); + } } void proto_reg_handoff_inap(void) { - static gboolean inap_prefs_initialized = FALSE; - static range_t *ssn_range; - - if (!inap_prefs_initialized) { - inap_prefs_initialized = TRUE; - inap_handle = find_dissector("inap"); - data_handle = find_dissector("data"); - oid_add_from_string("Core-INAP-CS1-Codes","0.4.0.1.1.0.3.0"); - oid_add_from_string("iso(1) identified-organization(3) icd-ecma(12) member-company(2) 1107 oen(3) inap(3) extensions(2)","1.3.12.2.1107.3.3.2"); - oid_add_from_string("alcatel(1006)","1.3.12.2.1006.64"); - oid_add_from_string("Siemens (1107)","1.3.12.2.1107"); - oid_add_from_string("iso(1) member-body(2) gb(826) national(0) ericsson(1249) inDomain(51) inNetwork(1) inNetworkcapabilitySet1plus(1) ","1.2.826.0.1249.51.1.1"); - } - else { - range_foreach(ssn_range, range_delete_callback); - g_free(ssn_range); - } + static gboolean inap_prefs_initialized = FALSE; + static range_t *ssn_range; + + if (!inap_prefs_initialized) { + inap_prefs_initialized = TRUE; + inap_handle = find_dissector("inap"); + data_handle = find_dissector("data"); + oid_add_from_string("Core-INAP-CS1-Codes","0.4.0.1.1.0.3.0"); + oid_add_from_string("iso(1) identified-organization(3) icd-ecma(12) member-company(2) 1107 oen(3) inap(3) extensions(2)","1.3.12.2.1107.3.3.2"); + oid_add_from_string("alcatel(1006)","1.3.12.2.1006.64"); + oid_add_from_string("Siemens (1107)","1.3.12.2.1107"); + oid_add_from_string("iso(1) member-body(2) gb(826) national(0) ericsson(1249) inDomain(51) inNetwork(1) inNetworkcapabilitySet1plus(1) ","1.2.826.0.1249.51.1.1"); + } + else { + range_foreach(ssn_range, range_delete_callback); + g_free(ssn_range); + } - ssn_range = range_copy(global_ssn_range); + ssn_range = range_copy(global_ssn_range); - range_foreach(ssn_range, range_add_callback); + range_foreach(ssn_range, range_add_callback); } void proto_register_inap(void) { - module_t *inap_module; + module_t *inap_module; /* List of fields */ static hf_register_info hf[] = { - { &hf_inap_cause_indicator, /* Currently not enabled */ - { "Cause indicator", "inap.cause_indicator", - FT_UINT8, BASE_DEC | BASE_EXT_STRING, &q850_cause_code_vals_ext, 0x7f, - NULL, HFILL } }, + { &hf_inap_cause_indicator, /* Currently not enabled */ + { "Cause indicator", "inap.cause_indicator", + FT_UINT8, BASE_DEC | BASE_EXT_STRING, &q850_cause_code_vals_ext, 0x7f, + NULL, HFILL } }, /*--- Included file: packet-inap-hfarr.c ---*/ @@ -11695,10 +11695,10 @@ void proto_register_inap(void) { /* List of subtrees */ static gint *ett[] = { &ett_inap, - &ett_inapisup_parameter, - &ett_inap_HighLayerCompatibility, + &ett_inapisup_parameter, + &ett_inap_HighLayerCompatibility, &ett_inap_extention_data, - &ett_inap_cause, + &ett_inap_cause, /*--- Included file: packet-inap-ettarr.c ---*/ #line 1 "../../asn1/inap/packet-inap-ettarr.c" @@ -11944,9 +11944,9 @@ void proto_register_inap(void) { }; static ei_register_info ei[] = { - { &ei_inap_unknown_invokeData, { "inap.unknown.invokeData", PI_MALFORMED, PI_WARN, "Unknown invokeData", EXPFILL }}, - { &ei_inap_unknown_returnResultData, { "inap.unknown.returnResultData", PI_MALFORMED, PI_WARN, "Unknown returnResultData", EXPFILL }}, - { &ei_inap_unknown_returnErrorData, { "inap.unknown.returnErrorData", PI_MALFORMED, PI_WARN, "Unknown returnResultData", EXPFILL }}, + { &ei_inap_unknown_invokeData, { "inap.unknown.invokeData", PI_MALFORMED, PI_WARN, "Unknown invokeData", EXPFILL }}, + { &ei_inap_unknown_returnResultData, { "inap.unknown.returnResultData", PI_MALFORMED, PI_WARN, "Unknown returnResultData", EXPFILL }}, + { &ei_inap_unknown_returnErrorData, { "inap.unknown.returnErrorData", PI_MALFORMED, PI_WARN, "Unknown returnResultData", EXPFILL }}, }; expert_module_t* expert_inap; @@ -11972,9 +11972,19 @@ void proto_register_inap(void) { 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); + "TCAP Subsystem numbers used for INAP", + &global_ssn_range, MAX_SSN); } - - +/* + * Editor modelines + * + * Local Variables: + * c-basic-offset: 2 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * ex: set shiftwidth=2 tabstop=8 expandtab: + * :indentSize=2:tabSize=8:noTabs=true: + */ |