diff --git a/doc/tshark.adoc b/doc/tshark.adoc index b8c1777ae4..ec821022ae 100644 --- a/doc/tshark.adoc +++ b/doc/tshark.adoc @@ -1099,7 +1099,7 @@ directly do a "Save as" nor export packets from. Examples: Generate hexdump output, with only the frame data source, with delimited ASCII -dump text, with each frame hex block preceeded by a human readable timestamp that +dump text, with each frame hex block preceded by a human readable timestamp that is directly usable by the *text2pcap* utility: tshark ... --hexdump frames --hexdump delimit \ @@ -1107,7 +1107,7 @@ is directly usable by the *text2pcap* utility: | text2pcap -n -t '%F %T.%f' - MYNEWPCAPNG Generate hexdump output, with only the frame data source, with no ASCII dump text, -with each frame hex block preceeded by an epoch timestamp that is directly +with each frame hex block preceded by an epoch timestamp that is directly usable by the *text2pcap* utility: tshark ... --hexdump frames --hexdump noascii \ diff --git a/epan/dissectors/packet-gsm_abis_pgsl.c b/epan/dissectors/packet-gsm_abis_pgsl.c index edc7802958..4bff0dbf05 100644 --- a/epan/dissectors/packet-gsm_abis_pgsl.c +++ b/epan/dissectors/packet-gsm_abis_pgsl.c @@ -602,7 +602,7 @@ proto_register_abis_pgsl(void) { &hf_pgsl_codec_delay, { "Codec Delay", "gsm_abis_pgsl.codec_delay", FT_UINT8, BASE_DEC, NULL, 0xe0, - "Estimated Accss Delay Deviation", HFILL } + "Estimated Access Delay Deviation", HFILL } }, { &hf_pgsl_codec_cs, { "Codec CS", "gsm_abis_pgsl.codec_csy", diff --git a/epan/dissectors/packet-gsm_rlcmac.c b/epan/dissectors/packet-gsm_rlcmac.c index d60335f0a5..1fc8a9a0f4 100644 --- a/epan/dissectors/packet-gsm_rlcmac.c +++ b/epan/dissectors/packet-gsm_rlcmac.c @@ -1291,7 +1291,7 @@ static int hf_ec_puan_monitor_ec_pacch = -1; static int hf_t3238 = -1; static int hf_ec_initial_waiting_time = -1; static int hf_ec_pacch_monitoring_pattern = -1; -static int hf_ec_puan_fua_dealy_exist = -1; +static int hf_ec_puan_fua_delay_exist = -1; static int hf_ec_reject_wait_exist = -1; static int hf_ec_packet_access_reject_count = -1; @@ -4129,7 +4129,7 @@ CSN_DESCR_BEGIN (PUAN_Fixed_Uplink_Allocation_t) M_NEXT_EXIST (PUAN_Fixed_Uplink_Allocation_t, Exist_BSN_OFFSET, 1, &hf_ec_bsn_offset_exist), M_UINT (PUAN_Fixed_Uplink_Allocation_t, BSN_OFFSET, 2, &hf_ec_bsn_offset), M_UINT (PUAN_Fixed_Uplink_Allocation_t, START_FIRST_UL_RLC_DATA_BLOCK, 4, &hf_ec_start_first_ul_rlc_data_block), - M_REC_TARRAY (PUAN_Fixed_Uplink_Allocation_t, FUA_Delay, FUA_Delay_t, Count_FUA_Delay, &hf_ec_puan_fua_dealy_exist), + M_REC_TARRAY (PUAN_Fixed_Uplink_Allocation_t, FUA_Delay, FUA_Delay_t, Count_FUA_Delay, &hf_ec_puan_fua_delay_exist), CSN_DESCR_END (PUAN_Fixed_Uplink_Allocation_t) static const @@ -4263,7 +4263,7 @@ CSN_DESCR_END (EC_Packet_Tbf_Release_t) static const CSN_DESCR_BEGIN (Fixed_Uplink_Allocation_t) M_UINT (Fixed_Uplink_Allocation_t, START_FIRST_UL_RLC_DATA_BLOCK, 4, &hf_ec_start_first_ul_rlc_data_block), - M_REC_TARRAY (Fixed_Uplink_Allocation_t, FUA_Delay, FUA_Delay_t, Count_FUA_Delay, &hf_ec_puan_fua_dealy_exist), + M_REC_TARRAY (Fixed_Uplink_Allocation_t, FUA_Delay, FUA_Delay_t, Count_FUA_Delay, &hf_ec_puan_fua_delay_exist), CSN_DESCR_END (Fixed_Uplink_Allocation_t) static const @@ -18462,8 +18462,8 @@ proto_register_gsm_rlcmac(void) } }, - { &hf_ec_puan_fua_dealy_exist, - { "EC_PUAN_FUA_DEALY Exist", "gsm_rlcmac.dl.ec_puan_fua_dealy_exist", + { &hf_ec_puan_fua_delay_exist, + { "EC_PUAN_FUA_DELAY Exist", "gsm_rlcmac.dl.ec_puan_fua_delay_exist", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL } diff --git a/epan/dissectors/packet-rdp_egfx.c b/epan/dissectors/packet-rdp_egfx.c index fc26a9f3b6..c52e33f302 100644 --- a/epan/dissectors/packet-rdp_egfx.c +++ b/epan/dissectors/packet-rdp_egfx.c @@ -130,7 +130,7 @@ static const value_string rdp_egfx_cmd_vals[] = { { RDPGFX_CMDID_DELETESURFACE, "Delete surface" }, { RDPGFX_CMDID_STARTFRAME, "Start frame" }, { RDPGFX_CMDID_ENDFRAME, "End frame" }, - { RDPGFX_CMDID_FRAMEACKNOWLEDGE, "Frame acknowlegde" }, + { RDPGFX_CMDID_FRAMEACKNOWLEDGE, "Frame acknowledge" }, { RDPGFX_CMDID_RESETGRAPHICS, "Reset graphics" }, { RDPGFX_CMDID_MAPSURFACETOOUTPUT, "Map Surface to output" }, { RDPGFX_CMDID_CACHEIMPORTOFFER, "Cache import offer" }, @@ -138,7 +138,7 @@ static const value_string rdp_egfx_cmd_vals[] = { { RDPGFX_CMDID_CAPSADVERTISE, "Caps advertise" }, { RDPGFX_CMDID_CAPSCONFIRM, "Caps confirm" }, { RDPGFX_CMDID_MAPSURFACETOWINDOW, "Map surface to window" }, - { RDPGFX_CMDID_QOEFRAMEACKNOWLEDGE, "Qoe frame acknowlegde" }, + { RDPGFX_CMDID_QOEFRAMEACKNOWLEDGE, "Qoe frame acknowledge" }, { RDPGFX_CMDID_MAPSURFACETOSCALEDOUTPUT, "Map surface to scaled output" }, { RDPGFX_CMDID_MAPSURFACETOSCALEDWINDOW, "Map surface to scaled window" }, { 0x0, NULL }, diff --git a/epan/dissectors/packet-rtp-midi.c b/epan/dissectors/packet-rtp-midi.c index 071823a387..60e7ff0e53 100644 --- a/epan/dissectors/packet-rtp-midi.c +++ b/epan/dissectors/packet-rtp-midi.c @@ -1315,7 +1315,7 @@ static const value_string rtp_midi_controller_values[] = { { RTP_MIDI_CTRL_EFFECTS_2_DEPTH, "Effects 2 Depth (formerly: Tremolo Depth)" }, { RTP_MIDI_CTRL_EFFECTS_3_DEPTH, "Effects 3 Depth (formerly: Chorus Depth)" }, { RTP_MIDI_CTRL_EFFECTS_4_DEPTH, "Effects 4 Depth (formerly: Celeste (Detune) Depth)" }, - { RTP_MIDI_CTRL_EFFECTS_5_DEPTH, "Effects 5 Depth (formerly: Phaser Deptch)" }, + { RTP_MIDI_CTRL_EFFECTS_5_DEPTH, "Effects 5 Depth (formerly: Phaser Depth)" }, { RTP_MIDI_CTRL_DATA_INCREMENT, "Data Increment" }, { RTP_MIDI_CTRL_DATA_DECREMENT, "Data Decrement" }, { RTP_MIDI_CTRL_NON_REGISTERED_PARAM_LSB, "Non-Registered Parameter (lsb)" }, diff --git a/epan/dissectors/packet-sapms.c b/epan/dissectors/packet-sapms.c index 7955ddfdfe..5dc486e9c1 100644 --- a/epan/dissectors/packet-sapms.c +++ b/epan/dissectors/packet-sapms.c @@ -1745,7 +1745,7 @@ proto_register_sapms(void) range_convert_str(wmem_epan_scope(), &global_sapms_port_range, SAPMS_PORT_RANGE, MAX_TCP_PORT); prefs_register_range_preference(sapms_module, "tcp_ports", "SAP MS Protocol TCP port numbers", "Port numbers used for SAP MS Protocol (default " SAPMS_PORT_RANGE ")", &global_sapms_port_range, MAX_TCP_PORT); - prefs_register_bool_preference(sapms_module, "highlight_unknown_items", "Highlight unknown SAP MS messages", "Whether the SAP MS Protocol dissector should highlight unknown MS messages (migth be noise and generate a lot of expert warnings)", &global_sapms_highlight_items); + prefs_register_bool_preference(sapms_module, "highlight_unknown_items", "Highlight unknown SAP MS messages", "Whether the SAP MS Protocol dissector should highlight unknown MS messages (might be noise and generate a lot of expert warnings)", &global_sapms_highlight_items); } diff --git a/tools/wireshark_words.txt b/tools/wireshark_words.txt index 0a0d824fda..caa9ea8df0 100644 --- a/tools/wireshark_words.txt +++ b/tools/wireshark_words.txt @@ -68,6 +68,7 @@ appset arbitrated arduino arfcn +arista asciidoc ashrae asn1 @@ -97,6 +98,7 @@ authntransitioning authorizer authtoken authtype +authz autoconfiguration autodiscovery autoneg @@ -197,6 +199,7 @@ cellidentity centiseconds centrino cfilters +cframe chan1 chan2 changelog @@ -204,6 +207,7 @@ channelisation channelized charset charsets +chauvet checkbox checkout checksum @@ -254,6 +258,7 @@ combiners communication compat compilers +compr computable concatenate concatenated @@ -265,8 +270,10 @@ configurable conformant connectionless connid +connp const contactless +contextp contiguity contiguously coord @@ -295,6 +302,7 @@ csapi ctime ctype cumulated +cumulatively customizable customization customizing @@ -386,6 +394,7 @@ dfilter dfilters dfsauth dftest +dgram dhcpv dialed dialup @@ -439,6 +448,7 @@ eeprom egprs egroup eigrp +einval elektronik elided elink @@ -492,6 +502,7 @@ eutra eutran eventlog executables +exflags exocet extattr extcap @@ -501,12 +512,14 @@ extern exthdr extrainformation eyesdn +facch failover fastcom fastip fastmsg fattr featureful +fhandle fiber fileset firewall @@ -554,6 +567,7 @@ geonw geran getattr getentrybyname +getgroupinfo getnext getter gidaddr @@ -568,9 +582,11 @@ gmprs gnodeb gnutls goaway +golomb google gpointer gprscdr +gprsmeasurementparams3g gregex greyed groupa @@ -589,6 +605,7 @@ hashed hashes hazelcast hcidump +headend heuristic hfarr hfill, @@ -612,6 +629,7 @@ huffman hytec icmpv ident +identifier idiographic idl2deb idl2wrs @@ -625,6 +643,7 @@ ifdef ifname ikev2 illuminance +imeisv immersive implementations implementer @@ -668,6 +687,7 @@ interruptible interworking inuse invalidation +invalidly ioctl ioerr ioflag @@ -676,7 +696,9 @@ iotecha ipaccess ipaddr ipaddress +ipcomp ipconfig +iperf ipfix ipphone ipprim @@ -685,6 +707,7 @@ ipseckey iptables iptrace ipv4addr +ipv6addr ipxnet ipxnets irqmask @@ -725,6 +748,7 @@ l2vpn l3vpn laggy lanalyzer +latencies lbmpdm lcgid lcids @@ -807,6 +831,7 @@ minus1 mirrorlink misconfiguration misconfigured +mitel mitsubishi mkdir mmdbresolve @@ -823,9 +848,12 @@ mpsse mptcp mrcpv msbuild +mscldap msgid +msglen msgreq msgsend +msgtype msisdn MSM7627A mtftp @@ -849,6 +877,7 @@ multiplexed multiplexer multiplexers multiplexing +multiplicative multiplicator multirat multirate @@ -938,8 +967,10 @@ octetstring ofdma offloadability ofpat +ofpet ofpmp ofppf +ofptfpt ofpxmt om2000 omniidl @@ -963,9 +994,11 @@ optiplex ordinal oscillatory oscore +osdmap osmocom ospf6 outhdr +pacch packetcable packetization packetized @@ -986,7 +1019,10 @@ passivated passkey passthrough passwd +pbcch pcapng +pccch +pcch pcell pcmax pcmaxc @@ -1024,6 +1060,7 @@ portinfo portmod portno portnumber +portset portstatus posix postfix @@ -1080,6 +1117,7 @@ qam64 qnet6 qosinfo qsearch +quadlet quadrature quadro quantifiers @@ -1239,6 +1277,8 @@ rtpmidi rtpmux ruleset rxchannel +rxlen +rxlev rxreq s7comm sabme @@ -1254,6 +1294,7 @@ scdma scell scoped scrollbar +sdcch sdjournal sdusize sectorization @@ -1445,6 +1486,7 @@ toolbar toolongfragment toolset tooltip +topup toshiba touchlink touchpad @@ -1626,6 +1668,7 @@ utf8mb utilization utils utran +uuencoded v1250 v1310 v1410 @@ -1636,6 +1679,7 @@ varint vcpkg vcredist vcxproj +vector3d verbosity verifier verizon @@ -1650,8 +1694,10 @@ versioning vhdset viavi virtex +virtio virtualization vlans +vnode vocoder vodafone voipmetrics @@ -1673,6 +1719,7 @@ wimaxasncp winget winpcap winspool +wiphy wireshark wiretap withfcs @@ -1693,6 +1740,7 @@ X32bit x509if x509sat xattr +xauth xchannel xcode xetra