From cd7026951b2354cb633b51cd82d6de0a0f622f00 Mon Sep 17 00:00:00 2001 From: moshekaplan Date: Tue, 5 Jan 2016 19:58:42 -0500 Subject: [PATCH] Fix a lot of typos and misspellings Change-Id: I8512cfa1d424f82a873a0e0e1d22c7b075fdd7f3 Reviewed-on: https://code.wireshark.org/review/13069 Reviewed-by: Alexis La Goutte Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann --- asn1/acse/packet-acse-template.c | 2 +- asn1/c1222/packet-c1222-template.c | 2 +- asn1/camel/camel.asn | 2 +- asn1/cmip/cmip.cnf | 2 +- asn1/gprscdr/GenericChargingDataTypes.asn | 2 +- asn1/ranap/packet-ranap-template.c | 2 +- asn1/ranap/ranap.cnf | 2 +- asn1/s1ap/s1ap.cnf | 4 +- asn1/tetra/tetra.asn | 10 ++-- epan/addr_resolv.c | 2 +- epan/dissectors/packet-6lowpan.c | 2 +- epan/dissectors/packet-9p.c | 8 +-- epan/dissectors/packet-acn.c | 20 ++++---- epan/dissectors/packet-acse.c | 2 +- epan/dissectors/packet-adb.c | 2 +- epan/dissectors/packet-adb_cs.c | 2 +- epan/dissectors/packet-adb_service.c | 2 +- epan/dissectors/packet-afp.c | 2 +- epan/dissectors/packet-ajp13.c | 4 +- epan/dissectors/packet-alcap.c | 4 +- epan/dissectors/packet-alljoyn.c | 22 ++++---- epan/dissectors/packet-amqp.c | 6 +-- epan/dissectors/packet-amr.c | 2 +- epan/dissectors/packet-applemidi.c | 2 +- epan/dissectors/packet-ber.c | 4 +- epan/dissectors/packet-bgp.c | 8 +-- epan/dissectors/packet-bssgp.c | 4 +- epan/dissectors/packet-btavdtp.c | 38 +++++++------- epan/dissectors/packet-btavdtp.h | 2 +- epan/dissectors/packet-btobex.c | 2 +- epan/dissectors/packet-btsdp.h | 2 +- epan/dissectors/packet-c1222.c | 2 +- epan/dissectors/packet-cipmotion.c | 2 +- epan/dissectors/packet-cipsafety.c | 2 +- epan/dissectors/packet-cmip.c | 2 +- epan/dissectors/packet-corosync-totemsrp.c | 6 +-- epan/dissectors/packet-dhcp-failover.c | 6 +-- epan/dissectors/packet-diameter.c | 10 ++-- epan/dissectors/packet-diameter_3gpp.c | 2 +- epan/dissectors/packet-distcc.c | 2 +- epan/dissectors/packet-dji-uav.c | 2 +- epan/dissectors/packet-ecmp.c | 8 +-- epan/dissectors/packet-epl.c | 2 +- epan/dissectors/packet-epon.c | 2 +- epan/dissectors/packet-erf.c | 2 +- epan/dissectors/packet-eth.c | 4 +- epan/dissectors/packet-ethertype.c | 2 +- .../dissectors/packet-etsi_card_app_toolkit.c | 6 +-- epan/dissectors/packet-extreme.c | 2 +- epan/dissectors/packet-forces.c | 2 +- epan/dissectors/packet-gsm_ipa.c | 2 +- epan/dissectors/packet-gtpv2.c | 2 +- epan/dissectors/packet-h223.c | 2 +- epan/dissectors/packet-h450-ros.c | 2 +- epan/dissectors/packet-hartip.c | 2 +- epan/dissectors/packet-idrp.c | 20 ++++---- epan/dissectors/packet-iec104.c | 36 ++++++------- epan/dissectors/packet-ieee17221.c | 12 ++--- epan/dissectors/packet-ieee1722a.c | 2 +- epan/dissectors/packet-ieee802154.c | 10 ++-- epan/dissectors/packet-igap.c | 2 +- epan/dissectors/packet-ipmi-session.c | 2 +- epan/dissectors/packet-ipsec.c | 14 +++--- epan/dissectors/packet-iscsi.c | 4 +- epan/dissectors/packet-isi.c | 2 +- epan/dissectors/packet-isis-hello.c | 4 +- epan/dissectors/packet-isis-lsp.c | 8 +-- epan/dissectors/packet-isl.c | 2 +- epan/dissectors/packet-ismacryp.c | 2 +- epan/dissectors/packet-ismp.c | 2 +- epan/dissectors/packet-isns.c | 2 +- epan/dissectors/packet-iso14443.c | 2 +- epan/dissectors/packet-isup.c | 48 +++++++++--------- epan/dissectors/packet-iwarp-mpa.c | 6 +-- epan/dissectors/packet-ixveriwave.c | 2 +- epan/dissectors/packet-jmirror.c | 2 +- epan/dissectors/packet-juniper.c | 2 +- epan/dissectors/packet-kingfisher.c | 2 +- epan/dissectors/packet-kink.c | 4 +- epan/dissectors/packet-kismet.c | 4 +- epan/dissectors/packet-l2tp.c | 6 +-- epan/dissectors/packet-lapd.c | 2 +- epan/dissectors/packet-lbmc.c | 4 +- epan/dissectors/packet-linx.c | 2 +- epan/dissectors/packet-lldp.c | 4 +- epan/dissectors/packet-llrp.c | 2 +- epan/dissectors/packet-lmp.c | 4 +- epan/dissectors/packet-lwapp.c | 2 +- epan/dissectors/packet-mausb.c | 2 +- epan/dissectors/packet-mbtcp.c | 2 +- epan/dissectors/packet-mcpe.c | 2 +- epan/dissectors/packet-megaco.c | 2 +- epan/dissectors/packet-mih.c | 8 +-- epan/dissectors/packet-mint.c | 2 +- epan/dissectors/packet-mip.c | 6 +-- epan/dissectors/packet-mip6.c | 2 +- epan/dissectors/packet-mmse.c | 2 +- epan/dissectors/packet-mount.c | 2 +- epan/dissectors/packet-mp2t.c | 10 ++-- epan/dissectors/packet-mp4ves.c | 2 +- epan/dissectors/packet-mpeg-descriptor.c | 8 +-- epan/dissectors/packet-mpeg-pes.c | 2 +- epan/dissectors/packet-mpeg-sect.c | 2 +- epan/dissectors/packet-mq-pcf.c | 6 +-- epan/dissectors/packet-mrp-mmrp.c | 4 +- epan/dissectors/packet-msdp.c | 2 +- epan/dissectors/packet-multipart.c | 4 +- epan/dissectors/packet-mux27010.c | 6 +-- epan/dissectors/packet-nas_eps.c | 4 +- epan/dissectors/packet-nbt.c | 2 +- epan/dissectors/packet-ncp2222.inc | 4 +- epan/dissectors/packet-ndps.c | 8 +-- epan/dissectors/packet-netbios.c | 2 +- epan/dissectors/packet-netrom.c | 4 +- epan/dissectors/packet-nfs.c | 2 +- epan/dissectors/packet-ntlmssp.c | 6 +-- epan/dissectors/packet-ntp.c | 4 +- epan/dissectors/packet-opensafety.c | 2 +- epan/dissectors/packet-ospf.c | 2 +- epan/dissectors/packet-ouch.c | 4 +- epan/dissectors/packet-packetbb.c | 2 +- epan/dissectors/packet-pana.c | 2 +- epan/dissectors/packet-pdc.c | 2 +- epan/dissectors/packet-pdcp-lte.c | 2 +- epan/dissectors/packet-per.c | 4 +- epan/dissectors/packet-ppi-gps.c | 2 +- epan/dissectors/packet-ppi-sensor.c | 8 +-- epan/dissectors/packet-ppi-vector.c | 8 +-- epan/dissectors/packet-ppp.c | 2 +- epan/dissectors/packet-q932-ros.c | 2 +- epan/dissectors/packet-quakeworld.c | 2 +- epan/dissectors/packet-radius.c | 2 +- epan/dissectors/packet-ranap.c | 2 +- epan/dissectors/packet-rdm.c | 8 +-- epan/dissectors/packet-rfc2190.c | 32 ++++++------ epan/dissectors/packet-rlc.c | 14 +++--- epan/dissectors/packet-rohc.c | 2 +- epan/dissectors/packet-rsip.c | 4 +- epan/dissectors/packet-rsl.c | 2 +- epan/dissectors/packet-rsvd.c | 2 +- epan/dissectors/packet-rtcp.c | 2 +- epan/dissectors/packet-s7comm.c | 12 ++--- epan/dissectors/packet-s7comm_szl_ids.c | 2 +- epan/dissectors/packet-sbc.c | 26 +++++----- epan/dissectors/packet-scsi-osd.c | 2 +- epan/dissectors/packet-sctp.c | 2 +- epan/dissectors/packet-ses.c | 2 +- epan/dissectors/packet-sigcomp.c | 8 +-- epan/dissectors/packet-smb.c | 2 +- epan/dissectors/packet-snmp.c | 6 +-- epan/dissectors/packet-socks.c | 4 +- epan/dissectors/packet-spdy.c | 2 +- epan/dissectors/packet-spice.c | 10 ++-- epan/dissectors/packet-sprt.c | 6 +-- epan/dissectors/packet-srvloc.c | 4 +- epan/dissectors/packet-ssl.c | 4 +- epan/dissectors/packet-stanag4607.c | 2 +- epan/dissectors/packet-synphasor.c | 2 +- epan/dissectors/packet-tcp.c | 6 +-- epan/dissectors/packet-tds.c | 4 +- epan/dissectors/packet-teamspeak2.c | 8 +-- epan/dissectors/packet-tetra.c | 50 +++++++++---------- epan/dissectors/packet-tn5250.c | 2 +- epan/dissectors/packet-tr.c | 2 +- epan/dissectors/packet-turbocell.c | 2 +- epan/dissectors/packet-tzsp.c | 4 +- epan/dissectors/packet-ua3g.c | 2 +- epan/dissectors/packet-umts_mac.c | 2 +- epan/dissectors/packet-usb.c | 2 +- epan/dissectors/packet-v5ua.c | 4 +- epan/dissectors/packet-vrrp.c | 4 +- epan/dissectors/packet-wccp.c | 4 +- epan/dissectors/packet-wcp.c | 4 +- epan/dissectors/packet-winsrepl.c | 4 +- epan/dissectors/packet-wps.c | 2 +- epan/dissectors/packet-xml.c | 2 +- epan/dissectors/packet-xmpp-utils.c | 4 +- epan/dissectors/packet-xmpp.c | 12 ++--- epan/dissectors/packet-xyplex.c | 4 +- epan/dissectors/packet-zbee-aps.c | 2 +- epan/dissectors/packet-zbee-nwk-gp.c | 10 ++-- epan/dissectors/packet-zbee-nwk.c | 2 +- epan/dissectors/packet-zbee-security.c | 4 +- epan/dissectors/packet-zbee-zcl-general.c | 12 ++--- epan/dissectors/packet-zbee-zcl-se.c | 2 +- epan/dissectors/packet-zbee-zcl.c | 2 +- epan/dissectors/packet-zep.c | 8 +-- epan/etypes.h | 2 +- epan/packet.c | 2 +- extcap/androiddump.c | 4 +- file.c | 2 +- fileset.c | 4 +- pcapio.c | 2 +- pdml2html.xsl | 2 +- plugins/wimax/mac_mgmt_msg_decoder.c | 2 +- ui/qt/bluetooth_hci_summary_dialog.cpp | 4 +- wimaxasncp/dictionary.xml | 2 +- 197 files changed, 493 insertions(+), 493 deletions(-) diff --git a/asn1/acse/packet-acse-template.c b/asn1/acse/packet-acse-template.c index b634f813f3..ce862a3afc 100644 --- a/asn1/acse/packet-acse-template.c +++ b/asn1/acse/packet-acse-template.c @@ -199,7 +199,7 @@ dissect_acse(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* d case SES_DISCONNECT: /* RLRQ */ case SES_FINISH: /* RLRE */ case SES_ABORT: /* ABRT */ - case CLSES_UNIT_DATA: /* AARQ Connetctionless session */ + case CLSES_UNIT_DATA: /* AARQ Connectionless session */ break; case SES_DATA_TRANSFER: oid=find_oid_by_pres_ctx_id(pinfo, indir_ref); diff --git a/asn1/c1222/packet-c1222-template.c b/asn1/c1222/packet-c1222-template.c index fae65c0714..42f0ab8a40 100644 --- a/asn1/c1222/packet-c1222-template.c +++ b/asn1/c1222/packet-c1222-template.c @@ -865,7 +865,7 @@ decrypt_packet(guchar *buffer, guint32 length, gboolean decrypt) * Checks to make sure that a complete, valid BER-encoded length is in the buffer. * * \param tvb contains the buffer to be examined - * \param offset is the offset within the buffer at which the BER-encded length begins + * \param offset is the offset within the buffer at which the BER-encoded length begins * \returns TRUE if a complete, valid BER-encoded length is in the buffer; otherwise FALSE */ static gboolean diff --git a/asn1/camel/camel.asn b/asn1/camel/camel.asn index 83564b2cd2..0c65a27506 100644 --- a/asn1/camel/camel.asn +++ b/asn1/camel/camel.asn @@ -2336,7 +2336,7 @@ VariablePartsArray ::= SEQUENCE SIZE (1..5) OF VariablePart -- InitialDPArgExtension notes: not recursive, exported, -- locally refd 1 times, import refd 0 times --- Udated from ETSI TS 129 078 V6.4.0 (2004-3GPP TS 29.078 version 6.4.0 Release 6 1 12) +-- Updated from ETSI TS 129 078 V6.4.0 (2004-3GPP TS 29.078 version 6.4.0 Release 6 1 12) InitialDPArgExtension ::= SEQUENCE { gmscAddress [0] ISDN-AddressString OPTIONAL, forwardingDestinationNumber [1] CalledPartyNumber OPTIONAL, diff --git a/asn1/cmip/cmip.cnf b/asn1/cmip/cmip.cnf index 0e94b3b607..3f37b9d48e 100644 --- a/asn1/cmip/cmip.cnf +++ b/asn1/cmip/cmip.cnf @@ -145,7 +145,7 @@ PrioritisedObject B "2.9.3.2.7.48" "userObject(48)" ActiveDestination B "2.9.3.2.7.49" "activeDestination(49)" Allomorphs B "2.9.3.2.7.50" "allomorphs(50)" BackUpDestinationList B "2.9.3.2.7.51" "backUpDestinationList(51)" -CapacityAlarmThreshold B "2.9.3.2.7.52" "capacityAlarmTreshold(52)" +CapacityAlarmThreshold B "2.9.3.2.7.52" "capacityAlarmThreshold(52)" ConfirmedMode B "2.9.3.2.7.53" "confirmedMode(53)" CurrentLogSize B "2.9.3.2.7.54" "currentLogSize(54)" Destination B "2.9.3.2.7.55" "destination(55)" diff --git a/asn1/gprscdr/GenericChargingDataTypes.asn b/asn1/gprscdr/GenericChargingDataTypes.asn index da8406c1d9..6c50b08621 100644 --- a/asn1/gprscdr/GenericChargingDataTypes.asn +++ b/asn1/gprscdr/GenericChargingDataTypes.asn @@ -49,7 +49,7 @@ FROM CMIP-1 {joint-iso-itu-t ms (9) cmip (1) version1 (1) protocol (3)} -- -- from Rec. X.2ab[304] Editor's note: clarify if this definition is still needed. It appears that it ends in Nirvana. --- WS imports localy +-- WS imports locally --ManagementExtension --FROM Attribute-ASN1Module {joint-iso-itu-t ms (9) smi (3) part2 (2) asn1Module (2) 1} -- diff --git a/asn1/ranap/packet-ranap-template.c b/asn1/ranap/packet-ranap-template.c index d5a6d5cfd1..0bfb4ba5b9 100644 --- a/asn1/ranap/packet-ranap-template.c +++ b/asn1/ranap/packet-ranap-template.c @@ -155,7 +155,7 @@ dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ret = (dissector_try_uint_new(ranap_ies_dissector_table, key, tvb, pinfo, tree, FALSE, NULL)) ? tvb_captured_length(tvb) : 0; break; } - /* Fall trough */ + /* Fall through */ default: /* no special handling */ ret = (dissector_try_uint_new(ranap_ies_dissector_table, ProtocolIE_ID, tvb, pinfo, tree, FALSE, NULL)) ? tvb_captured_length(tvb) : 0; diff --git a/asn1/ranap/ranap.cnf b/asn1/ranap/ranap.cnf index 973a8d9b62..f05d69a7e0 100644 --- a/asn1/ranap/ranap.cnf +++ b/asn1/ranap/ranap.cnf @@ -343,7 +343,7 @@ MAX_VAL = asn1_param_get_integer(%(ACTX)s,"upperBound") proto_tree_add_item(tree, saved_hf, parameter_tvb, 0, 4, ENC_BIG_ENDIAN); #.FN_HDR SourceRNC-ToTargetRNC-TransparentContainer -/* If SourceRNC-ToTargetRNC-TransparentContainer is called trough +/* If SourceRNC-ToTargetRNC-TransparentContainer is called through dissect_ranap_SourceRNC_ToTargetRNC_TransparentContainer_PDU ProtocolIE_ID may be unset */ diff --git a/asn1/s1ap/s1ap.cnf b/asn1/s1ap/s1ap.cnf index 13fd489017..18cca77d30 100644 --- a/asn1/s1ap/s1ap.cnf +++ b/asn1/s1ap/s1ap.cnf @@ -319,7 +319,7 @@ tvbuff_t *parameter_tvb=NULL; handover_type_value = 0; #.FN_BODY Source-ToTarget-TransparentContainer VAL_PTR = ¶meter_tvb -# I think the message is "directly encoded" into the octest string(no "double encoding") +# I think the message is "directly encoded" into the octet string(no "double encoding") # (Compare RANAP) # Annex A # ...Therefore the container content is encoded according to the @@ -381,7 +381,7 @@ tvbuff_t *parameter_tvb=NULL; col_set_writable(actx->pinfo->cinfo, TRUE); } #.FN_BODY Target-ToSource-TransparentContainer VAL_PTR = ¶meter_tvb -# I think the message is "directly encoded" into the octest string(no "double encoding") +# I think the message is "directly encoded" into the octet string(no "double encoding") # See Target-ToSource-TransparentContainer in RANAP tvbuff_t *parameter_tvb; diff --git a/asn1/tetra/tetra.asn b/asn1/tetra/tetra.asn index 0c149f3144..fe2d7fcf8f 100644 --- a/asn1/tetra/tetra.asn +++ b/asn1/tetra/tetra.asn @@ -1643,7 +1643,7 @@ TYPE3-IDENTIFIER ::= ENUMERATED GROUP-IDENTITY-DOWNLINK ::= SEQUENCE { - attach-detach-identifiet CHOICE{ + attach-detach-identifier CHOICE{ attach SEQUENCE{ lifetime INTEGER(0..3), class-of-usage INTEGER(0..7) @@ -1666,16 +1666,16 @@ GROUP-IDENTITY-DOWNLINK ::= SEQUENCE GROUP-IDENTITY-UPLINK ::= SEQUENCE { - attach-detach-identifiet CHOICE{ + attach-detach-identifier CHOICE{ attach SEQUENCE{ class-of-usage INTEGER(0..7) }, detach SEQUENCE{ detach-uplike ENUMERATED{ unknow-gssi(0), - unvaild-cipher(1), + invalid-cipher(1), user-intitial(2), - reseverd(3) + reserved(3) } } }, @@ -2330,4 +2330,4 @@ Modify-type ::= SEQUENCE{ -END \ No newline at end of file +END diff --git a/epan/addr_resolv.c b/epan/addr_resolv.c index 63615d1a4b..02d0016290 100644 --- a/epan/addr_resolv.c +++ b/epan/addr_resolv.c @@ -1324,7 +1324,7 @@ manuf_name_lookup(const guint8 *addr) } /* Mask out the broadcast/multicast flag but not the locally - * administered flag as localy administered means: not assigend + * administered flag as locally administered means: not assigned * by the IEEE but the local administrator instead. * 0x01 multicast / broadcast bit * 0x02 locally administered bit */ diff --git a/epan/dissectors/packet-6lowpan.c b/epan/dissectors/packet-6lowpan.c index 2f95e63b2d..ea9d8fb989 100644 --- a/epan/dissectors/packet-6lowpan.c +++ b/epan/dissectors/packet-6lowpan.c @@ -2154,7 +2154,7 @@ dissect_6lowpan_iphc_nhc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gi * disallows sending UDP datagrams without checksums. Likewise, 6LoWPAN * requires that we recompute the checksum. * - * If the datagram is incomplete, then leave the checsum at 0. + * If the datagram is incomplete, then leave the checksum at 0. */ #if 0 /* diff --git a/epan/dissectors/packet-9p.c b/epan/dissectors/packet-9p.c index cb0d397867..ebb1c24f2d 100644 --- a/epan/dissectors/packet-9p.c +++ b/epan/dissectors/packet-9p.c @@ -65,8 +65,8 @@ * @_9P_RCREATE: response with file access information * @_9P_TREAD: request to transfer data from a file or directory * @_9P_RREAD: response with data requested - * @_9P_TWRITE: reuqest to transfer data to a file - * @_9P_RWRITE: response with out much data was transfered to file + * @_9P_TWRITE: request to transfer data to a file + * @_9P_RWRITE: response with out much data was transferred to file * @_9P_TCLUNK: forget about a handle to an entity within the file system * @_9P_RCLUNK: response when server has forgotten about the handle * @_9P_TREMOVE: request to remove an entity from the hierarchy @@ -293,7 +293,7 @@ static value_string_ext ninep_mode_vals_ext = VALUE_STRING_EXT_INIT(ninep_mode_v * * QID types are a subset of permissions - they are primarily * used to differentiate semantics for a file system entity via - * a jump-table. Their value is also the most signifigant 16 bits + * a jump-table. Their value is also the most significant 16 bits * of the permission_t * * See Also: http://plan9.bell-labs.com/magic/man2html/2/stat @@ -1129,7 +1129,7 @@ static void conv_set_fid_nocopy(packet_info *pinfo, guint32 fid, const char *pat if (!val) { val = _9p_hash_new_val(0); val->data = wmem_tree_new(wmem_file_scope()); - /* val->len is intentionnaly left to 0 so the tree won't be freed */ + /* val->len is intentionally left to 0 so the tree won't be freed */ _9p_hash_set(pinfo, _9P_NOTAG, fid, val); } diff --git a/epan/dissectors/packet-acn.c b/epan/dissectors/packet-acn.c index 16c9729c18..ab1ab224d6 100644 --- a/epan/dissectors/packet-acn.c +++ b/epan/dissectors/packet-acn.c @@ -1319,7 +1319,7 @@ dissect_acn_dmp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int off case ACN_DMP_VECTOR_UNKNOWN: break; case ACN_DMP_VECTOR_GET_PROPERTY: - /* Rip trough property address */ + /* Rip through property address */ while (data_offset < end_offset) { old_offset = data_offset; data_offset = acn_add_dmp_address(tvb, pinfo, pdu_tree, data_offset, &adt); @@ -1406,7 +1406,7 @@ dissect_acn_dmp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int off } break; case ACN_DMP_VECTOR_UNMAP_PROPERTY: - /* Rip trough Actaul Proptery Address */ + /* Rip through Actual Property Address */ while (data_offset < end_offset) { old_offset = data_offset; data_offset = acn_add_dmp_address(tvb, pinfo, pdu_tree, data_offset, &adt); @@ -1414,7 +1414,7 @@ dissect_acn_dmp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int off } break; case ACN_DMP_VECTOR_SUBSCRIBE: - /* Rip trough Proptery Address */ + /* Rip through Property Address */ while (data_offset < end_offset) { old_offset = data_offset; data_offset = acn_add_dmp_address(tvb, pinfo, pdu_tree, data_offset, &adt); @@ -1422,7 +1422,7 @@ dissect_acn_dmp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int off } break; case ACN_DMP_VECTOR_UNSUBSCRIBE: - /* Rip trough Proptery Address */ + /* Rip through Property Address */ while (data_offset < end_offset) { old_offset = data_offset; data_offset = acn_add_dmp_address(tvb, pinfo, pdu_tree, data_offset, &adt); @@ -1430,7 +1430,7 @@ dissect_acn_dmp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int off } break; case ACN_DMP_VECTOR_GET_PROPERTY_FAIL: - /* Rip trough Address-Reason Code Pairs */ + /* Rip through Address-Reason Code Pairs */ while (data_offset < end_offset) { old_offset = data_offset; data_offset = acn_add_dmp_address(tvb, pinfo, pdu_tree, data_offset, &adt); @@ -1443,7 +1443,7 @@ dissect_acn_dmp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int off } break; case ACN_DMP_VECTOR_SET_PROPERTY_FAIL: - /* Rip trough Address-Reason Code Pairs */ + /* Rip through Address-Reason Code Pairs */ while (data_offset < end_offset) { old_offset = data_offset; data_offset = acn_add_dmp_address(tvb, pinfo, pdu_tree, data_offset, &adt); @@ -1456,7 +1456,7 @@ dissect_acn_dmp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int off } break; case ACN_DMP_VECTOR_MAP_PROPERTY_FAIL: - /* Rip trough Address-Reason Code Pairs */ + /* Rip through Address-Reason Code Pairs */ while (data_offset < end_offset) { old_offset = data_offset; data_offset = acn_add_dmp_address(tvb, pinfo, pdu_tree, data_offset, &adt); @@ -1469,7 +1469,7 @@ dissect_acn_dmp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int off } break; case ACN_DMP_VECTOR_SUBSCRIBE_ACCEPT: - /* Rip through Property Addrsses */ + /* Rip through Property Addresses */ while (data_offset < end_offset) { old_offset = data_offset; data_offset = acn_add_dmp_address(tvb, pinfo, pdu_tree, data_offset, &adt); @@ -1477,7 +1477,7 @@ dissect_acn_dmp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int off } break; case ACN_DMP_VECTOR_SUBSCRIBE_REJECT: - /* Rip trough Address-Reason Code Pairs */ + /* Rip through Address-Reason Code Pairs */ while (data_offset < end_offset) { old_offset = data_offset; data_offset = acn_add_dmp_address(tvb, pinfo, pdu_tree, data_offset, &adt); @@ -1808,7 +1808,7 @@ dissect_acn_sdt_client_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, /* level : 8 bit value */ /* string : pointer to buffer to fill */ /* leading_char: character to buffer left of digits */ -/* min_char : mininum number of characters (for filling, not including space)*/ +/* min_char : minimum number of characters (for filling, not including space)*/ /* show_zero: show zeros or dots */ /* also adds a space to right end */ /* */ diff --git a/epan/dissectors/packet-acse.c b/epan/dissectors/packet-acse.c index 9ed836ec39..92249050d9 100644 --- a/epan/dissectors/packet-acse.c +++ b/epan/dissectors/packet-acse.c @@ -1750,7 +1750,7 @@ dissect_acse(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* d case SES_DISCONNECT: /* RLRQ */ case SES_FINISH: /* RLRE */ case SES_ABORT: /* ABRT */ - case CLSES_UNIT_DATA: /* AARQ Connetctionless session */ + case CLSES_UNIT_DATA: /* AARQ Connectionless session */ break; case SES_DATA_TRANSFER: oid=find_oid_by_pres_ctx_id(pinfo, indir_ref); diff --git a/epan/dissectors/packet-adb.c b/epan/dissectors/packet-adb.c index 876343bf05..73a8dd0137 100644 --- a/epan/dissectors/packet-adb.c +++ b/epan/dissectors/packet-adb.c @@ -891,7 +891,7 @@ proto_register_adb(void) module = prefs_register_protocol(proto_adb, NULL); prefs_register_static_text_preference(module, "version", - "ADB protocol version is compatibile pior to: adb 1.0.31", + "ADB protocol version is compatible prior to: adb 1.0.31", "Version of protocol supported by this dissector."); } diff --git a/epan/dissectors/packet-adb_cs.c b/epan/dissectors/packet-adb_cs.c index f96035b413..e1636b1f3a 100644 --- a/epan/dissectors/packet-adb_cs.c +++ b/epan/dissectors/packet-adb_cs.c @@ -422,7 +422,7 @@ proto_register_adb_cs(void) module = prefs_register_protocol(proto_adb_cs, NULL); prefs_register_static_text_preference(module, "version", - "ADB CS protocol version is compatibile pior to: adb 1.0.31", + "ADB CS protocol version is compatible prior to: adb 1.0.31", "Version of protocol supported by this dissector."); prefs_register_uint_preference(module, "server_port", diff --git a/epan/dissectors/packet-adb_service.c b/epan/dissectors/packet-adb_service.c index 0cca210acf..23b0451a18 100644 --- a/epan/dissectors/packet-adb_service.c +++ b/epan/dissectors/packet-adb_service.c @@ -813,7 +813,7 @@ proto_register_adb_service(void) module = prefs_register_protocol(proto_adb_service, NULL); prefs_register_static_text_preference(module, "version", - "ADB Service protocol version is compatibile pior to: adb 1.0.31", + "ADB Service protocol version is compatible prior to: adb 1.0.31", "Version of protocol supported by this dissector."); prefs_register_bool_preference(module, "framebuffer_more_details", diff --git a/epan/dissectors/packet-afp.c b/epan/dissectors/packet-afp.c index fa72211c18..2a223c7e5c 100644 --- a/epan/dissectors/packet-afp.c +++ b/epan/dissectors/packet-afp.c @@ -53,7 +53,7 @@ http://developer.apple.com/DOCUMENTATION/macos8/pdf/ASAppleTalkFiling2.1_2.2.pdf http://developer.apple.com/documentation/Networking/Conceptual/AFP/index.html - Current AFP 3.x specfication, in HTML form, at + Current AFP 3.x specification, in HTML form, at http://developer.apple.com/mac/library/documentation/Networking/Reference/AFP_Reference/Reference/reference.html Current AFP 3.x programming guide, in HTML form, at diff --git a/epan/dissectors/packet-ajp13.c b/epan/dissectors/packet-ajp13.c index 912d68e1e9..54e6de2f17 100644 --- a/epan/dissectors/packet-ajp13.c +++ b/epan/dissectors/packet-ajp13.c @@ -78,7 +78,7 @@ void proto_reg_handoff_ajp13(void); * looking at raw network packets, aren't we? The stuff on the * wire. Wireshark has been getting better and better at helping * dissectors with this. I'm a little fuzzy on the details, but my - * uderstanding is that wireshark now contains a fairly substantial + * understanding is that wireshark now contains a fairly substantial * user-space TCP/IP stack so it can re-assemble the data. But I might * be wrong. Since AJP13 is going to be used either on the loopback * interface or on a LAN, it isn't likely to be a big issues anyway. @@ -89,7 +89,7 @@ void proto_reg_handoff_ajp13(void); * PDU can stretch across multiple TCP segments. Assembling them is * obviously possible, but a royal pain. During the "phase one" * in-order pass you have to keep track of a bunch of offsets and - * store which PDU goes with which TCP segment. Luckly, recent + * store which PDU goes with which TCP segment. Luckily, recent * (0.9.4+) versions of wireshark provide the "tcp_dissect_pdus()" * function that takes care of much of the work. See the comments in * packet-tcp.c, the example code in packet-dns.c, or check the diff --git a/epan/dissectors/packet-alcap.c b/epan/dissectors/packet-alcap.c index 5b679b936b..dfeaec62c2 100644 --- a/epan/dissectors/packet-alcap.c +++ b/epan/dissectors/packet-alcap.c @@ -1503,7 +1503,7 @@ proto_register_alcap(void) { &hf_alcap_compat_pass_on_sni, { "Pass-On SNI", "alcap.compat.pass.sni", FT_UINT8, BASE_DEC, VALS(send_notification), 0x40, - "Send Notificaation Indicator", HFILL } + "Send Notification Indicator", HFILL } }, { &hf_alcap_compat_pass_on_ii, { "Pass-On II", "alcap.compat.pass.ii", @@ -1513,7 +1513,7 @@ proto_register_alcap(void) { &hf_alcap_compat_general_sni, { "General SNI", "alcap.compat.general.sni", FT_UINT8, BASE_DEC, VALS(send_notification), 0x04, - "Send Notificaation Indicator", HFILL } + "Send Notification Indicator", HFILL } }, { &hf_alcap_compat_general_ii, { "General II", "alcap.compat.general.ii", diff --git a/epan/dissectors/packet-alljoyn.c b/epan/dissectors/packet-alljoyn.c index 603505a665..f890ab011d 100644 --- a/epan/dissectors/packet-alljoyn.c +++ b/epan/dissectors/packet-alljoyn.c @@ -201,7 +201,7 @@ static int proto_AllJoyn_ardp = -1; /* The top level. Entire AllJoyn Reliable D #define ARDP_HEADER_LEN_OFFSET 1 /* Offset into the ARDP header for the actual length of the header. */ /* These are bit masks for ARDP flags. */ -/* These bits are depricated and do not exist for version 1. */ +/* These bits are deprecated and do not exist for version 1. */ #define ARDP_SYN 0x01 #define ARDP_ACK 0x02 #define ARDP_EAK 0x04 @@ -232,7 +232,7 @@ static int hf_ardp_nsa = -1; /* next sequence to ack */ static int hf_ardp_fss = -1; /* fragment starting sequence number */ static int hf_ardp_fcnt = -1; /* fragment count */ static int hf_ardp_bmp = -1; /* EACK bitmap */ -static int hf_ardp_segmax = -1; /* The maximum number of outstanding segments the other side can send without acknowledgement. */ +static int hf_ardp_segmax = -1; /* The maximum number of outstanding segments the other side can send without acknowledgment. */ static int hf_ardp_segbmax = -1;/* The maximum segment size we are willing to receive. */ static int hf_ardp_dackt = -1; /* Receiver's delayed ACK timeout. Used in TTL estimate prior to sending a message. */ static int hf_ardp_options = -1;/* Options for the connection. Always Sequenced Delivery Mode (SDM). */ @@ -330,7 +330,7 @@ static const value_string mess_header_field_encoding_vals[] = { /* This is used to round up offsets into a packet to an even two byte * boundary from starting_offset. * @param current_offset is the current offset into the packet. - * @param starting_offset is offset into the packet from the begining of + * @param starting_offset is offset into the packet from the beginning of * the message. * @returns the offset rounded up to the next even two byte boundary from start of the message. @@ -346,7 +346,7 @@ static gint round_to_2byte(gint current_offset, /* This is used to round up offsets into a packet to an even four byte * boundary from starting_offset. * @param current_offset is the current offset into the packet. - * @param starting_offset is offset into the packet from the begining of + * @param starting_offset is offset into the packet from the beginning of * the message. * @returns the offset rounded up to the next even four byte boundary from start of the message. @@ -362,7 +362,7 @@ static gint round_to_4byte(gint current_offset, /* This is used to round up offsets into a packet to an even eight byte * boundary from starting_offset. * @param current_offset is the current offset into the packet. - * @param starting_offset is offset into the packet from the begining of + * @param starting_offset is offset into the packet from the beginning of * the message. * @returns the offset rounded up to the next even eight byte boundary from start of the message. @@ -399,7 +399,7 @@ get_uint32(tvbuff_t *tvb, /* This is called by dissect_AllJoyn_message() to handle the initial byte for * a connect message. - * If it was the intial byte for a connect message and was handled then return + * If it was the initial byte for a connect message and was handled then return * the number of bytes consumed out of the packet. If not an connect initial * byte message or unhandled return 0. * @param tvb is the incoming network data buffer. @@ -423,7 +423,7 @@ handle_message_connect(tvbuff_t *tvb, if(0 == the_one_byte) { col_set_str(pinfo->cinfo, COL_INFO, "CONNECT-initial byte"); - /* Now add the value as a subtree to the inital byte. */ + /* Now add the value as a subtree to the initial byte. */ proto_tree_add_item(message_tree, hf_alljoyn_connect_byte_value, tvb, offset, 1, ENC_NA); offset += 1; } @@ -707,7 +707,7 @@ pad_according_to_type(gint offset, gint field_starting_offset, gint max_offset, * to an item. This is complicated a bit by the fact that structures can be nested. * @param item is the item to append the signature data to. * @param signature points to the signature to be appended. - * @param signature_max_length is the specificied maximum length of this signature. + * @param signature_max_length is the specified maximum length of this signature. * @param type_stop is the character when indicates the end of the signature. */ static void @@ -1046,7 +1046,7 @@ parse_arg(tvbuff_t *tvb, header_type_name = "object path"; length = get_uint32(tvb, offset, encoding) + 1; - /* The + 4 is for the length specifier. Object pathes may be of "any length" + /* The + 4 is for the length specifier. Object paths may be of "any length" according to D-Bus spec. But there are practical limits. */ if(length < 0 || length > MAX_ARRAY_LEN || length + 4 > tvb_reported_length_remaining(tvb, offset)) { col_add_fstr(pinfo->cinfo, COL_INFO, "BAD DATA: Object path length is %d. Only %d bytes left in packet.", @@ -2163,7 +2163,7 @@ typedef struct _alljoyn_ardp_tree_data * @param tvb is the incoming network data buffer. * @param pinfo contains information about the incoming packet which * we update as we dissect the packet. - * @param tree_data is the destinationn of the data.. + * @param tree_data is the destination of the data.. */ static void ardp_parse_header(tvbuff_t *tvb, @@ -2863,7 +2863,7 @@ proto_register_AllJoyn(void) }, /* - * Strings are composed of a size and a data arrray. + * Strings are composed of a size and a data array. */ {&hf_alljoyn_string, {"Bus Name", "alljoyn.string", diff --git a/epan/dissectors/packet-amqp.c b/epan/dissectors/packet-amqp.c index ffb6b35d7f..baad98a160 100644 --- a/epan/dissectors/packet-amqp.c +++ b/epan/dissectors/packet-amqp.c @@ -1408,7 +1408,7 @@ static int hf_amqp_1_0_replyTo_str = -1; static int hf_amqp_1_0_mechanisms_sym = -1; /* Several field can be of multiple types. To distinguish it among hf_amqp_1_0_* variables, - * table below "translates" original hf_amqp_1_0_* variable to the type-speficic one. + * table below "translates" original hf_amqp_1_0_* variable to the type-specific one. * Each row contains synonym fields for {FT_NONE, FT_UINT, FT_STRING, FT_BYTES, FT_GUID} * NULL indicates no synonym of a given type * FT_NONE field must be always present @@ -10710,8 +10710,8 @@ get_amqp_1_0_value_formatter(tvbuff_t *tvb, } else if(code == AMQP_1_0_TYPE_NULL) { - /* null value says that a particular field was optional and is omited - * the omited fields of standard structutes are not shown + /* null value says that a particular field was optional and is omitted + * the omitted fields of standard structures are not shown * however, we still display null values of custom lists, maps and arrays */ if(hf_amqp_type == hf_amqp_1_0_list) { diff --git a/epan/dissectors/packet-amr.c b/epan/dissectors/packet-amr.c index e33734e8fb..3368ba411c 100644 --- a/epan/dissectors/packet-amr.c +++ b/epan/dissectors/packet-amr.c @@ -526,7 +526,7 @@ dissect_amr_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint amr bit_offset += 4; proto_tree_add_bits_item(toc_tree, hf_amr_toc_q, tvb, bit_offset, 1, ENC_BIG_ENDIAN); bit_offset += 1; - /* 2 pading bits */ + /* 2 padding bits */ bit_offset += 2; offset += 1; } diff --git a/epan/dissectors/packet-applemidi.c b/epan/dissectors/packet-applemidi.c index fb3dc2dbeb..5dd97cf981 100644 --- a/epan/dissectors/packet-applemidi.c +++ b/epan/dissectors/packet-applemidi.c @@ -241,7 +241,7 @@ test_applemidi(tvbuff_t *tvb, guint16 *command_p, gboolean conversation_establis /* If the conversation is establised (one prior packet with a valid known command) * we won't check the commands anymore - this way we still show new commands - * Apple might introduct as "unknown" instead of punting to RTP-dissector */ + * Apple might introduce as "unknown" instead of punting to RTP-dissector */ if ( conversation_established ) { return TRUE; } diff --git a/epan/dissectors/packet-ber.c b/epan/dissectors/packet-ber.c index 76fd68b547..dbe5175dc7 100644 --- a/epan/dissectors/packet-ber.c +++ b/epan/dissectors/packet-ber.c @@ -3604,7 +3604,7 @@ dissect_ber_GeneralizedTime(gboolean implicit_tag, asn1_ctx_t *actx, proto_tree first_delim[0] = 0; second_delim[0] = 0; ret = sscanf( tmpstr, "%14d%1[.,+-Z]%4d%1[+-Z]%4d", &tmp_int, first_delim, &first_digits, second_delim, &second_digits); - /* tmp_int does not contain valid value bacause of overflow but we use it just for format checking */ + /* tmp_int does not contain valid value because of overflow but we use it just for format checking */ if (ret < 1) { /* Nothing matched */ goto invalid; @@ -4033,7 +4033,7 @@ dissect_ber_bitstring32(gboolean implicit_tag, asn1_ctx_t *actx, proto_tree *par tree = proto_item_get_subtree(actx->created_item); if (bit_fields && tree && tmp_tvb) { /* tmp_tvb points to the actual bitstring (including any pad bits at the end. - * note that this bitstring is not neccessarily always encoded as 4 bytes + * note that this bitstring is not necessarily always encoded as 4 bytes * so we have to read it byte by byte. */ val = 0; diff --git a/epan/dissectors/packet-bgp.c b/epan/dissectors/packet-bgp.c index 318df81964..4e1f59d068 100644 --- a/epan/dissectors/packet-bgp.c +++ b/epan/dissectors/packet-bgp.c @@ -5144,7 +5144,7 @@ dissect_bgp_open(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo) } /* - * Heursitic for auto-detecton os ASN length 2 or 4 bytes + * Heuristic for auto-detection of ASN length 2 or 4 bytes */ static guint8 @@ -5162,7 +5162,7 @@ heuristic_as2_or_4_from_as_path(tvbuff_t *tvb, gint as_path_offset, gint end_att /* Heuristic is done in two phases * First we try to identify the as length (2 or 4 bytes) * then we do check that our assumption is ok - * recalculing the offset and checking we end up with the right result + * recalculating the offset and checking we end up with the right result * k is used to navigate into the AS_PATH */ k = as_path_offset; /* case of AS_PATH type being explicitly 4 bytes ASN */ @@ -5202,7 +5202,7 @@ heuristic_as2_or_4_from_as_path(tvbuff_t *tvb, gint as_path_offset, gint end_att *number_as_segment = counter_as_segment; return(bgp_asn_len); } - /* case of a empty path attribut */ + /* case of a empty path attribute */ if (as_path_offset == end_attr_offset) { *number_as_segment = 0; @@ -5213,7 +5213,7 @@ heuristic_as2_or_4_from_as_path(tvbuff_t *tvb, gint as_path_offset, gint end_att /* we do run the heuristic on first segment and look at next segment if it exists */ k++; length = tvb_get_guint8(tvb, k++); - /* let's do some cheking with an as length 2 bytes */ + /* let's do some checking with an as length 2 bytes */ offset_check = k + 2*length; next_type = tvb_get_guint8(tvb, offset_check); /* we do have one segment made of 2 bytes ASN we do reach the end of the attribute taking diff --git a/epan/dissectors/packet-bssgp.c b/epan/dissectors/packet-bssgp.c index a55b158fb1..494d1355a5 100644 --- a/epan/dissectors/packet-bssgp.c +++ b/epan/dissectors/packet-bssgp.c @@ -537,7 +537,7 @@ x8f Priority Class Indicator */ /* Macros */ -/* Defined localy here without the check of curr_len wrapping, that will be taken care of when this IEI dissecton finishes */ +/* Defined locally here without the check of curr_len wrapping, that will be taken care of when this IEI dissection finishes */ #define ELEM_IN_ELEM_MAND_TELV(EMT_iei, EMT_pdu_type, EMT_elem_idx, EMT_elem_name_addition) \ {\ if ((consumed = elem_telv(tvb, tree, pinfo, (guint8) EMT_iei, EMT_pdu_type, EMT_elem_idx, curr_offset, curr_len, EMT_elem_name_addition)) > 0) \ @@ -996,7 +996,7 @@ de_bssgp_llc_frames_disc(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_ /* Octets 3-n contain either the IMSI, IMEISV or IMEI coded as the * value part (starting with octet 3) of the Mobile Identity IE defined in * 3GPP TS 24.008, not including 3GPP TS 24.008 IEI and - * 3GPP TS 24.008 length indcator + * 3GPP TS 24.008 length indicator */ /* * 11.3.21 MS Bucket Size diff --git a/epan/dissectors/packet-btavdtp.c b/epan/dissectors/packet-btavdtp.c index 25728ed8ae..9637025b04 100644 --- a/epan/dissectors/packet-btavdtp.c +++ b/epan/dissectors/packet-btavdtp.c @@ -359,11 +359,11 @@ static const enum_val_t pref_vdp_codec[] = { /* APT-X Codec */ static int proto_aptx = -1; static int hf_aptx_data = -1; -static int hf_aptx_cummulative_frame_duration = -1; +static int hf_aptx_cumulative_frame_duration = -1; static int hf_aptx_delta_time = -1; static int hf_aptx_avrcp_song_position = -1; static int hf_aptx_delta_time_from_the_beginning = -1; -static int hf_aptx_cummulative_duration = -1; +static int hf_aptx_cumulative_duration = -1; static int hf_aptx_diff = -1; static gint ett_aptx = -1; static dissector_handle_t aptx_handle; @@ -1446,7 +1446,7 @@ dissect_btavdtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) media_packet_info_t *previous_media_packet_info; media_packet_info_t *current_media_packet_info; nstime_t first_abs_ts; - gdouble cummulative_frame_duration; + gdouble cumulative_frame_duration; gdouble avrcp_song_position = -1.0; btavrcp_song_position_data_t *song_position_data; @@ -1509,7 +1509,7 @@ dissect_btavdtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) if (previous_media_packet_info && previous_media_packet_info->stream_number == sep_data.stream_number ) { sep_data.previous_media_packet_info = previous_media_packet_info; first_abs_ts = previous_media_packet_info->first_abs_ts; - cummulative_frame_duration = previous_media_packet_info->cummulative_frame_duration; + cumulative_frame_duration = previous_media_packet_info->cumulative_frame_duration; if (avrcp_song_position == -1.0) avrcp_song_position = previous_media_packet_info->avrcp_song_position; else @@ -1518,11 +1518,11 @@ dissect_btavdtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) if (avrcp_song_position == -1.0) avrcp_song_position = 0.0; first_abs_ts = pinfo->fd->abs_ts; - cummulative_frame_duration = 0.0; + cumulative_frame_duration = 0.0; sep_data.previous_media_packet_info = (media_packet_info_t *) wmem_new(wmem_epan_scope(), media_packet_info_t); sep_data.previous_media_packet_info->abs_ts = pinfo->fd->abs_ts; sep_data.previous_media_packet_info->first_abs_ts = first_abs_ts; - sep_data.previous_media_packet_info->cummulative_frame_duration = cummulative_frame_duration; + sep_data.previous_media_packet_info->cumulative_frame_duration = cumulative_frame_duration; sep_data.previous_media_packet_info->avrcp_song_position = avrcp_song_position; sep_data.previous_media_packet_info->stream_number = sep_data.stream_number; } @@ -1539,7 +1539,7 @@ dissect_btavdtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) current_media_packet_info = wmem_new(wmem_file_scope(), media_packet_info_t); current_media_packet_info->abs_ts = pinfo->fd->abs_ts; current_media_packet_info->first_abs_ts = first_abs_ts; - current_media_packet_info->cummulative_frame_duration = cummulative_frame_duration; + current_media_packet_info->cumulative_frame_duration = cumulative_frame_duration; current_media_packet_info->avrcp_song_position = avrcp_song_position; current_media_packet_info->stream_number = sep_data.stream_number; @@ -2762,7 +2762,7 @@ dissect_aptx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) proto_tree *aptx_tree; proto_item *pitem; bta2dp_codec_info_t *info; - gdouble cummulative_frame_duration = 0; + gdouble cumulative_frame_duration = 0; info = (bta2dp_codec_info_t *) data; @@ -2845,9 +2845,9 @@ dissect_aptx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) expected_speed_data = frequency * (sample_bits / 8.0) * number_of_channels; frame_duration = (((double) frame_length / (double) expected_speed_data) * 1000.0); - cummulative_frame_duration = (tvb_reported_length(tvb) / 4.0) * frame_duration; + cumulative_frame_duration = (tvb_reported_length(tvb) / 4.0) * frame_duration; - pitem = proto_tree_add_double(aptx_tree, hf_aptx_cummulative_frame_duration, tvb, 0, 0, cummulative_frame_duration); + pitem = proto_tree_add_double(aptx_tree, hf_aptx_cumulative_frame_duration, tvb, 0, 0, cumulative_frame_duration); proto_item_append_text(pitem, " ms"); PROTO_ITEM_SET_GENERATED(pitem); @@ -2869,13 +2869,13 @@ dissect_aptx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) PROTO_ITEM_SET_GENERATED(pitem); if (!pinfo->fd->flags.visited) - info->current_media_packet_info->cummulative_frame_duration += cummulative_frame_duration; + info->current_media_packet_info->cumulative_frame_duration += cumulative_frame_duration; - pitem = proto_tree_add_double(aptx_tree, hf_aptx_cummulative_duration, tvb, 0, 0, info->previous_media_packet_info->cummulative_frame_duration); + pitem = proto_tree_add_double(aptx_tree, hf_aptx_cumulative_duration, tvb, 0, 0, info->previous_media_packet_info->cumulative_frame_duration); proto_item_append_text(pitem, " ms"); PROTO_ITEM_SET_GENERATED(pitem); - pitem = proto_tree_add_double(aptx_tree, hf_aptx_diff, tvb, 0, 0, info->previous_media_packet_info->cummulative_frame_duration - nstime_to_msec(&delta)); + pitem = proto_tree_add_double(aptx_tree, hf_aptx_diff, tvb, 0, 0, info->previous_media_packet_info->cumulative_frame_duration - nstime_to_msec(&delta)); proto_item_append_text(pitem, " ms"); PROTO_ITEM_SET_GENERATED(pitem); } @@ -2893,8 +2893,8 @@ proto_register_aptx(void) FT_BYTES, BASE_NONE, NULL, 0x00, NULL, HFILL } }, - { &hf_aptx_cummulative_frame_duration, - { "Cummulative Frame Duration", "aptx.cummulative_frame_duration", + { &hf_aptx_cumulative_frame_duration, + { "Cumulative Frame Duration", "aptx.cumulative_frame_duration", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, @@ -2913,8 +2913,8 @@ proto_register_aptx(void) FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, - { &hf_aptx_cummulative_duration, - { "Cummulative Music Duration", "aptx.cummulative_music_duration", + { &hf_aptx_cumulative_duration, + { "Cumulative Music Duration", "aptx.cumulative_music_duration", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, @@ -3073,7 +3073,7 @@ dissect_bta2dp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) bta2dp_codec_info.current_media_packet_info = sep_data.current_media_packet_info; #if RTP_PLAYER_WORKAROUND == TRUE - /* XXX: Workaround to get multiple RTP streams, because converation are too + /* XXX: Workaround to get multiple RTP streams, because conversations are too weak to recognize Bluetooth streams (key is: guint32 interface_id, guint32 adapter_id, guint32 chandle, guint32 cid, guint32 direction -> guint32 stream_number) */ pinfo->srcport = sep_data.stream_number; pinfo->destport = sep_data.stream_number; @@ -3309,7 +3309,7 @@ dissect_btvdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) btvdp_codec_info.content_protection_type = sep_data.content_protection_type; #if RTP_PLAYER_WORKAROUND == TRUE - /* XXX: Workaround to get multiple RTP streams, because converation are too + /* XXX: Workaround to get multiple RTP streams, because conversations are too weak to recognize Bluetooth streams (key is: guint32 interface_id, guint32 adapter_id, guint32 chandle, guint32 cid, guint32 direction -> guint32 stream_number) */ pinfo->srcport = sep_data.stream_number; pinfo->destport = sep_data.stream_number; diff --git a/epan/dissectors/packet-btavdtp.h b/epan/dissectors/packet-btavdtp.h index 5886b2e369..b0ebee55ef 100644 --- a/epan/dissectors/packet-btavdtp.h +++ b/epan/dissectors/packet-btavdtp.h @@ -30,7 +30,7 @@ typedef struct _media_packet_info_t { nstime_t abs_ts; nstime_t first_abs_ts; - gdouble cummulative_frame_duration; + gdouble cumulative_frame_duration; gdouble avrcp_song_position; guint32 stream_number; } media_packet_info_t; diff --git a/epan/dissectors/packet-btobex.c b/epan/dissectors/packet-btobex.c index 06dc15883c..12852b44fb 100644 --- a/epan/dissectors/packet-btobex.c +++ b/epan/dissectors/packet-btobex.c @@ -2784,7 +2784,7 @@ proto_register_btobex(void) NULL, HFILL} }, { &hf_authentication_parameter, - { "Autentication Parameter", "btobex.authentication", + { "Authentication Parameter", "btobex.authentication", FT_UINT8, BASE_HEX, NULL, 0x00, NULL, HFILL} }, diff --git a/epan/dissectors/packet-btsdp.h b/epan/dissectors/packet-btsdp.h index 6b32c285f4..2b2bfa6c63 100644 --- a/epan/dissectors/packet-btsdp.h +++ b/epan/dissectors/packet-btsdp.h @@ -168,7 +168,7 @@ /* This structure is passed to other dissectors * and contains information about the relation between service, PSM/server * channel, local/remote service. The btrfcomm and btl2cap dissectors - * need this information to determine the kind of data transfered on + * need this information to determine the kind of data transferred on * dynamically assigned server channels and PSM's, respectively. */ typedef struct _btsdp_data_t { diff --git a/epan/dissectors/packet-c1222.c b/epan/dissectors/packet-c1222.c index defc0a2e83..9bbe5bbdbe 100644 --- a/epan/dissectors/packet-c1222.c +++ b/epan/dissectors/packet-c1222.c @@ -916,7 +916,7 @@ decrypt_packet(guchar *buffer, guint32 length, gboolean decrypt) * Checks to make sure that a complete, valid BER-encoded length is in the buffer. * * \param tvb contains the buffer to be examined - * \param offset is the offset within the buffer at which the BER-encded length begins + * \param offset is the offset within the buffer at which the BER-encoded length begins * \returns TRUE if a complete, valid BER-encoded length is in the buffer; otherwise FALSE */ static gboolean diff --git a/epan/dissectors/packet-cipmotion.c b/epan/dissectors/packet-cipmotion.c index ea29f2c7d9..42e4ea87bb 100644 --- a/epan/dissectors/packet-cipmotion.c +++ b/epan/dissectors/packet-cipmotion.c @@ -30,7 +30,7 @@ #include "packet-cip.h" void proto_register_cipmotion(void); -/* The entry point to the actual disection is: dissect_cipmotion */ +/* The entry point to the actual dissection is: dissect_cipmotion */ void proto_reg_handoff_cipmotion(void); /* Protocol handle for CIP Motion */ diff --git a/epan/dissectors/packet-cipsafety.c b/epan/dissectors/packet-cipsafety.c index 11d6c06152..e5c1acee99 100644 --- a/epan/dissectors/packet-cipsafety.c +++ b/epan/dissectors/packet-cipsafety.c @@ -35,7 +35,7 @@ void proto_register_cipsafety(void); void proto_reg_handoff_cipsafety(void); -/* The entry point to the actual disection is: dissect_cipsafety */ +/* The entry point to the actual dissection is: dissect_cipsafety */ /* Protocol handle for CIP Safety */ static int proto_cipsafety = -1; diff --git a/epan/dissectors/packet-cmip.c b/epan/dissectors/packet-cmip.c index e7f3dd9b39..a76dee484b 100644 --- a/epan/dissectors/packet-cmip.c +++ b/epan/dissectors/packet-cmip.c @@ -5871,7 +5871,7 @@ void proto_register_cmip(void) { register_ber_oid_dissector("2.9.3.2.7.49", dissect_ActiveDestination_PDU, proto_cmip, "activeDestination(49)"); register_ber_oid_dissector("2.9.3.2.7.50", dissect_Allomorphs_PDU, proto_cmip, "allomorphs(50)"); register_ber_oid_dissector("2.9.3.2.7.51", dissect_BackUpDestinationList_PDU, proto_cmip, "backUpDestinationList(51)"); - register_ber_oid_dissector("2.9.3.2.7.52", dissect_CapacityAlarmThreshold_PDU, proto_cmip, "capacityAlarmTreshold(52)"); + register_ber_oid_dissector("2.9.3.2.7.52", dissect_CapacityAlarmThreshold_PDU, proto_cmip, "capacityAlarmThreshold(52)"); register_ber_oid_dissector("2.9.3.2.7.53", dissect_ConfirmedMode_PDU, proto_cmip, "confirmedMode(53)"); register_ber_oid_dissector("2.9.3.2.7.54", dissect_CurrentLogSize_PDU, proto_cmip, "currentLogSize(54)"); register_ber_oid_dissector("2.9.3.2.7.55", dissect_Destination_PDU, proto_cmip, "destination(55)"); diff --git a/epan/dissectors/packet-corosync-totemsrp.c b/epan/dissectors/packet-corosync-totemsrp.c index 6b4b4b6361..472c1bd877 100644 --- a/epan/dissectors/packet-corosync-totemsrp.c +++ b/epan/dissectors/packet-corosync-totemsrp.c @@ -1,5 +1,5 @@ /* packet-corosync-totemsrp.c - * Dissectors for totem single ring protocol implementated in corosync cluster engine + * Dissectors for totem single ring protocol implemented in corosync cluster engine * Copyright 2007 2009 2010 2014 Masatake YAMATO * Copyright (c) 2010 2014 Red Hat, Inc. * @@ -1129,9 +1129,9 @@ proto_register_corosync_totemsrp(void) FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}}, - /* token_hold_canel */ + /* token_hold_cancel */ { &hf_corosync_totemsrp_token_hold_cancel, - {"Hold cancel token", "corosync_totemsrp.token_hold_canel", + {"Hold cancel token", "corosync_totemsrp.token_hold_cancel", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL}}, }; diff --git a/epan/dissectors/packet-dhcp-failover.c b/epan/dissectors/packet-dhcp-failover.c index f80a46a462..aacffcfee4 100644 --- a/epan/dissectors/packet-dhcp-failover.c +++ b/epan/dissectors/packet-dhcp-failover.c @@ -147,7 +147,7 @@ enum { DHCP_FO_PD_BINDING_STATUS, DHCP_FO_PD_ASSIGNED_IP_ADDRESS, DHCP_FO_PD_SENDING_SERVER_IP_ADDRESS, - DHCP_FO_PD_ADDRESSES_TRANSFERED, + DHCP_FO_PD_ADDRESSES_TRANSFERRED, DHCP_FO_PD_CLIENT_IDENTIFIER, DHCP_FO_PD_CLIENT_HARDWARE_ADDRESS, DHCP_FO_PD_FTDDNS, @@ -182,7 +182,7 @@ static const value_string option_code_vals[] = {DHCP_FO_PD_BINDING_STATUS, "binding-status"}, {DHCP_FO_PD_ASSIGNED_IP_ADDRESS, "assigned-IP-address"}, {DHCP_FO_PD_SENDING_SERVER_IP_ADDRESS, "sending-server-IP-address"}, - {DHCP_FO_PD_ADDRESSES_TRANSFERED, "addresses-transferred"}, + {DHCP_FO_PD_ADDRESSES_TRANSFERRED, "addresses-transferred"}, {DHCP_FO_PD_CLIENT_IDENTIFIER, "client-identifier"}, {DHCP_FO_PD_CLIENT_HARDWARE_ADDRESS, "client-hardware-address"}, {DHCP_FO_PD_FTDDNS, "FTDDNS"}, @@ -549,7 +549,7 @@ dissect_dhcpfo_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* da offset, option_length, ENC_BIG_ENDIAN); break; - case DHCP_FO_PD_ADDRESSES_TRANSFERED: + case DHCP_FO_PD_ADDRESSES_TRANSFERRED: if (option_length != 4) { expert_add_info_format(pinfo, oi, &ei_dhcpfo_bad_length, "addresses transferred is not 4 bytes long"); break; diff --git a/epan/dissectors/packet-diameter.c b/epan/dissectors/packet-diameter.c index 5ed573b44c..6a522983a6 100644 --- a/epan/dissectors/packet-diameter.c +++ b/epan/dissectors/packet-diameter.c @@ -377,7 +377,7 @@ diameterstat_init(struct register_srt* srt _U_, GArray* srt_array, srt_gui_init_ srt_stat_table *diameter_srt_table; int* idx; - /* XXX - This is a hack/workaround support so reseting/freeing parameters at the dissector + /* XXX - This is a hack/workaround support so resetting/freeing parameters at the dissector level doesn't need to be supported. */ if (diameterstat_cmd_str_hash != NULL) { @@ -390,7 +390,7 @@ diameterstat_init(struct register_srt* srt _U_, GArray* srt_array, srt_gui_init_ g_hash_table_insert(diameterstat_cmd_str_hash, "Unknown", idx); /** @todo the filter to use in stead of NULL is "diameter.cmd.code" - * to enable the filter popup in the service response time dalouge + * to enable the filter popup in the service response time dialogue * Note to make it work the command code must be stored rather than the * index. */ @@ -408,7 +408,7 @@ diameterstat_packet(void *pss, packet_info *pinfo, epan_dissect_t *edt _U_, cons int* idx = NULL; /* Process only answers where corresponding request is found. - * Unpaired daimeter messages are currently not supported by statistics. + * Unpaired diameter messages are currently not supported by statistics. * Return 0, since redraw is not needed. */ if(!diameter || diameter->processing_request || !diameter->req_frame) return 0; @@ -1411,7 +1411,7 @@ dissect_diameter_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, voi } /* Handle requests for which no answers were found and - * anawers for which no requests were found in the tap listener. + * answers for which no requests were found in the tap listener. * In case if you don't need unpaired requests/answers use: * if (diameter_pair->processing_request || !diameter_pair->req_frame) * return; @@ -2371,7 +2371,7 @@ proto_reg_handoff_diameter(void) /* AVP Code: 97 Framed-IPv6-Address */ dissector_add_uint("diameter.base", 97, create_dissector_handle(dissect_diameter_base_framed_ipv6_prefix, proto_diameter)); - /* AVP Code: 265 Suported-Vendor-Id */ + /* AVP Code: 265 Supported-Vendor-Id */ dissector_add_uint("diameter.base", 265, create_dissector_handle(dissect_diameter_vendor_id, proto_diameter)); /* AVP Code: 266 Vendor-Id */ diff --git a/epan/dissectors/packet-diameter_3gpp.c b/epan/dissectors/packet-diameter_3gpp.c index 4f206d0a71..6d79f3c0a7 100644 --- a/epan/dissectors/packet-diameter_3gpp.c +++ b/epan/dissectors/packet-diameter_3gpp.c @@ -2084,7 +2084,7 @@ proto_register_diameter_3gpp(void) NULL, HFILL } }, { &hf_diameter_3gpp_feature_list_gx_flags_bit21, - { "Conditionali APN Policy Info", "diameter.3gpp.feature_list_gx_flags_bit21", + { "Conditional APN Policy Info", "diameter.3gpp.feature_list_gx_flags_bit21", FT_BOOLEAN, 32, TFS(&tfs_supported_not_supported), 0x00200000, NULL, HFILL } }, diff --git a/epan/dissectors/packet-distcc.c b/epan/dissectors/packet-distcc.c index ad473d7d9c..d28d839b57 100644 --- a/epan/dissectors/packet-distcc.c +++ b/epan/dissectors/packet-distcc.c @@ -70,7 +70,7 @@ extern void proto_reg_handoff_distcc(void); #define DESEGMENT_TCP(x) \ if(distcc_desegment && pinfo->can_desegment){\ - /* only attempt reassembly if whe have the full segment */\ + /* only attempt reassembly if we have the full segment */\ if(tvb_captured_length_remaining(tvb, offset)==tvb_reported_length_remaining(tvb, offset)){\ if(parameter>tvb_captured_length_remaining(tvb, offset)){\ proto_tree_add_expert_format(tree, pinfo, &ei_distcc_short_pdu, tvb, offset-12, -1, "[Short " x " PDU]");\ diff --git a/epan/dissectors/packet-dji-uav.c b/epan/dissectors/packet-dji-uav.c index a1f47cbc14..63cb69239a 100644 --- a/epan/dissectors/packet-dji-uav.c +++ b/epan/dissectors/packet-dji-uav.c @@ -244,7 +244,7 @@ dissect_djiuav_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *da pdu_length - 1 - offset, ENC_NA); offset += pdu_length - 1 - offset; } -/* FIXME: calcualte XOR and validate transmitted value */ +/* FIXME: calculate XOR and validate transmitted value */ proto_tree_add_item(djiuav_tree, hf_djiuav_checksum, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; diff --git a/epan/dissectors/packet-ecmp.c b/epan/dissectors/packet-ecmp.c index 561d10043e..56f092c38d 100644 --- a/epan/dissectors/packet-ecmp.c +++ b/epan/dissectors/packet-ecmp.c @@ -2369,7 +2369,7 @@ static void cyclic_setup(packet_info* pinfo, guint16 offset, gboolean request, t case 1: /* edit */ case 2: /* finalise */ case 3: /* delete */ - /* no mode specific datan */ + /* no mode specific data */ break; case 4: /* exist */ @@ -2501,7 +2501,7 @@ static void program_control(int offset, gboolean request, tvbuff_t *tvb, proto_t /* */ /* Returns: nothing */ /* */ -/* Notes: for querys, the "offset" points to the "target". */ +/* Notes: for queries, the "offset" points to the "target". */ /* for responses, the "offset" points to the "status". */ /* */ /* sample ECMP Request Frame */ @@ -2559,7 +2559,7 @@ static void modbus_pdu(int offset, gboolean request, tvbuff_t *tvb, packet_info* /* */ /* Returns: nothing */ /* */ -/* Notes: for querys, the "offset" points to the "size". */ +/* Notes: for queries, the "offset" points to the "size". */ /* for responses, the "offset" points to the size. */ /* */ /* sample ECMP Request Frame (Read Holding Registers) */ @@ -2629,7 +2629,7 @@ static void interrogate(packet_info* pinfo, int offset, gboolean request, tvbuff /* */ /* Returns: nothing */ /* */ -/* Notes: for querys, the "offset" points to the "item type". */ +/* Notes: for queries, the "offset" points to the "item type". */ /* for responses, the "offset" points to the "item type". */ /* */ /* sample ECMP Request Frame */ diff --git a/epan/dissectors/packet-epl.c b/epan/dissectors/packet-epl.c index 7ca2201b14..6c4024ce72 100644 --- a/epan/dissectors/packet-epl.c +++ b/epan/dissectors/packet-epl.c @@ -3251,7 +3251,7 @@ dissect_epl_sdo_command_write_multiple_by_index(proto_tree *epl_tree, tvbuff_t * * - 1 byte for subindex * - 1 byte for reserved and padding */ - /* Guarding against readout of padding. Probaility is nearly zero, as + /* Guarding against readout of padding. Probability is nearly zero, as * padding was checked above, but to be sure, this remains here */ if ( (guint32)( padding + 8 ) >= datalength ) break; diff --git a/epan/dissectors/packet-epon.c b/epan/dissectors/packet-epon.c index aeef8731e3..c808534212 100644 --- a/epan/dissectors/packet-epon.c +++ b/epan/dissectors/packet-epon.c @@ -264,7 +264,7 @@ proto_register_epon(void) }, { &ei_epon_dpoe_bad, { "epon.dpoe.expert", PI_MALFORMED, PI_ERROR, - "DPoE security byte must be 0x55 if encrypton is disabled.", EXPFILL } + "DPoE security byte must be 0x55 if encryption is disabled.", EXPFILL } }, { &ei_epon_dpoe_encrypted_data, { "epon.dpoe.encrypted.expert", PI_UNDECODED, PI_NOTE, diff --git a/epan/dissectors/packet-erf.c b/epan/dissectors/packet-erf.c index 7eac264601..270eff486f 100644 --- a/epan/dissectors/packet-erf.c +++ b/epan/dissectors/packet-erf.c @@ -1434,7 +1434,7 @@ dissect_erf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) hdlc_type = ERF_HDLC_CHDLC; else { /* Anything to check for to recognize Frame Relay or MTP2? - Should we require PPP packets to beging with FF 03? */ + Should we require PPP packets to begin with FF 03? */ hdlc_type = ERF_HDLC_PPP; } } diff --git a/epan/dissectors/packet-eth.c b/epan/dissectors/packet-eth.c index e57f395876..98d146c6fc 100644 --- a/epan/dissectors/packet-eth.c +++ b/epan/dissectors/packet-eth.c @@ -681,7 +681,7 @@ add_ethernet_trailer(packet_info *pinfo, proto_tree *tree, proto_tree *fh_tree, if (fcs_len != 0) { /* If fcs_len is 4, we assume we definitely have an FCS. Otherwise, then, if the frame is big enough that, if we - have a trailer, it probably inclues an FCS, and we have + have a trailer, it probably includes an FCS, and we have enough space in the trailer for the FCS, we assume we have an FCS. @@ -903,7 +903,7 @@ proto_register_eth(void) { &hf_eth_fcs_bad, { "FCS Bad", "eth.fcs_bad", FT_BOOLEAN, BASE_NONE, NULL, 0x0, - "True: checksum doesn't matche packet content; False: does match content or not checked", HFILL }}, + "True: checksum doesn't match packet content; False: does match content or not checked", HFILL }}, { &hf_eth_lg, { "LG bit", "eth.lg", FT_BOOLEAN, 24, diff --git a/epan/dissectors/packet-ethertype.c b/epan/dissectors/packet-ethertype.c index 88bbcaceee..1d7709aef2 100644 --- a/epan/dissectors/packet-ethertype.c +++ b/epan/dissectors/packet-ethertype.c @@ -50,7 +50,7 @@ const value_string etype_vals[] = { { ETHERTYPE_VLAN, "802.1Q Virtual LAN" }, { ETHERTYPE_ARP, "ARP" }, { ETHERTYPE_WLCCP, "Cisco Wireless Lan Context Control Protocol" }, - { ETHERTYPE_MINT, "Motorola Media Indepentent Network Transport" }, + { ETHERTYPE_MINT, "Motorola Media Independent Network Transport" }, { ETHERTYPE_CENTRINO_PROMISC, "IEEE 802.11 (Centrino promiscuous)" }, { ETHERTYPE_XNS_IDP, "XNS Internet Datagram Protocol" }, { ETHERTYPE_X25L3, "X.25 Layer 3" }, diff --git a/epan/dissectors/packet-etsi_card_app_toolkit.c b/epan/dissectors/packet-etsi_card_app_toolkit.c index d1e2c89816..6a374fd648 100644 --- a/epan/dissectors/packet-etsi_card_app_toolkit.c +++ b/epan/dissectors/packet-etsi_card_app_toolkit.c @@ -661,7 +661,7 @@ static const value_string bearer_descr_vals[] = { { 0x01, "CSD" }, { 0x02, "GPRS / UTRAN packet service / E-UTRAN" }, { 0x03, "default bearer for requested transport layer" }, - { 0x04, "local link techonlogy independent" }, + { 0x04, "local link technology independent" }, { 0x05, "Bluetooth" }, { 0x06, "IrDA" }, { 0x07, "RS232" }, @@ -790,7 +790,7 @@ static const value_string transport_ptype_vals[] = { { 0x02, "TCP, UICC in client mode, remote connection" }, { 0x03, "TCP, UICC in server mode" }, { 0x04, "UDP, UICC in client mode, local connection" }, - { 0x05, "TCP, UICC in client mode, locel connection" }, + { 0x05, "TCP, UICC in client mode, local connection" }, { 0x06, "direct communication channel" }, { 0, NULL } }; @@ -1684,7 +1684,7 @@ proto_register_card_app_toolkit(void) NULL, HFILL }, }, { &hf_ctlv_bearer_gprs_mean, - { "Mean Throuhgput Class", "etsi_cat.comp_tlv.bearer.gprs.mean", + { "Mean Throughput Class", "etsi_cat.comp_tlv.bearer.gprs.mean", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }, }, diff --git a/epan/dissectors/packet-extreme.c b/epan/dissectors/packet-extreme.c index c8608ce79d..936f20d80b 100644 --- a/epan/dissectors/packet-extreme.c +++ b/epan/dissectors/packet-extreme.c @@ -1073,7 +1073,7 @@ dissect_edp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) case EDP_TYPE_ESRP: /* Extreme Standby Router Protocol */ dissect_esrp_tlv(tvb, pinfo, offset, tlv_length, edp_tree); break; - case EDP_TYPE_EAPS: /* Ethernet Automatic Protection Swtiching */ + case EDP_TYPE_EAPS: /* Ethernet Automatic Protection Switching */ dissect_eaps_tlv(tvb, pinfo, offset, tlv_length, edp_tree); break; case EDP_TYPE_ESL: /* EAPS shared link */ diff --git a/epan/dissectors/packet-forces.c b/epan/dissectors/packet-forces.c index 0c1ecdb3a4..237c28ce75 100644 --- a/epan/dissectors/packet-forces.c +++ b/epan/dissectors/packet-forces.c @@ -778,7 +778,7 @@ proto_register_forces(void) FT_UINT32, BASE_DEC, VALS(association_setup_result_at_vals), 0x0, NULL, HFILL } }, { &hf_forces_astreason_tlv_teardown_reason, - { "AStreason TLV TearDonw Reason", "forces.astreason.tlv.teardonw.reason", + { "AStreason TLV TearDown Reason", "forces.astreason.tlv.teardown.reason", FT_UINT32, BASE_DEC, VALS(teardown_reason_at_vals), 0x0, NULL, HFILL } }, { &hf_forces_unknown_tlv, diff --git a/epan/dissectors/packet-gsm_ipa.c b/epan/dissectors/packet-gsm_ipa.c index 31a5fcd8b6..a13a8cbfad 100644 --- a/epan/dissectors/packet-gsm_ipa.c +++ b/epan/dissectors/packet-gsm_ipa.c @@ -190,7 +190,7 @@ dissect_ipa_attr(tvbuff_t *tvb, int base_offs, proto_tree *tree) proto_tree_add_item(tree, hf_ipaccess_attr_string, tvb, offset+3, len-1, ENC_ASCII|ENC_NA); break; - case 0x01: /* a single-byte reqest for a certain attr */ + case 0x01: /* a single-byte request for a certain attr */ len = 0; proto_tree_add_item(tree, hf_ipaccess_attr_tag, tvb, offset+1, 1, ENC_BIG_ENDIAN); diff --git a/epan/dissectors/packet-gtpv2.c b/epan/dissectors/packet-gtpv2.c index eccc8e9e37..744a2203b0 100644 --- a/epan/dissectors/packet-gtpv2.c +++ b/epan/dissectors/packet-gtpv2.c @@ -2937,7 +2937,7 @@ dissect_gtpv2_tra_info(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, prot lenb_tree = proto_tree_add_subtree(interfaces_tree, tvb, offset + 11, 1, ett_gtpv2_tra_info_interfaces_lpdn_lenb, NULL, "eNB"); - /* MSC Server - 2 octests */ + /* MSC Server - 2 octets */ proto_tree_add_item(imsc_server_tree, hf_gtpv2_tra_info_lmsc_a, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(imsc_server_tree, hf_gtpv2_tra_info_lmsc_lu, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(imsc_server_tree, hf_gtpv2_tra_info_lmsc_mc, tvb, offset, 1, ENC_BIG_ENDIAN); diff --git a/epan/dissectors/packet-h223.c b/epan/dissectors/packet-h223.c index 1424493aa3..ef90856066 100644 --- a/epan/dissectors/packet-h223.c +++ b/epan/dissectors/packet-h223.c @@ -1324,7 +1324,7 @@ dissect_h223_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, circuit * PDU. * * However, if we return that, it means that we get called twice - * for the next packet; this makes it hard to tell how far throught + * for the next packet; this makes it hard to tell how far through * the stream we are and we have to start messing about with * getting the seqno from the superdissector's private data. So we * don't do that. diff --git a/epan/dissectors/packet-h450-ros.c b/epan/dissectors/packet-h450-ros.c index 6954129c74..4ce29d5f59 100644 --- a/epan/dissectors/packet-h450-ros.c +++ b/epan/dissectors/packet-h450-ros.c @@ -98,7 +98,7 @@ static expert_field ei_ros_undecoded = EI_INIT; /* Subdissectors */ static dissector_handle_t data_handle = NULL; -/* Gloabl variables */ +/* Global variables */ static gint32 problem_val; static gchar problem_str[64]; static tvbuff_t *arg_next_tvb, *res_next_tvb, *err_next_tvb; diff --git a/epan/dissectors/packet-hartip.c b/epan/dissectors/packet-hartip.c index cc95a58c8a..1bbac7871a 100644 --- a/epan/dissectors/packet-hartip.c +++ b/epan/dissectors/packet-hartip.c @@ -1019,7 +1019,7 @@ proto_register_hartip(void) "Error Code", HFILL } }, - /* HARTIP Pass-through commads. */ + /* HARTIP Pass-through commands. */ { &hf_hartip_pt_preambles, { "Preambles", "hart_ip.pt.preambles", FT_BYTES, BASE_NONE, NULL, 0x0, diff --git a/epan/dissectors/packet-idrp.c b/epan/dissectors/packet-idrp.c index 4090fd8e5f..045aa2cf42 100644 --- a/epan/dissectors/packet-idrp.c +++ b/epan/dissectors/packet-idrp.c @@ -1176,7 +1176,7 @@ dissect_idrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_ tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - /* 4 octets Achnowledge */ + /* 4 octets Acknowledge */ proto_tree_add_item(idrp_tree, hf_idrp_ack, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; @@ -1240,7 +1240,7 @@ void proto_register_idrp(void) VALS(idrp_pdu_types), 0xff, NULL, HFILL}}, {&hf_idrp_sequence, {"Sequence Number", "idrp.seq", FT_UINT32, BASE_DEC, NULL, 0x0, - "Sequence number, Sequence number of curent BISPDU ", HFILL}}, + "Sequence number, Sequence number of current BISPDU ", HFILL}}, {&hf_idrp_ack, {"Acknowledgment number", "idrp.ack", FT_UINT32, BASE_DEC, NULL, 0x0, "Acknowledgment number, Sequence number of the PDU that the sender last received correctly and in sequence number order", @@ -1295,7 +1295,7 @@ void proto_register_idrp(void) {&hf_idrp_open_rib_attr_security_reg_id, {"Rib Attribute Value Security Registration ID", "idrp.open.rib-attr.security.reg-id", FT_BYTES, BASE_NONE, - NULL, 0, "Identifys the Security Authority" , + NULL, 0, "Identifies the Security Authority" , HFILL}}, {&hf_idrp_open_rib_attr_security_info, {"Rib Attribute Value Security Registration ID", @@ -1411,22 +1411,22 @@ void proto_register_idrp(void) {&hf_idrp_update_path_attr_dist_list_incl_nb_rdi, {"Path Attribute Value Dist List Incl Number of RDIs", "idrp.update.path-attr.dist-list-incl.number-rdi", FT_UINT8, BASE_DEC, - NULL, 0, "Number of RDIs which NLRI infomation may be distributed" , + NULL, 0, "Number of RDIs which NLRI information may be distributed" , HFILL}}, {&hf_idrp_update_path_attr_dist_list_incl_rdi, {"Path Attribute Value Dist List Incl RDI", "idrp.update.path-attr.dist-list-incl.rdi", FT_BYTES, BASE_NONE, - NULL, 0, "RDI which NLRI infomation may be distributed" , + NULL, 0, "RDI which NLRI information may be distributed" , HFILL}}, {&hf_idrp_update_path_attr_dist_list_excl_nb_rdi, {"Path Attribute Value Dist List Excl Number of RDIs", "idrp.update.path-attr.dist-list-excl.number-rdi", FT_UINT8, BASE_DEC, - NULL, 0, "Number of RDIs which NLRI infomation may not be distributed" , + NULL, 0, "Number of RDIs which NLRI information may not be distributed" , HFILL}}, {&hf_idrp_update_path_attr_dist_list_excl_rdi, {"Path Attribute Value Dist List Excl RDI", "idrp.update.path-attr.dist-list-excl.rdi", FT_BYTES, BASE_NONE, - NULL, 0, "RDI which NLRI infomation may be distributed" , + NULL, 0, "RDI which NLRI information may be distributed" , HFILL}}, {&hf_idrp_update_path_attr_multi_exit_disc, {"Path Attribute Value Multi Exit Disc", @@ -1476,7 +1476,7 @@ void proto_register_idrp(void) {&hf_idrp_update_path_attr_security_reg_id, {"Path Attribute Value Security Registration ID", "idrp.update.path-attr.security.reg-id", FT_BYTES, BASE_NONE, - NULL, 0, "Identifys the Security Authority" , + NULL, 0, "Identifies the Security Authority" , HFILL}}, {&hf_idrp_update_path_attr_security_info, {"Path Attribute Value Security Registration ID", @@ -1546,7 +1546,7 @@ void proto_register_idrp(void) "Diagnosis data that depends upon the error code and error subcode", HFILL}}, {&hf_idrp_rib_refresh_opcode, - {"Rib Refresh upcode", "idrp.rib-refresh.opcode", FT_UINT8, BASE_DEC, + {"Rib Refresh opcode", "idrp.rib-refresh.opcode", FT_UINT8, BASE_DEC, VALS(idrp_error_rib_refresh_subcodes), 0xff, NULL, HFILL}}, {&hf_idrp_rib_refresh_rib_attr_locally_defined_qos_nsap, @@ -1570,7 +1570,7 @@ void proto_register_idrp(void) {&hf_idrp_rib_refresh_rib_attr_security_reg_id, {"Rib Attribute Value Security Registration ID", "idrp.rib-refresh.rib-attr.security.reg-id", FT_BYTES, BASE_NONE, - NULL, 0, "Identifys the Security Authority" , + NULL, 0, "Identifies the Security Authority" , HFILL}}, {&hf_idrp_rib_refresh_rib_attr_security_info, {"Rib Attribute Value Security Registration ID", diff --git a/epan/dissectors/packet-iec104.c b/epan/dissectors/packet-iec104.c index 476d65d678..4c1500d185 100644 --- a/epan/dissectors/packet-iec104.c +++ b/epan/dissectors/packet-iec104.c @@ -112,7 +112,7 @@ static const value_string apci_types [] = { }; /* Constants relative to the filed, independent of the field position in the byte */ -/* U (Unnombered) constants */ +/* U (Unnumbered) constants */ #define U_STARTDT_ACT 0x01 #define U_STARTDT_CON 0x02 #define U_STOPDT_ACT 0x04 @@ -363,7 +363,7 @@ static const td_asdu_length asdu_length [] = { { 0, 0 } }; -/* Cause of Transmision (CauseTx) */ +/* Cause of Transmission (CauseTx) */ #define Per_Cyc 1 #define Back 2 #define Spont 3 @@ -489,22 +489,22 @@ static const value_string coi_r_types[] = { static const value_string qoi_r_types[] = { { 0, "Not specified" }, { 20, "Station interrogation (global)" }, - { 21, "Group 1 interrotagion" }, - { 22, "Group 2 interrotagion" }, - { 23, "Group 3 interrotagion" }, - { 24, "Group 4 interrotagion" }, - { 25, "Group 5 interrotagion" }, - { 26, "Group 6 interrotagion" }, - { 27, "Group 7 interrotagion" }, - { 28, "Group 8 interrotagion" }, - { 29, "Group 9 interrotagion" }, - { 30, "Group 10 interrotagion" }, - { 31, "Group 11 interrotagion" }, - { 32, "Group 12 interrotagion" }, - { 33, "Group 13 interrotagion" }, - { 34, "Group 14 interrotagion" }, - { 35, "Group 15 interrotagion" }, - { 36, "Group 16 interrotagion" }, + { 21, "Group 1 interrogation" }, + { 22, "Group 2 interrogation" }, + { 23, "Group 3 interrogation" }, + { 24, "Group 4 interrogation" }, + { 25, "Group 5 interrogation" }, + { 26, "Group 6 interrogation" }, + { 27, "Group 7 interrogation" }, + { 28, "Group 8 interrogation" }, + { 29, "Group 9 interrogation" }, + { 30, "Group 10 interrogation" }, + { 31, "Group 11 interrogation" }, + { 32, "Group 12 interrogation" }, + { 33, "Group 13 interrogation" }, + { 34, "Group 14 interrogation" }, + { 35, "Group 15 interrogation" }, + { 36, "Group 16 interrogation" }, { 0, NULL } }; diff --git a/epan/dissectors/packet-ieee17221.c b/epan/dissectors/packet-ieee17221.c index d24197eb40..5bb9463392 100644 --- a/epan/dissectors/packet-ieee17221.c +++ b/epan/dissectors/packet-ieee17221.c @@ -5051,7 +5051,7 @@ proto_register_17221(void) }, #endif { &hf_adp_assoc_id, - { "Assocation ID", "ieee17221.assocation_id", + { "Association ID", "ieee17221.association_id", FT_UINT64, BASE_HEX, NULL, 0x00, NULL, HFILL } }, #if 0 @@ -5226,7 +5226,7 @@ proto_register_17221(void) /* ACQUIRE_ENTITY */ { &hf_aecp_persistent_flag, - { "Peristent Flag", "ieee17221.flags.persistent", + { "Persistent Flag", "ieee17221.flags.persistent", FT_BOOLEAN, 32, NULL, AECP_PERSISTENT_FLAG_MASK, NULL, HFILL } }, { &hf_aecp_release_flag, @@ -5323,7 +5323,7 @@ proto_register_17221(void) FT_UINT64, BASE_HEX, NULL, 0x00, NULL, HFILL } }, { &hf_aecp_avb_info_propegation_delay, - {"Progagation Delay", "ieee17221.avb_info_propegation_delay", + {"Propagation Delay", "ieee17221.avb_info_propagation_delay", FT_UINT32, BASE_DEC, NULL, 0x00, NULL, HFILL } }, { &hf_aecp_avb_info_gptp_domain_number, @@ -5928,7 +5928,7 @@ proto_register_17221(void) },/* draft spec says this is defined by control_type field * * start_operation does not include a control type field * * There is an operation type table 7.83 that has not * - * yet beed defined. control_type may be part of a * + * yet been defined. control_type may be part of a * * descriptor; will check */ /* ABORT_OPERATION */ @@ -6421,7 +6421,7 @@ proto_register_17221(void) FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL } }, { &hf_aem_avb_offset_scaled_log_variance, - {"Scaled Log Variance", "ieee17221.offset_scaled_log_varianc", + {"Scaled Log Variance", "ieee17221.offset_scaled_log_variance", FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL } }, { &hf_aem_avb_clock_accuracy, @@ -6923,7 +6923,7 @@ proto_register_17221(void) FT_UINT8, BASE_HEX, NULL, 0x00, NULL, HFILL } }, { &hf_aem_color_space, - {"Color Space", "ieee17221.color_sapce", + {"Color Space", "ieee17221.color_space", FT_UINT8, BASE_HEX, NULL, 0x00, NULL, HFILL } }, #if 0 diff --git a/epan/dissectors/packet-ieee1722a.c b/epan/dissectors/packet-ieee1722a.c index df56f2962f..ff84765740 100644 --- a/epan/dissectors/packet-ieee1722a.c +++ b/epan/dissectors/packet-ieee1722a.c @@ -252,7 +252,7 @@ static int dissect_1722a (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, v ieee1722a_tree = proto_item_add_subtree(ti, ett_1722a); } - /* Version field ends the common AVTPDU. Now parse the specfic packet type */ + /* Version field ends the common AVTPDU. Now parse the specific packet type */ subtype = tvb_get_guint8(tvb, IEEE_1722A_CD_OFFSET); subtype &= IEEE_1722A_SUBTYPE_MASK; diff --git a/epan/dissectors/packet-ieee802154.c b/epan/dissectors/packet-ieee802154.c index 8d03f7a4dd..d0868d346e 100644 --- a/epan/dissectors/packet-ieee802154.c +++ b/epan/dissectors/packet-ieee802154.c @@ -2069,7 +2069,7 @@ dissect_ieee802154_decrypt(tvbuff_t *tvb, guint offset, packet_info *pinfo, ieee /* * Oh God! The specification is so bad. This is the worst * case of design-by-committee I've ever seen in my life. - * The IEEE has created an unintelligable mess in order + * The IEEE has created an unintelligible mess in order * to decipher which key is used for which message. * * Let's hope it's simpler to implement for dissecting only. @@ -2156,7 +2156,7 @@ dissect_ieee802154_decrypt(tvbuff_t *tvb, guint offset, packet_info *pinfo, ieee guint l_m = captured_len; guint l_a = offset; - /* Adjust the lengths of the plantext and additional data if unencrypted. */ + /* Adjust the lengths of the plaintext and additional data if unencrypted. */ if (!IEEE802154_IS_ENCRYPTED(packet->security_level)) { l_a += l_m; l_m = 0; @@ -2434,7 +2434,7 @@ gboolean ieee802154_long_addr_equal(gconstpointer a, gconstpointer b) *@param short_addr 16-bit short address *@param pan 16-bit PAN id *@param long_addr 64-bit long (extended) address - *@param proto ointer to name of current protocol + *@param proto pointer to name of current protocol *@param fnum Frame number this mapping became valid *@return TRUE Record was updated, FALSE Couldn't find it */ @@ -2493,7 +2493,7 @@ ieee802154_map_rec *ieee802154_addr_update(ieee802154_map_tab_t *au_ieee802154_m /** *Marks a mapping record associated with device with short_addr *as invalid at a certain frame number, typically when a - *dissassociation occurs. + *disassociation occurs. * *@param short_addr 16-bit short address *@param pan 16-bit PAN id @@ -2521,7 +2521,7 @@ gboolean ieee802154_short_addr_invalidate(guint16 short_addr, guint16 pan, guint /** * Mark a mapping record associated with device with long_addr * as invalid at a certain frame number, typically when a - * dissassociation occurs. + * disassociation occurs. * *@param long_addr 16-bit short address *@param fnum Frame number when mapping became invalid diff --git a/epan/dissectors/packet-igap.c b/epan/dissectors/packet-igap.c index 86d3c86edf..a85a1c60c5 100644 --- a/epan/dissectors/packet-igap.c +++ b/epan/dissectors/packet-igap.c @@ -219,7 +219,7 @@ dissect_igap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* d proto_tree_add_item(tree, hf_igap_challenge, tvb, offset, msize, ENC_NA); break; case IGAP_SUBTYPE_AUTH_MESSAGE: - /* Challenge field indicates the result of the authenticaion */ + /* Challenge field indicates the result of the authentication */ proto_tree_add_uint(tree, hf_igap_authentication_result, tvb, offset, msize, message[0]); break; case IGAP_SUBTYPE_ACCOUNTING_MESSAGE: diff --git a/epan/dissectors/packet-ipmi-session.c b/epan/dissectors/packet-ipmi-session.c index f67134f34f..d7805aba90 100644 --- a/epan/dissectors/packet-ipmi-session.c +++ b/epan/dissectors/packet-ipmi-session.c @@ -130,7 +130,7 @@ dissect_ipmi_session(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void * payloadtype &= 0x3f; /* IPMI v2.0 packets have session ID BEFORE the session - sequence number; just after authentification and payload + sequence number; just after authentication and payload types. The OEM Explicit payload type has 6 more bytes (IANA + Payload ID) before the session ID. */ if (payloadtype == IPMI_OEM_EXPLICIT) { diff --git a/epan/dissectors/packet-ipsec.c b/epan/dissectors/packet-ipsec.c index f6efbc0def..6e180210af 100644 --- a/epan/dissectors/packet-ipsec.c +++ b/epan/dissectors/packet-ipsec.c @@ -422,7 +422,7 @@ UAT_CSTRING_CB_DEF(uat_esp_sa_records, authentication_key_string, uat_esp_sa_rec /* Configure a new SA (programmatically, most likely from a private dissector). - The arugments here are deliberately in the same string formats as the UAT fields + The arguments here are deliberately in the same string formats as the UAT fields in order to keep code paths common. Note that an attempt to match with these entries will be made *before* entries added through the UAT entry interface/file. */ @@ -704,7 +704,7 @@ static int get_ipv6_suffix(char* ipv6_suffix, char *ipv6_address) Return : Return the remaining number of char of the IPv6 address parsed Params: - char *ipv6_addr : the valid ipv6 address to parse in char * - - char *ipv6_addr_expansed : the expanded ipv6 address associated in char * + - char *ipv6_addr_expanded : the expanded ipv6 address associated in char * ex: if IPv6 address is "3ffe::1" the IPv6 expanded address will be "3FFE0000000000000000000000000001" and the function will return 0 @@ -769,7 +769,7 @@ get_full_ipv6_addr(char* ipv6_addr_expanded, char *ipv6_addr) the previous one was valid. Params: - char *ipv4_addr : the valid ipv4 address to parse in char * - - char *ipv4_addr_expansed : the expanded ipv4 address associated in char * + - char *ipv4_addr_expanded : the expanded ipv4 address associated in char * ex: if IPv4 address is "190.*.*.1" the IPv4 expanded address will be "BE****01" and the function will return 0 @@ -997,7 +997,7 @@ filter_spi_match(gchar *spi, gchar *filter) gcry_cipher_hd_t **cipher_hd, gboolean **cipher_hd_created - Description : Give Encryption Algo, Key and Authentification Algo for a Packet if a corresponding SA is available in a Security Association database + Description : Give Encryption Algo, Key and Authentication Algo for a Packet if a corresponding SA is available in a Security Association database Return: If the SA is not present, FALSE is then returned. Params: - g_esp_sa_database *sad : the Security Association Database @@ -1083,9 +1083,9 @@ get_esp_sa(gint protocol_typ, gchar *src, gchar *dst, gint spi, *encryption_key_len = record->encryption_key_length; } - /* Tell the caller whether cypher_hd has been created yet and a pointer. + /* Tell the caller whether cipher_hd has been created yet and a pointer. Pass pointer to created flag so that caller can set if/when - it opens the cypher_hd. */ + it opens the cipher_hd. */ *cipher_hd = &record->cipher_hd; *cipher_hd_created = &record->cipher_hd_created; } @@ -1224,7 +1224,7 @@ Return : void Params: - proto_tree *tree : the current tree - tvbuff_t *tvb : the tvbuffer -- gint len : length of the data availabale in tvbuff +- gint len : length of the data available in tvbuff - gint esp_auth_len : size of authenticator field - guint8 *authenticator_data_computed : give the authenticator computed (only needed when authentication_ok and !authentication_checking_ok - gboolean authentication_ok : set to true if the authentication checking has been run successfully diff --git a/epan/dissectors/packet-iscsi.c b/epan/dissectors/packet-iscsi.c index 17f56dbd4d..8a5d47fba8 100644 --- a/epan/dissectors/packet-iscsi.c +++ b/epan/dissectors/packet-iscsi.c @@ -835,7 +835,7 @@ dissect_iscsi_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint off We need to keep track of this on a per transaction basis since for error recoverylevel 0 and when the A bit is clear in a - Data-In PDU, there will not be a LUN field in teh iscsi layer. + Data-In PDU, there will not be a LUN field in the iscsi layer. */ if(tvb_get_guint8(tvb, offset+8)&0x40){ /* volume set addressing */ @@ -1668,7 +1668,7 @@ dissect_iscsi_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint off cdb_tvb=tvb_new_subset(tvb, cdb_offset, tvb_len, tvb_rlen); } dissect_scsi_cdb(cdb_tvb, pinfo, tree, SCSI_DEV_UNKNOWN, &cdata->itlq, itl); - /* we don't want the immediata below to overwrite our CDB info */ + /* we don't want the immediate below to overwrite our CDB info */ col_set_fence(pinfo->cinfo, COL_INFO); /* where there any ImmediateData ? */ diff --git a/epan/dissectors/packet-isi.c b/epan/dissectors/packet-isi.c index cf441e16a3..0a3afe1577 100644 --- a/epan/dissectors/packet-isi.c +++ b/epan/dissectors/packet-isi.c @@ -1977,7 +1977,7 @@ proto_register_isi(void) { &hf_isi_gps_satellites, { "Visible Satellites", "isi.gps.satellites", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_isi_gps_prn, - { "Pseudeorandom Noise (PRN)", "isi.gps.sat.prn", FT_UINT8, BASE_HEX_DEC, NULL, 0x0, NULL, HFILL }}, + { "Pseudorandom Noise (PRN)", "isi.gps.sat.prn", FT_UINT8, BASE_HEX_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_isi_gps_sat_used, { "in use", "isi.gps.sat.used", FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_isi_gps_sat_strength, diff --git a/epan/dissectors/packet-isis-hello.c b/epan/dissectors/packet-isis-hello.c index fd34211cd0..740908376e 100644 --- a/epan/dissectors/packet-isis-hello.c +++ b/epan/dissectors/packet-isis-hello.c @@ -644,7 +644,7 @@ dissect_hello_ipv6_int_addr_clv(tvbuff_t *tvb, packet_info* pinfo, * Name: dissect_hello_authentication_clv() * * Description: - * Decode for a hello packets authenticaion clv. + * Decode for a hello packets authentication clv. * Calls into the CLV common one. * * Input: @@ -668,7 +668,7 @@ dissect_hello_authentication_clv(tvbuff_t *tvb, packet_info* pinfo, * Name: dissect_hello_ip_authentication_clv() * * Description: - * Decode for a hello packets IP authenticaion clv. + * Decode for a hello packets IP authentication clv. * Calls into the CLV common one. * * Input: diff --git a/epan/dissectors/packet-isis-lsp.c b/epan/dissectors/packet-isis-lsp.c index 62c7abf825..c2b7260ac0 100644 --- a/epan/dissectors/packet-isis-lsp.c +++ b/epan/dissectors/packet-isis-lsp.c @@ -589,7 +589,7 @@ dissect_lsp_mt_id(tvbuff_t *tvb, proto_tree *tree, int offset) * Name: dissect_metric() * * Description: - * Display a metric prefix portion. ISIS has the concept of multple + * Display a metric prefix portion. ISIS has the concept of multiple * metric per prefix (default, delay, expense, and error). This * routine assists other dissectors by adding a single one of * these to the display tree.. @@ -2129,7 +2129,7 @@ dissect_isis_lsp_clv_sid_label_binding(tvbuff_t *tvb, packet_info* pinfo, proto_ * Name: dissect_lsp_authentication_clv() * * Description: - * Decode for a lsp packets authenticaion clv. Calls into the + * Decode for a lsp packets authentication clv. Calls into the * clv common one. * * Input: @@ -2153,7 +2153,7 @@ dissect_lsp_authentication_clv(tvbuff_t *tvb, packet_info* pinfo, proto_tree *tr * Name: dissect_lsp_ip_authentication_clv() * * Description: - * Decode for a lsp packets authenticaion clv. Calls into the + * Decode for a lsp packets authentication clv. Calls into the * clv common one. * * Input: @@ -2392,7 +2392,7 @@ dissect_lsp_instance_identifier_clv(tvbuff_t *tvb, packet_info* pinfo _U_, * Description: Called by function dissect_lsp_ext_is_reachability_clv(). * * This function is called by dissect_lsp_ext_is_reachability_clv() - * for dissect the administrive group sub-CLV (code 3). + * for dissect the administrative group sub-CLV (code 3). * * Input: * tvbuff_t * : tvbuffer for packet data diff --git a/epan/dissectors/packet-isl.c b/epan/dissectors/packet-isl.c index 2e18868272..5f6b5b1924 100644 --- a/epan/dissectors/packet-isl.c +++ b/epan/dissectors/packet-isl.c @@ -262,7 +262,7 @@ dissect_isl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int fcs_len) next_tvb = tvb_new_subset(payload_tvb, 12, captured_length, length); - /* Dissect the payload as an Etherner frame. + /* Dissect the payload as an Ethernet frame. Catch BoundsError and ReportedBoundsError, so that if the reported length of "next_tvb" was reduced by some dissector diff --git a/epan/dissectors/packet-ismacryp.c b/epan/dissectors/packet-ismacryp.c index 5f140aaa74..2e0fd2d6e7 100644 --- a/epan/dissectors/packet-ismacryp.c +++ b/epan/dissectors/packet-ismacryp.c @@ -324,7 +324,7 @@ static void dissect_ismacryp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tre { guint16 au_headers_length; /* total length of AU headers */ guint16 totalbits; /* keeps track of total number of AU header bits treated (used to determine end of AU headers) */ - int deltabits; /* keeps track of extra bits per AU header treated (used to determine end of AU heafers ) */ + int deltabits; /* keeps track of extra bits per AU header treated (used to determine end of AU headers ) */ offset_struct s_offset; offset_struct* poffset; guint16 nbmessage_bytes; /*nb of message data bytes */ diff --git a/epan/dissectors/packet-ismp.c b/epan/dissectors/packet-ismp.c index f1da6d73f6..d89b087754 100644 --- a/epan/dissectors/packet-ismp.c +++ b/epan/dissectors/packet-ismp.c @@ -264,7 +264,7 @@ dissect_ismp_edp(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tree *ismp proto_tree *edp_tuples_leaf_tree; - /* add column iformation marking this as EDP (Enterasys Discover Protocol */ + /* add column information marking this as EDP (Enterasys Discover Protocol */ col_set_str(pinfo->cinfo, COL_PROTOCOL, "ISMP.EDP"); col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-isns.c b/epan/dissectors/packet-isns.c index a9d96ddc4f..c0ce1bab44 100644 --- a/epan/dissectors/packet-isns.c +++ b/epan/dissectors/packet-isns.c @@ -1,4 +1,4 @@ -/* XXX fixme can not reassemple multiple isns PDU fragments into one +/* XXX fixme can not reassemble multiple isns PDU fragments into one isns PDU */ diff --git a/epan/dissectors/packet-iso14443.c b/epan/dissectors/packet-iso14443.c index 09f6019544..ac7b2a228c 100644 --- a/epan/dissectors/packet-iso14443.c +++ b/epan/dissectors/packet-iso14443.c @@ -1066,7 +1066,7 @@ proto_register_iso14443(void) FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL } }, { &hf_iso14443_bit_frame_anticoll, - { "Bit frame anicollision", "iso14443.bit_frame_anticoll", + { "Bit frame anticollision", "iso14443.bit_frame_anticoll", FT_UINT8, BASE_HEX, NULL, 0x1F, NULL, HFILL } }, { &hf_iso14443_apf, diff --git a/epan/dissectors/packet-isup.c b/epan/dissectors/packet-isup.c index c80dda8d63..92b1ace4b1 100644 --- a/epan/dissectors/packet-isup.c +++ b/epan/dissectors/packet-isup.c @@ -6,7 +6,7 @@ * * Inserted routines for BICC dissection according to Q.765.5 Q.1902 Q.1970 Q.1990, * calling SDP dissector for RFC2327 decoding. - * Modified 2004-01-10 by Anders Broman to add abillity to dissect + * Modified 2004-01-10 by Anders Broman to add ability to dissect * Content type application/ISUP RFC 3204 used in SIP-T * * Copyright 2004-2005, Anders Broman @@ -2357,7 +2357,7 @@ static const true_false_string isup_solicited_information_ind_value = { static const true_false_string isup_continuity_ind_value = { "Continuity check successful", - "Continuity ckec failed" + "Continuity check failed" }; #define CHARGE_NO_IND 0 @@ -2941,7 +2941,7 @@ static int hf_optimisation_mode = -1; static int hf_max_codec_modes = -1; static int hf_bearer_control_tunneling = -1; static int hf_Local_BCU_ID = -1; -static int hf_late_cut_trough_cap_ind = -1; +static int hf_late_cut_through_cap_ind = -1; static int hf_bat_ase_signal = -1; static int hf_bat_ase_duration = -1; static int hf_bat_ase_bearer_redir_ind = -1; @@ -4403,7 +4403,7 @@ static const true_false_string Bearer_Control_Tunnelling_ind_value = { "No indication" }; -static const true_false_string late_cut_trough_cap_ind_value = { +static const true_false_string late_cut_through_cap_ind_value = { "Late Cut-through supported", "Late Cut-through not supported" }; @@ -4528,7 +4528,7 @@ static const value_string BAT_ASE_Report_Reason_vals[] = { { 0x02, "BICC data with unrecognized information element, discarded"}, { 0, NULL } }; -/* This routine should bve called with offset at Organization_Identifier not the lengh indicator +/* This routine should be called with offset at Organization_Identifier not the lengh indicator * because of use from other disectors. */ extern int dissect_codec_mode(proto_tree *tree, tvbuff_t *tvb, int offset, int len) { @@ -4718,7 +4718,7 @@ dissect_bat_ase_Encapsulated_Application_Information(tvbuff_t *parameter_tvb, pa val_to_str_ext(identifier, &bat_ase_list_of_Identifiers_vals_ext, "unknown (%u)")); if (identifier != CODEC) { - /* identifier, length indicator and compabillity info must be printed inside CODEC */ + /* identifier, length indicator and compatibility info must be printed inside CODEC */ /* dissection in order to use dissect_codec routine for codec list */ proto_tree_add_uint(bat_ase_element_tree , hf_bat_ase_identifier , parameter_tvb, offset - length_ind_len, 1, identifier); @@ -4913,7 +4913,7 @@ dissect_bat_ase_Encapsulated_Application_Information(tvbuff_t *parameter_tvb, pa break; case BEARER_REDIRECTION_CAPABILITY : tempdata = tvb_get_guint8(parameter_tvb, offset); - proto_tree_add_boolean(bat_ase_element_tree, hf_late_cut_trough_cap_ind , parameter_tvb, offset, 1, tempdata); + proto_tree_add_boolean(bat_ase_element_tree, hf_late_cut_through_cap_ind , parameter_tvb, offset, 1, tempdata); offset = offset + content_len; break; case BEARER_REDIRECTION_INDICATORS : @@ -6431,7 +6431,7 @@ dissect_isup_location_number_parameter(tvbuff_t *parameter_tvb, proto_tree *para } /* ------------------------------------------------------------------ - Dissector Parameter Redirection number restiriction + Dissector Parameter Redirection number restriction */ static const value_string isup_redirection_presentation_indicator_vals[] = { { 0x00 , "Presentation allowed" }, @@ -6594,7 +6594,7 @@ dissect_isup_redirect_capability_parameter(tvbuff_t *parameter_tvb, proto_tree * switch (itu_isup_variant) { case ISUP_JAPAN_VARIANT: - /* Fall trough */ + /* Fall through */ case ISUP_JAPAN_TTC_VARIANT: proto_tree_add_item(parameter_tree, hf_isup_extension_ind, parameter_tvb, 0, 1, ENC_BIG_ENDIAN); proto_tree_add_item(parameter_tree, hf_japan_isup_redirect_capability, parameter_tvb, 0, 1, ENC_BIG_ENDIAN); @@ -6817,7 +6817,7 @@ dissect_isup_redirect_counter_parameter(tvbuff_t *parameter_tvb, proto_tree *par switch (itu_isup_variant) { case ISUP_JAPAN_VARIANT: - /* Fall trough */ + /* Fall through */ case ISUP_JAPAN_TTC_VARIANT: proto_tree_add_item(parameter_tree, hf_japan_isup_redirect_counter, parameter_tvb, 0, 1, ENC_BIG_ENDIAN); break; @@ -8339,7 +8339,7 @@ dissect_isup_optional_parameter(tvbuff_t *optional_parameters_tvb, packet_info * guint16 chg_inf_type = 0xffff; /* Dissect all optional parameters while end of message isn't reached */ - parameter_type = 0xFF; /* Start-initializiation since parameter_type is used for while-condition */ + parameter_type = 0xFF; /* Start-initialization since parameter_type is used for while-condition */ while ((tvb_reported_length_remaining(optional_parameters_tvb, offset) >= 1) && (parameter_type != PARAM_TYPE_END_OF_OPT_PARAMS)) { parameter_type = tvb_get_guint8(optional_parameters_tvb, offset); @@ -8356,7 +8356,7 @@ dissect_isup_optional_parameter(tvbuff_t *optional_parameters_tvb, packet_info * /* Handle national extensions here */ switch (itu_isup_variant) { case ISUP_JAPAN_VARIANT: - /* Fall trough */ + /* Fall through */ case ISUP_JAPAN_TTC_VARIANT: proto_tree_add_uint_format_value(parameter_tree, hf_isup_opt_parameter_type, optional_parameters_tvb, offset, PARAMETER_TYPE_LENGTH, parameter_type, @@ -8630,7 +8630,7 @@ dissect_isup_optional_parameter(tvbuff_t *optional_parameters_tvb, packet_info * default: switch (itu_isup_variant) { case ISUP_JAPAN_VARIANT: - /* Fall trough */ + /* Fall through */ case ISUP_JAPAN_TTC_VARIANT: switch (parameter_type) { case JAPAN_ISUP_PARAM_CALLED_DIRECTORY_NUMBER: @@ -8701,7 +8701,7 @@ dissect_isup_optional_parameter(tvbuff_t *optional_parameters_tvb, packet_info * /* ------------------------------------------------------------------ Dissector all ANSI optional parameters - TODO: Actullay make this dissect ANSI :) - It's still plain old ITU for now + TODO: Actually make this dissect ANSI :) - It's still plain old ITU for now */ static void dissect_ansi_isup_optional_parameter(tvbuff_t *optional_parameters_tvb, packet_info *pinfo, proto_tree *isup_tree, guint8 itu_isup_variant) @@ -8713,7 +8713,7 @@ dissect_ansi_isup_optional_parameter(tvbuff_t *optional_parameters_tvb, packet_i guint8 octet; /* Dissect all optional parameters while end of message isn't reached */ - parameter_type = 0xFF; /* Start-initializiation since parameter_type is used for while-condition */ + parameter_type = 0xFF; /* Start-initialization since parameter_type is used for while-condition */ while ((tvb_reported_length_remaining(optional_parameters_tvb, offset) >= 1) && (parameter_type != PARAM_TYPE_END_OF_OPT_PARAMS)) { parameter_type = tvb_get_guint8(optional_parameters_tvb, offset); @@ -9034,7 +9034,7 @@ dissect_ansi_isup_circuit_validation_test_resp_message(tvbuff_t *message_tvb, pr gint offset = 0; gint parameter_type, actual_length; - /* Do stuff for first mandatory fixed parameter: CVR Repsonse Indicator */ + /* Do stuff for first mandatory fixed parameter: CVR Response Indicator */ parameter_type = ANSI_ISUP_PARAM_TYPE_CVR_RESP_IND; parameter_tree = proto_tree_add_subtree(isup_tree, message_tvb, offset, CVR_RESP_IND_LENGTH, ett_isup_parameter, ¶meter_item, "CVR Response Indicator"); @@ -10314,7 +10314,7 @@ dissect_isup_message(tvbuff_t *message_tvb, packet_info *pinfo, proto_tree *isup message_type); break; case ISUP_JAPAN_VARIANT: - /* Fall trough */ + /* Fall through */ case ISUP_JAPAN_TTC_VARIANT: type_item = proto_tree_add_uint_format_value(isup_tree, hf_isup_message_type, message_tvb, 0, MESSAGE_TYPE_LENGTH, message_type, "%s (%u)", @@ -10593,7 +10593,7 @@ dissect_isup_message(tvbuff_t *message_tvb, packet_info *pinfo, proto_tree *isup } break; case ISUP_JAPAN_VARIANT: - /* Fall trough */ + /* Fall through */ case ISUP_JAPAN_TTC_VARIANT: switch (message_type) { case MESSAGE_TYPE_JAPAN_CHARG_INF: @@ -10764,7 +10764,7 @@ dissect_bicc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ used_value_string_ext = &russian_isup_message_type_value_acro_ext; break; case ISUP_JAPAN_VARIANT: - /* Fall trough */ + /* Fall through */ case ISUP_JAPAN_TTC_VARIANT: col_set_str(pinfo->cinfo, COL_PROTOCOL, "BICC(Japan)"); used_value_string_ext = &japan_isup_message_type_value_acro_ext; @@ -11228,7 +11228,7 @@ proto_register_isup(void) NULL, HFILL }}, { &hf_isup_solicited_indicator, - { "Solicited indicator", "isup.solicided_indicator", + { "Solicited indicator", "isup.solicited_indicator", FT_BOOLEAN, 16, TFS(&isup_solicited_information_ind_value), H_16BIT_MASK, NULL, HFILL }}, @@ -11348,7 +11348,7 @@ proto_register_isup(void) NULL, HFILL }}, { &hf_isup_event_presentation_restricted_ind, - { "Event presentation restricted indicator", "isup.event_presentatiation_restr_ind", + { "Event presentation restricted indicator", "isup.event_presentation_restr_ind", FT_BOOLEAN, 8, TFS(&isup_event_presentation_restricted_ind_value), H_8BIT_MASK, NULL, HFILL }}, @@ -11827,9 +11827,9 @@ proto_register_isup(void) FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, - { &hf_late_cut_trough_cap_ind, - { "Late Cut-through capability indicator", "bat_ase.late_cut_trough_cap_ind", - FT_BOOLEAN, 8, TFS(&late_cut_trough_cap_ind_value), 0x01, + { &hf_late_cut_through_cap_ind, + { "Late Cut-through capability indicator", "bat_ase.late_cut_through_cap_ind", + FT_BOOLEAN, 8, TFS(&late_cut_through_cap_ind_value), 0x01, NULL, HFILL }}, { &hf_bat_ase_signal, diff --git a/epan/dissectors/packet-iwarp-mpa.c b/epan/dissectors/packet-iwarp-mpa.c index 23f3e38f2e..a81c708c7a 100644 --- a/epan/dissectors/packet-iwarp-mpa.c +++ b/epan/dissectors/packet-iwarp-mpa.c @@ -254,7 +254,7 @@ get_first_marker_offset(mpa_state_t *state, struct tcpinfo *tcpinfo, /* * Returns the total length of this FPDU under the assumption that a TCP - * segement carries only one FPDU. + * segment carries only one FPDU. */ static guint32 fpdu_total_length(struct tcpinfo *tcpinfo) @@ -350,7 +350,7 @@ is_mpa_req(tvbuff_t *tvb, packet_info *pinfo) */ state = init_mpa_state(); - /* anaylize MPA connection parameter and record them */ + /* analyze MPA connection parameter and record them */ mcrres = tvb_get_guint8(tvb, 16); state->ini_exp_m_res = mcrres & MPA_MARKER_FLAG; state->crc = mcrres & MPA_CRC_FLAG; @@ -711,7 +711,7 @@ dissect_mpa_fpdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, * libpcap was not able to capture every packet) or lost alignment (the * MPA FPDU header does not start right after TCP header). * We consider the above to be an error since we make the assumption - * that exactly one MPA FPDU is contained in one TCP segement and starts + * that exactly one MPA FPDU is contained in one TCP segment and starts * always either with a Marker or the ULPDU_LENGTH header field. */ exp_ulpdu_length = expected_ulpdu_length(state, tcpinfo, endpoint); diff --git a/epan/dissectors/packet-ixveriwave.c b/epan/dissectors/packet-ixveriwave.c index e8fb6ffebe..738d13e61a 100644 --- a/epan/dissectors/packet-ixveriwave.c +++ b/epan/dissectors/packet-ixveriwave.c @@ -1004,7 +1004,7 @@ wlantap_dissect(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_tree proto_tree_add_uint_format(tap_tree, hf_radiotap_vht_mu_mimo_flg, tvb, offset, 1, vht_mu_mimo_flg, "VHT MU MIMO: %u ",vht_mu_mimo_flg); - /*** extract user Postiion in case of mu-mimo ***/ + /*** extract user Position in case of mu-mimo ***/ vht_user_pos = (vht_user_pos & 0x03); proto_tree_add_uint_format(tap_tree, hf_radiotap_vht_user_pos, tvb, offset, 1, vht_user_pos, "VHT User Pos: %u ",vht_user_pos); diff --git a/epan/dissectors/packet-jmirror.c b/epan/dissectors/packet-jmirror.c index 7b05bad2c7..f5e3b78f64 100644 --- a/epan/dissectors/packet-jmirror.c +++ b/epan/dissectors/packet-jmirror.c @@ -149,7 +149,7 @@ dissect_jmirror(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data /* Create a buffer pointer for the next dissector */ next_tvb = tvb_new_subset_remaining(tvb, offset); - /* Call the next dissector based on the heurstics and return the number of bytes dissected */ + /* Call the next dissector based on the heuristics and return the number of bytes dissected */ return MIRROR_HDR_SZ + call_dissector(dissector_handle, next_tvb, pinfo, tree); } diff --git a/epan/dissectors/packet-juniper.c b/epan/dissectors/packet-juniper.c index e74672ffa0..80fee3aac0 100644 --- a/epan/dissectors/packet-juniper.c +++ b/epan/dissectors/packet-juniper.c @@ -596,7 +596,7 @@ dissect_juniper_payload_proto(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre if (!dissector_try_uint(payload_table, proto, next_tvb, pinfo, tree)) { /* XXX - left in for posterity, dissection was never done */ - /* case JUNIPER_PROTO_OAM: FIXME call OAM disector without leading HEC byte */ + /* case JUNIPER_PROTO_OAM: FIXME call OAM dissector without leading HEC byte */ call_dissector(data_handle, next_tvb, pinfo, tree); } diff --git a/epan/dissectors/packet-kingfisher.c b/epan/dissectors/packet-kingfisher.c index 9a6c8dcb12..ea6b9593e9 100644 --- a/epan/dissectors/packet-kingfisher.c +++ b/epan/dissectors/packet-kingfisher.c @@ -212,7 +212,7 @@ dissect_kingfisher(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolean proto_tree_add_protocol_format(tree, proto_kingfisher, tvb, 0, -1, "Kingfisher Protocol, %s", func_string); return TRUE; } - /* othervise it is way too short to be kingfisger */ + /* otherwise it is way too short to be kingfisher */ return FALSE; } diff --git a/epan/dissectors/packet-kink.c b/epan/dissectors/packet-kink.c index 081fa1ac7e..94887e1929 100644 --- a/epan/dissectors/packet-kink.c +++ b/epan/dissectors/packet-kink.c @@ -1,6 +1,6 @@ /* packet-kink.c * Routines for KINK packet disassembly - * It is referrenced draft-ietf-kink-kink-jp-04.txt,v 1.14 2003/02/10 + * It is referenced draft-ietf-kink-kink-jp-04.txt,v 1.14 2003/02/10 * * Copyright 2004, Takeshi Nakashima * @@ -251,7 +251,7 @@ dissect_kink(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ proto_tree_add_uint(kink_tree, hf_kink_next_payload, tvb, offset, 1, next_payload); offset ++; - /* A is 1bit field. The caluculation of A is shown below. + /* A is 1bit field. The calculation of A is shown below. * The logical product of 1octet value and 0x80 is performed. * And It is performed 7bit right shift. */ diff --git a/epan/dissectors/packet-kismet.c b/epan/dissectors/packet-kismet.c index 32fbcfe4da..81153d0170 100644 --- a/epan/dissectors/packet-kismet.c +++ b/epan/dissectors/packet-kismet.c @@ -83,7 +83,7 @@ dissect_kismet(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, void * da /* * Check if it is an ASCII based protocol with reasonable length - * packets, if not return, and try annother dissector. + * packets, if not return, and try another dissector. */ if (linelen < 8) { /* @@ -238,7 +238,7 @@ dissect_kismet(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, void * da t.nsecs = 0; /* - * Format ascii representaion of time + * Format ascii representation of time */ ptr = abs_time_secs_to_str(wmem_packet_scope(), t.secs, ABSOLUTE_TIME_LOCAL, TRUE); proto_tree_add_time_format_value(reqresp_tree, hf_kismet_time, tvb, offset, tokenlen, &t, "%s", ptr); diff --git a/epan/dissectors/packet-l2tp.c b/epan/dissectors/packet-l2tp.c index 947ffd214d..cba790b530 100644 --- a/epan/dissectors/packet-l2tp.c +++ b/epan/dissectors/packet-l2tp.c @@ -214,7 +214,7 @@ static dissector_table_t pw_type_table; #define CONTROL_BIT(msg_info) (msg_info & 0x8000) /* Type bit control = 1 data = 0 */ #define LENGTH_BIT(msg_info) (msg_info & 0x4000) /* Length bit = 1 */ -#define RESERVE_BITS(msg_info) (msg_info &0x37F8) /* Reserved bit - usused */ +#define RESERVE_BITS(msg_info) (msg_info &0x37F8) /* Reserved bit - unused */ #define SEQUENCE_BIT(msg_info) (msg_info & 0x0800) /* SEQUENCE bit = 1 Ns and Nr fields */ #define OFFSET_BIT(msg_info) (msg_info & 0x0200) /* Offset */ #define PRIORITY_BIT(msg_info) (msg_info & 0x0100) /* Priority */ @@ -701,7 +701,7 @@ static const value_string cablelabs_avp_type_vals[] = { { 103, "Downstream QAM Channel Modulation" }, { 104, "Downstream QAM Channel J.83 Annex" }, { 105, "Downstream QAM Channel Symbol Rate" }, - { 106, "Downstream QAM Channel Interleaver Depth" }, + { 106, "Downstream QAM Channel Interleave Depth" }, { 107, "Downstream QAM Channel RF Block Muting53" }, /* 7.5.4 DEPI Redundancy Capabilities AVPs */ { 200, "DEPI Redundancy Capabilities" }, @@ -2733,7 +2733,7 @@ proto_register_l2tp(void) { &hf_l2tp_offset, { "Offset","l2tp.offset", FT_UINT16, BASE_DEC, NULL, 0x0, - "Number of octest past the L2TP header at which the payload data starts.", HFILL }}, + "Number of octets past the L2TP header at which the payload data starts.", HFILL }}, { &hf_l2tp_avp_mandatory, { "Mandatory", "l2tp.avp.mandatory", FT_BOOLEAN, 16, NULL, 0x8000, diff --git a/epan/dissectors/packet-lapd.c b/epan/dissectors/packet-lapd.c index 03c30cd7e8..3984e89dfd 100644 --- a/epan/dissectors/packet-lapd.c +++ b/epan/dissectors/packet-lapd.c @@ -169,7 +169,7 @@ typedef struct lapd_byte_state { typedef struct lapd_ppi { gboolean has_crc; /* CRC is captured with LAPD the frames */ - lapd_byte_state_t start_byte_state; /* LAPD bitstream byte state at the beginnigng of processing the packet */ + lapd_byte_state_t start_byte_state; /* LAPD bitstream byte state at the beginning of processing the packet */ } lapd_ppi_t; /* Fill values in lapd_byte_state struct */ diff --git a/epan/dissectors/packet-lbmc.c b/epan/dissectors/packet-lbmc.c index 81a3239ad3..d1bd030c9e 100644 --- a/epan/dissectors/packet-lbmc.c +++ b/epan/dissectors/packet-lbmc.c @@ -963,7 +963,7 @@ typedef struct #define L_LBMC_CNTL_SSF_CREQ_HDR_T_CLIENT_IDX SIZEOF(lbmc_cntl_ssf_creq_hdr_t, client_idx) #define L_LBMC_CNTL_SSF_CREQ_HDR_T (gint) sizeof(lbmc_cntl_ssf_creq_hdr_t) -/* LBMC control UME presistent registration header */ +/* LBMC control UME persistent registration header */ typedef struct { lbm_uint8_t next_hdr; @@ -1110,7 +1110,7 @@ typedef struct #define L_LBMC_CNTL_UME_ACK_ID_HDR_T_ID SIZEOF(lbmc_cntl_ume_ack_id_hdr_t, id) #define L_LBMC_CNTL_UME_ACK_ID_HDR_T (gint) sizeof(lbmc_cntl_ume_ack_id_hdr_t) -/* LBMC control UME retransmision request header */ +/* LBMC control UME retranmission request header */ typedef struct { lbm_uint8_t next_hdr; diff --git a/epan/dissectors/packet-linx.c b/epan/dissectors/packet-linx.c index 2e77b0a6b3..c2003b82b3 100644 --- a/epan/dissectors/packet-linx.c +++ b/epan/dissectors/packet-linx.c @@ -441,7 +441,7 @@ dissect_linx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ /* how many sequence numbers will be there? */ /* this is not implemented due to a lack of documentation with */ - /* longer seqence numbers. */ + /* longer sequence numbers. */ /* guess there will be padding if the Seqno doesn't reach */ /* a 32bit boundary */ diff --git a/epan/dissectors/packet-lldp.c b/epan/dissectors/packet-lldp.c index 57096b96d5..6739340e54 100644 --- a/epan/dissectors/packet-lldp.c +++ b/epan/dissectors/packet-lldp.c @@ -1986,7 +1986,7 @@ dissect_ieee_802_1_tlv(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, } case 0x04: /* Protocol ID */ { - /* Get protocal id length */ + /* Get protocol id length */ tempByte = tvb_get_guint8(tvb, offset); proto_tree_add_item(tree, hf_ieee_802_1_proto_id_length, tvb, offset, 1, ENC_BIG_ENDIAN); @@ -2035,7 +2035,7 @@ dissect_ieee_802_1_tlv(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, proto_tree_add_item(tree, hf_ieee_8021az_feature_flag_cbs, tvb, offset, 1, ENC_BIG_ENDIAN); tempByte = (tvb_get_guint8(tvb, offset) & 0x7); - /* 0 implies 8 trafffic classes supported */ + /* 0 implies 8 traffic classes supported */ proto_tree_add_uint_format_value(tree, hf_ieee_8021az_maxtcs, tvb, offset, 1, tempByte, "%u (0x%X)", tempByte ? tempByte : 8, tempByte); offset++; diff --git a/epan/dissectors/packet-llrp.c b/epan/dissectors/packet-llrp.c index 3024f8d624..fa3d57bbe0 100644 --- a/epan/dissectors/packet-llrp.c +++ b/epan/dissectors/packet-llrp.c @@ -640,7 +640,7 @@ static const value_string tlv_type[] = { { LLRP_TLV_C1G2_INVENTORY_COMMAND, "C1G2 Inventory Command" }, { LLRP_TLV_C1G2_FILTER, "C1G2 Filter" }, { LLRP_TLV_C1G2_TAG_INV_MASK, "C1G2 Tag Inventory Mask" }, - { LLRP_TLV_C1G2_TAG_INV_AWARE_FLTR, "C1G2 Tag Inventory State-Aware Filtre Action" }, + { LLRP_TLV_C1G2_TAG_INV_AWARE_FLTR, "C1G2 Tag Inventory State-Aware Filter Action" }, { LLRP_TLV_C1G2_TAG_INV_UNAWR_FLTR, "C1G2 Tag Inventory State-Unaware Filter Action" }, { LLRP_TLV_C1G2_RF_CONTROL, "C1G2 RF Control" }, { LLRP_TLV_C1G2_SINGULATION_CTRL, "C1G2 Singulation Control" }, diff --git a/epan/dissectors/packet-lmp.c b/epan/dissectors/packet-lmp.c index 45e66d2068..500a7e0b7f 100644 --- a/epan/dissectors/packet-lmp.c +++ b/epan/dissectors/packet-lmp.c @@ -1625,7 +1625,7 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) (l & 0x02) ? "Line/MS Overhead Transparency " : "", (l & 0x04) ? "Section/RS Overhead Transparency " : ""); - /* Contiguous Concatentation Types */ + /* Contiguous Concatenation Types */ proto_tree_add_bitmask(lmp_object_tree, tvb, offset2+3, hf_lmp_filter[LMPF_VAL_SERVICE_CONFIG_CPSA_CCT_FLAGS], lmp_subtree[LMP_TREE_SERVICE_CONFIG_CPSA_CCT_FLAGS], cct_flags, ENC_NA); /* Min and Max NCC */ @@ -2349,7 +2349,7 @@ proto_register_lmp(void) { "Summary - Unacceptable non-negotiable parameters", "lmp.error.summary_bad_params", FT_BOOLEAN, 8, NULL, 0x01, NULL, HFILL }}, {&hf_lmp_filter[LMPF_VAL_ERROR_SUMMARY_RENEGOTIATE], - { "Summary - Renegotiate Parametere", "lmp.error.summary_renegotiate", + { "Summary - Renegotiate Parameter", "lmp.error.summary_renegotiate", FT_BOOLEAN, 8, NULL, 0x02, NULL, HFILL }}, {&hf_lmp_filter[LMPF_VAL_ERROR_SUMMARY_BAD_TE_LINK], { "Summary - Bad TE Link Object", "lmp.error.summary_bad_te_link", diff --git a/epan/dissectors/packet-lwapp.c b/epan/dissectors/packet-lwapp.c index 87e437bd91..8737e86a7b 100644 --- a/epan/dissectors/packet-lwapp.c +++ b/epan/dissectors/packet-lwapp.c @@ -565,7 +565,7 @@ proto_reg_handoff_lwapp(void) * becoming obscelete, but we still wanted to dissect the * packets. * - * Next, lwapp can be over UDP, but packged for L3 tunneling. This + * Next, lwapp can be over UDP, but packaged for L3 tunneling. This * is the new-style. In this case, LWAP headers are just transmitted * via UDP. * diff --git a/epan/dissectors/packet-mausb.c b/epan/dissectors/packet-mausb.c index 521fcd3d44..a1d475ed61 100644 --- a/epan/dissectors/packet-mausb.c +++ b/epan/dissectors/packet-mausb.c @@ -1320,7 +1320,7 @@ static guint16 dissect_mausb_mgmt_pkt_cancel_transfer( proto_tree *tree, } -/* dissects portions of a MA USB packet specific to particaular management packets */ +/* dissects portions of a MA USB packet specific to particular management packets */ static guint16 dissect_mausb_mgmt_pkt_flds(struct mausb_header *header, proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, gint16 start) diff --git a/epan/dissectors/packet-mbtcp.c b/epan/dissectors/packet-mbtcp.c index cc887df9b5..9092757ae5 100644 --- a/epan/dissectors/packet-mbtcp.c +++ b/epan/dissectors/packet-mbtcp.c @@ -875,7 +875,7 @@ dissect_modbus_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint8 /* "hi" component by 16-bits and then OR them together into a combined 32-bit int. */ /* Following that operation, use some memcpy magic to copy the 4 raw data bytes from the */ /* 32-bit integer into a standard float. Not sure if there is a cleaner way possible using */ - /* the Wireshark libaries, but this seems to work OK. */ + /* the Wireshark libraries, but this seems to work OK. */ modflt_lo = tvb_get_ntohs(next_tvb, data_offset); modflt_hi = tvb_get_ntohs(next_tvb, data_offset+2); diff --git a/epan/dissectors/packet-mcpe.c b/epan/dissectors/packet-mcpe.c index d6e172c42f..fba05f802b 100644 --- a/epan/dissectors/packet-mcpe.c +++ b/epan/dissectors/packet-mcpe.c @@ -336,7 +336,7 @@ proto_register_mcpe(void) ); /* - * Register detailed diessection arrays. + * Register detailed dissection arrays. */ proto_register_field_array(proto_mcpe, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); diff --git a/epan/dissectors/packet-megaco.c b/epan/dissectors/packet-megaco.c index 3c14dfdf0f..313ab62e62 100644 --- a/epan/dissectors/packet-megaco.c +++ b/epan/dissectors/packet-megaco.c @@ -2407,7 +2407,7 @@ dissect_megaco_servicechangedescriptor(tvbuff_t *tvb, proto_tree *megaco_tree, case MEGACO_PROFILE_TOKEN: case MEGACO_VERSION_TOKEN: case MEGACO_METHOD_TOKEN: - /* No special dissection: fall trough */ + /* No special dissection: fall through */ default: /* Unknown or: * extension = extensionParameter parmValue diff --git a/epan/dissectors/packet-mih.c b/epan/dissectors/packet-mih.c index a0c4392a8d..dd0a894ef1 100644 --- a/epan/dissectors/packet-mih.c +++ b/epan/dissectors/packet-mih.c @@ -863,8 +863,8 @@ static const value_string op_mode_vals[] = { static const value_string link_param_qos_vals[] = { {0, "Max no of differentiable classes"}, {1, "Min Packet transfer delay"}, -{2, "Avg packet ransfer delay"}, -{3, "Max packet ransfer delay"}, +{2, "Avg packet transfer delay"}, +{3, "Max packet transfer delay"}, {4, "delay jitter"}, {5, "Packet loss"}, {0, NULL} @@ -1220,7 +1220,7 @@ static gint16 dissect_link_poa(tvbuff_t *tvb, gint16 offset, proto_tree *tlv_tre static gint16 dissect_rq_result(tvbuff_t *tvb, gint16 offset, proto_tree *tlv_tree) { proto_tree *subtree; - subtree = proto_tree_add_subtree(tlv_tree, tvb, offset, 1, ett_list_prefer_link, NULL, "List of preffered links"); + subtree = proto_tree_add_subtree(tlv_tree, tvb, offset, 1, ett_list_prefer_link, NULL, "List of preferred links"); offset = dissect_link_poa(tvb, offset, subtree); offset = dissect_qos_list(tvb, offset, tlv_tree); offset++; @@ -2202,7 +2202,7 @@ static int dissect_mih(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void return tvb_captured_length(tvb); } -/*dissector initialistaion*/ +/*dissector initialisation*/ void proto_register_mih(void) { static hf_register_info hf[] = diff --git a/epan/dissectors/packet-mint.c b/epan/dissectors/packet-mint.c index ea05ef7987..5e5770b93e 100644 --- a/epan/dissectors/packet-mint.c +++ b/epan/dissectors/packet-mint.c @@ -168,7 +168,7 @@ static header_field_info hfi_mint_data_vlan MINT_HF_INIT = 0x0, NULL, HFILL }; static header_field_info hfi_mint_data_seqno MINT_HF_INIT = - { "Seqence Number", "mint.data.seqno", FT_UINT32, BASE_DEC, NULL, + { "Sequence Number", "mint.data.seqno", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }; static header_field_info hfi_mint_data_unknown1 MINT_HF_INIT = diff --git a/epan/dissectors/packet-mip.c b/epan/dissectors/packet-mip.c index c1f4eda424..c00260edcc 100644 --- a/epan/dissectors/packet-mip.c +++ b/epan/dissectors/packet-mip.c @@ -144,7 +144,7 @@ typedef enum { MIP_NATT_TUNNEL_DATA = 4, MIP_REGISTRATION_REVOCATION = 7, MIP_REGISTRATION_REVOCATION_ACK = 15, - MIP_HANDOFF_REQEST = 16, + MIP_HANDOFF_REQUEST = 16, MIP_HANDOFF_REPLY = 17, MIP_REGIONAL_REG_REQ = 18, MIP_REGIONAL_REG_REP = 19, @@ -159,7 +159,7 @@ static const value_string mip_types[] = { {MIP_NATT_TUNNEL_DATA, "NAT Traversal Tunnel Data"}, {MIP_REGISTRATION_REVOCATION, "Registration Revocation"}, {MIP_REGISTRATION_REVOCATION_ACK, "Registration Revocation Acknowledgement"}, - {MIP_HANDOFF_REQEST, "NAT Traversal Tunnel Data"}, + {MIP_HANDOFF_REQUEST, "NAT Traversal Tunnel Data"}, {MIP_HANDOFF_REPLY, "NAT Traversal Tunnel Data"}, {MIP_REGIONAL_REG_REQ, "NAT Traversal Tunnel Data"}, {MIP_REGIONAL_REG_REP, "NAT Traversal Tunnel Data"}, @@ -463,7 +463,7 @@ dissect_mip_priv_ext_3gpp2(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr offset+=2; switch(type){ - case 16: /* PPP Link Indicato X.S0011-003-C v1.0 */ + case 16: /* PPP Link Indicator X.S0011-003-C v1.0 */ proto_tree_add_item(tree, hf_mip_nvse_3gpp2_type16_value, tvb, offset, 2, ENC_BIG_ENDIAN); break; case 17: /* DNS server IP address X.S0011-002-C v3.0*/ diff --git a/epan/dissectors/packet-mip6.c b/epan/dissectors/packet-mip6.c index fa368ca09f..4633eead22 100644 --- a/epan/dissectors/packet-mip6.c +++ b/epan/dissectors/packet-mip6.c @@ -5122,7 +5122,7 @@ proto_register_mip6(void) { &hf_pmip6_lra_status, { "Status", "mip6.lra.status", FT_UINT8, BASE_DEC, VALS(pmip6_lra_status_vals), 0x0, - "Indicating the result ofprocessing the Localized Routing Acknowledgment message.", HFILL } + "Indicating the result of processing the Localized Routing Acknowledgment message.", HFILL } }, { &hf_pmip6_lra_lifetime, diff --git a/epan/dissectors/packet-mmse.c b/epan/dissectors/packet-mmse.c index 52553f2f44..1c3e62b752 100644 --- a/epan/dissectors/packet-mmse.c +++ b/epan/dissectors/packet-mmse.c @@ -126,7 +126,7 @@ static void dissect_mmse(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, #define MM_CONTENT_HDR 0xAE /* Content */ #define MM_START_HDR 0xAF /* X-Mms-Start */ #define MM_ADDITIONAL_HDR 0xB0 /* Additional-headers */ -#define MM_DISTRIBUION_IND_HDR 0xB1 /* X-Mms-Distribution-Indcator */ +#define MM_DISTRIBUION_IND_HDR 0xB1 /* X-Mms-Distribution-Indicator */ #define MM_ELEMENT_DESCR_HDR 0xB2 /* X-Mms-Element-Descriptor */ #define MM_LIMIT_HDR 0xB3 /* X-Mms-Limit */ diff --git a/epan/dissectors/packet-mount.c b/epan/dissectors/packet-mount.c index 5618fa9561..914126b0f0 100644 --- a/epan/dissectors/packet-mount.c +++ b/epan/dissectors/packet-mount.c @@ -123,7 +123,7 @@ static const value_string mount3_mountstat3[] = * Formally, hf_mount3_status only define the status codes returned by version * 3 of the protocol. * Though not formally defined in the standard, we use the same - * value-to-string mappings as version 3 since we belive that this mapping + * value-to-string mappings as version 3 since we believe that this mapping * is consistant with most v1 and v2 implementations. */ static int diff --git a/epan/dissectors/packet-mp2t.c b/epan/dissectors/packet-mp2t.c index 49eac8d80e..0ffc5ab119 100644 --- a/epan/dissectors/packet-mp2t.c +++ b/epan/dissectors/packet-mp2t.c @@ -282,7 +282,7 @@ typedef struct mp2t_analysis_data { /* This structure contains a tree containing data for the * individual pid's, this is only used when packets are - * processed sequencially. + * processed sequentially. */ wmem_tree_t *pid_table; @@ -339,7 +339,7 @@ typedef struct pid_analysis_data { typedef struct ts_analysis_data { guint16 pid; gint8 cc_prev; /* Previous CC number */ - guint8 skips; /* Skips between CCs max 14 */ + guint8 skips; /* Skips between Ccs max 14 */ } ts_analysis_data_t; @@ -473,7 +473,7 @@ mp2t_get_packet_length(tvbuff_t *tvb, guint offset, packet_info *pinfo, if ( (pload_type == pid_pload_docsis && remaining_len < 4) || (pload_type == pid_pload_sect && remaining_len < 3) || (pload_type == pid_pload_pes && remaining_len < 5) ) { - /* Not enough info to determine the size of the encapulated packet */ + /* Not enough info to determine the size of the encapsulated packet */ /* Just add the fragment and we'll check out the length later */ return -1; } @@ -855,9 +855,9 @@ detect_cc_drops(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, gboolean detected_drop = FALSE; guint32 skips = 0; - /* The initial sequencial processing stage */ + /* The initial sequential processing stage */ if (!pinfo->fd->flags.visited) { - /* This is the sequencial processing stage */ + /* This is the sequential processing stage */ pid_data = get_pid_analysis(mp2t_data, pid); cc_prev = pid_data->cc_prev; diff --git a/epan/dissectors/packet-mp4ves.c b/epan/dissectors/packet-mp4ves.c index 29f7d4e3ff..7c5d40c2f7 100644 --- a/epan/dissectors/packet-mp4ves.c +++ b/epan/dissectors/packet-mp4ves.c @@ -732,7 +732,7 @@ dissect_mp4ves(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _ GOV - Group_of_VideoObjectPlane VOP - Video Object Plane VP - Video Plane - Otherwies it's a VOP fragment. + Otherwise it's a VOP fragment. visual_object_sequence_start_code: The visual_object_sequence_start_code is the bit string '000001B0' in hexadecimal. It initiates a visual session. diff --git a/epan/dissectors/packet-mpeg-descriptor.c b/epan/dissectors/packet-mpeg-descriptor.c index 4216332c4c..ab10bfce32 100644 --- a/epan/dissectors/packet-mpeg-descriptor.c +++ b/epan/dissectors/packet-mpeg-descriptor.c @@ -346,7 +346,7 @@ static const value_string mpeg_descr_iso639_type_vals[] = { { 0x00, "Undefined" }, { 0x01, "Clean Effects" }, { 0x02, "Hearing Impaired" }, - { 0x03, "Visual Impaired Comentary" }, + { 0x03, "Visual Impaired Commentary" }, { 0x00, NULL } }; @@ -1111,7 +1111,7 @@ static const value_string mpeg_descr_linkage_target_listed_vals[] = { static const value_string mpeg_descr_linkage_event_simulcast_vals[] = { { 0x0, "Events are offset in time" }, - { 0x1, "Target and source events are being sumulcast" }, + { 0x1, "Target and source events are being simulcast" }, { 0x0, NULL } }; @@ -1589,7 +1589,7 @@ static const value_string mpeg_descr_content_nibble_vals[] = { { 0xB1, "black and white" }, { 0xB2, "unpublished" }, { 0xB3, "live broadcast" }, - { 0xBF, "user defined (special charateristics)" }, + { 0xBF, "user defined (special characteristics)" }, { 0x00, NULL } }; @@ -2332,7 +2332,7 @@ static int hf_mpeg_descr_private_data = -1; static const value_string mpeg_descr_extension_tag_extension_vals[] = { { EXT_TAG_IMG_ICON, "Image Icon Descriptor" }, - { EXT_TAG_CPCM_DLV, "CPCM Delivery Dignalling Descriptor" }, + { EXT_TAG_CPCM_DLV, "CPCM Delivery Signalling Descriptor" }, { EXT_TAG_CP, "CP Descriptor" }, { EXT_TAG_CP_ID, "CP Identifier Descriptor" }, { EXT_TAG_T2, "T2 Delivery System Descriptor" }, diff --git a/epan/dissectors/packet-mpeg-pes.c b/epan/dissectors/packet-mpeg-pes.c index f361cfeeea..de4485825a 100644 --- a/epan/dissectors/packet-mpeg-pes.c +++ b/epan/dissectors/packet-mpeg-pes.c @@ -1235,7 +1235,7 @@ proto_register_mpeg_pes(void) FT_UINT8, BASE_HEX, VALS(mpeg_pes_TrickModeIntraSliceRefresh_vals), 0, "mpeg_pes trick mode intra slice refresh", HFILL }}, { &hf_mpeg_pes_dsm_trick_mode_frequency_truncation, - { "frequency truncation", "mpeg-pes.trick-mode-frequeny-truncation", + { "frequency truncation", "mpeg-pes.trick-mode-frequency-truncation", FT_UINT8, BASE_HEX, VALS(mpeg_pes_TrickModeFrequencyTruncation_vals), 0, "mpeg_pes trick mode frequency truncation", HFILL }}, { &hf_mpeg_pes_dsm_trick_mode_rep_cntrl, diff --git a/epan/dissectors/packet-mpeg-sect.c b/epan/dissectors/packet-mpeg-sect.c index e2ccbe0380..0f4db406ff 100644 --- a/epan/dissectors/packet-mpeg-sect.c +++ b/epan/dissectors/packet-mpeg-sect.c @@ -127,7 +127,7 @@ static const value_string mpeg_sect_table_id_vals[] = { { TID_NIT_OTHER, "Network Information Table (NIT), other network" }, { TID_SDT, "Service Description Table (SDT), current network" }, { TID_SDT_OTHER, "Service Description (SDT), other network" }, - { TID_BAT, "Bouquet Associatoin Table (BAT)" }, + { TID_BAT, "Bouquet Association Table (BAT)" }, { TID_EIT, "Event Information Table (EIT), actual TS" }, { TID_EIT_OTHER, "Event Information Table (EIT), other TS" }, { TID_TDT, "Time and Date Table (TDT)" }, diff --git a/epan/dissectors/packet-mq-pcf.c b/epan/dissectors/packet-mq-pcf.c index fe92fe182b..1886fbc591 100644 --- a/epan/dissectors/packet-mq-pcf.c +++ b/epan/dissectors/packet-mq-pcf.c @@ -694,14 +694,14 @@ void proto_register_mqpcf(void) mq_pcf_module = prefs_register_protocol(proto_mqpcf, NULL); prefs_register_uint_preference(mq_pcf_module, "maxprm", - "Set the maximun number of parameter in the PCF to decode", + "Set the maximum number of parameters in the PCF to decode", "When dissecting PCF there can be a lot of parameters." " You can limit the number of parameter decoded, before it continue with the next PCF.", 10, &mq_pcf_maxprm); prefs_register_uint_preference(mq_pcf_module, "maxlst", - "Set the maximun number of Parameter List that are displayed", + "Set the maximum number of Parameter List that are displayed", "When dissecting a parameter of a PCFm, if it is a StringList, IntegerList or Integer64 List, " - " You can limit the number of element displayed, before it continue with the next Parameter.", + " You can limit the number of elements displayed, before it continues with the next Parameter.", 10, &mq_pcf_maxlst); } diff --git a/epan/dissectors/packet-mrp-mmrp.c b/epan/dissectors/packet-mrp-mmrp.c index eae806668a..4a8b9af623 100644 --- a/epan/dissectors/packet-mrp-mmrp.c +++ b/epan/dissectors/packet-mrp-mmrp.c @@ -309,7 +309,7 @@ dissect_mmrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ dissect_mmrp_common2(vect_attr_tree, tvb, msg_offset + vect_offset); if (attribute_type == MMRP_ATTRIBUTE_TYPE_MAC) { - /* MMRP FirstValue is a Mac Adress*/ + /* MMRP FirstValue is a Mac Address*/ proto_tree_add_item(vect_attr_tree, hf_mmrp_first_value, tvb, MMRP_FIRST_VALUE_GROUP_OFFSET + msg_offset + vect_offset, attribute_length, ENC_NA); @@ -320,7 +320,7 @@ dissect_mmrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ } else if (attribute_type == MMRP_ATTRIBUTE_TYPE_SERVICE) { - /* MMRP Service Requierment*/ + /* MMRP Service Requirement*/ proto_tree_add_item(vect_attr_tree, hf_mmrp_first_value, tvb, MMRP_FIRST_VALUE_GROUP_OFFSET + msg_offset + vect_offset, attribute_length, ENC_NA); diff --git a/epan/dissectors/packet-msdp.c b/epan/dissectors/packet-msdp.c index 2e96cfad5f..604118d7c1 100644 --- a/epan/dissectors/packet-msdp.c +++ b/epan/dissectors/packet-msdp.c @@ -38,7 +38,7 @@ enum { MSDP_SA = 1, MSDP_KEEP_ALIVE, MSDP_NOTIFICATION, - /* Theses are only assigned in MSDP spec. Their use is specifed + /* These are only assigned in MSDP spec. Their use is specified * elsewhere */ MSDP_TRACE_IN_PROGRESS, MSDP_TRACE_REPLY diff --git a/epan/dissectors/packet-multipart.c b/epan/dissectors/packet-multipart.c index bbedf74937..3248e564c1 100644 --- a/epan/dissectors/packet-multipart.c +++ b/epan/dissectors/packet-multipart.c @@ -137,7 +137,7 @@ static dissector_table_t media_type_dissector_table; static dissector_handle_t data_handle; static dissector_handle_t media_handle; -/* Determins if bodies with no media type dissector shoud be displayed +/* Determines if bodies with no media type dissector should be displayed * as raw text, may cause problems with images sound etc * TODO improve to check for different content types ? */ @@ -668,7 +668,7 @@ process_body_part(proto_tree *tree, tvbuff_t *tvb, const guint8 *boundary, break; case POS_CONTENT_TRANSFER_ENCODING: { - /* The Content-Transfeing starts at colon_offset + 1 */ + /* The Content-Transferring starts at colon_offset + 1 */ gint cr_offset = index_of_char(value_str, '\r'); if (cr_offset > 0) { diff --git a/epan/dissectors/packet-mux27010.c b/epan/dissectors/packet-mux27010.c index 8daf50275f..4460b93799 100644 --- a/epan/dissectors/packet-mux27010.c +++ b/epan/dissectors/packet-mux27010.c @@ -1250,7 +1250,7 @@ proto_register_mux27010 (void) FT_UINT8, BASE_HEX, NULL, 0xFF, NULL, HFILL }}, { &hf_mux27010_controlchannel_detailedvalue_response, - { "Resposne", "mux27010.controlchannel.value.detailedvalue.response", + { "Response", "mux27010.controlchannel.value.detailedvalue.response", FT_UINT8, BASE_DEC, VALS(detailedvalue_response_vals), 0, NULL, HFILL }}, /*Test Command*/ @@ -1295,7 +1295,7 @@ proto_register_mux27010 (void) { "Break Signal", "mux27010.controlchannel.value.detailedvaluemscbreak", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - /*Parameter Negotation*/ + /*Parameter Negotiation*/ { &hf_mux27010_controlchanneldetailedvaluepndlci, { "DLCI", "mux27010.controlchannel.value.detailedvaluepndlci", @@ -1417,7 +1417,7 @@ proto_register_mux27010 (void) expert_module_t* expert_mux27010; - /*Register protocoll*/ + /*Register protocol*/ proto_mux27010 = proto_register_protocol ("MUX27010 Protocol", "MUX27010", "mux27010"); /*Register arrays*/ diff --git a/epan/dissectors/packet-nas_eps.c b/epan/dissectors/packet-nas_eps.c index 67949a03e5..4021b93eef 100644 --- a/epan/dissectors/packet-nas_eps.c +++ b/epan/dissectors/packet-nas_eps.c @@ -4915,7 +4915,7 @@ dissect_nas_eps_emm_msg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset++; } } - /* Messge type IE*/ + /* Message type IE*/ oct = tvb_get_guint8(tvb,offset); msg_fcn_p = NULL; ett_tree = -1; @@ -5036,7 +5036,7 @@ dissect_nas_eps_plain(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* */ /* - * All messages recived here will have the security header: + * All messages received here will have the security header: * Figure 9.1.2: General message organization example for a security protected NAS message * 9.3.1 Bits 5 to 8 of the first octet of every EPS Mobility Management (EMM) * message contain the Security header type IE. diff --git a/epan/dissectors/packet-nbt.c b/epan/dissectors/packet-nbt.c index 8b30969305..c3ec5f83bb 100644 --- a/epan/dissectors/packet-nbt.c +++ b/epan/dissectors/packet-nbt.c @@ -1587,7 +1587,7 @@ dissect_nbss(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data) } /* - * The larged size in for non-SMB NBSS traffic is + * The largest size in for non-SMB NBSS traffic is * 17 bits (0x1FFFF). * * The SMB1 unix extensions and the SMB2 multi credit diff --git a/epan/dissectors/packet-ncp2222.inc b/epan/dissectors/packet-ncp2222.inc index e8f950e348..69081312c3 100644 --- a/epan/dissectors/packet-ncp2222.inc +++ b/epan/dissectors/packet-ncp2222.inc @@ -4388,7 +4388,7 @@ process_entry_info(proto_tree *it_tree, tvbuff_t *tvb, nds_val *values) ioffset = ioffset+values->vvalue; ioffset += align_4(tvb, ioffset); } - if (iter_flags & DSI_ENTRY_RDN) { /* Relative Distiguished Name */ + if (iter_flags & DSI_ENTRY_RDN) { /* Relative Distinguished Name */ values->vvalue = tvb_get_letohl(tvb, ioffset); /* Length of string */ ioffset = ioffset+4; values->vstring = get_string(tvb, ioffset, values->vvalue); @@ -8193,7 +8193,7 @@ dissect_ncp_reply(tvbuff_t *tvb, packet_info *pinfo, if (ncp_rec->func == 0x17 && ncp_rec->subfunc == 0x1a) { dissect_ncp_23_26_reply(tvb, ncp_tree); } - /* Process ncp 87/72 bytes transfered value. */ + /* Process ncp 87/72 bytes transferred value. */ if (ncp_rec->func == 0x57 && ncp_rec->subfunc == 0x48) { dissect_ncp_87_72_reply(tvb, ncp_tree); } diff --git a/epan/dissectors/packet-ndps.c b/epan/dissectors/packet-ndps.c index b31db4e033..5883fd5ae4 100644 --- a/epan/dissectors/packet-ndps.c +++ b/epan/dissectors/packet-ndps.c @@ -1358,7 +1358,7 @@ static const value_string ndps_error_types[] = { { 0xFFFFFB47, "Notify Unknown Session" }, { 0xFFFFFB48, "Notify No Attribute Values" }, { 0xFFFFFB49, "Notify DS Value Size Too Large" }, - { 0xFFFFFB4A, "Notify Service Name Must be Fully Distiguished" }, + { 0xFFFFFB4A, "Notify Service Name Must be Fully Distinguished" }, { 0xFFFFFB4B, "Notify Failed Login" }, { 0xFFFFFB4C, "Notify Failed to Create Context" }, { 0xFFFFFB4D, "Notify Failed to Get Messages" }, @@ -1937,7 +1937,7 @@ static const value_string ndps_error_types[] = { { 0xffffff67, "(-153) Directory Full" }, { 0xffffff68, "(-152) Invalid Volume" }, { 0xffffff69, "(-151) No Spool Space" }, - { 0xffffff6a, "(-150) No Alloc Space/Target Not a Subdirectory/Insuffficient Memory" }, + { 0xffffff6a, "(-150) No Alloc Space/Target Not a Subdirectory/Insufficient Memory" }, { 0xffffff6b, "(-149) File Detached" }, { 0xffffff6c, "(-148) No Write Privilege" }, { 0xffffff6d, "(-147) No Read Privilege" }, @@ -4289,7 +4289,7 @@ dissect_ndps_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data * * SPX EOM not being set indicates we are inside or at the * beginning of a fragment. But when the end of the fragment - * is encounterd the flag is set. So we must mark what the + * is encountered the flag is set. So we must mark what the * frame number is of the end fragment so that we will be * able to redissect if the user clicks on the packet * or resorts/filters the trace. @@ -4393,7 +4393,7 @@ ndps_defrag(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, spx_info *spx_i } else { - /* This is either a beggining or middle fragment on second dissection */ + /* This is either a beginning or middle fragment on second dissection */ next_tvb = tvb_new_subset_remaining(tvb, 0); if (!spx_info_p->eom) { diff --git a/epan/dissectors/packet-netbios.c b/epan/dissectors/packet-netbios.c index 62b06b4d24..eeb205de97 100644 --- a/epan/dissectors/packet-netbios.c +++ b/epan/dissectors/packet-netbios.c @@ -167,7 +167,7 @@ static const value_string nb_name_type_vals[] = { {0x01, "Browser"}, {0x02, "Workstation/Redirector"}, /* not sure what 0x02 is, I'm seeing a lot of them however */ - /* i'm seeing them with workstation/redirection host + /* I'm seeing them with workstation/redirection host announcements */ {0x03, "Messenger service/Main name"}, {0x05, "Forwarded name"}, diff --git a/epan/dissectors/packet-netrom.c b/epan/dissectors/packet-netrom.c index d88f61d62f..80cead4433 100644 --- a/epan/dissectors/packet-netrom.c +++ b/epan/dissectors/packet-netrom.c @@ -53,8 +53,8 @@ void proto_reg_handoff_netrom(void); #define STRLEN 80 -#define NETROM_MIN_SIZE 7 /* minumum payload for a routing packet */ -#define NETROM_HEADER_SIZE 20 /* minumum payload for a normal packet */ +#define NETROM_MIN_SIZE 7 /* minimum payload for a routing packet */ +#define NETROM_HEADER_SIZE 20 /* minimum payload for a normal packet */ #define NETROM_PROTOEXT 0x00 #define NETROM_CONNREQ 0x01 diff --git a/epan/dissectors/packet-nfs.c b/epan/dissectors/packet-nfs.c index 50f79cbdae..d0206450b4 100644 --- a/epan/dissectors/packet-nfs.c +++ b/epan/dissectors/packet-nfs.c @@ -1982,7 +1982,7 @@ dissect_fhandle_data_LINUX_KNFSD_NEW(tvbuff_t* tvb, packet_info *pinfo _U_, prot /* * Dissect GlusterFS/NFS NFSv3 File Handle - glusterfs-3.3+ - * The filehandle is alway 32 bytes and first 4 bytes of ident ":OGL" + * The filehandle is always 32 bytes and first 4 bytes of ident ":OGL" */ static int dissect_fhandle_data_GLUSTER(tvbuff_t* tvb, packet_info *pinfo _U_, proto_tree *tree, void* data _U_) diff --git a/epan/dissectors/packet-ntlmssp.c b/epan/dissectors/packet-ntlmssp.c index 83221c50ec..4c029bf5dd 100644 --- a/epan/dissectors/packet-ntlmssp.c +++ b/epan/dissectors/packet-ntlmssp.c @@ -546,7 +546,7 @@ create_ntlmssp_v2_key(const char *nt_password _U_, const guint8 *serverchallenge guint32 nb_pass = 0; gboolean found = FALSE; - /* We are going to try password encrypted in keytab as well, it's an idean of Stefan Metzmacher + /* We are going to try password encrypted in keytab as well, it's an idea of Stefan Metzmacher * The idea is to be able to test all the key of domain in once and to be able to decode the NTLM dialogs */ memset(sessionkey, 0, NTLMSSP_KEY_LEN); @@ -566,7 +566,7 @@ create_ntlmssp_v2_key(const char *nt_password _U_, const guint8 *serverchallenge } } else { - /* Unable to calculate the session not enought space in buffer, note this is unlikely to happen but ......*/ + /* Unable to calculate the session not enough space in buffer, note this is unlikely to happen but ......*/ return; } domain_len = strlen(ntlmssph->domain_name); @@ -574,7 +574,7 @@ create_ntlmssp_v2_key(const char *nt_password _U_, const guint8 *serverchallenge str_to_unicode(ntlmssph->domain_name, domain_name_unicode); } else { - /* Unable to calculate the session not enought space in buffer, note this is unlikely to happen but ......*/ + /* Unable to calculate the session not enough space in buffer, note this is unlikely to happen but ......*/ return; } while (i < nb_pass) { diff --git a/epan/dissectors/packet-ntp.c b/epan/dissectors/packet-ntp.c index a67d10d4fd..c4bad5b0e8 100644 --- a/epan/dissectors/packet-ntp.c +++ b/epan/dissectors/packet-ntp.c @@ -145,7 +145,7 @@ static const value_string ver_nums[] = { { 0, NULL} }; -/* Mode, 3bit field representing mode of comunication. +/* Mode, 3bit field representing mode of communication. */ #define NTP_MODE_MASK 7 @@ -331,7 +331,7 @@ static const true_false_string tfs_ctrl_peer_status_reach = {"reachability okay static const value_string ctrl_peer_status_selection_types[] = { { 0, "rejected" }, - { 1, "passed sanity checks (tests 1 trough 8 in Section 3.4.3)" }, + { 1, "passed sanity checks (tests 1 through 8 in Section 3.4.3)" }, { 2, "passed correctness checks (intersection algorithm in Section 4.2.1)" }, { 3, "passed candidate checks (if limit check implemented)" }, { 4, "passed outlyer checks (clustering algorithm in Section 4.2.2)" }, diff --git a/epan/dissectors/packet-opensafety.c b/epan/dissectors/packet-opensafety.c index de2733c628..f5a3c52267 100644 --- a/epan/dissectors/packet-opensafety.c +++ b/epan/dissectors/packet-opensafety.c @@ -2257,7 +2257,7 @@ dissect_opensafety_epl(tvbuff_t *message_tvb, packet_info *pinfo, proto_tree *tr else epl_msgtype = OPENSAFETY_ACYCLIC_DATA; - /* We check if we have a asynchronous message, or a synchronoues message. In case of + /* We check if we have a asynchronous message, or a synchronous message. In case of * asynchronous messages, SPDO packages are not valid. */ result = opensafety_package_dissector("openSAFETY/Powerlink", "", diff --git a/epan/dissectors/packet-ospf.c b/epan/dissectors/packet-ospf.c index 167bb9d83d..df305fcd65 100644 --- a/epan/dissectors/packet-ospf.c +++ b/epan/dissectors/packet-ospf.c @@ -897,7 +897,7 @@ static bitfield_info bfinfo_v3_prefix_options = { &hf_ospf_v3_prefix_option, &ett_ospf_v3_prefix_options, bf_v3_prefix_options, array_length(bf_v3_prefix_options) }; -/* Structure used for dissecing the Options bitfield of the Optional Router Informational +/* Structure used for dissecting the Options bitfield of the Optional Router Informational Capabilities RI LSA. */ static bitfield_info bfinfo_ri_options = { &hf_ospf_ri_options, &ett_ospf_ri_options, diff --git a/epan/dissectors/packet-ouch.c b/epan/dissectors/packet-ouch.c index fe7b4867e1..e0662eb5b4 100644 --- a/epan/dissectors/packet-ouch.c +++ b/epan/dissectors/packet-ouch.c @@ -1376,7 +1376,7 @@ dissect_ouch_heur( return FALSE; } - /* Peform dissection of this (initial) packet */ + /* Perform dissection of this (initial) packet */ dissect_ouch(tvb, pinfo, tree, NULL); return TRUE; @@ -1527,7 +1527,7 @@ proto_register_ouch(void) NULL, HFILL }}, { &hf_ouch_quantity_prevented_from_trading, - { "Quanity Prevented from Trading", + { "Quantity Prevented from Trading", "ouch.quantity_prevented_from_trading", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, diff --git a/epan/dissectors/packet-packetbb.c b/epan/dissectors/packet-packetbb.c index 643de7f0a8..3604c9aed4 100644 --- a/epan/dissectors/packet-packetbb.c +++ b/epan/dissectors/packet-packetbb.c @@ -865,7 +865,7 @@ void proto_register_packetbb(void) { NULL, HFILL } }, { &hf_packetbb_msgheader_seqnr, - { "Squence number", "packetbb.msg.seqnum", + { "Sequence number", "packetbb.msg.seqnum", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL } }, diff --git a/epan/dissectors/packet-pana.c b/epan/dissectors/packet-pana.c index ed9fe61e0e..0895bc257f 100644 --- a/epan/dissectors/packet-pana.c +++ b/epan/dissectors/packet-pana.c @@ -21,7 +21,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ /* This protocol implements PANA as of the IETF RFC 5191. - * (Note: This dissector was udated to reflect + * (Note: This dissector was updated to reflect * draft-ietf-pana-pana-18 which is a workitem of the ietf workgroup * internet area/pana. I believe draft-18 then became RFC 5191). */ diff --git a/epan/dissectors/packet-pdc.c b/epan/dissectors/packet-pdc.c index bef702a25d..76aa99f63a 100644 --- a/epan/dissectors/packet-pdc.c +++ b/epan/dissectors/packet-pdc.c @@ -372,7 +372,7 @@ static int dissect_pdc_packet(tvbuff_t *tvb, proto_tree *tree, packet_info *pinf default: break; }; - return (length); /* XXX: returned length ignored by caller: Remove keeping track of data rocessed ? */ + return (length); /* XXX: returned length ignored by caller: Remove keeping track of data processed ? */ /* col_set_str() could then be done separately with 'if (tree)' around the dissection */ } diff --git a/epan/dissectors/packet-pdcp-lte.c b/epan/dissectors/packet-pdcp-lte.c index 9fde6d508a..5c4356a89b 100644 --- a/epan/dissectors/packet-pdcp-lte.c +++ b/epan/dissectors/packet-pdcp-lte.c @@ -509,7 +509,7 @@ static guint pdcp_result_hash_func(gconstpointer v) } /* pdcp_channel_hash_key fits into the pointer, so just copy the value into - a guint, cast to apointer and return that as the key */ + a guint, cast to a pointer and return that as the key */ static gpointer get_channel_hash_key(pdcp_channel_hash_key *key) { guint asInt = 0; diff --git a/epan/dissectors/packet-per.c b/epan/dissectors/packet-per.c index 25fadc2b70..f070808350 100644 --- a/epan/dissectors/packet-per.c +++ b/epan/dissectors/packet-per.c @@ -1784,7 +1784,7 @@ index_get_field_name(const per_sequence_t *sequence, int idx) /* this functions decodes a SEQUENCE it can only handle SEQUENCES with at most 32 DEFAULT or OPTIONAL fields 18.1 extension bit -18.2 optinal/default items in root +18.2 optional/default items in root 18.3 we ignore the case where n>64K 18.4 the root sequence 18.5 @@ -2216,7 +2216,7 @@ guint32 dissect_per_bit_string_containing_pdu_new(tvbuff_t *tvb, guint32 offset, return offset; } -/* this fucntion dissects an OCTET STRING +/* this function dissects an OCTET STRING 16.1 16.2 16.3 diff --git a/epan/dissectors/packet-ppi-gps.c b/epan/dissectors/packet-ppi-gps.c index 75bef2a306..5ea93849f6 100644 --- a/epan/dissectors/packet-ppi-gps.c +++ b/epan/dissectors/packet-ppi-gps.c @@ -468,7 +468,7 @@ proto_register_ppi_gps(void) { { &hf_ppi_gps_present_ept, { "error_t", "ppi_gps.present.ept", FT_BOOLEAN, 32, NULL, PPI_GPS_MASK_EPT, - "Specifies if the estimed time error field is present (ept)", HFILL } }, + "Specifies if the estimated time error field is present (ept)", HFILL } }, { &hf_ppi_gps_present_descr, { "Description", "ppi_gps.present.descr", diff --git a/epan/dissectors/packet-ppi-sensor.c b/epan/dissectors/packet-ppi-sensor.c index aae1a354fe..d9ce4328ca 100644 --- a/epan/dissectors/packet-ppi-sensor.c +++ b/epan/dissectors/packet-ppi-sensor.c @@ -296,7 +296,7 @@ dissect_ppi_sensor(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* da if (tree) { my_pt = proto_tree_add_double(ppi_sensor_tree, hf_ppi_sensor_val_x, tvb, offset, 4, c_val); proto_item_append_text (my_pt, " %s", unit_str); - curr_native_val = c_val * base_10_expt(scalefactor); /* this will almost always be eqaul to the original val */ + curr_native_val = c_val * base_10_expt(scalefactor); /* this will almost always be equal to the original val */ proto_item_set_text(sensor_line, "Sensor: %s %f %s", type_str, curr_native_val, unit_str); } offset+=4; @@ -310,7 +310,7 @@ dissect_ppi_sensor(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* da if (tree) { my_pt = proto_tree_add_double(ppi_sensor_tree, hf_ppi_sensor_val_y, tvb, offset, 4, c_val); proto_item_append_text (my_pt, " %s", unit_str); - curr_native_val = c_val * base_10_expt(scalefactor); /* this will almost always be eqaul to the original val */ + curr_native_val = c_val * base_10_expt(scalefactor); /* this will almost always be equal to the original val */ proto_item_set_text(sensor_line, "Sensor: %s %f %s", type_str, curr_native_val, unit_str); } @@ -325,7 +325,7 @@ dissect_ppi_sensor(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* da if (tree) { my_pt = proto_tree_add_double(ppi_sensor_tree, hf_ppi_sensor_val_z, tvb, offset, 4, c_val); proto_item_append_text (my_pt, " %s", unit_str); - curr_native_val = c_val * base_10_expt(scalefactor); /* this will almost always be eqaul to the original val */ + curr_native_val = c_val * base_10_expt(scalefactor); /* this will almost always be equal to the original val */ proto_item_set_text(sensor_line, "Sensor: %s %f %s", type_str, curr_native_val, unit_str); } offset+=4; @@ -339,7 +339,7 @@ dissect_ppi_sensor(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* da if (tree) { my_pt = proto_tree_add_double(ppi_sensor_tree, hf_ppi_sensor_val_t, tvb, offset, 4, c_val); proto_item_append_text (my_pt, " %s", unit_str); - curr_native_val = c_val * base_10_expt(scalefactor); /* this will almost always be eqaul to the original val */ + curr_native_val = c_val * base_10_expt(scalefactor); /* this will almost always be equal to the original val */ proto_item_set_text(sensor_line, "Sensor: %s %f %s", type_str, curr_native_val, unit_str); } offset+=4; diff --git a/epan/dissectors/packet-ppi-vector.c b/epan/dissectors/packet-ppi-vector.c index ffb6c98f7f..6fcf481307 100644 --- a/epan/dissectors/packet-ppi-vector.c +++ b/epan/dissectors/packet-ppi-vector.c @@ -126,7 +126,7 @@ enum ppi_vector_type { #define PPI_VECTOR_MASK_EXT 0x80000000 /* 31 */ /* There are currently only three vector flags. - * These control the units/interpreration of a vector + * These control the units/interpretation of a vector */ #define PPI_VECTOR_VFLAGS_DEFINES_FORWARD 0x00000001 @@ -269,7 +269,7 @@ static expert_field ei_ppi_vector_present_bit = EI_INIT; static expert_field ei_ppi_vector_length = EI_INIT; -/* We want to abbreviate this field into a single line. Does so without any string maniuplation */ +/* We want to abbreviate this field into a single line. Does so without any string manipulation */ static void annotate_vector_chars(guint32 chars, proto_tree *my_pt) { @@ -734,7 +734,7 @@ dissect_ppi_vector_v2(tvbuff_t *tvb, packet_info *pinfo, int offset, gint length relativeto_str = " RelativeTo: Forward"; } /* - * vchars is another field that we want to pre-process simillar to vflags and for the same reasons. + * vchars is another field that we want to pre-process similar to vflags and for the same reasons. * we perform separate length checks depending on if vector_flags is present (which would precede vector_chars) */ if ( ( (present & PPI_VECTOR_MASK_VFLAGS)) && (present & PPI_VECTOR_MASK_VCHARS) && length_remaining >= 8) @@ -1045,7 +1045,7 @@ proto_register_ppi_vector(void) "Specifies if the Vector flags bitfield is present", HFILL } }, { &hf_ppi_vector_present_vchars, - { "Vector chararacteristics", "ppi_vector.present.chars", + { "Vector characteristics", "ppi_vector.present.chars", FT_BOOLEAN, 32, NULL, PPI_VECTOR_MASK_VCHARS, "Specifies if the Vector chars bitfield is present", HFILL } }, diff --git a/epan/dissectors/packet-ppp.c b/epan/dissectors/packet-ppp.c index dfa923a76a..21ed81bd16 100644 --- a/epan/dissectors/packet-ppp.c +++ b/epan/dissectors/packet-ppp.c @@ -2486,7 +2486,7 @@ dissect_lcp_auth_opt(const ip_tcp_opt *optp, tvbuff_t *tvb, int offset, } } -/* Asuming it's this one: +/* Assuming it's this one: * http://tools.ietf.org/html/draft-ietf-pppext-cobs-00 */ static void diff --git a/epan/dissectors/packet-q932-ros.c b/epan/dissectors/packet-q932-ros.c index af91aa1782..0293df4943 100644 --- a/epan/dissectors/packet-q932-ros.c +++ b/epan/dissectors/packet-q932-ros.c @@ -103,7 +103,7 @@ static expert_field ei_ros_undecoded = EI_INIT; /* Subdissectors */ static dissector_handle_t data_handle = NULL; -/* Gloabl variables */ +/* Global variables */ static rose_ctx_t *rose_ctx_tmp; static guint32 problem_val; diff --git a/epan/dissectors/packet-quakeworld.c b/epan/dissectors/packet-quakeworld.c index d6a775564a..5045e0a009 100644 --- a/epan/dissectors/packet-quakeworld.c +++ b/epan/dissectors/packet-quakeworld.c @@ -209,7 +209,7 @@ Cmd_TokenizeString(const char* text) } if (*text == '\n') { - /* a newline seperates commands in the buffer */ + /* a newline separates commands in the buffer */ text++; break; } diff --git a/epan/dissectors/packet-radius.c b/epan/dissectors/packet-radius.c index 23b3dc3fb9..616a5199ed 100644 --- a/epan/dissectors/packet-radius.c +++ b/epan/dissectors/packet-radius.c @@ -1959,7 +1959,7 @@ dissect_radius(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _ nstime_delta(&delta, &pinfo->fd->abs_ts, &radius_call->req_time); item = proto_tree_add_time(radius_tree, hf_radius_time, tvb, 0, 0, &delta); PROTO_ITEM_SET_GENERATED(item); - /* Resonse Authenticator Validation */ + /* Response Authenticator Validation */ if (validate_authenticator && *shared_secret != '\0') { proto_item * authenticator_tree; diff --git a/epan/dissectors/packet-ranap.c b/epan/dissectors/packet-ranap.c index 7eb32ded92..9f89599092 100644 --- a/epan/dissectors/packet-ranap.c +++ b/epan/dissectors/packet-ranap.c @@ -60,7 +60,7 @@ #define PSNAME "RANAP" #define PFNAME "ranap" -/* Higest Ranap_ProcedureCode_value, use in heuristics */ +/* Highest Ranap_ProcedureCode_value, use in heuristics */ #define RANAP_MAX_PC 45 /* id_RANAPenhancedRelocation = 45 */ diff --git a/epan/dissectors/packet-rdm.c b/epan/dissectors/packet-rdm.c index 87513034fd..105379fc77 100644 --- a/epan/dissectors/packet-rdm.c +++ b/epan/dissectors/packet-rdm.c @@ -2311,7 +2311,7 @@ proto_register_rdm(void) NULL, HFILL }}, { &hf_rdm_pd_manu_label, - { "Manufacturur Label", "rdm.pd.manu_label", + { "Manufacturer Label", "rdm.pd.manu_label", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, @@ -2367,12 +2367,12 @@ proto_register_rdm(void) NULL, HFILL }}, { &hf_rdm_pd_dmx_pers_current, - { "Current DMX Personallity", "rdm.pd.dmx_pers_current", + { "Current DMX Personality", "rdm.pd.dmx_pers_current", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_rdm_pd_dmx_pers_total, - { "Total nr. DMX Personallities", "rdm.pd.dmx_pers_total", + { "Total nr. DMX Personalities", "rdm.pd.dmx_pers_total", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, @@ -2622,7 +2622,7 @@ proto_register_rdm(void) NULL, HFILL }}, { &hf_rdm_pd_parameter_default_value, - { "Delauft Value", "rdm.pd.parameter.default_value", + { "Default Value", "rdm.pd.parameter.default_value", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, diff --git a/epan/dissectors/packet-rfc2190.c b/epan/dissectors/packet-rfc2190.c index e58b3ff582..e6a87bff5c 100644 --- a/epan/dissectors/packet-rfc2190.c +++ b/epan/dissectors/packet-rfc2190.c @@ -138,36 +138,36 @@ dissect_rfc2190( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data /* A flag, 1 bit */ proto_tree_add_bits_item(rfc2190_tree, hf_rfc2190_advanced_prediction, tvb, (offset<<3)+6, 1, ENC_BIG_ENDIAN); - /* Reserved 2nd octect, 1 bit + 3rd octect 3 bits */ + /* Reserved 2nd octet, 1 bit + 3rd octet 3 bits */ proto_tree_add_uint( rfc2190_tree, hf_rfc2190_r, tvb, offset, 2, ( ( tvb_get_guint8( tvb, offset ) & 0x1 ) << 3 ) + ( ( tvb_get_guint8( tvb, offset + 1 ) & 0xe0 ) >> 5 ) ); offset++; - /* DBQ 3 octect, 2 bits */ + /* DBQ 3 octet, 2 bits */ proto_tree_add_item( rfc2190_tree, hf_rfc2190_dbq, tvb, offset, 1, ENC_BIG_ENDIAN ); - /* TRB 3 octect, 3 bits */ + /* TRB 3 octet, 3 bits */ proto_tree_add_item( rfc2190_tree, hf_rfc2190_trb, tvb, offset, 1, ENC_BIG_ENDIAN ); offset++; - /* TR 4 octect, 8 bits */ + /* TR 4 octet, 8 bits */ proto_tree_add_item( rfc2190_tree, hf_rfc2190_tr, tvb, offset, 1, ENC_NA ); offset++; } else { /* MODE B or MODE C */ - /* QUANT 2 octect, 5 bits */ + /* QUANT 2 octet, 5 bits */ proto_tree_add_item( rfc2190_tree, hf_rfc2190_quant, tvb, offset, 1, ENC_NA); offset++; - /* GOBN 3 octect, 5 bits */ + /* GOBN 3 octet, 5 bits */ proto_tree_add_item( rfc2190_tree, hf_rfc2190_gobn, tvb, offset, 1, ENC_NA); - /* MBA 3 octect, 3 bits + 4 octect 6 bits */ + /* MBA 3 octet, 3 bits + 4 octet 6 bits */ proto_tree_add_uint( rfc2190_tree, hf_rfc2190_mba, tvb, offset, 2, ( ( tvb_get_guint8( tvb, offset ) & 0x7 ) << 6 ) + ( ( tvb_get_guint8( tvb, offset + 1 ) & 0xfc ) >> 2 ) ); offset++; - /* Reserved 4th octect, 2 bits */ + /* Reserved 4th octet, 2 bits */ proto_tree_add_uint( rfc2190_tree, hf_rfc2190_r, tvb, offset, 1, ( tvb_get_guint8( tvb, offset ) & 0x3 ) ); offset++; @@ -181,40 +181,40 @@ dissect_rfc2190( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data /* A flag, 1 bit */ proto_tree_add_boolean( rfc2190_tree, hf_rfc2190_advanced_prediction, tvb, offset, 1, tvb_get_guint8( tvb, offset ) & 0x10 ); - /* HMV1 5th octect, 4 bits + 6th octect 3 bits*/ + /* HMV1 5th octet, 4 bits + 6th octet 3 bits*/ proto_tree_add_uint( rfc2190_tree, hf_rfc2190_hmv1, tvb, offset, 2,( ( tvb_get_guint8( tvb, offset ) & 0xf ) << 3 ) + ( ( tvb_get_guint8( tvb, offset+1 ) & 0xe0 ) >> 5) ); offset++; - /* VMV1 6th octect, 5 bits + 7th octect 2 bits*/ + /* VMV1 6th octet, 5 bits + 7th octet 2 bits*/ proto_tree_add_uint( rfc2190_tree, hf_rfc2190_vmv1, tvb, offset, 2,( ( tvb_get_guint8( tvb, offset ) & 0x1f ) << 2 ) + ( ( tvb_get_guint8( tvb, offset+1 ) & 0xc0 ) >> 6) ); offset++; - /* HMV2 7th octect, 6 bits + 8th octect 1 bit*/ + /* HMV2 7th octet, 6 bits + 8th octet 1 bit*/ proto_tree_add_uint( rfc2190_tree, hf_rfc2190_hmv2, tvb, offset, 2,( ( tvb_get_guint8( tvb, offset ) & 0x3f ) << 1 ) + ( ( tvb_get_guint8( tvb, offset+1 ) & 0xf0 ) >> 7) ); offset++; - /* VMV2 8th octect, 7 bits*/ + /* VMV2 8th octet, 7 bits*/ proto_tree_add_item( rfc2190_tree, hf_rfc2190_vmv2, tvb, offset, 1, ENC_NA); offset++; if(rfc2190_version == 0x03) { /* MODE C */ - /* Reserved 9th to 11th octect, 8 + 8 + 3 bits */ + /* Reserved 9th to 11th octet, 8 + 8 + 3 bits */ proto_tree_add_uint( rfc2190_tree, hf_rfc2190_rr, tvb, offset, 3, ( tvb_get_guint8( tvb, offset ) << 11 ) + ( tvb_get_guint8( tvb, offset + 1 ) << 3 ) + ( ( tvb_get_guint8( tvb, offset + 2 ) & 0xe0 ) >> 5 ) ); offset+=2; - /* DBQ 11th octect, 2 bits */ + /* DBQ 11th octet, 2 bits */ proto_tree_add_item( rfc2190_tree, hf_rfc2190_dbq, tvb, offset, 1, ENC_BIG_ENDIAN ); - /* TRB 11th octect, 3 bits */ + /* TRB 11th octet, 3 bits */ proto_tree_add_item( rfc2190_tree, hf_rfc2190_trb, tvb, offset, 1, ENC_BIG_ENDIAN ); offset++; - /* TR 12th octect, 8 bits */ + /* TR 12th octet, 8 bits */ proto_tree_add_uint( rfc2190_tree, hf_rfc2190_tr, tvb, offset, 1, tvb_get_guint8( tvb, offset ) ); offset++; diff --git a/epan/dissectors/packet-rlc.c b/epan/dissectors/packet-rlc.c index 80adde1539..4042fb3df0 100644 --- a/epan/dissectors/packet-rlc.c +++ b/epan/dissectors/packet-rlc.c @@ -521,7 +521,7 @@ static int moduloCompare(guint16 a, guint16 b, guint16 modulus) static guint16 getChannelSNModulus(struct rlc_channel * ch_lookup) { - if( RLC_UM == ch_lookup->mode){ /*FIXME: This is a very heuristic way to detemine SN bitwidth. */ + if( RLC_UM == ch_lookup->mode){ /*FIXME: This is a very heuristic way to determine SN bitwidth. */ return 128; } else { return 4096; @@ -542,7 +542,7 @@ free_sequence_table_entry_data(gpointer data) } } -/** Utility functions used for various comparions/cleanups in tree **/ +/** Utility functions used for various comparisons/cleanups in tree **/ static gint rlc_simple_key_cmp(gconstpointer b_ptr, gconstpointer a_ptr, gpointer ignore _U_){ if( GPOINTER_TO_INT(a_ptr) > GPOINTER_TO_INT(b_ptr) ){ @@ -1139,7 +1139,7 @@ add_fragment(enum rlc_mode mode, tvbuff_t *tvb, packet_info *pinfo, if (frags[start] != NULL) { endlist->list->data = GINT_TO_POINTER(start-1); } - /* NOTE: frags[start] is wmem_alloced and will remain until file closes, we would want to free it here maybe. */ + /* NOTE: frags[start] is wmem_alloc'ed and will remain until file closes, we would want to free it here maybe. */ return NULL; } @@ -1382,7 +1382,7 @@ translate_hex_key(gchar * char_key){ /** @brief Deciphers a given tvb * * Note that the actual KASUMI implementation needs to be placed into - * epan/crypt/kasumi.* by "end users" since due to patents the acutal implementation + * epan/crypt/kasumi.* by "end users" since due to patents the actual implementation * cannot be distributed openly at the moment. * * Refer to 3GPP TS 35.201 and 3GPP TS 35.202 for further information. @@ -1421,7 +1421,7 @@ rlc_decipher_tvb(tvbuff_t *tvb, packet_info *pinfo, guint32 counter, guint8 rbid for(i = 0; i< tvb_captured_length(tvb)-header_size; i++ ){ out[i+header_size] = tvb_get_guint8(tvb, header_size+i); } - /*Call KASUMI confidentiality function, note that rbid is zero indxed*/ + /*Call KASUMI confidentiality function, note that rbid is zero indexed*/ f8( key_in, counter, rbid-1, dir, &out[header_size], (tvb_captured_length(tvb)-header_size)*8 ); /*Restore header in tvb*/ @@ -1509,7 +1509,7 @@ rlc_decipher(tvbuff_t *tvb, packet_info * pinfo, proto_tree * tree, fp_info * fp /*Initializes counter*/ counter_init[rlcinf->rbid[pos]][0] = TRUE; counter_init[rlcinf->rbid[pos]][1] = TRUE; - /*Find apropriate start value*/ + /*Find appropriate start value*/ g_tree_foreach(c_inf->start_ps, (GTraverseFunc)iter_same, &frame_num); /*Set COUNTER value accordingly as specified by 6.4.8 in 3GPP TS 33.102 */ @@ -1706,7 +1706,7 @@ rlc_decode_li(enum rlc_mode mode, tvbuff_t *tvb, packet_info *pinfo, proto_tree offs = 0; break; case RLC_TM: - /* fall trough */ + /* fall through */ case RLC_UNKNOWN_MODE: default: return -1; diff --git a/epan/dissectors/packet-rohc.c b/epan/dissectors/packet-rohc.c index 2048ea164f..c1fbc20342 100644 --- a/epan/dissectors/packet-rohc.c +++ b/epan/dissectors/packet-rohc.c @@ -2380,7 +2380,7 @@ proto_register_rohc(void) static hf_register_info hf[] = { { &hf_rohc_padding, - { "Padding","rohc.pading", + { "Padding","rohc.padding", FT_BYTES, BASE_NONE, NULL, 0x0, NULL , HFILL } diff --git a/epan/dissectors/packet-rsip.c b/epan/dissectors/packet-rsip.c index efd5fb6fbc..ab4a6b96ab 100644 --- a/epan/dissectors/packet-rsip.c +++ b/epan/dissectors/packet-rsip.c @@ -141,7 +141,7 @@ static const value_string addr_type_vals[] = { { 1, "IPv4" }, { 2, "IPv4 Netmask" }, { 3, "IPv6" }, - { 4, "Fully Qualified Doman Name" }, + { 4, "Fully Qualified Domain Name" }, { 0, NULL } }; @@ -800,7 +800,7 @@ rsip_message_query_request(tvbuff_t *tvb, proto_tree *rsip_tree,
::=
- ::= + ::=
*/ diff --git a/epan/dissectors/packet-rsl.c b/epan/dissectors/packet-rsl.c index ac8f37baa9..17a9df1de0 100644 --- a/epan/dissectors/packet-rsl.c +++ b/epan/dissectors/packet-rsl.c @@ -428,7 +428,7 @@ static const value_string rsl_msg_type_vals[] = { /* 0x37 */ { RSL_MSG_REMOTE_CODEC_CONF_REP, "REMOTE CODEC CONFiguration REPort" }, /* 8.4.23 */ /* 0x38 */ { RSL_MSG_R_T_D_REP, "Round Trip Delay REPort" }, /* 8.4.24 */ /* 0x39 */ { RSL_MSG_PRE_HANDO_NOTIF, "PRE-HANDOver NOTIFication" }, /* 8.4.25 */ -/* 0x3a */ { RSL_MSG_MR_CODEC_MOD_REQ, "MultiRate CODEC MODification REQest" }, /* 8.4.26 */ +/* 0x3a */ { RSL_MSG_MR_CODEC_MOD_REQ, "MultiRate CODEC MODification REQuest" }, /* 8.4.26 */ /* 0x3b */ { RSL_MSG_MR_CODEC_MOD_ACK, "MultiRate CODEC MOD ACKnowledge" }, /* 8.4.27 */ /* 0x3c */ { RSL_MSG_MR_CODEC_MOD_NACK, "MultiRate CODEC MOD Negative ACKnowledge" }, /* 8.4.28 */ /* 0x3d */ { RSL_MSG_MR_CODEC_MOD_PER, "MultiRate CODEC MOD PERformed" }, /* 8.4.29 */ diff --git a/epan/dissectors/packet-rsvd.c b/epan/dissectors/packet-rsvd.c index b1be6e5916..eec5612251 100644 --- a/epan/dissectors/packet-rsvd.c +++ b/epan/dissectors/packet-rsvd.c @@ -90,7 +90,7 @@ static gint ett_svhdx_tunnel_file_info_response = -1; static const value_string rsvd_operation_code_vals[] = { { 1, "RSVD_TUNNEL_GET_FILE_INFO" }, { 2, "RSVD_TUNNEL_SCSI" }, - { 3, "RSVD_TUNNEL_CHECK_CONNECTON_STATUS" }, + { 3, "RSVD_TUNNEL_CHECK_CONNECTION_STATUS" }, { 4, "RSVD_TUNNEL_SRB_STATUS" }, { 5, "RSVD_TUNNEL_GET_DISK_INFO" }, { 6, "RSVD_TUNNEL_VALIDATE_DISK" }, diff --git a/epan/dissectors/packet-rtcp.c b/epan/dissectors/packet-rtcp.c index 05d01e5212..f82f32bc00 100644 --- a/epan/dissectors/packet-rtcp.c +++ b/epan/dissectors/packet-rtcp.c @@ -3235,7 +3235,7 @@ static void calculate_roundtrip_delay(tvbuff_t *tvb, packet_info *pinfo, } } -/* Show the calcaulted roundtrip delay info by adding protocol tree items +/* Show the calculated roundtrip delay info by adding protocol tree items and appending text to the info column */ static void add_roundtrip_delay_info(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint frame, guint gap_between_reports, diff --git a/epan/dissectors/packet-s7comm.c b/epan/dissectors/packet-s7comm.c index bf50604565..80e8f3028d 100644 --- a/epan/dissectors/packet-s7comm.c +++ b/epan/dissectors/packet-s7comm.c @@ -334,7 +334,7 @@ static const value_string item_syntaxid_names[] = { */ #define S7COMM_DATA_TRANSPORT_SIZE_NULL 0 #define S7COMM_DATA_TRANSPORT_SIZE_BBIT 3 /* bit access, len is in bits */ -#define S7COMM_DATA_TRANSPORT_SIZE_BBYTE 4 /* byte/word/dword acces, len is in bits */ +#define S7COMM_DATA_TRANSPORT_SIZE_BBYTE 4 /* byte/word/dword access, len is in bits */ #define S7COMM_DATA_TRANSPORT_SIZE_BINT 5 /* integer access, len is in bits */ #define S7COMM_DATA_TRANSPORT_SIZE_BDINT 6 /* integer access, len is in bytes */ #define S7COMM_DATA_TRANSPORT_SIZE_BREAL 7 /* real access, len is in bytes */ @@ -470,7 +470,7 @@ static const value_string userdata_lastdataunit_names[] = { #define S7COMM_UD_FUNCGROUP_CYCLIC 0x2 #define S7COMM_UD_FUNCGROUP_BLOCK 0x3 #define S7COMM_UD_FUNCGROUP_CPU 0x4 -#define S7COMM_UD_FUNCGROUP_SEC 0x5 /* Security funnctions e.g. plc password */ +#define S7COMM_UD_FUNCGROUP_SEC 0x5 /* Security functions e.g. plc password */ #define S7COMM_UD_FUNCGROUP_PBC 0x6 /* PBC = Programmable Block Communication (PBK in german) */ #define S7COMM_UD_FUNCGROUP_TIME 0x7 @@ -579,7 +579,7 @@ static const value_string userdata_prog_subfunc_names[] = { static const value_string userdata_cyclic_subfunc_names[] = { { S7COMM_UD_SUBF_CYCLIC_MEM, "Memory" }, /* read data from memory (DB/M/etc.) */ - { S7COMM_UD_SUBF_CYCLIC_UNSUBSCRIBE, "Unsubscribe" }, /* Unsubcribe (disable) cyclic data */ + { S7COMM_UD_SUBF_CYCLIC_UNSUBSCRIBE, "Unsubscribe" }, /* Unsubscribe (disable) cyclic data */ { 0, NULL } }; @@ -1802,7 +1802,7 @@ static const char mon_names[][4] = { "Jan", "Feb", "Mar", "Apr", "May", "Jun", " /******************************************************************************************************* * * Converts a siemens special timestamp to a string of 25+1 bytes length (e.g. "Apr 15, 2009 12:49:30.520"). - * The timestamp is 6 bytes long, one word is the number of days since 1.1.1984, and 4 bytes millisecods of the day + * The timestamp is 6 bytes long, one word is the number of days since 1.1.1984, and 4 bytes milliseconds of the day * *******************************************************************************************************/ static void @@ -3690,7 +3690,7 @@ s7comm_decode_ud(tvbuff_t *tvb, param_tree = proto_item_add_subtree(item, ett_s7comm_param); /* Try do decode some functions... - * Some functions may use data that does't fit one telegram + * Some functions may use data that doesn't fit one telegram */ offset_temp = offset; /* Save offset */ /* 3 bytes constant head */ @@ -4067,7 +4067,7 @@ dissect_s7comm(tvbuff_t *tvb, /* Show pdu type beside the header tree */ proto_item_append_text(s7comm_header_tree, ": (%s)", val_to_str(rosctr, rosctr_names, "Unknown ROSCTR: 0x%02x")); offset += 1; - /* Redundacy ID, reserved */ + /* Redundancy ID, reserved */ proto_tree_add_item(s7comm_header_tree, hf_s7comm_header_redid, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; /* Protocol Data Unit Reference */ diff --git a/epan/dissectors/packet-s7comm_szl_ids.c b/epan/dissectors/packet-s7comm_szl_ids.c index 0f8eee3af6..5f61c2ea2d 100644 --- a/epan/dissectors/packet-s7comm_szl_ids.c +++ b/epan/dissectors/packet-s7comm_szl_ids.c @@ -146,7 +146,7 @@ static const value_string szl_id_partlist_ex_names[] = { { 0x0781, "Startup information of all OBs of one priority class before processing" }, { 0x0782, "Startup events of all OBs of one priority class before processing" }, { 0x07a0, "All entries of the test and installation function" }, - { 0x0822, "Data records of all interrupts of one class and for which the ccorresponding interrupt OB is loaded, class specified by index" }, + { 0x0822, "Data records of all interrupts of one class and for which the corresponding interrupt OB is loaded, class specified by index" }, { 0x0881, "Startup information of all OBs before processing" }, { 0x0882, "Startup events of all OBs before processing" }, { 0x08a0, "All entries due to operating statuses" }, diff --git a/epan/dissectors/packet-sbc.c b/epan/dissectors/packet-sbc.c index ba2392ed3a..6acf502680 100644 --- a/epan/dissectors/packet-sbc.c +++ b/epan/dissectors/packet-sbc.c @@ -58,10 +58,10 @@ static int hf_sbc_bitpool = -1; static int hf_sbc_crc_check = -1; static int hf_sbc_expected_data_speed = -1; static int hf_sbc_frame_duration = -1; -static int hf_sbc_cummulative_frame_duration = -1; +static int hf_sbc_cumulative_frame_duration = -1; static int hf_sbc_delta_time = -1; static int hf_sbc_delta_time_from_the_beginning = -1; -static int hf_sbc_cummulative_duration = -1; +static int hf_sbc_cumulative_duration = -1; static int hf_sbc_avrcp_song_position = -1; static int hf_sbc_diff = -1; @@ -135,7 +135,7 @@ dissect_sbc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) gint frame_length; gint expected_speed_data; gdouble frame_duration; - gdouble cummulative_frame_duration = 0; + gdouble cumulative_frame_duration = 0; bta2dp_codec_info_t *info; col_set_str(pinfo->cinfo, COL_PROTOCOL, "SBC"); @@ -232,7 +232,7 @@ dissect_sbc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) PROTO_ITEM_SET_GENERATED(pitem); frame_duration = (((double) frame_length / (double) expected_speed_data) * 1000.0); - cummulative_frame_duration += frame_duration; + cumulative_frame_duration += frame_duration; pitem = proto_tree_add_double(rtree, hf_sbc_frame_duration, tvb, offset, 0, frame_duration); proto_item_append_text(pitem, " ms"); @@ -241,7 +241,7 @@ dissect_sbc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) counter += 1; } - pitem = proto_tree_add_double(sbc_tree, hf_sbc_cummulative_frame_duration, tvb, offset, 0, cummulative_frame_duration); + pitem = proto_tree_add_double(sbc_tree, hf_sbc_cumulative_frame_duration, tvb, offset, 0, cumulative_frame_duration); proto_item_append_text(pitem, " ms"); PROTO_ITEM_SET_GENERATED(pitem); @@ -267,15 +267,15 @@ dissect_sbc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) PROTO_ITEM_SET_GENERATED(pitem); if (!pinfo->fd->flags.visited) { - info->current_media_packet_info->cummulative_frame_duration += cummulative_frame_duration; - info->current_media_packet_info->avrcp_song_position += cummulative_frame_duration; + info->current_media_packet_info->cumulative_frame_duration += cumulative_frame_duration; + info->current_media_packet_info->avrcp_song_position += cumulative_frame_duration; } - pitem = proto_tree_add_double(sbc_tree, hf_sbc_cummulative_duration, tvb, offset, 0, info->previous_media_packet_info->cummulative_frame_duration); + pitem = proto_tree_add_double(sbc_tree, hf_sbc_cumulative_duration, tvb, offset, 0, info->previous_media_packet_info->cumulative_frame_duration); proto_item_append_text(pitem, " ms"); PROTO_ITEM_SET_GENERATED(pitem); - pitem = proto_tree_add_double(sbc_tree, hf_sbc_diff, tvb, offset, 0, info->previous_media_packet_info->cummulative_frame_duration - nstime_to_msec(&delta)); + pitem = proto_tree_add_double(sbc_tree, hf_sbc_diff, tvb, offset, 0, info->previous_media_packet_info->cumulative_frame_duration - nstime_to_msec(&delta)); proto_item_append_text(pitem, " ms"); PROTO_ITEM_SET_GENERATED(pitem); } @@ -369,8 +369,8 @@ proto_register_sbc(void) FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, - { &hf_sbc_cummulative_frame_duration, - { "Cummulative Frame Duration", "sbc.cummulative_frame_duration", + { &hf_sbc_cumulative_frame_duration, + { "Cumulative Frame Duration", "sbc.cumulative_frame_duration", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, @@ -384,8 +384,8 @@ proto_register_sbc(void) FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, - { &hf_sbc_cummulative_duration, - { "Cummulative Music Duration", "sbc.cummulative_music_duration", + { &hf_sbc_cumulative_duration, + { "Cumulative Music Duration", "sbc.cumulative_music_duration", FT_DOUBLE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, diff --git a/epan/dissectors/packet-scsi-osd.c b/epan/dissectors/packet-scsi-osd.c index 81bcdafe06..211831a53d 100644 --- a/epan/dissectors/packet-scsi-osd.c +++ b/epan/dissectors/packet-scsi-osd.c @@ -3363,7 +3363,7 @@ dissect_osd_opcode(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, svcaction = tvb_get_ntohs(tvb, offset); if (cdata && cdata->itlq) { /* We must store the service action for this itlq - * so we can indentify what the data contains + * so we can identify what the data contains */ if ((!pinfo->fd->flags.visited) || (!cdata->itlq->extra_data)) { scsi_osd_extra_data_t *extra_data; diff --git a/epan/dissectors/packet-sctp.c b/epan/dissectors/packet-sctp.c index e7519d3401..0865992815 100644 --- a/epan/dissectors/packet-sctp.c +++ b/epan/dissectors/packet-sctp.c @@ -4899,7 +4899,7 @@ proto_register_sctp(void) { &hf_sctp_ack_tsn, { "Acknowledges TSN", "sctp.ack", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_sctp_ack_frame, { "Acknowledges TSN in frame", "sctp.ack_frame", FT_FRAMENUM, BASE_NONE, FRAMENUM_TYPE(FT_FRAMENUM_ACK), 0x0, NULL, HFILL } }, { &hf_sctp_retransmitted_after_ack, { "Chunk was acked prior to retransmission", "sctp.retransmitted_after_ack", FT_FRAMENUM, BASE_NONE, NULL, 0x0, NULL, HFILL } }, - { &hf_sctp_assoc_index, { "Assocation index", "sctp.assoc_index", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL } } + { &hf_sctp_assoc_index, { "Association index", "sctp.assoc_index", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL } } }; diff --git a/epan/dissectors/packet-ses.c b/epan/dissectors/packet-ses.c index 4c8b604adb..b94d77f402 100644 --- a/epan/dissectors/packet-ses.c +++ b/epan/dissectors/packet-ses.c @@ -1589,7 +1589,7 @@ proto_register_ses(void) &hf_beginning_of_SSDU, { "beginning of SSDU", - "ses.begininng_of_SSDU", + "ses.beginning_of_SSDU", FT_BOOLEAN, 8, NULL, BEGINNING_SPDU, diff --git a/epan/dissectors/packet-sigcomp.c b/epan/dissectors/packet-sigcomp.c index d025f0a46a..bb977dfaf0 100644 --- a/epan/dissectors/packet-sigcomp.c +++ b/epan/dissectors/packet-sigcomp.c @@ -1121,7 +1121,7 @@ static void udvm_state_create(guint8 *state_buff,guint8 *state_identifier,guint1 if ( dummy_buff == NULL ) { g_hash_table_insert(state_buffer_table, g_strdup(partial_state_str), state_buff); } else { - /* The buffer allocated by sigcomp-udvm.c wasen't needed so free it + /* The buffer allocated by sigcomp-udvm.c wasn't needed so free it */ g_free(state_buff); @@ -1670,7 +1670,7 @@ decomp_dispatch_get_bits( } /* - * Check we can suppy the required number of bits now, before we alter + * Check we can supply the required number of bits now, before we alter * the input buffer's state. */ if (*remaining_bits + extra_bytes_available * 8 < length) @@ -3084,7 +3084,7 @@ execute_next_instruction: current_address, addr, length, start_value, multy_offset); } current_address = next_operand_address; - /* exetute the instruction + /* execute the instruction * The sequence of values used by the MEMSET instruction is specified by * the following formula: * @@ -4304,7 +4304,7 @@ execute_next_instruction: "Addr: %u ## END-MESSAGE (requested_feedback_location=%u, returned_parameters_location=%u, state_length=%u, state_address=%u, state_instruction=%u, minimum_access_length=%u, state_retention_priority=%u)", current_address, requested_feedback_location, returned_parameters_location, state_length, state_address, state_instruction, minimum_access_length,state_retention_priority); } - /* TODO: This isn't currently totaly correct as END_INSTRUCTION might not create state */ + /* TODO: This isn't currently totally correct as END_INSTRUCTION might not create state */ no_of_state_create++; if ( no_of_state_create > 4 ) { result_code = 12; diff --git a/epan/dissectors/packet-smb.c b/epan/dissectors/packet-smb.c index 1792128e9b..cc43c782a6 100644 --- a/epan/dissectors/packet-smb.c +++ b/epan/dissectors/packet-smb.c @@ -1149,7 +1149,7 @@ feed_eo_smb(guint16 cmd, guint16 fid, tvbuff_t * tvb, packet_info *pinfo, guint1 tap_queue_packet(smb_eo_tap, pinfo, eo_info); } /* feed_eo_smb */ -/* Compare funtion to maintain the GSL_fid_info ordered +/* Compare function to maintain the GSL_fid_info ordered Order criteria: packet where the fid was opened */ static gint fid_cmp(smb_fid_info_t *fida, smb_fid_info_t *fidb) diff --git a/epan/dissectors/packet-snmp.c b/epan/dissectors/packet-snmp.c index 1171832dec..5d9a05d73e 100644 --- a/epan/dissectors/packet-snmp.c +++ b/epan/dissectors/packet-snmp.c @@ -154,7 +154,7 @@ static snmp_ue_assoc_t* localized_ues = NULL; static snmp_ue_assoc_t* unlocalized_ues = NULL; /****/ -/* Variabled used for handling enterprise spesific trap types */ +/* Variabled used for handling enterprise specific trap types */ typedef struct _snmp_st_assoc_t { char *enterprise; guint trap; @@ -3271,7 +3271,7 @@ dissect_snmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_ /* * See if this looks like SNMP or not. if not, return 0 so - * wireshark can try som other dissector instead. + * wireshark can try some other dissector instead. */ /* All SNMP packets are BER encoded and consist of a SEQUENCE * that spans the entire PDU. The first item is an INTEGER that @@ -3286,7 +3286,7 @@ dissect_snmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_ /* then comes a length which spans the rest of the tvb */ offset = get_ber_length(tvb, offset, &tmp_length, &tmp_ind); /* if(tmp_length!=(guint32)tvb_reported_length_remaining(tvb, offset)) { - * Losen the heuristic a bit to handle the case where data has intentionally + * Loosen the heuristic a bit to handle the case where data has intentionally * been added after the snmp PDU ( UDP case) */ if ( pinfo->ptype == PT_UDP ) { diff --git a/epan/dissectors/packet-socks.c b/epan/dissectors/packet-socks.c index 144339d4c9..5c6202bf9f 100644 --- a/epan/dissectors/packet-socks.c +++ b/epan/dissectors/packet-socks.c @@ -230,7 +230,7 @@ static const value_string gssapi_command_table[] = { static const char *get_auth_method_name( guint Number){ -/* return the name of the authenication method */ +/* return the name of the authentication method */ if ( Number == 0) return "No authentication"; if ( Number == 1) return "GSSAPI"; @@ -931,7 +931,7 @@ static void call_next_dissector(tvbuff_t *tvb, int offset, packet_info *pinfo, /* Call TCP dissector for the port that was passed during the */ /* connect process */ /* Load pointer to pinfo->XXXport depending upon the direction, */ -/* change pinfo port to the remote port, call next dissecotr to decode */ +/* change pinfo port to the remote port, call next dissector to decode */ /* the payload, and restore the pinfo port after that is done. */ guint32 *ptr; diff --git a/epan/dissectors/packet-spdy.c b/epan/dissectors/packet-spdy.c index 870f4d30b6..1f358df203 100644 --- a/epan/dissectors/packet-spdy.c +++ b/epan/dissectors/packet-spdy.c @@ -547,7 +547,7 @@ static spdy_stream_info_t* spdy_get_stream_info(spdy_conv_t *conv_data, } /* - * Adds a data chunk to a given SPDY converstaion/stream. + * Adds a data chunk to a given SPDY conversation/stream. */ static void spdy_add_data_chunk(spdy_conv_t *conv_data, guint32 stream_id, diff --git a/epan/dissectors/packet-spice.c b/epan/dissectors/packet-spice.c index 343e2bc872..ea11eda16a 100644 --- a/epan/dissectors/packet-spice.c +++ b/epan/dissectors/packet-spice.c @@ -1834,7 +1834,7 @@ dissect_spice_display_server(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo offset += dissect_Mask(tvb, pinfo, tree, offset); - if (data_size != 5) { /* if it's not a SOLID brush, it's a PATTERN, dissect its image descriptior */ + if (data_size != 5) { /* if it's not a SOLID brush, it's a PATTERN, dissect its image descriptor */ offset += dissect_Image(tvb, tree, pinfo, offset); } break; @@ -3577,7 +3577,7 @@ proto_register_spice(void) NULL, HFILL } }, { &hf_main_cap_semi_migrate, - { "Semi-seamless migratation capability", "spice.main_cap_semi_migrate", + { "Semi-seamless migration capability", "spice.main_cap_semi_migrate", FT_BOOLEAN, 4, TFS(&tfs_set_notset), SPICE_MAIN_CAP_SEMI_SEAMLESS_MIGRATE_MASK, NULL, HFILL } }, @@ -3787,7 +3787,7 @@ proto_register_spice(void) NULL, HFILL } }, { &hf_cursor_trail_visible, - { "Cursor trail visiblity", "spice.cursor_trail_visible", + { "Cursor trail visibility", "spice.cursor_trail_visible", FT_UINT8, BASE_DEC, VALS(cursor_visible_vs), 0x0, NULL, HFILL } }, @@ -3877,7 +3877,7 @@ proto_register_spice(void) NULL, HFILL } }, { &hf_pixmap_address, - { "Pixmap palettte pointer", "spice.pixmap_palette_address", + { "Pixmap palette pointer", "spice.pixmap_palette_address", FT_UINT32, BASE_HEX_DEC, NULL, 0x0, NULL, HFILL } }, @@ -4412,7 +4412,7 @@ proto_register_spice(void) NULL, HFILL } }, { &hf_vd_agent_cap_sparse_monitors_config, - { "Sparse monitors config", "spice.vd_agent_cap_sparese_monitors_config", + { "Sparse monitors config", "spice.vd_agent_cap_sparse_monitors_config", FT_BOOLEAN, 32, TFS(&tfs_set_notset), VD_AGENT_CAP_SPARSE_MONITORS_CONFIG, NULL, HFILL } }, diff --git a/epan/dissectors/packet-sprt.c b/epan/dissectors/packet-sprt.c index 9d3c7b39c0..caf9acc94a 100644 --- a/epan/dissectors/packet-sprt.c +++ b/epan/dissectors/packet-sprt.c @@ -555,8 +555,8 @@ static const value_string sprt_jminfo_tbc_call_funct_name[] = { { SPRT_JMINFO_TBC_CALL_FUNCT_PSTN_MULTIMEDIA_TERM, "PSTN Multimedia terminal (ITU-T Rec. H.324)" }, { SPRT_JMINFO_TBC_CALL_FUNCT_TEXTPHONE_ITU_T_REC_V18, "Textphone (ITU-T Rec. V.18)" }, { SPRT_JMINFO_TBC_CALL_FUNCT_VIDEOTEXT_ITU_T_REC_T101, "Videotext (ITU-T Rec. T.101)" }, - { SPRT_JMINFO_TBC_CALL_FUNCT_TRANS_FAX_ITU_T_REC_T30, "Transmit facsimilie from call terminal (ITU-T Rec. T.30)" }, - { SPRT_JMINFO_TBC_CALL_FUNCT_RECV_FAX_ITU_T_REC_T30, "Receive facsimilie at call terminal (ITU-T Rec. T.30)" }, + { SPRT_JMINFO_TBC_CALL_FUNCT_TRANS_FAX_ITU_T_REC_T30, "Transmit facsimile from call terminal (ITU-T Rec. T.30)" }, + { SPRT_JMINFO_TBC_CALL_FUNCT_RECV_FAX_ITU_T_REC_T30, "Receive facsimile at call terminal (ITU-T Rec. T.30)" }, { SPRT_JMINFO_TBC_CALL_FUNCT_DATA_V_SERIES_MODEM_REC, "Data (V-series modem Recommendations)" }, { 0, NULL } }; @@ -1794,7 +1794,7 @@ proto_register_sprt(void) { &hf_sprt_payload_msg_init_assym_data_types, { - "Assymetrical data types", + "Asymmetrical data types", "sprt.payload.msg_init.assym_data_types", FT_BOOLEAN, 16, diff --git a/epan/dissectors/packet-srvloc.c b/epan/dissectors/packet-srvloc.c index 01f1a5b81c..b16c8c0c39 100644 --- a/epan/dissectors/packet-srvloc.c +++ b/epan/dissectors/packet-srvloc.c @@ -492,7 +492,7 @@ unicode_to_bytes(tvbuff_t *tvb, int offset, int length, gboolean endianness) * The third is the protocol: 6 for TCP, 17 for UDP, and 1000 for IPX. * Last is the IP address, in hex, of the interface that is registered (or, in the case of IPX, an IPX network number). * - * OpenSLP supports multiple attribute replies so we need to parse the attribute name and then decode accourdingly. + * OpenSLP supports multiple attribute replies so we need to parse the attribute name and then decode accordingly. * We currently only parse the (non-utf8) attributes: * svcname * svcaddr @@ -855,7 +855,7 @@ dissect_srvloc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _ encoding = tvb_get_ntohs(tvb, offset + 8); proto_tree_add_item(srvloc_tree, hf_srvloc_encoding, tvb, offset + 8, 2, ENC_BIG_ENDIAN); proto_tree_add_item(srvloc_tree, hf_srvloc_transaction_id, tvb, offset + 10, 2, ENC_BIG_ENDIAN); - /* added echo of XID to info colomn by Greg Morris 0ct 14, 2005 */ + /* added echo of XID to info column by Greg Morris 0ct 14, 2005 */ col_append_fstr(pinfo->cinfo, COL_INFO, ", V1 Transaction ID - %u", tvb_get_ntohs(tvb, offset + 10)); offset += 12; diff --git a/epan/dissectors/packet-ssl.c b/epan/dissectors/packet-ssl.c index 9a310b4f54..02e05dc320 100644 --- a/epan/dissectors/packet-ssl.c +++ b/epan/dissectors/packet-ssl.c @@ -1139,7 +1139,7 @@ again: * which we stopped. * * Convert that back into an offset - * relative to the beginninng of + * relative to the beginning of * "tvb", by taking the length of * "tvb" and subtracting the offset * relative to the end. @@ -2377,7 +2377,7 @@ dissect_ssl2_record(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, } } - /* We have a valid message type, so move foward, filling in the + /* We have a valid message type, so move forward, filling in the * tree by adding the length, is_escape boolean and padding_length, * if present in the original packet */ diff --git a/epan/dissectors/packet-stanag4607.c b/epan/dissectors/packet-stanag4607.c index 54d247dfad..d317e32c7f 100644 --- a/epan/dissectors/packet-stanag4607.c +++ b/epan/dissectors/packet-stanag4607.c @@ -1481,7 +1481,7 @@ proto_register_stanag4607(void) NULL, HFILL } }, { &hf_4607_jobdef_sense_mdv, - { "Nominal Sensor Minimum Dectectable Velocity (MDV)", "s4607.job.sense.mdv", + { "Nominal Sensor Minimum Detectable Velocity (MDV)", "s4607.job.sense.mdv", FT_UINT8, BASE_CUSTOM, CF_FUNC(prt_none8), 0x0, NULL, HFILL } diff --git a/epan/dissectors/packet-synphasor.c b/epan/dissectors/packet-synphasor.c index 326217110c..be7694fdd9 100644 --- a/epan/dissectors/packet-synphasor.c +++ b/epan/dissectors/packet-synphasor.c @@ -1130,7 +1130,7 @@ static gint dissect_DIGUNIT(tvbuff_t *tvb, proto_tree *tree, gint offset, gint c "Masks for digital status words (%u)", cnt); /* Mask words for digital status words. Two 16-bit words for each digital word. The first - * inidcates the normal status of the inputs, the second indicated the valid bits in + * indicates the normal status of the inputs, the second indicated the valid bits in * the status word */ for (i = 0; i < cnt; i++) { diff --git a/epan/dissectors/packet-tcp.c b/epan/dissectors/packet-tcp.c index fa124015a3..2a47c773d6 100644 --- a/epan/dissectors/packet-tcp.c +++ b/epan/dissectors/packet-tcp.c @@ -1515,7 +1515,7 @@ finished_fwd: goto finished_checking_retransmission_type; } - /* If the segment came relativly close since the segment with the highest + /* If the segment came relatively close since the segment with the highest * seen sequence number and it doesn't look like a retransmission * then it is an OUT-OF-ORDER segment. */ @@ -1556,7 +1556,7 @@ finished_checking_retransmission_type: nextseq = seq+seglen; if ((seglen || flags&(TH_SYN|TH_FIN)) && tcpd->fwd->segment_count < TCP_MAX_UNACKED_SEGMENTS) { /* Add this new sequence number to the fwd list. But only if there - * aren't "too many" unacked segements (e.g., we're not seeing the ACKs). + * aren't "too many" unacked segments (e.g., we're not seeing the ACKs). */ ual = wmem_new(wmem_file_scope(), tcp_unacked_t); ual->next=tcpd->fwd->segments; @@ -2191,7 +2191,7 @@ again: } /* The above code only finds retransmission if the PDU boundaries and the seq coinside I think - * If we have sequience analysis active use the TCP_A_RETRANSMISSION flag. + * If we have sequence analysis active use the TCP_A_RETRANSMISSION flag. * XXXX Could the above code be improved? */ if((tcpd->ta) && ((tcpd->ta->flags&TCP_A_RETRANSMISSION) == TCP_A_RETRANSMISSION)){ diff --git a/epan/dissectors/packet-tds.c b/epan/dissectors/packet-tds.c index 2da77ed2a3..1ca4a6770d 100644 --- a/epan/dissectors/packet-tds.c +++ b/epan/dissectors/packet-tds.c @@ -105,7 +105,7 @@ * netlib stuff anyway, so no big loss. * . The older two layer version of the code dissected the PDU's, but the new * version does not yet, it only labels the names. I need an elegant way to - * deal with dissecting data crossing (netlib and tcp) packet boundries. I + * deal with dissecting data crossing (netlib and tcp) packet boundaries. I * think I have one, but ran out of time to do it. * . It will only work on little endian platforms. Or rather I should say, * the client that was captured must be little endian. TDS 7.0/8.0 is @@ -114,7 +114,7 @@ * . result sets that span netlib packets are not working * . TDS 7 and 4.2 result sets are not working yet * - * All that said, the code does deal gracefully with different boudary + * All that said, the code does deal gracefully with different boundary * conditions and what remains are the easier bits, IMHO. * * XXX - "real packets" means "TCP segments", for TCP. diff --git a/epan/dissectors/packet-teamspeak2.c b/epan/dissectors/packet-teamspeak2.c index db63214278..a0b0dbb8f9 100644 --- a/epan/dissectors/packet-teamspeak2.c +++ b/epan/dissectors/packet-teamspeak2.c @@ -1016,25 +1016,25 @@ void proto_register_ts2(void) NULL, HFILL } }, { &hf_ts2_channel_id, - { "Channel Id", "ts2.chanelid", + { "Channel Id", "ts2.channelid", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, { &hf_ts2_channel_name, - { "Channel Name", "ts2.chanelname", + { "Channel Name", "ts2.channelname", FT_STRINGZ, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_ts2_channel_topic, - { "Channel Topic", "ts2.chaneltopic", + { "Channel Topic", "ts2.channeltopic", FT_STRINGZ, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_ts2_channel_description, - { "Channel Description", "ts2.chaneldescription", + { "Channel Description", "ts2.channeldescription", FT_STRINGZ, BASE_NONE, NULL, 0x0, NULL, HFILL } diff --git a/epan/dissectors/packet-tetra.c b/epan/dissectors/packet-tetra.c index f784c08fff..af7605b10e 100644 --- a/epan/dissectors/packet-tetra.c +++ b/epan/dissectors/packet-tetra.c @@ -406,7 +406,7 @@ static int hf_tetra_d_MM_Status = -1; /* D_MM_STATUS */ static int hf_tetra_d_MM_reserved5 = -1; /* NULL */ static int hf_tetra_d_MM_reserved6 = -1; /* NULL */ static int hf_tetra_d_MM_Function_Not_Support = -1; /* NULL */ -static int hf_tetra_attach_detach_identifiet = -1; /* T_attach_detach_identifiet */ +static int hf_tetra_attach_detach_identifier = -1; /* T_attach_detach_identifier */ static int hf_tetra_attach = -1; /* T_attach */ static int hf_tetra_lifetime = -1; /* INTEGER_0_3 */ static int hf_tetra_class_of_usage = -1; /* INTEGER_0_7 */ @@ -417,7 +417,7 @@ static int hf_tetra_gssi_01 = -1; /* OCTET_STRING_SIZE_3 */ static int hf_tetra_gssi_extension = -1; /* T_gssi_extension */ static int hf_tetra_extension = -1; /* OCTET_STRING_SIZE_3 */ static int hf_tetra_vgssi = -1; /* OCTET_STRING_SIZE_3 */ -static int hf_tetra_attach_detach_identifiet_01 = -1; /* T_attach_detach_identifiet_01 */ +static int hf_tetra_attach_detach_identifier_01 = -1; /* T_attach_detach_identifier_01 */ static int hf_tetra_attach_01 = -1; /* T_attach_01 */ static int hf_tetra_detach_01 = -1; /* T_detach_01 */ static int hf_tetra_detach_uplike = -1; /* T_detach_uplike */ @@ -793,13 +793,13 @@ static gint ett_tetra_D_RESTORE_FAIL = -1; static gint ett_tetra_U_MM_PDU = -1; static gint ett_tetra_D_MM_PDU = -1; static gint ett_tetra_GROUP_IDENTITY_DOWNLINK = -1; -static gint ett_tetra_T_attach_detach_identifiet = -1; +static gint ett_tetra_T_attach_detach_identifier = -1; static gint ett_tetra_T_attach = -1; static gint ett_tetra_T_detach = -1; static gint ett_tetra_T_address_type = -1; static gint ett_tetra_T_gssi_extension = -1; static gint ett_tetra_GROUP_IDENTITY_UPLINK = -1; -static gint ett_tetra_T_attach_detach_identifiet_01 = -1; +static gint ett_tetra_T_attach_detach_identifier_01 = -1; static gint ett_tetra_T_attach_01 = -1; static gint ett_tetra_T_detach_01 = -1; static gint ett_tetra_T_address_type_01 = -1; @@ -2611,9 +2611,9 @@ dissect_tetra_T_attach_01(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U static const value_string tetra_T_detach_uplike_vals[] = { { 0, "unknow-gssi" }, - { 1, "unvaild-cipher" }, + { 1, "invalid-cipher" }, { 2, "user-intitial" }, - { 3, "reseverd" }, + { 3, "reserved" }, { 0, NULL } }; @@ -2641,22 +2641,22 @@ dissect_tetra_T_detach_01(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U } -static const value_string tetra_T_attach_detach_identifiet_01_vals[] = { +static const value_string tetra_T_attach_detach_identifier_01_vals[] = { { 0, "attach" }, { 1, "detach" }, { 0, NULL } }; -static const per_choice_t T_attach_detach_identifiet_01_choice[] = { +static const per_choice_t T_attach_detach_identifier_01_choice[] = { { 0, &hf_tetra_attach_01 , ASN1_NO_EXTENSIONS , dissect_tetra_T_attach_01 }, { 1, &hf_tetra_detach_01 , ASN1_NO_EXTENSIONS , dissect_tetra_T_detach_01 }, { 0, NULL, 0, NULL } }; static int -dissect_tetra_T_attach_detach_identifiet_01(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_tetra_T_attach_detach_identifier_01(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, - ett_tetra_T_attach_detach_identifiet_01, T_attach_detach_identifiet_01_choice, + ett_tetra_T_attach_detach_identifier_01, T_attach_detach_identifier_01_choice, NULL); return offset; @@ -2703,7 +2703,7 @@ dissect_tetra_T_address_type_01(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *a static const per_sequence_t GROUP_IDENTITY_UPLINK_sequence[] = { - { &hf_tetra_attach_detach_identifiet_01, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_tetra_T_attach_detach_identifiet_01 }, + { &hf_tetra_attach_detach_identifier_01, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_tetra_T_attach_detach_identifier_01 }, { &hf_tetra_address_type_01, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_tetra_T_address_type_01 }, { NULL, 0, 0, NULL } }; @@ -6193,22 +6193,22 @@ dissect_tetra_T_detach(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, } -static const value_string tetra_T_attach_detach_identifiet_vals[] = { +static const value_string tetra_T_attach_detach_identifier_vals[] = { { 0, "attach" }, { 1, "detach" }, { 0, NULL } }; -static const per_choice_t T_attach_detach_identifiet_choice[] = { +static const per_choice_t T_attach_detach_identifier_choice[] = { { 0, &hf_tetra_attach , ASN1_NO_EXTENSIONS , dissect_tetra_T_attach }, { 1, &hf_tetra_detach , ASN1_NO_EXTENSIONS , dissect_tetra_T_detach }, { 0, NULL, 0, NULL } }; static int -dissect_tetra_T_attach_detach_identifiet(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_tetra_T_attach_detach_identifier(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, - ett_tetra_T_attach_detach_identifiet, T_attach_detach_identifiet_choice, + ett_tetra_T_attach_detach_identifier, T_attach_detach_identifier_choice, NULL); return offset; @@ -6255,7 +6255,7 @@ dissect_tetra_T_address_type(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx static const per_sequence_t GROUP_IDENTITY_DOWNLINK_sequence[] = { - { &hf_tetra_attach_detach_identifiet, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_tetra_T_attach_detach_identifiet }, + { &hf_tetra_attach_detach_identifier, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_tetra_T_attach_detach_identifier }, { &hf_tetra_address_type , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_tetra_T_address_type }, { NULL, 0, 0, NULL } }; @@ -10615,9 +10615,9 @@ void proto_register_tetra (void) { "d-MM-Function-Not-Support", "tetra.d_MM_Function_Not_Support_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_tetra_attach_detach_identifiet, - { "attach-detach-identifiet", "tetra.attach_detach_identifiet", - FT_UINT32, BASE_DEC, VALS(tetra_T_attach_detach_identifiet_vals), 0, + { &hf_tetra_attach_detach_identifier, + { "attach-detach-identifier", "tetra.attach_detach_identifier", + FT_UINT32, BASE_DEC, VALS(tetra_T_attach_detach_identifier_vals), 0, NULL, HFILL }}, { &hf_tetra_attach, { "attach", "tetra.attach_element", @@ -10659,10 +10659,10 @@ void proto_register_tetra (void) { "vgssi", "tetra.vgssi", FT_BYTES, BASE_NONE, NULL, 0, "OCTET_STRING_SIZE_3", HFILL }}, - { &hf_tetra_attach_detach_identifiet_01, - { "attach-detach-identifiet", "tetra.attach_detach_identifiet", - FT_UINT32, BASE_DEC, VALS(tetra_T_attach_detach_identifiet_01_vals), 0, - "T_attach_detach_identifiet_01", HFILL }}, + { &hf_tetra_attach_detach_identifier_01, + { "attach-detach-identifier", "tetra.attach_detach_identifier", + FT_UINT32, BASE_DEC, VALS(tetra_T_attach_detach_identifier_01_vals), 0, + "T_attach_detach_identifier_01", HFILL }}, { &hf_tetra_attach_01, { "attach", "tetra.attach_element", FT_NONE, BASE_NONE, NULL, 0, @@ -11827,13 +11827,13 @@ void proto_register_tetra (void) &ett_tetra_U_MM_PDU, &ett_tetra_D_MM_PDU, &ett_tetra_GROUP_IDENTITY_DOWNLINK, - &ett_tetra_T_attach_detach_identifiet, + &ett_tetra_T_attach_detach_identifier, &ett_tetra_T_attach, &ett_tetra_T_detach, &ett_tetra_T_address_type, &ett_tetra_T_gssi_extension, &ett_tetra_GROUP_IDENTITY_UPLINK, - &ett_tetra_T_attach_detach_identifiet_01, + &ett_tetra_T_attach_detach_identifier_01, &ett_tetra_T_attach_01, &ett_tetra_T_detach_01, &ett_tetra_T_address_type_01, diff --git a/epan/dissectors/packet-tn5250.c b/epan/dissectors/packet-tn5250.c index f0fdc55e02..2c5d14feb9 100644 --- a/epan/dissectors/packet-tn5250.c +++ b/epan/dissectors/packet-tn5250.c @@ -1384,7 +1384,7 @@ static const value_string vals_tn5250_dckf_function_code[] = { /* 15.27.4.3 READ TEXT SCREEN Command */ static const range_string vals_tn5250_rts_partition[] = { - { 0x00, 0x00, "Valid Parition ID" }, + { 0x00, 0x00, "Valid Partition ID" }, { 0x01, 0xFF, "Invalid Partition ID" }, { 0, 0, NULL} }; diff --git a/epan/dissectors/packet-tr.c b/epan/dissectors/packet-tr.c index 813aa67d44..ed55756e38 100644 --- a/epan/dissectors/packet-tr.c +++ b/epan/dissectors/packet-tr.c @@ -191,7 +191,7 @@ tr_hostlist_packet(void *pit, packet_info *pinfo, epan_dissect_t *edt _U_, const * so the frame the sniffer gets is fine (just has extra sr routing). * In the first instance (driver hacking frame in situ) the sniffer gets a garbled * frame. - * This function trys to detect this and returns the offset of where + * This function tries to detect this and returns the offset of where * the frame really starts. * This only detects frames that we have sent ourselves so if we are packet sniffing * on the machine we are watching this is useful. diff --git a/epan/dissectors/packet-turbocell.c b/epan/dissectors/packet-turbocell.c index 2a4ef2684d..637672929b 100644 --- a/epan/dissectors/packet-turbocell.c +++ b/epan/dissectors/packet-turbocell.c @@ -160,7 +160,7 @@ dissect_turbocell(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* dat if (remaining_length > 6) { /* If the first character is a printable character that means we have a payload with network info */ - /* I couldn't find anything in the header that would definitvely indicate if payload is either data or network info */ + /* I couldn't find anything in the header that would definitively indicate if payload is either data or network info */ /* Since the frame size is limited this should work ok */ if (tvb_get_guint8(tvb, 0x14)>=0x20){ diff --git a/epan/dissectors/packet-tzsp.c b/epan/dissectors/packet-tzsp.c index bdc481d6bc..abbe275a29 100644 --- a/epan/dissectors/packet-tzsp.c +++ b/epan/dissectors/packet-tzsp.c @@ -74,7 +74,7 @@ static dissector_handle_t data_handle; static dissector_table_t encap_dissector_table; /* ************************************************************************* */ -/* WLAN radio header felds */ +/* WLAN radio header fields */ /* ************************************************************************* */ static int hf_option_tag = -1; @@ -545,7 +545,7 @@ proto_reg_handoff_tzsp(void) /* Get the data dissector for handling unknown encapsulation types. */ data_handle = find_dissector("data"); - /* Register this protocol as an ecapsulation type. */ + /* Register this protocol as an encapsulation type. */ dissector_add_uint("wtap_encap", WTAP_ENCAP_TZSP, tzsp_handle); encap_dissector_table = find_dissector_table("wtap_encap"); diff --git a/epan/dissectors/packet-ua3g.c b/epan/dissectors/packet-ua3g.c index f1fb094d50..e4b99e7365 100644 --- a/epan/dissectors/packet-ua3g.c +++ b/epan/dissectors/packet-ua3g.c @@ -1127,7 +1127,7 @@ decode_ip_device_routing(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, proto_tree_add_item(ua3g_param_tree, hf_ua3g_ip_device_routing_start_rtp_parameter_value, tvb, offset, parameter_length, ENC_NA); } break; - case 0x06: /* Echo Cancelation Enabler */ + case 0x06: /* Echo Cancellation Enabler */ case 0x07: /* Silence Suppression Enabler */ case 0x0A: /* Post Filtering Enabler */ case 0x0B: /* High Pass Filtering Enabler */ diff --git a/epan/dissectors/packet-umts_mac.c b/epan/dissectors/packet-umts_mac.c index 2751738c74..51e4067f9b 100644 --- a/epan/dissectors/packet-umts_mac.c +++ b/epan/dissectors/packet-umts_mac.c @@ -1075,7 +1075,7 @@ static int dissect_mac_fdd_edch(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t /** * Dissect hsdsch_common channel. * -* This will dissect hsdsch common channels, we handle this seperately +* This will dissect hsdsch common channels, we handle this separately * since we might have to deal with MAC-ehs and or MAC-c headers * (in the MAC PDU). * diff --git a/epan/dissectors/packet-usb.c b/epan/dissectors/packet-usb.c index 4062a2fb6b..64e5a8ba1d 100644 --- a/epan/dissectors/packet-usb.c +++ b/epan/dissectors/packet-usb.c @@ -3465,7 +3465,7 @@ dissect_linux_usb_iso_transfer(packet_info *pinfo _U_, proto_tree *urb_tree, * byte order. The fields coming from the USB communication are in little * endian format (see usb_20.pdf, chapter 8.1 Byte/Bit ordering). * - * When a capture file is transfered to a host with different endianness + * When a capture file is transferred to a host with different endianness * than packet was captured then the necessary swapping happens in * wiretap/pcap-common.c, pcap_byteswap_linux_usb_pseudoheader(). */ diff --git a/epan/dissectors/packet-v5ua.c b/epan/dissectors/packet-v5ua.c index 851051a7c7..c6258ee26b 100644 --- a/epan/dissectors/packet-v5ua.c +++ b/epan/dissectors/packet-v5ua.c @@ -1128,7 +1128,7 @@ static const value_string msg_class_type_values[] = { { MSG_CLASS_MGMT_MSG * 256 + MGMT_MSG_TYPE_TEI_QUERY_REQUEST5, "TEI query request" }, { MSG_CLASS_MGMT_MSG_DRAFT * 256 + MGMT_MSG_DRAFT_TYPE_TEI_STATUS_REQ, "TEI status request" }, - { MSG_CLASS_MGMT_MSG_DRAFT * 256 + MGMT_MSG_DRAFT_TYPE_TEI_STATUS_CON, "TEI status confimation" }, + { MSG_CLASS_MGMT_MSG_DRAFT * 256 + MGMT_MSG_DRAFT_TYPE_TEI_STATUS_CON, "TEI status confirmation" }, { MSG_CLASS_MGMT_MSG_DRAFT * 256 + MGMT_MSG_DRAFT_TYPE_TEI_STATUS_IND, "TEI status indication" }, { MSG_CLASS_MGMT_MSG_DRAFT * 256 + MGMT_MSG_DRAFT_TYPE_TEI_QUERY_REQUEST, "TEI query request" }, { MSG_CLASS_MGMT_MSG_DRAFT * 256 + MGMT_MSG_DRAFT_TYPE_TEI_QUERY_REQUEST5, "TEI query request" }, @@ -1200,7 +1200,7 @@ static const value_string msg_class_type_values_short[] = { { MSG_CLASS_MGMT_MSG * 256 + MGMT_MSG_TYPE_TEI_QUERY_REQUEST5, "TEI query request" }, { MSG_CLASS_MGMT_MSG_DRAFT * 256 + MGMT_MSG_DRAFT_TYPE_TEI_STATUS_REQ, "TEI status request" }, - { MSG_CLASS_MGMT_MSG_DRAFT * 256 + MGMT_MSG_DRAFT_TYPE_TEI_STATUS_CON, "TEI status confimation" }, + { MSG_CLASS_MGMT_MSG_DRAFT * 256 + MGMT_MSG_DRAFT_TYPE_TEI_STATUS_CON, "TEI status confirmation" }, { MSG_CLASS_MGMT_MSG_DRAFT * 256 + MGMT_MSG_DRAFT_TYPE_TEI_STATUS_IND, "TEI status indication" }, { MSG_CLASS_MGMT_MSG_DRAFT * 256 + MGMT_MSG_DRAFT_TYPE_TEI_QUERY_REQUEST, "TEI query request" }, { MSG_CLASS_MGMT_MSG_DRAFT * 256 + MGMT_MSG_DRAFT_TYPE_TEI_QUERY_REQUEST5, "TEI query request" }, diff --git a/epan/dissectors/packet-vrrp.c b/epan/dissectors/packet-vrrp.c index 89324ce1e6..00fa9cf9cd 100644 --- a/epan/dissectors/packet-vrrp.c +++ b/epan/dissectors/packet-vrrp.c @@ -309,7 +309,7 @@ void proto_register_vrrp(void) "IPv6 address associated with the virtual router", HFILL }}, { &hf_vrrp_auth_string, - {"Authentification String", "vrrp.auth_string", + {"Authentication String", "vrrp.auth_string", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, }; @@ -338,7 +338,7 @@ void proto_register_vrrp(void) prefs_register_bool_preference(vrrp_module, "v3_checksum_as_in_v2", "Calculate V3 checksum as in V2 for IPv4 packets", - "There is some ambigiousy on how to calculate V3 checksums" + "There is some ambiguity on how to calculate V3 checksums" "As in V3 will use a pseudo header(which may only be implemented for IPv6 by some manufacturers)", &g_vrrp_v3_checksum_as_in_v2); diff --git a/epan/dissectors/packet-wccp.c b/epan/dissectors/packet-wccp.c index 77ec6eebd4..6a145c539c 100644 --- a/epan/dissectors/packet-wccp.c +++ b/epan/dissectors/packet-wccp.c @@ -2424,7 +2424,7 @@ dissect_wccp2_info(tvbuff_t *tvb, int offset, wccp2r1_alt_assignment_map=FALSE; /* ugly hack: we first need to check for the address table - compnent, otherwise we cannot print the IP's. + component, otherwise we cannot print the IP's. */ find_wccp_address_table(tvb,offset,pinfo,wccp_tree, &wccp_wccp_address_table); @@ -2854,7 +2854,7 @@ proto_register_wccp(void) }, { &hf_item_length, { "Length", "wccp.item_length", FT_UINT16, BASE_DEC, 0x0, 0x0, - "The Length ofthe WCCPv2 item", HFILL } + "The Length of the WCCPv2 item", HFILL } }, { &hf_item_type, { "Type", "wccp.item_type", FT_UINT16, BASE_DEC, VALS(info_type_vals), 0x0, diff --git a/epan/dissectors/packet-wcp.c b/epan/dissectors/packet-wcp.c index 97db350d83..a4cc280ef0 100644 --- a/epan/dissectors/packet-wcp.c +++ b/epan/dissectors/packet-wcp.c @@ -491,7 +491,7 @@ static tvbuff_t *wcp_uncompress( tvbuff_t *src_tvb, int offset, packet_info *pin } /* - * XXX - this will thow an exception if a snapshot length cut short + * XXX - this will throw an exception if a snapshot length cut short * the data. We may want to try to dissect the data in that case, * and we may even want to try to decompress it, *but* we will * want to mark the buffer of decompressed data as incomplete, so @@ -608,7 +608,7 @@ static tvbuff_t *wcp_uncompress( tvbuff_t *src_tvb, int offset, packet_info *pin /* * This is the first pass through * the packets, so copy it to the - * buffer of unco,pressed data. + * buffer of uncompressed data. */ *dst = *src; if ( dst++ == buf_end) diff --git a/epan/dissectors/packet-winsrepl.c b/epan/dissectors/packet-winsrepl.c index a28f9e4457..d1f366da1e 100644 --- a/epan/dissectors/packet-winsrepl.c +++ b/epan/dissectors/packet-winsrepl.c @@ -428,7 +428,7 @@ dissect_winsrepl_wins_name(tvbuff_t *winsrepl_tvb, packet_info *pinfo, /* ALIGN to 4 Byte */ /* winsrepl_offset += ((winsrepl_offset & (4-1)) == 0 ? 0 : (4 - (winsrepl_offset & (4-1)))); */ /* Windows including w2k8 add 4 padding bytes, when it's already 4 byte - * alligned... This happens when the name has a "scope" part + * aligned... This happens when the name has a "scope" part */ winsrepl_offset += 4 - (winsrepl_offset & (4-1)); @@ -550,7 +550,7 @@ dissect_winsrepl_replication(tvbuff_t *winsrepl_tvb, packet_info *pinfo, repl_tree = proto_tree_add_subtree(winsrepl_tree, winsrepl_tvb, winsrepl_offset, -1, ett_winsrepl_replication, &repl_item, "WREPL_REPLICATION"); - /* REPLIICATION_CMD */ + /* REPLICATION_CMD */ command = (enum wrepl_replication_cmd)tvb_get_ntohl(winsrepl_tvb, winsrepl_offset); proto_tree_add_uint(repl_tree, hf_winsrepl_replication_command, winsrepl_tvb, winsrepl_offset, 4, command); winsrepl_offset += 4; diff --git a/epan/dissectors/packet-wps.c b/epan/dissectors/packet-wps.c index 2d99955975..8f9451d5e9 100644 --- a/epan/dissectors/packet-wps.c +++ b/epan/dissectors/packet-wps.c @@ -1673,7 +1673,7 @@ dissect_exteap_wps(proto_tree *eap_tree, tvbuff_t *tvb, int offset, col_append_str(pinfo->cinfo, COL_INFO, ", WPS"); - /* Flag field, if msg-len flag set, add approriate field */ + /* Flag field, if msg-len flag set, add appropriate field */ flags = tvb_get_guint8(tvb,offset); pi = proto_tree_add_item(eap_tree, hf_eapwps_flags, tvb, offset, 1, ENC_BIG_ENDIAN); pt = proto_item_add_subtree(pi, ett_eap_wps_flags); diff --git a/epan/dissectors/packet-xml.c b/epan/dissectors/packet-xml.c index 75899d5549..2cf0aa54c8 100644 --- a/epan/dissectors/packet-xml.c +++ b/epan/dissectors/packet-xml.c @@ -1161,7 +1161,7 @@ static void register_dtd(dtd_build_data_t *dtd_data, GString *errors) root_element->attributes = g_hash_table_new(g_str_hash, g_str_equal); } - /* we then create all the sub hierachies to catch the recurred cases */ + /* we then create all the sub hierarchies to catch the recurred cases */ g_ptr_array_add(hier, root_name); while(root_element->element_names->len) { diff --git a/epan/dissectors/packet-xmpp-utils.c b/epan/dissectors/packet-xmpp-utils.c index ca40e34bc7..9abd8bb381 100644 --- a/epan/dissectors/packet-xmpp-utils.c +++ b/epan/dissectors/packet-xmpp-utils.c @@ -670,7 +670,7 @@ attr_find_pred(gpointer key, gpointer value _U_, gpointer user_data) return FALSE; } -/*Functions returns element's attibute by name and set as read*/ +/*Functions returns element's attribute by name and set as read*/ xmpp_attr_t* xmpp_get_attr(xmpp_element_t *element, const gchar* attr_name) { @@ -687,7 +687,7 @@ xmpp_get_attr(xmpp_element_t *element, const gchar* attr_name) return result; } -/*Functions returns element's attibute by name and namespace abbrev*/ +/*Functions returns element's attribute by name and namespace abbrev*/ static xmpp_attr_t* xmpp_get_attr_ext(xmpp_element_t *element, const gchar* attr_name, const gchar* ns_abbrev) { diff --git a/epan/dissectors/packet-xmpp.c b/epan/dissectors/packet-xmpp.c index 0447484abe..9f37fe907b 100644 --- a/epan/dissectors/packet-xmpp.c +++ b/epan/dissectors/packet-xmpp.c @@ -941,27 +941,27 @@ proto_register_xmpp(void) { { &hf_xmpp_jingle_cont_desc_enc, { "ENCRYPTION", "xmpp.jingle.content.description.encryption", FT_NONE, BASE_NONE, NULL, 0x0, - "iq jingle content descryption encryption", HFILL + "iq jingle content description encryption", HFILL }}, { &hf_xmpp_jingle_cont_desc_enc_zrtp_hash, { "ZRTP-HASH", "xmpp.jingle.content.description.encryption.zrtp-hash", FT_NONE, BASE_NONE, NULL, 0x0, - "iq jingle content descryption encryption zrtp-hash", HFILL + "iq jingle content description encryption zrtp-hash", HFILL }}, { &hf_xmpp_jingle_cont_desc_enc_crypto, { "CRYPTO", "xmpp.jingle.content.description.encryption.crypto", FT_NONE, BASE_NONE, NULL, 0x0, - "iq jingle content descryption encryption crypto", HFILL + "iq jingle content description encryption crypto", HFILL }}, { &hf_xmpp_jingle_cont_desc_bandwidth, { "BANDWIDTH", "xmpp.jingle.content.description.bandwidth", FT_NONE, BASE_NONE, NULL, 0x0, - "iq jingle content descryption bandwidth", HFILL + "iq jingle content description bandwidth", HFILL }}, { &hf_xmpp_jingle_cont_desc_rtp_hdr, { "RTP-HDREXT", "xmpp.jingle.content.description.rtp-hdrext", FT_NONE, BASE_NONE, NULL, 0x0, - "iq jingle content descryption rtp-hdrext", HFILL + "iq jingle content description rtp-hdrext", HFILL }}, { &hf_xmpp_jingle_reason, { @@ -1460,7 +1460,7 @@ proto_register_xmpp(void) { xmpp_module = prefs_register_protocol(proto_xmpp, NULL); prefs_register_bool_preference(xmpp_module, "desegment", - "Reasemble XMPP messages", + "Reassemble XMPP messages", "Whether the XMPP dissector should reassemble messages. " "To use this option, you must also enable" " \"Allow subdissectors to reassemble TCP streams\"" diff --git a/epan/dissectors/packet-xyplex.c b/epan/dissectors/packet-xyplex.c index 33249887d9..f39282a47d 100644 --- a/epan/dissectors/packet-xyplex.c +++ b/epan/dissectors/packet-xyplex.c @@ -107,7 +107,7 @@ dissect_xyplex(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _ offset += 8; /* Look for all future TCP conversations between the - * requestiong server and the Xyplex host using the + * requesting server and the Xyplex host using the * return_port. */ conversation = find_conversation(pinfo->fd->num, &pinfo->src, &pinfo->dst, @@ -141,7 +141,7 @@ dissect_xyplex(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _ /* * This must be the TCP data stream. This will just be - * the raw data being transfered from the remote server + * the raw data being transferred from the remote server * and the Xyplex serial port. */ col_add_fstr(pinfo->cinfo, COL_INFO, "%d > %d Data", diff --git a/epan/dissectors/packet-zbee-aps.c b/epan/dissectors/packet-zbee-aps.c index 930af1daa2..9778046d66 100644 --- a/epan/dissectors/packet-zbee-aps.c +++ b/epan/dissectors/packet-zbee-aps.c @@ -1962,7 +1962,7 @@ void proto_register_zbee_aps(void) { &hf_zbee_aps_cmd_initiator_flag, { "Initiator", "zbee_aps.cmd.init_flag", FT_BOOLEAN, BASE_NONE, NULL, 0x0, - "Inidicates the destination of the transport-key command requested this key.", HFILL }}, + "Indicates the destination of the transport-key command requested this key.", HFILL }}, { &hf_zbee_aps_cmd_device, { "Device Address", "zbee_aps.cmd.device", FT_EUI64, BASE_NONE, NULL, 0x0, diff --git a/epan/dissectors/packet-zbee-nwk-gp.c b/epan/dissectors/packet-zbee-nwk-gp.c index 9d6a596946..56a611fcce 100644 --- a/epan/dissectors/packet-zbee-nwk-gp.c +++ b/epan/dissectors/packet-zbee-nwk-gp.c @@ -382,8 +382,8 @@ static const value_string zbee_nwk_gp_app_id_names[] = { XXX( /*FP*/ ZB_GP_CMD_ID_STEP_HUE_UP , 0x43, "Step Hue Up" ) \ XXX( /*FP*/ ZB_GP_CMD_ID_STEP_HUW_DOWN , 0x44, "Step Hue Down" ) \ XXX( /*F */ ZB_GP_CMD_ID_MOVE_SATURATION_STOP , 0x45, "Move Saturation Stop" ) \ - XXX( /*FP*/ ZB_GP_CMD_ID_MOVE_SATUREATION_UP , 0x46, "Move Saturation Up" ) \ - XXX( /*FP*/ ZB_GP_CMD_ID_MOVE_SATUREATION_DOWN , 0x47, "Move Saturation Down" ) \ + XXX( /*FP*/ ZB_GP_CMD_ID_MOVE_SATURATION_UP , 0x46, "Move Saturation Up" ) \ + XXX( /*FP*/ ZB_GP_CMD_ID_MOVE_SATURATION_DOWN , 0x47, "Move Saturation Down" ) \ XXX( /*FP*/ ZB_GP_CMD_ID_STEP_SATURATION_UP , 0x48, "Step Saturation Up" ) \ XXX( /*FP*/ ZB_GP_CMD_ID_STEP_SATURATION_DOWN , 0x49, "Step Saturation Down" ) \ XXX( /*FP*/ ZB_GP_CMD_ID_MOVE_COLOR , 0x4A, "Move Color" ) \ @@ -816,7 +816,7 @@ dissect_zbee_nwk_gp_cmd_attr_reporting(tvbuff_t *tvb, packet_info *pinfo _U_, pr } /* dissect_zbee_nwk_gp_cmd_attr_reporting */ /** - *Dissector for ZigBee Green Power comissioning reply. + *Dissector for ZigBee Green Power commissioning reply. * *@param tvb pointer to buffer containing raw packet. *@param pinfo pointer to packet information fields. @@ -1031,8 +1031,8 @@ dissect_zbee_nwk_gp_cmd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, voi case ZB_GP_CMD_ID_MOVE_DOWN_WITH_ON_OFF: case ZB_GP_CMD_ID_MOVE_HUE_UP: case ZB_GP_CMD_ID_MOVE_HUE_DOWN: - case ZB_GP_CMD_ID_MOVE_SATUREATION_UP: - case ZB_GP_CMD_ID_MOVE_SATUREATION_DOWN: + case ZB_GP_CMD_ID_MOVE_SATURATION_UP: + case ZB_GP_CMD_ID_MOVE_SATURATION_DOWN: offset = dissect_zbee_nwk_gp_cmd_move_up_down(tvb, pinfo, cmd_tree, packet, offset); break; case ZB_GP_CMD_ID_STEP_UP: diff --git a/epan/dissectors/packet-zbee-nwk.c b/epan/dissectors/packet-zbee-nwk.c index e36d847cc4..a7b1940166 100644 --- a/epan/dissectors/packet-zbee-nwk.c +++ b/epan/dissectors/packet-zbee-nwk.c @@ -1024,7 +1024,7 @@ dissect_zbee_nwk_leave(tvbuff_t *tvb, proto_tree *tree, guint offset) } /* dissect_zbee_nwk_leave */ /** - *Helper dissector for the Reoute Record command. + *Helper dissector for the Route Record command. * *@param tvb pointer to buffer containing raw packet. *@param pinfo pointer to packet information fields diff --git a/epan/dissectors/packet-zbee-security.c b/epan/dissectors/packet-zbee-security.c index 86d4a3e5b7..61500d6528 100644 --- a/epan/dissectors/packet-zbee-security.c +++ b/epan/dissectors/packet-zbee-security.c @@ -451,7 +451,7 @@ zbee_security_handoff(void) * tvbuff_t *tvb - pointer to buffer containing raw packet. * packet_info *pinfo - pointer to packet information fields * proto_tree *tree - pointer to data tree Wireshark uses to display packet. - * guint offset - pointer to the start of the auxilliary security header. + * guint offset - pointer to the start of the auxiliary security header. * guint64 src64 - extended source address, or 0 if unknown. * RETURNS * tvbuff_t * @@ -1148,7 +1148,7 @@ zbee_sec_hash(guint8 *input, guint input_len, guint8 *output) } /* Create the subsequent hash blocks using the formula: Hash[i] = E(Hash[i-1], M[i]) XOR M[i] * - * because we can't garauntee that M will be exactly a multiple of the + * because we can't guarantee that M will be exactly a multiple of the * block size, we will need to copy it into local buffers and pad it. * * Note that we check for the next cipher block at the end of the loop diff --git a/epan/dissectors/packet-zbee-zcl-general.c b/epan/dissectors/packet-zbee-zcl-general.c index fd632f1e3c..a3b4548170 100644 --- a/epan/dissectors/packet-zbee-zcl-general.c +++ b/epan/dissectors/packet-zbee-zcl-general.c @@ -797,7 +797,7 @@ proto_register_zbee_zcl_power_config(void) 0x00, NULL, HFILL } }, { &hf_zbee_zcl_power_config_batt_voltage, - { "Measured Battey Voltage", "zbee_zcl_general.power_config.attr.batt_voltage", FT_UINT8, BASE_CUSTOM, CF_FUNC(decode_power_conf_voltage), + { "Measured Battery Voltage", "zbee_zcl_general.power_config.attr.batt_voltage", FT_UINT8, BASE_CUSTOM, CF_FUNC(decode_power_conf_voltage), 0x00, NULL, HFILL } }, { &hf_zbee_zcl_power_config_batt_ah_rating, @@ -4159,7 +4159,7 @@ dissect_zcl_rssi_location_get_location_data(tvbuff_t *tvb, proto_tree *tree, gui proto_tree_add_bitmask(tree, tvb, *offset, hf_zbee_zcl_rssi_location_header, ett_zbee_zcl_rssi_location_header, location_header_fields, ENC_LITTLE_ENDIAN); *offset += 1; - /* Retrieve the number reponses field */ + /* Retrieve the number responses field */ proto_tree_add_item(tree, hf_zbee_zcl_rssi_location_number_responses, tvb, *offset, 1, ENC_LITTLE_ENDIAN); *offset += 1; @@ -7444,7 +7444,7 @@ dissect_zbee_zcl_part(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* * NAME * dissect_zcl_part_trasfpartframe * DESCRIPTION - * This function manages the Trasfer Partition Frame payload + * This function manages the Transfer Partition Frame payload * PARAMETERS * tvbuff_t *tvb - pointer to buffer containing raw packet. * proto_tree *tree - pointer to data tree Wireshark uses to display packet. @@ -8342,7 +8342,7 @@ dissect_zcl_ota_imageblockreq(tvbuff_t *tvb, proto_tree *tree, guint *offset) /* Check if there are optional fields */ if (field_ctrl & ZBEE_ZCL_OTA_FIELD_CTRL_IEEE_ADDR_PRESENT) { - /* 'Requerst Node Address' field present, retrieves it */ + /* 'Request Node Address' field present, retrieves it */ proto_tree_add_item(tree, hf_zbee_zcl_ota_req_node_addr, tvb, *offset, 8, ENC_LITTLE_ENDIAN); *offset += 8; } @@ -8400,7 +8400,7 @@ dissect_zcl_ota_imagepagereq(tvbuff_t *tvb, proto_tree *tree, guint *offset) /* Check if there are optional fields */ if (field_ctrl & ZBEE_ZCL_OTA_FIELD_CTRL_IEEE_ADDR_PRESENT) { - /* 'Requerst Node Address' field present, retrieves it */ + /* 'Request Node Address' field present, retrieves it */ proto_tree_add_item(tree, hf_zbee_zcl_ota_req_node_addr, tvb, *offset, 8, ENC_LITTLE_ENDIAN); *offset += 8; } @@ -8557,7 +8557,7 @@ dissect_zcl_ota_upgradeendrsp(tvbuff_t *tvb, proto_tree *tree, guint *offset) static void dissect_zcl_ota_queryspecfilereq(tvbuff_t *tvb, proto_tree *tree, guint *offset) { - /* 'Requerst Node Address' field present, retrieves it */ + /* 'Request Node Address' field present, retrieves it */ proto_tree_add_item(tree, hf_zbee_zcl_ota_req_node_addr, tvb, *offset, 8, ENC_LITTLE_ENDIAN); *offset += 8; diff --git a/epan/dissectors/packet-zbee-zcl-se.c b/epan/dissectors/packet-zbee-zcl-se.c index 9c8394339f..8a18fdb6be 100644 --- a/epan/dissectors/packet-zbee-zcl-se.c +++ b/epan/dissectors/packet-zbee-zcl-se.c @@ -591,7 +591,7 @@ proto_register_zbee_zcl_msg(void) 0x0, NULL, HFILL } }, { &hf_zbee_zcl_msg_ext_ctrl_status, - { "Message Confirmation Satus", "zbee_zcl_se.msg.message.ext.ctrl.status", FT_BOOLEAN, 8, TFS(&tfs_confirmed_unconfirmed), + { "Message Confirmation Status", "zbee_zcl_se.msg.message.ext.ctrl.status", FT_BOOLEAN, 8, TFS(&tfs_confirmed_unconfirmed), ZBEE_ZCL_MSG_EXT_CTRL_STATUS_MASK, NULL, HFILL } }, /* End of 'Extended Message Control' fields */ diff --git a/epan/dissectors/packet-zbee-zcl.c b/epan/dissectors/packet-zbee-zcl.c index 6daac375ab..90778b9b9f 100644 --- a/epan/dissectors/packet-zbee-zcl.c +++ b/epan/dissectors/packet-zbee-zcl.c @@ -2205,7 +2205,7 @@ void proto_register_zbee_zcl(void) NULL, HFILL }}, { &hf_zbee_zcl_attr_maxnum, - { "Maxiumum Number", "zbee_zcl.attr.maxnum", FT_UINT8, BASE_DEC, NULL, 0x0, + { "Maximum Number", "zbee_zcl.attr.maxnum", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_zbee_zcl_attr_str_len, diff --git a/epan/dissectors/packet-zep.c b/epan/dissectors/packet-zep.c index ed28255f32..f812a1ac7b 100644 --- a/epan/dissectors/packet-zep.c +++ b/epan/dissectors/packet-zep.c @@ -344,12 +344,12 @@ void proto_reg_handoff_zep(void) if ( !inited) { dissector_handle_t h; /* Get dissector handles. */ - if ( !(h = find_dissector("wpan")) ) { /* Try use built-in 802.15.4 disector */ - h = find_dissector("ieee802154"); /* otherwise use older 802.15.4 plugin disector */ + if ( !(h = find_dissector("wpan")) ) { /* Try use built-in 802.15.4 dissector */ + h = find_dissector("ieee802154"); /* otherwise use older 802.15.4 plugin dissector */ } ieee802154_handle = h; - if ( !(h = find_dissector("wpan_cc24xx")) ) { /* Try use built-in 802.15.4 (Chipcon) disector */ - h = find_dissector("ieee802154_ccfcs"); /* otherwise use older 802.15.4 (Chipcon) plugin disector */ + if ( !(h = find_dissector("wpan_cc24xx")) ) { /* Try use built-in 802.15.4 (Chipcon) dissector */ + h = find_dissector("ieee802154_ccfcs"); /* otherwise use older 802.15.4 (Chipcon) plugin dissector */ } ieee802154_ccfcs_handle = h; data_handle = find_dissector("data"); diff --git a/epan/etypes.h b/epan/etypes.h index 46a46799bf..5af30e5101 100644 --- a/epan/etypes.h +++ b/epan/etypes.h @@ -269,7 +269,7 @@ extern "C" { #endif #ifndef ETHERTYPE_MINT -#define ETHERTYPE_MINT 0x8783 /* Motorola Media Indepentent Network Transport */ +#define ETHERTYPE_MINT 0x8783 /* Motorola Media Independent Network Transport */ #endif #ifndef ETHERTYPE_MAC_CONTROL diff --git a/epan/packet.c b/epan/packet.c index 71c814191b..808d532c29 100644 --- a/epan/packet.c +++ b/epan/packet.c @@ -1722,7 +1722,7 @@ dissector_add_for_decode_as(const char *name, dissector_handle_t handle) } /* Ensure the protocol is unique. This prevents confusion when using Decode As - with duplicative entires */ + with duplicative entries */ if (sub_dissectors->allow_dup_proto == DISSECTOR_TABLE_NOT_ALLOW_DUPLICATE) { for (entry = sub_dissectors->dissector_handles; entry != NULL; entry = g_slist_next(entry)) diff --git a/extcap/androiddump.c b/extcap/androiddump.c index 74ea6ab96b..ba31567936 100644 --- a/extcap/androiddump.c +++ b/extcap/androiddump.c @@ -1607,7 +1607,7 @@ static int capture_android_bluetooth_btsnoop_net(char *interface, char *fifo, uint32_t *reported_length; uint32_t *captured_length; uint32_t *flags; -/* uint32_t *cummulative_dropped_packets; */ +/* uint32_t *cumulative_dropped_packets; */ uint64_t *timestamp; char *payload = packet + sizeof(own_pcap_bluetooth_h4_header) + 24; own_pcap_bluetooth_h4_header *h4_header; @@ -1615,7 +1615,7 @@ static int capture_android_bluetooth_btsnoop_net(char *interface, char *fifo, SET_DATA(reported_length, value_u32, packet + sizeof(own_pcap_bluetooth_h4_header) + 0); SET_DATA(captured_length, value_u32, packet + sizeof(own_pcap_bluetooth_h4_header) + 4); SET_DATA(flags, value_u32, packet + sizeof(own_pcap_bluetooth_h4_header) + 8); -/* SET_DATA(cummulative_dropped_packets, value_u32, packet + sizeof(own_pcap_bluetooth_h4_header) + 12); */ +/* SET_DATA(cumulative_dropped_packets, value_u32, packet + sizeof(own_pcap_bluetooth_h4_header) + 12); */ SET_DATA(timestamp, value_u64, packet + sizeof(own_pcap_bluetooth_h4_header) + 16); SET_DATA(h4_header, value_own_pcap_bluetooth_h4_header, payload - sizeof(own_pcap_bluetooth_h4_header)); diff --git a/file.c b/file.c index d7f13bb7a2..ad3363c39b 100644 --- a/file.c +++ b/file.c @@ -1877,7 +1877,7 @@ rescan_packets(capture_file *cf, const char *action, const char *action_item, gb /* - * Scan trough all frame data and recalculate the ref time + * 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? */ diff --git a/fileset.c b/fileset.c index 2d022957a5..60bb6d5223 100644 --- a/fileset.c +++ b/fileset.c @@ -254,7 +254,7 @@ void fileset_update_dlg(void *window) GList *le; - /* add all entires to the dialog */ + /* add all entries to the dialog */ le = g_list_first(set.entries); while(le) { fileset_dlg_add_file((fileset_entry *)le->data, window); @@ -327,7 +327,7 @@ fileset_get_current(void) fileset_entry *entry; - /* add all entires to the dialog */ + /* add all entries to the dialog */ le = g_list_first(set.entries); while(le) { entry = (fileset_entry *)le->data; diff --git a/pcapio.c b/pcapio.c index 9020acd4a3..ce2a90d0c1 100644 --- a/pcapio.c +++ b/pcapio.c @@ -117,7 +117,7 @@ struct shb { }; #define SECTION_HEADER_BLOCK_TYPE 0x0A0D0D0A -/* Interface Decription Block without options and trailing Block Total Length */ +/* Interface Description Block without options and trailing Block Total Length */ struct idb { guint32 block_type; guint32 block_total_length; diff --git a/pdml2html.xsl b/pdml2html.xsl index 746f1e0a05..996cf49d12 100644 --- a/pdml2html.xsl +++ b/pdml2html.xsl @@ -64,7 +64,7 @@