From 5262c3f4b040fe69320ba11f16b7f48c7a2cf2f9 Mon Sep 17 00:00:00 2001 From: Jeff Morriss Date: Thu, 1 Sep 2011 14:30:16 +0000 Subject: Update my email address (the old one still works but I don't use it for Wireshark related stuff). svn path=/trunk/; revision=38841 --- AUTHORS | 2 +- epan/dissectors/packet-m2pa.c | 2 +- epan/dissectors/packet-mtp3.c | 28 ++++++++++++++-------------- epan/dissectors/packet-mtp3mg.c | 2 +- epan/dissectors/packet-sccp.c | 8 ++++---- epan/dissectors/packet-sccpmg.c | 4 ++-- epan/dissectors/packet-sscf-nni.c | 6 +++--- epan/dissectors/packet-syslog.c | 2 +- 8 files changed, 27 insertions(+), 27 deletions(-) diff --git a/AUTHORS b/AUTHORS index 64a61ba36f..a31c5c28d8 100644 --- a/AUTHORS +++ b/AUTHORS @@ -879,7 +879,7 @@ nuf si { RTSP fixes } -Jeff Morriss { +Jeff Morriss { M2PA support Support for ANSI flavor of MTP3 SCCP support diff --git a/epan/dissectors/packet-m2pa.c b/epan/dissectors/packet-m2pa.c index ba0b01ff9a..fa2b13c294 100644 --- a/epan/dissectors/packet-m2pa.c +++ b/epan/dissectors/packet-m2pa.c @@ -5,7 +5,7 @@ * http://www.ietf.org/internet-drafts/draft-ietf-sigtran-m2pa-08.txt * http://tools.ietf.org/rfc/rfc4165.txt * - * Copyright 2001, 2002, Jeff Morriss , + * Copyright 2001, 2002, Jeff Morriss , * updated by Michael Tuexen * * $Id$ diff --git a/epan/dissectors/packet-mtp3.c b/epan/dissectors/packet-mtp3.c index 80dbc34cbe..dfa3116ae6 100644 --- a/epan/dissectors/packet-mtp3.c +++ b/epan/dissectors/packet-mtp3.c @@ -12,7 +12,7 @@ * * Copyright 2001, Michael Tuexen * Updated for ANSI, Chinese ITU, and Japan support by - * Jeff Morriss + * Jeff Morriss * * $Id$ * @@ -222,7 +222,7 @@ static dissector_handle_t data_handle; * helper routine to format a point code in structured form */ -void +void mtp3_pc_to_str_buf(const guint32 pc, gchar *buf, int buf_len) { switch (mtp3_standard) @@ -276,7 +276,7 @@ gchar * mtp3_pc_to_str(const guint32 pc) { gchar *str; - + str=ep_alloc(MAX_STRUCTURED_PC_LENGTH); mtp3_pc_to_str_buf(pc, str, MAX_STRUCTURED_PC_LENGTH); return str; @@ -296,7 +296,7 @@ mtp3_pc_structured(void) /* * helper routine to format address to string */ - + void mtp3_addr_to_str_buf( const mtp3_addr_pc_t *addr_pc_p, @@ -380,7 +380,7 @@ mtp3_addr_to_str_buf( guint32 mtp3_pc_hash(const mtp3_addr_pc_t *addr_pc_p) { guint32 pc; - + switch (addr_pc_p->type) { case ITU_STANDARD: @@ -391,7 +391,7 @@ guint32 mtp3_pc_hash(const mtp3_addr_pc_t *addr_pc_p) { pc = (addr_pc_p->pc & ANSI_PC_MASK) | ((addr_pc_p->ni) << 24) ; break; } - + return pc; } @@ -517,7 +517,7 @@ dissect_mtp3_routing_label(tvbuff_t *tvb, packet_info *pinfo, proto_tree *mtp3_t pc_subtree = proto_item_add_subtree(label_dpc_item, ett_mtp3_label_dpc); analyze_q708_ispc(tvb, pc_subtree, ROUTING_LABEL_OFFSET, ITU_ROUTING_LABEL_LENGTH, dpc); } - + label_opc_item = proto_tree_add_uint(label_tree, hf_mtp3_itu_opc, tvb, ROUTING_LABEL_OFFSET, ITU_ROUTING_LABEL_LENGTH, label); if (mtp3_pc_structured()) @@ -670,7 +670,7 @@ dissect_mtp3(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case JAPAN_STANDARD: col_set_str(pinfo->cinfo, COL_PROTOCOL, "MTP3 (Japan)"); break; - }; + }; if (tree) { /* create display subtree for the protocol */ @@ -789,7 +789,7 @@ proto_register_mtp3(void) { "3-4-4-5", "3-4-4-5", JAPAN_PC_STRUCTURE_3_4_4_5 }, { NULL, NULL, 0 } }; - + /* Register the protocol name and description */ proto_mtp3 = proto_register_protocol("Message Transfer Part Level 3", "MTP3", "mtp3"); @@ -843,11 +843,11 @@ proto_register_mtp3(void) void proto_reg_handoff_mtp3(void) { - dissector_handle_t mtp3_handle; - - mtp3_handle = find_dissector("mtp3"); - dissector_add_uint("wtap_encap", WTAP_ENCAP_MTP3, mtp3_handle); + dissector_handle_t mtp3_handle; + + mtp3_handle = find_dissector("mtp3"); + dissector_add_uint("wtap_encap", WTAP_ENCAP_MTP3, mtp3_handle); dissector_add_string("tali.opcode", "mtp3", mtp3_handle); - + data_handle = find_dissector("data"); } diff --git a/epan/dissectors/packet-mtp3mg.c b/epan/dissectors/packet-mtp3mg.c index 235e01f5fb..922e456dee 100644 --- a/epan/dissectors/packet-mtp3mg.c +++ b/epan/dissectors/packet-mtp3mg.c @@ -12,7 +12,7 @@ * Note that the division of the Japan SLS into the SLC and A/B bit is not * done. * - * Copyright 2003, Jeff Morriss + * Copyright 2003, Jeff Morriss * * $Id$ * diff --git a/epan/dissectors/packet-sccp.c b/epan/dissectors/packet-sccp.c index ef29f21125..92da1f7143 100644 --- a/epan/dissectors/packet-sccp.c +++ b/epan/dissectors/packet-sccp.c @@ -10,7 +10,7 @@ * Note that Japan-specific GTT is incomplete; in particular, the specific * TTs that are defined in TTC and NTT are not decoded in detail. * - * Copyright 2002, Jeff Morriss + * Copyright 2002, Jeff Morriss * * $Id$ * @@ -864,9 +864,9 @@ get_sccp_assoc(packet_info* pinfo, guint offset, guint32 src_lr, guint32 dst_lr, { /* CR contains the opc,dpc,dlr key of backward messages swapped as dpc,opc,slr */ emem_tree_key_t bw_key[] = { - {1, &dpck}, - {1, &opck}, - {1, &src_lr}, + {1, &dpck}, + {1, &opck}, + {1, &src_lr}, {0, NULL} }; diff --git a/epan/dissectors/packet-sccpmg.c b/epan/dissectors/packet-sccpmg.c index 374ae45e4d..e8617c7a35 100644 --- a/epan/dissectors/packet-sccpmg.c +++ b/epan/dissectors/packet-sccpmg.c @@ -10,7 +10,7 @@ * Note that NTT Annex E (SCCP Management Procedure (Global Title Status * Management)) is not implemented (yet) * - * Copyright 2002, Jeff Morriss + * Copyright 2002, Jeff Morriss * * $Id$ * @@ -276,7 +276,7 @@ dissect_sccpmg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case CHINESE_ITU_STANDARD: col_set_str(pinfo->cinfo, COL_PROTOCOL, "SCCPMG (Chin. ITU)"); break; - }; + }; /* In the interest of speed, if "tree" is NULL, don't do any work not necessary to generate protocol tree items. */ diff --git a/epan/dissectors/packet-sscf-nni.c b/epan/dissectors/packet-sscf-nni.c index a92f16984c..a073026933 100644 --- a/epan/dissectors/packet-sscf-nni.c +++ b/epan/dissectors/packet-sscf-nni.c @@ -1,6 +1,6 @@ /* packet-sscf-nni.c * Routines for SSCF-NNI (Q.2140) frame disassembly - * Jeff Morriss + * Jeff Morriss * * $Id$ * @@ -98,7 +98,7 @@ dissect_sscf_nni(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_add_fstr(pinfo->cinfo, COL_INFO, "STATUS (%s) ", val_to_str(sscf_status, sscf_status_vals, "Unknown")); - + proto_tree_add_item(sscf_tree, hf_status, tvb, SSCF_STATUS_OFFSET, SSCF_STATUS_LENGTH, FALSE); proto_tree_add_item(sscf_tree, hf_spare, tvb, SSCF_SPARE_OFFSET, @@ -110,7 +110,7 @@ dissect_sscf_nni(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) void proto_register_sscf(void) { - static hf_register_info hf[] = + static hf_register_info hf[] = { { &hf_status, { "Status", "sscf-nni.status", FT_UINT8, BASE_HEX, VALS(sscf_status_vals), 0x0, NULL, HFILL} }, { &hf_spare, { "Spare", "sscf-nni.spare", FT_UINT24, BASE_HEX, diff --git a/epan/dissectors/packet-syslog.c b/epan/dissectors/packet-syslog.c index 78674f064d..0cd062f770 100644 --- a/epan/dissectors/packet-syslog.c +++ b/epan/dissectors/packet-syslog.c @@ -5,7 +5,7 @@ * * Support for passing SS7 MSUs (from the Cisco ITP Packet Logging * facility) to the MTP3 dissector by Abhik Sarkar - * with some rework by Jeff Morriss + * with some rework by Jeff Morriss * * $Id$ * -- cgit v1.2.3