diff options
29 files changed, 33 insertions, 33 deletions
diff --git a/asn1/ansi_map/packet-ansi_map-template.c b/asn1/ansi_map/packet-ansi_map-template.c index 64448fbd48..e8b3c58b57 100644 --- a/asn1/ansi_map/packet-ansi_map-template.c +++ b/asn1/ansi_map/packet-ansi_map-template.c @@ -5485,7 +5485,7 @@ void proto_register_ansi_map(void) { prefs_register_enum_preference(ansi_map_module, "transaction.matchtype", "Type of matching invoke/response", - "Type of matching invoke/response, risk of missmatch if loose matching choosen", + "Type of matching invoke/response, risk of mismatch if loose matching chosen", &ansi_map_response_matching_type, ansi_map_response_matching_type_values, FALSE); register_init_routine(&ansi_map_init); diff --git a/asn1/ansi_tcap/packet-ansi_tcap-template.c b/asn1/ansi_tcap/packet-ansi_tcap-template.c index 3fff0c9bfa..f3020dfafa 100644 --- a/asn1/ansi_tcap/packet-ansi_tcap-template.c +++ b/asn1/ansi_tcap/packet-ansi_tcap-template.c @@ -524,7 +524,7 @@ proto_register_ansi_tcap(void) prefs_register_enum_preference(ansi_tcap_module, "transaction.matchtype", "Type of matching invoke/response", - "Type of matching invoke/response, risk of missmatch if loose matching choosen", + "Type of matching invoke/response, risk of mismatch if loose matching chosen", &ansi_tcap_response_matching_type, ansi_tcap_response_matching_type_values, FALSE); register_init_routine(&ansi_tcap_init); diff --git a/asn1/h248/packet-h248-template.c b/asn1/h248/packet-h248-template.c index 0168c8d242..5161137601 100644 --- a/asn1/h248/packet-h248-template.c +++ b/asn1/h248/packet-h248-template.c @@ -1626,7 +1626,7 @@ void proto_register_h248(void) { h248_module = prefs_register_protocol(proto_h248, proto_reg_handoff_h248); prefs_register_bool_preference(h248_module, "ctx_info", "Track Context", - "Mantain relationships between transactions and contexts and display an extra tree showing context data", + "Maintain relationships between transactions and contexts and display an extra tree showing context data", &keep_persistent_data); prefs_register_uint_preference(h248_module, "udp_port", "UDP port", diff --git a/capchild/capture_sync.c b/capchild/capture_sync.c index 905d514c95..a698efc5e0 100644 --- a/capchild/capture_sync.c +++ b/capchild/capture_sync.c @@ -793,7 +793,7 @@ sync_pipe_start(capture_options *capture_opts, capture_session *cap_session, voi * standard output and one for its standard error. * * On success, *msg is unchanged and 0 is returned; data_read_fd, - * messsage_read_fd, and fork_child point to the standard output pipe's + * message_read_fd, and fork_child point to the standard output pipe's * file descriptor, the standard error pipe's file descriptor, and * the child's PID/handle, respectively. * diff --git a/epan/dissectors/packet-ansi_map.c b/epan/dissectors/packet-ansi_map.c index 23dbaeab54..ee56d70480 100644 --- a/epan/dissectors/packet-ansi_map.c +++ b/epan/dissectors/packet-ansi_map.c @@ -19555,7 +19555,7 @@ void proto_register_ansi_map(void) { prefs_register_enum_preference(ansi_map_module, "transaction.matchtype", "Type of matching invoke/response", - "Type of matching invoke/response, risk of missmatch if loose matching choosen", + "Type of matching invoke/response, risk of mismatch if loose matching chosen", &ansi_map_response_matching_type, ansi_map_response_matching_type_values, FALSE); register_init_routine(&ansi_map_init); diff --git a/epan/dissectors/packet-ansi_tcap.c b/epan/dissectors/packet-ansi_tcap.c index e6a8b40d44..67a3bf7dbe 100644 --- a/epan/dissectors/packet-ansi_tcap.c +++ b/epan/dissectors/packet-ansi_tcap.c @@ -1821,7 +1821,7 @@ proto_register_ansi_tcap(void) prefs_register_enum_preference(ansi_tcap_module, "transaction.matchtype", "Type of matching invoke/response", - "Type of matching invoke/response, risk of missmatch if loose matching choosen", + "Type of matching invoke/response, risk of mismatch if loose matching chosen", &ansi_tcap_response_matching_type, ansi_tcap_response_matching_type_values, FALSE); register_init_routine(&ansi_tcap_init); diff --git a/epan/dissectors/packet-btatt.c b/epan/dissectors/packet-btatt.c index be012c8720..d78a5d1167 100644 --- a/epan/dissectors/packet-btatt.c +++ b/epan/dissectors/packet-btatt.c @@ -2673,7 +2673,7 @@ static const value_string cycling_power_control_point_response_value[] = { static const value_string location_and_speed_flags_elevation_source_vals[] = { { 0x00, "Positioning System"}, { 0x01, "Barometric Air Pressure"}, - { 0x02, "Database Service (or similiar)"}, + { 0x02, "Database Service (or similar)"}, { 0x03, "Other"}, {0x0, NULL} }; diff --git a/epan/dissectors/packet-bthfp.c b/epan/dissectors/packet-bthfp.c index 5d821d80c8..752b0619ef 100644 --- a/epan/dissectors/packet-bthfp.c +++ b/epan/dissectors/packet-bthfp.c @@ -1565,7 +1565,7 @@ static const at_cmd_t at_cmds[] = { { "+VTS", "DTMF and tone generation", check_vts, dissect_vts_parameter }, { "+CNUM", "Subscriber Number Information", check_cnum, dissect_cnum_parameter }, { "ERROR", "ERROR", check_only_ag_role, dissect_no_parameter }, - { "RING", "Incomming Call Indication", check_only_ag_role, dissect_no_parameter }, + { "RING", "Incoming Call Indication", check_only_ag_role, dissect_no_parameter }, { "OK", "OK", check_only_ag_role, dissect_no_parameter }, { "D", "Dial", check_only_hs_role, NULL }, { "A", "Call Answer", check_only_hs_role, dissect_no_parameter }, diff --git a/epan/dissectors/packet-bthsp.c b/epan/dissectors/packet-bthsp.c index d3bcea93d6..cb713ecec7 100644 --- a/epan/dissectors/packet-bthsp.c +++ b/epan/dissectors/packet-bthsp.c @@ -264,7 +264,7 @@ static const at_cmd_t at_cmds[] = { { "+VGM", "Gain of Microphone", check_vgm, dissect_vgm_parameter }, { "+CKPD", "Control Keypad", check_ckpd, dissect_ckpd_parameter }, { "ERROR", "ERROR", check_only_ag_role, dissect_no_parameter }, - { "RING", "Incomming Call Indication", check_only_ag_role, dissect_no_parameter }, + { "RING", "Incoming Call Indication", check_only_ag_role, dissect_no_parameter }, { "OK", "OK", check_only_ag_role, dissect_no_parameter }, { NULL, NULL, NULL, NULL } }; diff --git a/epan/dissectors/packet-coap.c b/epan/dissectors/packet-coap.c index 5521749913..a09d9320c8 100644 --- a/epan/dissectors/packet-coap.c +++ b/epan/dissectors/packet-coap.c @@ -839,7 +839,7 @@ dissect_coap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* d /* append the header information */ proto_item_append_text(coap_root, ", %s, %s, MID:%u", - val_to_str(ttype, vals_ttype, "Unkown %u"), + val_to_str(ttype, vals_ttype, "Unknown %u"), val_to_str_ext(code, &vals_code_ext, "Unknown %u"), mid); diff --git a/epan/dissectors/packet-dec-dnart.c b/epan/dissectors/packet-dec-dnart.c index 157fe3a1d8..2dfa3e26f1 100644 --- a/epan/dissectors/packet-dec-dnart.c +++ b/epan/dissectors/packet-dec-dnart.c @@ -1299,7 +1299,7 @@ proto_register_dec_rt(void) { "Nodes visited ty this package", "dec_dna.vst_node", FT_UINT8, BASE_DEC, NULL, 0x0, "Nodes visited", HFILL }}, - /* Control messsage items */ + /* Control message items */ { &hf_dec_ctl_msgs, { "Routing control message", "dec_dna.rt.msg_type", FT_UINT8, BASE_HEX, VALS(rt_msg_type_vals), 0xe, diff --git a/epan/dissectors/packet-dns.c b/epan/dissectors/packet-dns.c index 215e6636db..f73a89193d 100644 --- a/epan/dissectors/packet-dns.c +++ b/epan/dissectors/packet-dns.c @@ -5439,7 +5439,7 @@ proto_register_dns(void) "URL or email address for certificate issue requests and violation reports", HFILL }}, { &hf_dns_caa_unknown, - { "Unkown tag", "dns.caa.unknown", + { "Unknown tag", "dns.caa.unknown", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, diff --git a/epan/dissectors/packet-dpnss.c b/epan/dissectors/packet-dpnss.c index f28bfc9d19..13f0e874cc 100644 --- a/epan/dissectors/packet-dpnss.c +++ b/epan/dissectors/packet-dpnss.c @@ -1624,7 +1624,7 @@ proto_register_dpnss(void) { &hf_dpnss_selection_field, { "Selection Field", "dpnss.selection_field", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_dpnss_user_information, { "User Information", "dpnss.user_information", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_dpnss_sup_str, { "Sup str", "dpnss.sup_str", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, - { &hf_dpnss_parameter, { "Paramter", "dpnss.parameter", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, + { &hf_dpnss_parameter, { "Parameter", "dpnss.parameter", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, }; diff --git a/epan/dissectors/packet-exported_pdu.c b/epan/dissectors/packet-exported_pdu.c index 0ad9c4c11c..3195904e47 100644 --- a/epan/dissectors/packet-exported_pdu.c +++ b/epan/dissectors/packet-exported_pdu.c @@ -246,7 +246,7 @@ proto_register_exported_pdu(void) NULL, HFILL } }, { &hf_exported_pdu_unknown_tag, - { "Unkown tag", "exported_pdu.unknown_tag", + { "Unknown tag", "exported_pdu.unknown_tag", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL } }, diff --git a/epan/dissectors/packet-gsm_ipa.c b/epan/dissectors/packet-gsm_ipa.c index f4c3bb1527..c50784dcb2 100644 --- a/epan/dissectors/packet-gsm_ipa.c +++ b/epan/dissectors/packet-gsm_ipa.c @@ -421,7 +421,7 @@ void proto_register_ipa(void) {&hf_ipaccess_msgtype, {"MessageType", "ipaccess.msg_type", FT_UINT8, BASE_HEX, VALS(ipaccess_msgtype_vals), 0x0, - "Type of ip.access messsage", HFILL} + "Type of ip.access message", HFILL} }, {&hf_ipaccess_attr_tag, {"Tag", "ipaccess.attr_tag", diff --git a/epan/dissectors/packet-gvcp.c b/epan/dissectors/packet-gvcp.c index 02d557a57c..fd56506a44 100644 --- a/epan/dissectors/packet-gvcp.c +++ b/epan/dissectors/packet-gvcp.c @@ -2770,7 +2770,7 @@ void proto_register_gvcp(void) /* GVCP_devicemode */ { &hf_gvcp_devicemode_endianess, - { "Endianess", "gvcp.bootstrap.devicemode.endianess", + { "Endianness", "gvcp.bootstrap.devicemode.endianess", FT_BOOLEAN, 32, NULL, 0x80000000, NULL, HFILL }}, diff --git a/epan/dissectors/packet-h248.c b/epan/dissectors/packet-h248.c index 6f709b9158..c89afa489e 100644 --- a/epan/dissectors/packet-h248.c +++ b/epan/dissectors/packet-h248.c @@ -6957,7 +6957,7 @@ void proto_register_h248(void) { h248_module = prefs_register_protocol(proto_h248, proto_reg_handoff_h248); prefs_register_bool_preference(h248_module, "ctx_info", "Track Context", - "Mantain relationships between transactions and contexts and display an extra tree showing context data", + "Maintain relationships between transactions and contexts and display an extra tree showing context data", &keep_persistent_data); prefs_register_uint_preference(h248_module, "udp_port", "UDP port", diff --git a/epan/dissectors/packet-isup.c b/epan/dissectors/packet-isup.c index 2d5f3abbb6..9b196b2832 100644 --- a/epan/dissectors/packet-isup.c +++ b/epan/dissectors/packet-isup.c @@ -38,7 +38,7 @@ * * National variants * French ISUP Specification: SPIROU 1998 - 002-005 edition 1 ( Info found here http://www.icg-corp.com/docs/ISUP.pdf ). - * Israeli ISUP Specification: excertp (for BCM messsage) found in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4231 . + * Israeli ISUP Specification: excertp (for BCM message) found in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4231 . * Russian national ISUP-R 2000: RD 45.217-2001 book 4 * Japan ISUP http://www.ttc.or.jp/jp/document_list/sum/sum_JT-Q763v21.1.pdf */ @@ -7305,7 +7305,7 @@ static const value_string isup_rfi_info_type_values[] = { /* Performing redirect reason */ static const value_string perf_redir_reason_vals[] = { - { 0, "Unkown/not available" }, + { 0, "Unknown/not available" }, { 1, "Service provider portability (national use)" }, { 2, "Reserved for location portability" }, { 3, "Reserved for service portability" }, diff --git a/epan/dissectors/packet-knxnetip.c b/epan/dissectors/packet-knxnetip.c index 4f6b366644..79ffa91958 100644 --- a/epan/dissectors/packet-knxnetip.c +++ b/epan/dissectors/packet-knxnetip.c @@ -428,13 +428,13 @@ static const value_string knxnetip_connectionstate_response_status_codes[] = { }; static const value_string knxnetip_tunneling_error_codes[] = { - { 0x00, "E_NO_ERROR - The message was received succesfully" }, + { 0x00, "E_NO_ERROR - The message was received successfully" }, { 0x29, "E_TUNNELLING_LAYER - The KNXnet/IP server device does not support the requested tunnelling layer" }, { 0, NULL } }; static const value_string knxnetip_device_configuration_ack_status_codes[] = { - { 0x00, "E_NO_ERROR - The message was received succesfully" }, + { 0x00, "E_NO_ERROR - The message was received successfully" }, { 0, NULL } }; diff --git a/epan/dissectors/packet-netlink-route.c b/epan/dissectors/packet-netlink-route.c index 4ca0a1e4be..2022c0a229 100644 --- a/epan/dissectors/packet-netlink-route.c +++ b/epan/dissectors/packet-netlink-route.c @@ -525,7 +525,7 @@ static header_field_info hfi_netlink_route_ifa_scope NETLINK_ROUTE_HFI_INIT = NULL, 0x00, NULL, HFILL }; static header_field_info hfi_netlink_route_ifa_index NETLINK_ROUTE_HFI_INIT = - { "Inteface index", "netlink-route.ifa_index", FT_INT32, BASE_DEC, + { "Interface index", "netlink-route.ifa_index", FT_INT32, BASE_DEC, NULL, 0x00, NULL, HFILL }; static int diff --git a/epan/dissectors/packet-nstrace.c b/epan/dissectors/packet-nstrace.c index 0a088147f4..d7a2089bd2 100644 --- a/epan/dissectors/packet-nstrace.c +++ b/epan/dissectors/packet-nstrace.c @@ -371,7 +371,7 @@ static const value_string ns_httpabortcode_vals[] = { {0, "connection is trackable"}, {1, "connection is marked for NOREUSE on receiving CONNECT request"}, {2, "no reuse due to HTTP/0.9 Request processing"}, - {3, "recieved FIN from server in the middle of transaction"}, + {3, "received FIN from server in the middle of transaction"}, {4, "VPN GSLB CONNECTION PROXY connections"}, {5, "if http FA moves to unknown on clt req; svr_pcb's http state is also made unknown"}, {6, "Incomplete HTTP chunk"}, diff --git a/epan/dissectors/packet-rsvp.c b/epan/dissectors/packet-rsvp.c index 80e37e0142..40459444d5 100644 --- a/epan/dissectors/packet-rsvp.c +++ b/epan/dissectors/packet-rsvp.c @@ -6148,7 +6148,7 @@ static const value_string rsvp_3gpp_obj_traffic_class_vals[] = { { 1, "Conversational"}, { 2, "Streaming"}, { 3, "Interactive"}, - { 4, "Backgroud"}, + { 4, "Background"}, { 0, NULL} }; diff --git a/epan/dissectors/packet-skinny.c b/epan/dissectors/packet-skinny.c index 01f79cdbf8..c5300b13de 100644 --- a/epan/dissectors/packet-skinny.c +++ b/epan/dissectors/packet-skinny.c @@ -8886,11 +8886,11 @@ proto_register_skinny(void) { &hf_skinny_precedenceDomain, { "precedenceDomain", "skinny.precedenceDomain", FT_UINT32, BASE_DEC, NULL, 0x0, - "Precendence Domain", HFILL }}, + "Precedence Domain", HFILL }}, { &hf_skinny_precedenceLevel, { "precedenceLevel", "skinny.precedenceLevel", FT_UINT32, BASE_DEC, NULL, 0x0, - "Precendence Level, MLPP priorities", HFILL }}, + "Precedence Level, MLPP priorities", HFILL }}, { &hf_skinny_precedenceValue, { "precedenceValue", "skinny.precedenceValue", FT_UINT32, BASE_DEC, NULL, 0x0, diff --git a/epan/dissectors/packet-spice.c b/epan/dissectors/packet-spice.c index d1a9b5a97c..1d12b48e45 100644 --- a/epan/dissectors/packet-spice.c +++ b/epan/dissectors/packet-spice.c @@ -2780,7 +2780,7 @@ dissect_spice_data_client_pdu(tvbuff_t *tvb, proto_tree *tree, packet_info *pinf } col_append_sep_str(pinfo->cinfo, COL_INFO, ", ", get_message_type_string(message_type, spice_info, TRUE)); offset += header_size; - /* TODO: deal with sub-messages list first. As implementation does not uses sub-messsages list yet, */ + /* TODO: deal with sub-messages list first. As implementation does not uses sub-messages list yet, */ /* it cannot be implemented in the dissector yet. */ if (message_type < SPICE_FIRST_AVAIL_MESSAGE) { /* this is a common message */ diff --git a/epan/dissectors/packet-zbee-aps.c b/epan/dissectors/packet-zbee-aps.c index 166bc56b40..d257c52d49 100644 --- a/epan/dissectors/packet-zbee-aps.c +++ b/epan/dissectors/packet-zbee-aps.c @@ -641,7 +641,7 @@ const value_string zbee_aps_t2_cid_names[] = { { ZBEE_APS_T2_CID_RDREQ, "Route Discovery Request"}, { ZBEE_APS_T2_CID_RDRES, "Route Discovery Response"}, { ZBEE_APS_T2_CID_RESPC, "Reset Packet Count"}, - { ZBEE_APS_T2_CID_RETPC, "Retreive Packet Count"}, + { ZBEE_APS_T2_CID_RETPC, "Retrieve Packet Count"}, { ZBEE_APS_T2_CID_TCP, "Transmit Counted Packets"}, { 0, NULL } diff --git a/epan/prefs-int.h b/epan/prefs-int.h index dcec4d0978..e10cf3d61d 100644 --- a/epan/prefs-int.h +++ b/epan/prefs-int.h @@ -174,7 +174,7 @@ struct preference { */ typedef prefs_set_pref_e (*pref_set_pair_cb) (gchar *key, const gchar *value, void *private_data, gboolean return_range_errors); -/** read the preferences file (or similiar) and call the callback +/** read the preferences file (or similar) and call the callback * function to set each key/value pair found */ WS_DLL_PUBLIC diff --git a/epan/prefs.c b/epan/prefs.c index e9ecf29879..36cd4ebd7a 100644 --- a/epan/prefs.c +++ b/epan/prefs.c @@ -3343,7 +3343,7 @@ read_prefs(int *gpf_errno_return, int *gpf_read_errno_return, return &prefs; } -/* read the preferences file (or similiar) and call the callback +/* read the preferences file (or similar) and call the callback * function to set each key/value pair found */ int read_prefs_file(const char *pf_path, FILE *pf, diff --git a/tools/SkinnyProtocolOptimized.xml b/tools/SkinnyProtocolOptimized.xml index 91485b1b4a..8356f63063 100644 --- a/tools/SkinnyProtocolOptimized.xml +++ b/tools/SkinnyProtocolOptimized.xml @@ -2973,8 +2973,8 @@ <enum comment="" name="privacy" subtype="CallPrivacy" type="uint32"/> <struct comment="" name="precedence" type="struct"> <fields> - <integer comment="Precendence Level, MLPP priorities" name="precedenceLevel" type="uint32"/> - <integer comment="Precendence Domain" name="precedenceDomain" type="uint32"/> + <integer comment="Precedence Level, MLPP priorities" name="precedenceLevel" type="uint32"/> + <integer comment="Precedence Domain" name="precedenceDomain" type="uint32"/> </fields> </struct> </fields> diff --git a/tools/pkt-from-core.py b/tools/pkt-from-core.py index 26fac29533..f9cb6aa38e 100755 --- a/tools/pkt-from-core.py +++ b/tools/pkt-from-core.py @@ -380,7 +380,7 @@ def make_cap_file(pkt_data, lnk_t): print "%s created with %d bytes in packet, and %s encoding." % \ (output_file, len(pkt_data), wtap_name[lnk_t]) else: - sys.exit("text2pcap did not run succesfully.") + sys.exit("text2pcap did not run successfully.") |