aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--doc/tshark.adoc2
-rw-r--r--epan/dissectors/packet-gsm_rlcmac.c2
-rw-r--r--epan/dissectors/packet-sip.c2
-rw-r--r--packaging/nsis/wireshark.nsi2
-rw-r--r--tools/wireshark_words.txt22
5 files changed, 26 insertions, 4 deletions
diff --git a/doc/tshark.adoc b/doc/tshark.adoc
index 7b522371fb..81d0b56e44 100644
--- a/doc/tshark.adoc
+++ b/doc/tshark.adoc
@@ -243,7 +243,7 @@ packets.
__value__ is 1, make running file number part before start time part; this is
the original and default behaviour (e.g. log_00001_20210714164426.pcap). If
__value__ is greater than 1, make start time part before running number part
-(e.g. log_20210828164426_00001.pcap). The latter makes alphabetical sortig
+(e.g. log_20210828164426_00001.pcap). The latter makes alphabetical sorting
order equal to creation time order, and keeps related multiple file sets in
same directory close to each other.
diff --git a/epan/dissectors/packet-gsm_rlcmac.c b/epan/dissectors/packet-gsm_rlcmac.c
index 69366a50a6..c05a267a84 100644
--- a/epan/dissectors/packet-gsm_rlcmac.c
+++ b/epan/dissectors/packet-gsm_rlcmac.c
@@ -12245,7 +12245,7 @@ proto_register_gsm_rlcmac(void)
}
},
{ &hf_egprs_prr_additionsr7_16qam_hsr_mean_bep_exist,
- { "Exist_16QAM_HSR_MEAN_BEP", "gsm_rlcmac.ul.prr_esixt_16qam_hsr_mean_bep",
+ { "Exist_16QAM_HSR_MEAN_BEP", "gsm_rlcmac.ul.prr_exist_16qam_hsr_mean_bep",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
diff --git a/epan/dissectors/packet-sip.c b/epan/dissectors/packet-sip.c
index 5f82cf4afb..d1f6235fa8 100644
--- a/epan/dissectors/packet-sip.c
+++ b/epan/dissectors/packet-sip.c
@@ -4776,7 +4776,7 @@ dissect_sip_common(tvbuff_t *tvb, int offset, int remaining_length, packet_info
/* The body is gzip:ed */
next_tvb = tvb_uncompress(tvb, offset, datalen);
if (next_tvb) {
- add_new_data_source(pinfo, next_tvb, "gunziped data");
+ add_new_data_source(pinfo, next_tvb, "gunzipped data");
if(sip_tree) {
ti_a = proto_tree_add_item(sip_tree, hf_sip_msg_body, next_tvb, 0, -1,
ENC_NA);
diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi
index 04cf01a094..a7d4228116 100644
--- a/packaging/nsis/wireshark.nsi
+++ b/packaging/nsis/wireshark.nsi
@@ -1256,7 +1256,7 @@ SectionEnd
!insertmacro MUI_DESCRIPTION_TEXT ${SecUDPdump} "Provide capture interface that gets UDP packets from network devices"
!insertmacro MUI_DESCRIPTION_TEXT ${SecRandpktdump} "Provide random packet generator"
!insertmacro MUI_DESCRIPTION_TEXT ${SecEtwdump} "Provide ETW reader"
- !insertmacro MUI_DESCRIPTION_TEXT ${SecEditCap} "Copy packets to a new file, optionally trimmming packets, omitting them, or saving to a different format."
+ !insertmacro MUI_DESCRIPTION_TEXT ${SecEditCap} "Copy packets to a new file, optionally trimming packets, omitting them, or saving to a different format."
!insertmacro MUI_DESCRIPTION_TEXT ${SecText2Pcap} "Read an ASCII hex dump and write the data into a libpcap-style capture file."
!insertmacro MUI_DESCRIPTION_TEXT ${SecMergecap} "Combine multiple saved capture files into a single output file"
!insertmacro MUI_DESCRIPTION_TEXT ${SecReordercap} "Copy packets to a new file, sorted by time."
diff --git a/tools/wireshark_words.txt b/tools/wireshark_words.txt
index f9810e7513..df4258b031 100644
--- a/tools/wireshark_words.txt
+++ b/tools/wireshark_words.txt
@@ -299,6 +299,7 @@ decrypt
decrypted
decrypting
decryption
+dedup
deduplicate
deenabled
deenablement
@@ -405,6 +406,7 @@ encrypting
endace
endian
endianness
+endif
engineid
enodeb
enqueue
@@ -510,6 +512,7 @@ groupcast
groupmod
gssapi
guint
+gzipped
handoff
hangup
harqid
@@ -546,6 +549,7 @@ ieee17221
ieee80211
iface
ifconfig
+ifdef
ikev2
illuminance
immersive
@@ -577,6 +581,7 @@ initializing
inline
inode
inodes
+instdir
instrumented
interferer
interleaving
@@ -595,6 +600,7 @@ ipseckey
iptables
iptrace
ipv4addr
+ipxnets
irqmask
isakmp
iscsi
@@ -648,6 +654,7 @@ loghans
loglocal
logoff
logout
+lookups
loopback
lossy
lscap
@@ -819,6 +826,7 @@ optimizations
optimizer
optiplex
ordinal
+osmocom
ospf6
outhdr
packetcable
@@ -830,6 +838,7 @@ param
parameterization
parameterized
params
+parens
parlay
parms
parser
@@ -864,6 +873,7 @@ plixer
plugin
pluginize
plugins
+pluginsdir
pname
polestar
popup
@@ -878,6 +888,7 @@ posix
postfix
powercontrol
pppdump
+pppoe
prach
preauth
preconfiguration
@@ -995,6 +1006,8 @@ reinitialization
reinitialize
reinitialized
reinitializing
+reinjected
+reinjection
reinvoke
rekey
rekeying
@@ -1253,6 +1266,7 @@ transcoder
transifex
transitioning
transitivity
+transum
transversal
traveler
traversal
@@ -1364,6 +1378,7 @@ unparsed
unprocessable
unpublish
unpunctuated
+unquoted
unreach
unreassembled
unreceived
@@ -1389,8 +1404,10 @@ untrusted
untunneled
untyped
unvisited
+unvoiced
updatability
updatable
+upiri
uplink
upload
uploaded
@@ -1399,6 +1416,7 @@ uploads
urlencoded
urnti
usability
+usbpcap
userdata
userinfo
userlist
@@ -1415,6 +1433,7 @@ v1610
validator
varint
vcredist
+verbosity
verifier
verizon
version2
@@ -1434,12 +1453,14 @@ volerr
vxlan
wakeup
webcam
+webkit
websocket
whoami
wideband
wikipedia
wikis
wimax
+wimaxasncp
winpcap
winspool
wireshark
@@ -1457,6 +1478,7 @@ wsluarm
x509sat
xattr
xchannel
+xferext
xmlns
xsltproc
xtreme