diff --git a/AUTHORS b/AUTHORS index 64dcfdd13c..70048018fb 100644 --- a/AUTHORS +++ b/AUTHORS @@ -942,7 +942,7 @@ Motonori Shindo { Patches to packet-x11-keysym.h to clean up 8-bit chars Fixes to take the Vendor-Specific attribute into consideration when dissecting L2TP - L2TP Dissconnect Cause Information AVP support + L2TP Disconnect Cause Information AVP support PPP CCP support PPP compressed packet support Assorted BGP improvements diff --git a/CMakeLists.txt b/CMakeLists.txt index b2c6f87c8a..3586013319 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1570,7 +1570,7 @@ if(ENABLE_CCACHE) endif() endif() -# The top level checkAPIs target, add before subdirectory calls so it's avaiable to all +# The top level checkAPIs target, add before subdirectory calls so it's available to all add_custom_target(checkAPI) set_target_properties(checkAPI PROPERTIES diff --git a/capinfos.c b/capinfos.c index acb5d8557b..e960b7177b 100644 --- a/capinfos.c +++ b/capinfos.c @@ -317,7 +317,7 @@ absolute_time_string(nstime_t *timer, int tsprecision, capture_info *cf_info) * GMT 15:30:08, Sunday, 4th December, 292,277,026,596. * * So, if we're displaying the time as YYYY-MM-DD HH:MM:SS.SSSSSSSSS, - * we'll have the buffer be large enouth for a date of the format + * we'll have the buffer be large enough for a date of the format * 292277026596-MM-DD HH:MM:SS.SSSSSSSSS, which is the biggest value * you'll get with a 64-bit time_t and a nanosecond-resolution * fraction-of-a-second. @@ -951,7 +951,7 @@ print_stats_table(const gchar *filename, capture_info *cf_info) * comments the last item(s) in each row. We now have a new -K option to * disable cap_comment to more easily manage the potential silliness. * Potential silliness includes multiple comments (therefore resulting in - * more than one additional column and/or comments with embeded newlines + * more than one additional column and/or comments with embedded newlines * and/or possible delimiters). * * To mitigate embedded newlines and other special characters, use -M diff --git a/capture_opts.c b/capture_opts.c index 028b4db8d8..df8d68c038 100644 --- a/capture_opts.c +++ b/capture_opts.c @@ -373,7 +373,7 @@ static gboolean get_filter_arguments(capture_options* capture_opts, const char* } if (filter_exp == NULL) { - /* No filter expression found yet; fallback to previous implemention + /* No filter expression found yet; fallback to previous implementation and assume the arg contains a filter expression */ if (colonp) { *colonp = ':'; /* restore colon */ diff --git a/dumpcap.c b/dumpcap.c index 5c18e5acc5..ddf2328d24 100644 --- a/dumpcap.c +++ b/dumpcap.c @@ -784,7 +784,7 @@ get_pcap_failure_secondary_error_message(cap_device_open_status open_status, PLATFORM_PERMISSIONS_SUGGESTION; } else { /* - * This is not a permissons error, so no need to suggest + * This is not a permissions error, so no need to suggest * checking permissions. */ return @@ -796,7 +796,7 @@ get_pcap_failure_secondary_error_message(cap_device_open_status open_status, default: /* - * This is not a permissons error, so no need to suggest + * This is not a permissions error, so no need to suggest * checking permissions. */ return @@ -1425,7 +1425,7 @@ dlt_to_linktype(int dlt) That way, for example, "raw IP" packets will have LINKTYPE_RAW as the code in all savefiles for which the code that writes them maps to that - value, regardless of the platform on whih they + value, regardless of the platform on which they were written, so they should be readable on all platforms without having to determine on which platform they were written. @@ -1971,7 +1971,7 @@ cap_pipe_open_live(char *pipename, if (g_strlcpy(sa.sun_path, pipename, sizeof sa.sun_path) > sizeof sa.sun_path) { /* Path name too long */ snprintf(errmsg, errmsgl, - "The capture session coud not be initiated " + "The capture session could not be initiated " "due to error on socket connect: Path name too long."); pcap_src->cap_pipe_err = PIPERR; ws_close(fd); @@ -1980,7 +1980,7 @@ cap_pipe_open_live(char *pipename, b = connect(fd, (struct sockaddr *)&sa, sizeof sa); if (b == -1) { snprintf(errmsg, errmsgl, - "The capture session coud not be initiated " + "The capture session could not be initiated " "due to error on socket connect: %s.", g_strerror(errno)); pcap_src->cap_pipe_err = PIPERR; ws_close(fd); diff --git a/editcap.c b/editcap.c index 5230c3920c..e8cd6a3000 100644 --- a/editcap.c +++ b/editcap.c @@ -420,7 +420,7 @@ set_strict_time_adj(char *optarg_str_p) /* * check for a negative adjustment * A negative strict adjustment value is a flag - * to adjust all frames by the specifed delta time. + * to adjust all frames by the specified delta time. */ if (*optarg_str_p == '-') { strict_time_adj.is_negative = 1; @@ -771,7 +771,7 @@ is_duplicate_rel_time(guint8* fd, guint32 len, const nstime_t *current) { * 1. 'continue' dup checking with the next cached frame. * 2. 'break' from looking for a duplicate of the current frame. * 3. Take the absolute value of the delta and see if that - * falls within the specifed dup time window. + * falls within the specified dup time window. * * Currently this code does option 1. But it would pretty * easy to add yet-another-editcap-option to select one of @@ -1666,7 +1666,7 @@ main(int argc, char *argv[]) goto clean_exit; break; } - } /* processing commmand-line options */ + } /* processing command-line options */ #ifdef DEBUG fprintf(stderr, "Optind = %i, argc = %i\n", ws_optind, argc); diff --git a/extcap.c b/extcap.c index 3bf8dacf14..63612a2f65 100644 --- a/extcap.c +++ b/extcap.c @@ -1946,7 +1946,7 @@ process_new_extcap(const char *extcap, char *output) ws_debug("Interface found %s\n", int_iter->call); /* Help is not necessarily stored with the interface, but rather with the version string. - * As the version string allways comes in front of the interfaces, this ensures, that it get's + * As the version string always comes in front of the interfaces, this ensures, that it gets * properly stored with the interface */ if (int_iter->if_type == EXTCAP_SENTENCE_EXTCAP) { diff --git a/file.c b/file.c index 23c80301a7..b1fac38e57 100644 --- a/file.c +++ b/file.c @@ -555,7 +555,7 @@ cf_read(capture_file *cf, gboolean reloading) XXX - do we know this at open time? */ cf->compression_type = wtap_get_compression_type(cf->provider.wth); - /* The packet list window will be empty until the file is completly loaded */ + /* The packet list window will be empty until the file is completely loaded */ packet_list_freeze(); cf->stop_flag = FALSE; @@ -2091,7 +2091,7 @@ rescan_packets(capture_file *cf, const char *action, const char *action_item, gb /* * Scan through all frame data and recalculate the ref time * without rereading the file. - * XXX - do we need a progres bar or is this fast enough? + * XXX - do we need a progress bar or is this fast enough? */ void cf_reftime_packets(capture_file* cf) diff --git a/include/ws_diag_control.h b/include/ws_diag_control.h index 33b5965e50..4764450b7a 100644 --- a/include/ws_diag_control.h +++ b/include/ws_diag_control.h @@ -140,7 +140,7 @@ extern "C" { #endif /* - * Suppress complaints about narrowing converstions and about signed vs. + * Suppress complaints about narrowing conversations and about signed vs. * unsigned comparison. * * XXX - this is done solely to squelch complaints from code generated diff --git a/mmdbresolve.c b/mmdbresolve.c index 0f0607d913..5669e89ea7 100644 --- a/mmdbresolve.c +++ b/mmdbresolve.c @@ -4,7 +4,7 @@ * By Gerald Combs * Copyright 1998 Gerald Combs * - * This progam uses the MaxMind DB library (libmaxminddb) and MUST be + * This program uses the MaxMind DB library (libmaxminddb) and MUST be * compatible with its license (Apache 2.0). * * SPDX-License-Identifier: MIT diff --git a/rawshark.c b/rawshark.c index d4430d06ba..041d21384b 100644 --- a/rawshark.c +++ b/rawshark.c @@ -15,7 +15,7 @@ /* * Rawshark does the following: * - Opens a specified file or named pipe - * - Applies a specfied DLT or "decode as" encapsulation + * - Applies a specified DLT or "decode as" encapsulation * - Reads frames prepended with a libpcap packet header. * - Prints a status line, followed by fields from a specified list. */ diff --git a/sharkd_daemon.c b/sharkd_daemon.c index 5daa7e1856..319b5f0d75 100644 --- a/sharkd_daemon.c +++ b/sharkd_daemon.c @@ -274,7 +274,7 @@ sharkd_init(int argc, char **argv) In Daemon Mode, we will come through here twice; once when we start the Daemon and once again after we have forked the session process. The second time through, the session process has already had its stdin and stdout wired up to the TCP or UNIX - socket and so in the orignal version of sharkd the session process is invoked with + socket and so in the original version of sharkd the session process is invoked with the command line: sharkd - When not using the classic command line, we want to spawn the session process with diff --git a/sharkd_session.c b/sharkd_session.c index e9bda22a44..fb1d7ec9b5 100644 --- a/sharkd_session.c +++ b/sharkd_session.c @@ -355,7 +355,7 @@ json_prep(char* buf, const jsmntok_t* tokens, int count) /* * The member attribute structure is key to the syntax checking. The * array contains all of the root level (1) member names, the data - * types permissable for the value and a boolean that indicates whether + * types permissible for the value and a boolean that indicates whether * or not the member is mandatory. * * Once we get into the next layer (2) of the json tree, we need to check @@ -1507,7 +1507,7 @@ sharkd_session_process_frames_cb(epan_dissect_t *edt, proto_tree *tree _U_, * Process frames request * * Input: - * (o) column0...columnXX - requested columns either number in range [0..NUM_COL_FMTS), or custom (syntax :). + * (o) column0...columnXX - requested columns either number in range [0..NUM_COL_FMTS), or custom (syntax :). * If column0 is not specified default column set will be used. * (o) filter - filter to be used * (o) skip=N - skip N frames @@ -2972,7 +2972,7 @@ sharkd_session_process_tap_rtp_cb(void *arg) * Output UDP Multicast streams tap: * (m) tap - tap name * (m) type - tap output type -* (m) bufferThresholdBytes - byte count for a stream where a buffer alarm shold be reported +* (m) bufferThresholdBytes - byte count for a stream where a buffer alarm should be reported * (m) burstIntervalMs - analysis interval in milliseconds * (m) burstThresholdPackets - count of packets in an interval that should trigger an alarm * (m) streams - array of streams with metrics: @@ -5844,7 +5844,7 @@ sharkd_session_main(int mode_setting) while (fgets(buf, sizeof(buf), stdin)) { - /* every command is line seperated JSON */ + /* every command is line separated JSON */ int ret; ret = json_parse(buf, NULL, 0); diff --git a/tshark.c b/tshark.c index ef1b9064fb..d2fd908fb6 100644 --- a/tshark.c +++ b/tshark.c @@ -2956,7 +2956,7 @@ capture_input_new_file(capture_session *cap_session, gchar *new_file) /* if we are in real-time mode, open the new file now */ if (do_dissection) { - /* this is probably unecessary, but better safe than sorry */ + /* this is probably unnecessary, but better safe than sorry */ cap_session->cf->open_type = WTAP_TYPE_AUTO; /* Attempt to open the capture file and set up to read from it. */ switch(cf_open(cap_session->cf, capture_opts->save_file, WTAP_TYPE_AUTO, is_tempfile, &err)) { diff --git a/ui/capture.c b/ui/capture.c index 3ffc81ba12..62c8df7e35 100644 --- a/ui/capture.c +++ b/ui/capture.c @@ -709,7 +709,7 @@ capture_input_closed(capture_session *cap_session, gchar *msg) } /* * ws_log prefixes log messages with a timestamp delimited by " -- " and possibly - * a function name delimted by "(): ". Log it to sterr, but omit it in the UI. + * a function name delimited by "(): ". Log it to sterr, but omit it in the UI. */ char *plain_msg = strstr(msg, "(): "); if (plain_msg != NULL) { diff --git a/ui/proto_hier_stats.c b/ui/proto_hier_stats.c index 708574b171..6069b008f2 100644 --- a/ui/proto_hier_stats.c +++ b/ui/proto_hier_stats.c @@ -65,7 +65,7 @@ find_stat_node(GNode *parent_stat_node, header_field_info *needle_hfinfo) /* None found. Create one. */ stats = g_new(ph_stats_node_t, 1); - /* Intialize counters */ + /* Initialize counters */ stats->hfinfo = needle_hfinfo; stats->num_pkts_total = 0; stats->num_pdus_total = 0; diff --git a/ui/recent.c b/ui/recent.c index 438af9f9e2..7e838e7a41 100644 --- a/ui/recent.c +++ b/ui/recent.c @@ -94,14 +94,14 @@ static const value_string ts_type_values[] = { { TS_ABSOLUTE, "ABSOLUTE" }, { TS_ABSOLUTE_WITH_YMD, "ABSOLUTE_WITH_YMD" }, { TS_ABSOLUTE_WITH_YDOY, "ABSOLUTE_WITH_YDOY" }, - { TS_ABSOLUTE_WITH_YMD, "ABSOLUTE_WITH_DATE" }, /* Backward compability */ + { TS_ABSOLUTE_WITH_YMD, "ABSOLUTE_WITH_DATE" }, /* Backward compatibility */ { TS_DELTA, "DELTA" }, { TS_DELTA_DIS, "DELTA_DIS" }, { TS_EPOCH, "EPOCH" }, { TS_UTC, "UTC" }, { TS_UTC_WITH_YMD, "UTC_WITH_YMD" }, { TS_UTC_WITH_YDOY, "UTC_WITH_YDOY" }, - { TS_UTC_WITH_YMD, "UTC_WITH_DATE" }, /* Backward compability */ + { TS_UTC_WITH_YMD, "UTC_WITH_DATE" }, /* Backward compatibility */ { 0, NULL } }; diff --git a/ui/tap-rlc-graph.c b/ui/tap-rlc-graph.c index 49f5875607..0d4961c468 100644 --- a/ui/tap-rlc-graph.c +++ b/ui/tap-rlc-graph.c @@ -73,7 +73,7 @@ tap_lte_rlc_packet(void *pct, packet_info *pinfo _U_, epan_dissect_t *edt _U_, c /* Add address if unique and have space for it */ if (is_unique && (th->num_hdrs < MAX_SUPPORTED_CHANNELS)) { - /* Copy the tap stuct in as next header */ + /* Copy the tap struct in as next header */ /* Need to take a deep copy of the tap struct, it may not be valid to read after this function returns? */ th->rlchdrs[th->num_hdrs] = g_new(rlc_lte_tap_info,1); diff --git a/ui/tap-rtp-analysis.c b/ui/tap-rtp-analysis.c index ac8670de25..bd2438fa6c 100644 --- a/ui/tap-rtp-analysis.c +++ b/ui/tap-rtp-analysis.c @@ -243,7 +243,7 @@ rtppacket_analyse(tap_rtp_stat_t *statinfo, /* Check if time sequence of packets is in order. We check whether * timestamp difference is below 1/2 of timestamp range (hours or days). - * Packets can be in pure sequence or sequence can be wrapped arround + * Packets can be in pure sequence or sequence can be wrapped around * 0xFFFFFFFF. */ if ((statinfo->first_timestamp <= rtpinfo->info_timestamp) && diff --git a/ui/tap-rtp-common.h b/ui/tap-rtp-common.h index 11e6a1a048..65c9d38e70 100644 --- a/ui/tap-rtp-common.h +++ b/ui/tap-rtp-common.h @@ -53,7 +53,7 @@ typedef struct _rtpstream_info_calc { gchar *all_payload_type_names; /* Name of codec derived from fixed or dynamic codec names */ guint32 packet_count; guint32 total_nr; - guint32 packet_expected; /* Count of expected packets, derived from lenght of RTP stream */ + guint32 packet_expected; /* Count of expected packets, derived from length of RTP stream */ gint32 lost_num; double lost_perc; double max_delta; @@ -75,7 +75,7 @@ typedef struct _rtpstream_info_calc { } rtpstream_info_calc_t; /** - * Funcions for init and destroy of rtpstream_info_t and attached structures + * Functions for init and destroy of rtpstream_info_t and attached structures */ void rtpstream_info_init(rtpstream_info_t* info); rtpstream_info_t *rtpstream_info_malloc_and_init(void); diff --git a/ui/text_import.c b/ui/text_import.c index e89adf3350..ffde4ac668 100644 --- a/ui/text_import.c +++ b/ui/text_import.c @@ -70,7 +70,7 @@ * Fields are decoded using a leanient parser, but only one attempt is made. * Except for in data invalid values will be replaced by default ones. * data currently only accepts plain HEX, OCT or BIN encoded data. - * common field seperators are ignored. Note however that 0x or 0b prefixing is + * common field separators are ignored. Note however that 0x or 0b prefixing is * not supported and no automatic format detection is attempted. */ @@ -893,7 +893,7 @@ DIAG_ON_INIT_TWICE * The modularized part of this mess, used by the wrapper around the regex * engine in text_import_regex.c to hook into this state-machine backend. * - * Should the rest be modularized aswell? Maybe, but then start with pcap2text.c + * Should the rest be modularized as well? Maybe, but then start with pcap2text.c */ /** @@ -1480,7 +1480,7 @@ parse_token(token_t token, char *str) tmp_str[0] = pkt_lnstart[i*3]; tmp_str[1] = pkt_lnstart[i*3+1]; tmp_str[2] = '\0'; - /* it is a valid convertable string */ + /* it is a valid convertible string */ if (!g_ascii_isxdigit(tmp_str[0]) || !g_ascii_isxdigit(tmp_str[1])) { break; } diff --git a/ui/text_import_regex.c b/ui/text_import_regex.c index 7b1b26bfb4..928957a702 100644 --- a/ui/text_import_regex.c +++ b/ui/text_import_regex.c @@ -73,7 +73,7 @@ int text_import_regex(const text_import_info_t* info) { } parse_data(f_content + field_start, f_content + field_end, info->regex.encoding); - /* parse the auxillary information if present */ + /* parse the auxiliary information if present */ if (re_time && g_match_info_fetch_named_pos(match, "time", &field_start, &field_end)) { parse_time(f_content + field_start, f_content + field_end, info->timestamp_format); diff --git a/ui/text_import_regex.h b/ui/text_import_regex.h index d795ce21ec..93307c187a 100644 --- a/ui/text_import_regex.h +++ b/ui/text_import_regex.h @@ -2,7 +2,7 @@ * * text_import_regex.h * Regex based alternative to the state machine for text import - * Feburary 2021, Paul Weiß + * February 2021, Paul Weiß * * Wireshark - Network traffic analyzer * By Gerald Combs diff --git a/ui/util.c b/ui/util.c index 064d83ca30..25981634ce 100644 --- a/ui/util.c +++ b/ui/util.c @@ -200,7 +200,7 @@ const gchar *get_conn_cfilter(void) { * * Display names may be of the following format: * - * [protoco./] [hostname] : [:] displaynumber [.screennumber] + * [protocol./] [hostname] : [:] displaynumber [.screennumber] * * A string with exactly two colons separating hostname * from the display indicates a DECnet style name. Colons diff --git a/ui/voip_calls.c b/ui/voip_calls.c index c010c0335a..e6175e048a 100644 --- a/ui/voip_calls.c +++ b/ui/voip_calls.c @@ -961,7 +961,7 @@ t38_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt, const if (gai) conv_num = (int) gai->conv_num; } - /* if setup_frame_number in the t38 packet is 0, it means it was not set using an SDP or H245 sesion, which means we don't + /* if setup_frame_number in the t38 packet is 0, it means it was not set using an SDP or H245 session, which means we don't * have the associated Voip calls. It probably means that the packet was decoded using the default t38 port, or using "Decode as.." * in this case we create a "voip" call that only have t38 media (no signaling) * OR if we have not found the Setup message in the graph. @@ -1731,7 +1731,7 @@ q931_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt, if (callsinfo != NULL) { comment = NULL; if (tapinfo->h225_cstype == H225_SETUP) { - /* set te calling and called number from the Q931 packet */ + /* set the calling and called number from the Q931 packet */ if (tapinfo->q931_calling_number != NULL) { g_free(callsinfo->from_identity); callsinfo->from_identity=g_strdup(tapinfo->q931_calling_number);