diff options
54 files changed, 146 insertions, 146 deletions
diff --git a/epan/dissectors/file-file.c b/epan/dissectors/file-file.c index 35767a6370..07b6280caa 100644 --- a/epan/dissectors/file-file.c +++ b/epan/dissectors/file-file.c @@ -101,7 +101,7 @@ dissect_file_record(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) pinfo->current_proto = "File"; - /* if FILE is not referenced from any filters we dont need to worry about + /* if FILE is not referenced from any filters we don't need to worry about generating any tree items. */ if(!proto_field_is_referenced(tree, proto_file)) { tree=NULL; diff --git a/epan/dissectors/packet-afs.c b/epan/dissectors/packet-afs.c index b9aba67e96..7be8558f85 100644 --- a/epan/dissectors/packet-afs.c +++ b/epan/dissectors/packet-afs.c @@ -1961,7 +1961,7 @@ dissect_acl(tvbuff_t *tvb, struct rxinfo *rxinfo _U_, proto_tree *tree, int offs if (sscanf(GETSTR, "%d %n", &pos, &n) != 1) { /* does not matter what we return, if this fails, - * we cant dissect anything else in the packet either. + * we can't dissect anything else in the packet either. */ return offset; } diff --git a/epan/dissectors/packet-ancp.c b/epan/dissectors/packet-ancp.c index 7036c31ff1..c3d75727e7 100644 --- a/epan/dissectors/packet-ancp.c +++ b/epan/dissectors/packet-ancp.c @@ -588,7 +588,7 @@ dissect_ancp_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* if (mtype != ANCP_MTYPE_ADJ) { /* Dissect common header */ proto_tree_add_item(ancp_tree, hf_ancp_result, tvb, offset, 1, - ENC_BIG_ENDIAN); /* treat as 1B, but dont change offset */ + ENC_BIG_ENDIAN); /* treat as 1B, but don't change offset */ proto_tree_add_item(ancp_tree, hf_ancp_code, tvb, offset, 2, ENC_BIG_ENDIAN); @@ -603,7 +603,7 @@ dissect_ancp_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* offset += 3; proto_tree_add_item(ancp_tree, hf_ancp_i_flag, tvb, offset, 1, - ENC_BIG_ENDIAN); /* treat as 1B, but dont change offset */ + ENC_BIG_ENDIAN); /* treat as 1B, but don't change offset */ sti = proto_tree_add_item(ancp_tree, hf_ancp_submsg_num, tvb, offset, 2, ENC_BIG_ENDIAN); diff --git a/epan/dissectors/packet-aoe.c b/epan/dissectors/packet-aoe.c index 3a892137f4..f6046e76cb 100644 --- a/epan/dissectors/packet-aoe.c +++ b/epan/dissectors/packet-aoe.c @@ -305,7 +305,7 @@ dissect_ata_pdu(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset, } else { proto_tree_add_item(tree, hf_aoe_astatus, tvb, offset, 1, ENC_BIG_ENDIAN); if(ata_info != NULL && ata_info->request_frame){ - /* we dont know what command it was unless we saw the request_frame */ + /* we don't know what command it was unless we saw the request_frame */ tmp_item=proto_tree_add_uint(tree, hf_aoe_acmd, tvb, 0, 0, ata_info->cmd); PROTO_ITEM_SET_GENERATED(tmp_item); col_append_fstr(pinfo->cinfo, COL_INFO, " ATA:%s", val_to_str(ata_info->cmd, ata_cmd_vals, " Unknown ATA<0x%02x>")); diff --git a/epan/dissectors/packet-ber.c b/epan/dissectors/packet-ber.c index c55076921b..6a1ebf5096 100644 --- a/epan/dissectors/packet-ber.c +++ b/epan/dissectors/packet-ber.c @@ -2421,7 +2421,7 @@ printf("SEQUENCE dissect_ber_sequence(%s) subdissector ate %d bytes\n", name, co seq++; } - /* if we didnt end up at exactly offset, then we ate too many bytes */ + /* if we didn't end up at exactly offset, then we ate too many bytes */ if (offset != end_offset) { tvb_ensure_bytes_exist(tvb, offset-2, 2); cause = proto_tree_add_string_format_value( @@ -2693,7 +2693,7 @@ printf("SET dissect_ber_set(%s) calling subdissector\n", name); } } - /* if we didnt end up at exactly offset, then we ate too many bytes */ + /* if we didn't end up at exactly offset, then we ate too many bytes */ if (offset != end_offset) { tvb_ensure_bytes_exist(tvb, offset-2, 2); cause = proto_tree_add_string_format_value( @@ -2936,7 +2936,7 @@ printf("CHOICE dissect_ber_choice(%s) trying again\n", name); /*XXX here we should have another flag to the CHOICE to distinguish * between the case when we know it is a mandatory or if the CHOICE is optional == no arm matched */ - /* oops no more entries and we still havent found + /* oops no more entries and we still haven't found * our guy :-( */ item = proto_tree_add_string_format_value( @@ -3353,7 +3353,7 @@ printf("SQ OF dissect_ber_sq_of(%s) entered\n", name); offset = get_ber_identifier(tvb, offset, NULL, NULL, NULL); offset = get_ber_length(tvb, offset, &len, &ind); /* best place to get real length of implicit sequence of or set of is here... */ - /* adjust end_offset if we find somthing that doesnt match */ + /* adjust end_offset if we find somthing that doesn't match */ offset += len; cnt++; if (offset <= s_offset) { @@ -3468,13 +3468,13 @@ printf("SQ OF dissect_ber_sq_of(%s) entered\n", name); /* call the dissector for this field */ seq->func(imp_tag, next_tvb, 0, actx, tree, *seq->p_id); /* hold on if we are implicit and the result is zero, i.e. the item in the sequence of - doesnt match the next item, thus this implicit sequence is over, return the number of bytes + doesn't match the next item, thus this implicit sequence is over, return the number of bytes we have eaten to allow the possible upper sequence continue... */ cnt++; /* rubbish*/ offset = eoffset; } - /* if we didnt end up at exactly offset, then we ate too many bytes */ + /* if we didn't end up at exactly offset, then we ate too many bytes */ if (offset != end_offset) { tvb_ensure_bytes_exist(tvb, offset-2, 2); causex = proto_tree_add_string_format_value( diff --git a/epan/dissectors/packet-ber.h b/epan/dissectors/packet-ber.h index 6a76b15b6a..2597bfa279 100644 --- a/epan/dissectors/packet-ber.h +++ b/epan/dissectors/packet-ber.h @@ -48,7 +48,7 @@ typedef int (*ber_type_fn)(gboolean, tvbuff_t*, int, asn1_ctx_t *actx, proto_tre #define BER_CLASS_APP 1 #define BER_CLASS_CON 2 #define BER_CLASS_PRI 3 -#define BER_CLASS_ANY 99 /* dont check class nor tag */ +#define BER_CLASS_ANY 99 /* don't check class nor tag */ #define BER_UNI_TAG_EOC 0 /* 'end-of-content' */ #define BER_UNI_TAG_BOOLEAN 1 diff --git a/epan/dissectors/packet-bvlc.c b/epan/dissectors/packet-bvlc.c index 6807c0a611..a8e6fbc046 100644 --- a/epan/dissectors/packet-bvlc.c +++ b/epan/dissectors/packet-bvlc.c @@ -188,7 +188,7 @@ dissect_bvlc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_ switch (bvlc_function) { case 0x00: /* BVLC-Result */ bvlc_result = tvb_get_ntohs(tvb, offset); - /* I dont know why the result code is encoded in 4 nibbles, + /* I don't know why the result code is encoded in 4 nibbles, * but only using one: 0x00r0. Shifting left 4 bits. */ /* We should bitmask the result correctly when we have a diff --git a/epan/dissectors/packet-cisco-sm.c b/epan/dissectors/packet-cisco-sm.c index 9c98bd900e..d79e9377c9 100644 --- a/epan/dissectors/packet-cisco-sm.c +++ b/epan/dissectors/packet-cisco-sm.c @@ -344,7 +344,7 @@ dissect_sm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset = offset + 2; proto_item_set_len(ti, 8); - /* This should be the EISUP dissector but we havent got one + /* This should be the EISUP dissector but we haven't got one * right now - so decode it as data for now ... */ next_tvb = tvb_new_subset_length(tvb, offset, length); call_dissector(data_handle, next_tvb, pinfo, sm_tree); diff --git a/epan/dissectors/packet-dcerpc-netlogon.c b/epan/dissectors/packet-dcerpc-netlogon.c index d573bbc25d..386447eb19 100644 --- a/epan/dissectors/packet-dcerpc-netlogon.c +++ b/epan/dissectors/packet-dcerpc-netlogon.c @@ -1023,7 +1023,7 @@ netlogon_dissect_LOGON_IDENTITY_INFO(tvbuff_t *tvb, int offset, hf_netlogon_workstation, 0); #ifdef REMOVED - /* NetMon does not recognize these bytes. Ill comment them out until someone complains */ + /* NetMon does not recognize these bytes. I'll comment them out until someone complains */ /* XXX 8 extra bytes here */ /* there were 8 extra bytes, either here or in NETWORK_INFO that does not match the idl file. Could be a bug in either the NETLOGON implementation or in the @@ -4837,7 +4837,7 @@ netlogon_dissect_netrgetanydcname_reply(tvbuff_t *tvb, int offset, * According to muddle this is what CONTROL_DATA_INFORMATION is supposed * to look like. However NetMon does not recognize any such informationlevels. * - * Ill leave it as CONTROL_DATA_INFORMATION with no informationlevels + * I'll leave it as CONTROL_DATA_INFORMATION with no informationlevels * until someone has any source of better authority to call upon. */ static int diff --git a/epan/dissectors/packet-dcerpc-nt.c b/epan/dissectors/packet-dcerpc-nt.c index b80fcd589f..6bd61cbd51 100644 --- a/epan/dissectors/packet-dcerpc-nt.c +++ b/epan/dissectors/packet-dcerpc-nt.c @@ -1071,7 +1071,7 @@ PIDL_dissect_policy_hnd(tvbuff_t *tvb, gint offset, packet_info *pinfo, param&PIDL_POLHND_OPEN, param&PIDL_POLHND_CLOSE, HND_TYPE_CTX_HANDLE); - /* If this was an open/create and we dont yet have a policy name + /* If this was an open/create and we don't yet have a policy name * then create one. * XXX We do not yet have the infrastructure to know the name of the * actual object so just show it as <...> for the time being. @@ -1365,7 +1365,7 @@ dissect_ndr_nt_SID28(tvbuff_t *tvb, int offset, packet_info *pinfo, newoffset = dissect_nt_sid(tvb, offset, tree, name, &sid_str, hf_nt_domain_sid); - /* The dissected stuff cant be more than 28 bytes */ + /* The dissected stuff can't be more than 28 bytes */ if ((newoffset - offset) > 28) { item = proto_tree_get_parent(tree->last_child); expert_add_info(pinfo, item, &ei_dcerpc_nt_badsid); diff --git a/epan/dissectors/packet-dcerpc.c b/epan/dissectors/packet-dcerpc.c index 0dc9359dfb..d643926294 100644 --- a/epan/dissectors/packet-dcerpc.c +++ b/epan/dissectors/packet-dcerpc.c @@ -2400,7 +2400,7 @@ add_pointer_to_list(packet_info *pinfo, proto_tree *tree, proto_item *item, } } } else { - /* if we haven't seen the request bail out since we cant + /* if we haven't seen the request bail out since we can't know whether this is the first non-NULL instance or not */ if (value->req_frame == 0) { diff --git a/epan/dissectors/packet-dvbci.c b/epan/dissectors/packet-dvbci.c index a8556b340e..f7dfe2987c 100644 --- a/epan/dissectors/packet-dvbci.c +++ b/epan/dissectors/packet-dvbci.c @@ -3399,7 +3399,7 @@ dissect_sac_msg(guint32 tag, tvbuff_t *tvb, gint offset, sac_payload_len), ENC_NA); /* we call this function also to dissect exported SAC messages, - dont' try to export them a second time */ + don't try to export them a second time */ if (!exported && is_exportable && have_tap_listener(exported_pdu_tap)) { tvbuff_t *clear_sac_msg_tvb; diff --git a/epan/dissectors/packet-eigrp.c b/epan/dissectors/packet-eigrp.c index 04869c7706..aa1e0db248 100644 --- a/epan/dissectors/packet-eigrp.c +++ b/epan/dissectors/packet-eigrp.c @@ -149,7 +149,7 @@ * External routes originate from some other protocol - these are them */ #define NULL_PROTID 0 /*!< unknown protocol */ -#define IGRP1_PROTID 1 /*!< IGRP.. whos your daddy! */ +#define IGRP1_PROTID 1 /*!< IGRP.. who's your daddy! */ #define IGRP2_PROTID 2 /*!< EIGRP - Just flat out the best */ #define STATIC_PROTID 3 /*!< Staticly configured source */ #define RIP_PROTID 4 /*!< Routing Information Protocol */ @@ -2557,7 +2557,7 @@ dissect_eigrp (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _ * * @usage * you can not have the function name inside a comment or else Wireshark - * will fail with "duplicate protocol" error. Dont you hate it when tools + * will fail with "duplicate protocol" error. Don't you hate it when tools * try to be to smart :( * * @par diff --git a/epan/dissectors/packet-esis.c b/epan/dissectors/packet-esis.c index f9595f6032..ffb99e1bee 100644 --- a/epan/dissectors/packet-esis.c +++ b/epan/dissectors/packet-esis.c @@ -133,7 +133,7 @@ static void esis_dissect_redirect_pdu( guint8 len, tvbuff_t *tvb, * that we make sure we don't go off the end of the bleedin packet here! * * This is just a copy of isis.c and isis.h, so I keep the stuff also - * and adapt the names to cover possible protocol errors! Ive really no + * and adapt the names to cover possible protocol errors! I've really no * idea whether I need this or not. * * Input diff --git a/epan/dissectors/packet-eth.c b/epan/dissectors/packet-eth.c index e475909dce..30773c5e91 100644 --- a/epan/dissectors/packet-eth.c +++ b/epan/dissectors/packet-eth.c @@ -422,7 +422,7 @@ dissect_eth_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, fh_tree = proto_item_add_subtree(ti, ett_ieee8023); } - /* if IP is not referenced from any filters we dont need to worry about + /* if IP is not referenced from any filters we don't need to worry about generating any tree items. We must do this after we created the actual protocol above so that proto hier stat still works though. */ diff --git a/epan/dissectors/packet-fcip.c b/epan/dissectors/packet-fcip.c index f5c32c559e..4778c5640e 100644 --- a/epan/dissectors/packet-fcip.c +++ b/epan/dissectors/packet-fcip.c @@ -170,7 +170,7 @@ get_next_fcip_header_offset (tvbuff_t *tvb, packet_info *pinfo, gint offset) * c) Replication of encapsulation word 0 in word 1 (1 test); * d) Reserved field and its ones complement (2 tests); * e) Flags field and its ones complement (2 tests); - * f) CRC field is equal to zero (1 test); (DONT DO THIS TEST!) + * f) CRC field is equal to zero (1 test); (DON'T DO THIS TEST!) * g) SOF fields and ones complement fields (4 tests); * h) Format and values of FC header (1 test); * i) CRC of FC Frame (2 tests); @@ -270,7 +270,7 @@ NXT_BYTE: while (bytes_remaining) { /* Test f - * We dont test this since some implementations actually provide + * We don't test this since some implementations actually provide * a CRC here. */ diff --git a/epan/dissectors/packet-frame.c b/epan/dissectors/packet-frame.c index e58f91a74c..66b87fd839 100644 --- a/epan/dissectors/packet-frame.c +++ b/epan/dissectors/packet-frame.c @@ -263,7 +263,7 @@ dissect_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) } - /* if FRAME is not referenced from any filters we dont need to worry about + /* if FRAME is not referenced from any filters we don't need to worry about generating any tree items. */ if(!proto_field_is_referenced(tree, proto_frame)) { tree=NULL; diff --git a/epan/dissectors/packet-giop.c b/epan/dissectors/packet-giop.c index 8de212b862..8bfe8e0435 100644 --- a/epan/dissectors/packet-giop.c +++ b/epan/dissectors/packet-giop.c @@ -1041,7 +1041,7 @@ static GList *insert_in_comp_req_list(GList *list, guint32 fn, guint32 reqid, co entry->reqid = reqid; entry->subh = sh; entry->operation = wmem_strdup(wmem_file_scope(), op); /* duplicate operation for storage */ - entry->repoid = NULL; /* dont have yet */ + entry->repoid = NULL; /* don't have yet */ return g_list_append (list, entry); /* append */ } @@ -2068,7 +2068,7 @@ static gboolean try_explicit_giop_dissector(tvbuff_t *tvb, packet_info *pinfo, p /* Take in an array of char and create a new ephemeral string. * Replace non-printable characters with periods. * - * The array may contain \0's so dont use strdup + * The array may contain \0's so don't use strdup * The string is \0 terminated, and thus longer than * the initial sequence. */ @@ -3646,7 +3646,7 @@ guint32 get_CDR_wstring(tvbuff_t *tvb, const gchar **seq, int *offset, gboolean *seq = NULL; /* set in case GIOP 1.2 length is 0 */ /* get length, same for all GIOP versions, - * although for 1.2 CORBA doesnt say, so assume. + * although for 1.2 CORBA doesn't say, so assume. */ slength = get_CDR_ulong(tvb, offset, stream_is_big_endian, boundary); @@ -3818,7 +3818,7 @@ static void decode_UnknownServiceContext(tvbuff_t *tvb, proto_tree *tree, return; /* - * Decode sequence according to vendor ServiceId, but I dont + * Decode sequence according to vendor ServiceId, but I don't * have that yet, so just dump it as data. */ diff --git a/epan/dissectors/packet-giop.h b/epan/dissectors/packet-giop.h index f60832bd46..e02222dd11 100644 --- a/epan/dissectors/packet-giop.h +++ b/epan/dissectors/packet-giop.h @@ -536,7 +536,7 @@ WS_DLL_PUBLIC guint32 get_CDR_encap_info(tvbuff_t *tvb, proto_tree *tree, gint * /* Take in an array of char and create a new ephemeral string. * Replace non-printable characters with periods. * - * The array may contain \0's so dont use strdup + * The array may contain \0's so don't use strdup * The string is \0 terminated, and thus longer than * the initial sequence. */ diff --git a/epan/dissectors/packet-gssapi.c b/epan/dissectors/packet-gssapi.c index 4a94e335aa..fcb949d7ff 100644 --- a/epan/dissectors/packet-gssapi.c +++ b/epan/dissectors/packet-gssapi.c @@ -636,7 +636,7 @@ wrap_dissect_gssapi_payload(tvbuff_t *data_tvb, tvbuff_t *auth_tvb, { tvbuff_t *result; - /* we need a full auth and a full data tvb or else we cant + /* we need a full auth and a full data tvb or else we can't decrypt anything */ if((!auth_tvb)||(!data_tvb)){ diff --git a/epan/dissectors/packet-gtp.c b/epan/dissectors/packet-gtp.c index b7de941498..1225fb20d9 100644 --- a/epan/dissectors/packet-gtp.c +++ b/epan/dissectors/packet-gtp.c @@ -3085,7 +3085,7 @@ gtp_match_response(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, gint if (gcrp) { g_hash_table_remove(gtp_info->unmatched, gcrp); } - /* if we cant reuse the old one, grab a new chunk */ + /* if we can't reuse the old one, grab a new chunk */ if (!gcrp) { gcrp = wmem_new(wmem_file_scope(), gtp_msg_hash_t); } diff --git a/epan/dissectors/packet-ifcp.c b/epan/dissectors/packet-ifcp.c index ad2963602d..68f2b86529 100644 --- a/epan/dissectors/packet-ifcp.c +++ b/epan/dissectors/packet-ifcp.c @@ -150,7 +150,7 @@ static dissector_handle_t fc_handle=NULL; /* This function checks the first 16 bytes of the "header" that it looks sane - * and returns TRUE if this looks like iFCP and FALSE if it doesnt. + * and returns TRUE if this looks like iFCP and FALSE if it doesn't. */ static gboolean ifcp_header_test(tvbuff_t *tvb, int offset) @@ -183,7 +183,7 @@ ifcp_header_test(tvbuff_t *tvb, int offset) * c) Replication of encapsulation word 0 in word 1 (1 test); * d) Reserved field and its ones complement (2 tests); * e) Flags field and its ones complement (2 tests); - * f) CRC field is equal to zero (1 test); (DONT DO THIS TEST!) + * f) CRC field is equal to zero (1 test); (DON'T DO THIS TEST!) * g) SOF fields and ones complement fields (4 tests); * h) Format and values of FC header (1 test); * i) CRC of FC Frame (2 tests); @@ -535,7 +535,7 @@ dissect_ifcp_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat conversation_t* ifcp_conv; ifcp_conv=find_or_create_conversation(pinfo); - /* XXX why does this not work? it doesnt result in dissect_ifcp_handle being called look into later*/ + /* XXX why does this not work? it doesn't result in dissect_ifcp_handle being called look into later*/ conversation_set_dissector(ifcp_conv, ifcp_handle); } diff --git a/epan/dissectors/packet-iscsi.c b/epan/dissectors/packet-iscsi.c index 280706c7d7..6a4b5fb961 100644 --- a/epan/dissectors/packet-iscsi.c +++ b/epan/dissectors/packet-iscsi.c @@ -545,7 +545,7 @@ iscsi_dissect_TargetAddress(packet_info *pinfo, proto_tree *tree _U_,char *val) *pgt++ = 0; } - /* cant handle ipv6 yet */ + /* can't handle ipv6 yet */ } } else { /* This is either a ipv4 address or a dns name */ @@ -1616,7 +1616,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 dont want the immediata below to overwrite our CDB info */ + /* we don't want the immediata below to overwrite our CDB info */ col_set_fence(pinfo->cinfo, COL_INFO); /* where there any ImmediateData ? */ @@ -2377,7 +2377,7 @@ dissect_iscsi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolean chec case ISCSI_DIGEST_NONE: break; case ISCSI_DIGEST_AUTO: - /* oops we didnt know what digest is used yet */ + /* oops we don't yet know what digest is used */ /* here we should use some default */ break; default: diff --git a/epan/dissectors/packet-knet.c b/epan/dissectors/packet-knet.c index bff29425cc..2a2c19998b 100644 --- a/epan/dissectors/packet-knet.c +++ b/epan/dissectors/packet-knet.c @@ -645,7 +645,7 @@ dissect_knet_udp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if(tvb_get_guint8(tvb, 0) & UDP_DATAGRAM_RELIABLE_FLAG) offset += dissect_reliable_message_index_base(tvb, 3, datagram_tree); /* Calculate RMIB */ - while ((tvb_length_remaining(tvb, offset) > 2) && /* If theres at least 2 bytes available in the buffer */ + while ((tvb_length_remaining(tvb, offset) > 2) && /* If there's at least 2 bytes available in the buffer */ (dissect_content_length(tvb, offset, NULL) > 0)) /* Empty data Abort */ { offset += dissect_knet_message(tvb, pinfo, knet_tree, offset, messageindex); /* Call the message subdissector */ diff --git a/epan/dissectors/packet-lapdm.c b/epan/dissectors/packet-lapdm.c index 9f84d03d3e..5ed9353907 100644 --- a/epan/dissectors/packet-lapdm.c +++ b/epan/dissectors/packet-lapdm.c @@ -258,7 +258,7 @@ dissect_lapdm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } control = dissect_xdlc_control(tvb, 1, pinfo, lapdm_tree, hf_lapdm_control, - ett_lapdm_control, &lapdm_cf_items, NULL /* LAPDm doesnt support extended */, NULL, NULL, + ett_lapdm_control, &lapdm_cf_items, NULL /* LAPDm doesn't support extended */, NULL, NULL, is_response, FALSE, FALSE); if (tree) { diff --git a/epan/dissectors/packet-mac-lte.c b/epan/dissectors/packet-mac-lte.c index 62ea587e68..e36ff68435 100644 --- a/epan/dissectors/packet-mac-lte.c +++ b/epan/dissectors/packet-mac-lte.c @@ -3002,7 +3002,7 @@ static void TrackReportedDLHARQResend(packet_info *pinfo, tvbuff_t *tvb, volatil thisData->received_time = pinfo->fd->abs_ts; } else { - /* Not first time, so just set whats already stored in result */ + /* Not first time, so just set what's already stored in result */ result = (DLHARQResult *)g_hash_table_lookup(mac_lte_dl_harq_result_hash, GUINT_TO_POINTER(pinfo->fd->num)); } @@ -3153,7 +3153,7 @@ static void TrackReportedULHARQResend(packet_info *pinfo, tvbuff_t *tvb, volatil thisData->received_time = pinfo->fd->abs_ts; } else { - /* Not first time, so just get whats already stored in result */ + /* Not first time, so just get what's already stored in result */ result = (ULHARQResult *)g_hash_table_lookup(mac_lte_ul_harq_result_hash, GUINT_TO_POINTER(pinfo->fd->num)); } diff --git a/epan/dissectors/packet-ncp-nmas.c b/epan/dissectors/packet-ncp-nmas.c index e29f88ffee..4133c65c7d 100644 --- a/epan/dissectors/packet-ncp-nmas.c +++ b/epan/dissectors/packet-ncp-nmas.c @@ -305,7 +305,7 @@ dissect_nmas_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ncp_tree, nc break; } foffset += 4; - foffset += 4; /* Dont know what this is */ + foffset += 4; /* Don't know what this is */ proto_tree_add_item(atree, hf_length, tvb, foffset, 4, ENC_LITTLE_ENDIAN); msg_length = tvb_get_letohl(tvb, foffset); foffset += 4; diff --git a/epan/dissectors/packet-nfs.c b/epan/dissectors/packet-nfs.c index 20664108ce..90b5852386 100644 --- a/epan/dissectors/packet-nfs.c +++ b/epan/dissectors/packet-nfs.c @@ -1045,7 +1045,7 @@ nfs_name_snoop_add_fh(int xid, tvbuff_t *tvb, int fh_offset, int fh_length) /* find which request we correspond to */ nns = (nfs_name_snoop_t *)g_hash_table_lookup(nfs_name_snoop_unmatched, GINT_TO_POINTER(xid)); if (!nns) { - /* oops couldnt find matching request, bail out */ + /* oops couldn't find matching request, bail out */ return; } diff --git a/epan/dissectors/packet-nisplus.c b/epan/dissectors/packet-nisplus.c index 4dfed6dc9f..edff55d14f 100644 --- a/epan/dissectors/packet-nisplus.c +++ b/epan/dissectors/packet-nisplus.c @@ -720,7 +720,7 @@ dissect_nisplus_object(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree return offset; } /* xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx - end of nis object, thats right, all this was the definition of + end of nis object, that's right, all this was the definition of ONE SINGLE struct. */ diff --git a/epan/dissectors/packet-nt-tpcp.c b/epan/dissectors/packet-nt-tpcp.c index 4d03c3ccc4..3f27f9a3f9 100644 --- a/epan/dissectors/packet-nt-tpcp.c +++ b/epan/dissectors/packet-nt-tpcp.c @@ -41,7 +41,7 @@ typedef struct _tpcppdu_t { guint8 type; /* PDU type: 1=request, 2=reply, 3=add filter, 4=rem filter */ /* Version 2 adds 5=add session 6= remove session */ guint16 flags; /* 0x0001: 0=UDP, 1=TCP*/ - /* 0x0002: 0=NONE, 1=DONT REDIRECT */ + /* 0x0002: 0=NONE, 1=DONT_REDIRECT */ /* 0x0004: 0=NONE, 1=Xon */ /* 0x0008: 0=NONE, 1=Xoff */ guint16 id; /* request/response identification or TTL */ diff --git a/epan/dissectors/packet-per.c b/epan/dissectors/packet-per.c index 536ebdf1e8..67b7cf1c2e 100644 --- a/epan/dissectors/packet-per.c +++ b/epan/dissectors/packet-per.c @@ -477,7 +477,7 @@ DEBUG_ENTRY("dissect_per_normally_small_nonnegative_whole_number"); /* this function reads a GeneralString */ -/* currently based on pure guesswork since RFC2833 didnt tell me much +/* currently based on pure guesswork since RFC2833 didn't tell me much i guess that the PER encoding for this is a normally-small-whole-number followed by a ascii string. diff --git a/epan/dissectors/packet-pktc.c b/epan/dissectors/packet-pktc.c index 36bfb369cd..299af7a9cb 100644 --- a/epan/dissectors/packet-pktc.c +++ b/epan/dissectors/packet-pktc.c @@ -192,7 +192,7 @@ dissect_pktc_app_specific_data(packet_info *pinfo, proto_tree *parent_tree, tvbu switch(doi){ case DOI_SNMPv3: switch(kmmid){ - /* we dont distinguish between manager and agent engineid. + /* we don't distinguish between manager and agent engineid. feel free to add separation for this if it is imporant enough for you. */ case KMMID_AP_REQUEST: @@ -228,12 +228,12 @@ dissect_pktc_app_specific_data(packet_info *pinfo, proto_tree *parent_tree, tvbu break; default: proto_tree_add_expert(tree, pinfo, &ei_pktc_unknown_kmmid, tvb, offset, 1); - THROW(ReportedBoundsError); /* bail out and inform user we cant dissect the packet */ + THROW(ReportedBoundsError); /* bail out and inform user we can't dissect the packet */ }; break; case DOI_IPSEC: switch(kmmid){ - /* we dont distinguish between SPIs for inbound Security Associations + /* we don't distinguish between SPIs for inbound Security Associations of the client (AP-REQ) vs. server (AP-REP, REKEY). Feel free to add separation for this if it is imporant enough for you. */ case KMMID_AP_REQUEST: @@ -246,12 +246,12 @@ dissect_pktc_app_specific_data(packet_info *pinfo, proto_tree *parent_tree, tvbu break; default: proto_tree_add_expert(tree, pinfo, &ei_pktc_unknown_kmmid, tvb, offset, 1); - THROW(ReportedBoundsError); /* bail out and inform user we cant dissect the packet */ + THROW(ReportedBoundsError); /* bail out and inform user we can't dissect the packet */ }; break; default: proto_tree_add_expert(tree, pinfo, &ei_pktc_unknown_doi, tvb, offset, 1); - THROW(ReportedBoundsError); /* bail out and inform user we cant dissect the packet */ + THROW(ReportedBoundsError); /* bail out and inform user we can't dissect the packet */ } proto_item_set_len(item, offset-old_offset); @@ -307,7 +307,7 @@ dissect_pktc_list_of_ciphersuites(packet_info *pinfo _U_, proto_tree *parent_tre break; default: proto_tree_add_expert(tree, pinfo, &ei_pktc_unknown_doi, tvb, offset, 1); - THROW(ReportedBoundsError); /* bail out and inform user we cant dissect the packet */ + THROW(ReportedBoundsError); /* bail out and inform user we can't dissect the packet */ } proto_item_set_len(item, offset-old_offset); diff --git a/epan/dissectors/packet-ppi-vector.c b/epan/dissectors/packet-ppi-vector.c index 9f126a99ce..28ddc5ced8 100644 --- a/epan/dissectors/packet-ppi-vector.c +++ b/epan/dissectors/packet-ppi-vector.c @@ -728,7 +728,7 @@ dissect_ppi_vector_v2(tvbuff_t *tvb, packet_info *pinfo, int offset, gint length if (flags & PPI_VECTOR_VFLAGS_DEFINES_FORWARD) proto_item_append_text(vector_line, " (Forward)"); - /* Intentionally dont upset offset, length_remaining. This is taken care of in the normal vflags parser below*/ + /* Intentionally don't upset offset, length_remaining. This is taken care of in the normal vflags parser below*/ } else /* No vflags means vlfags defaults to zero. RelativeTo: Forward */ { @@ -747,7 +747,7 @@ dissect_ppi_vector_v2(tvbuff_t *tvb, packet_info *pinfo, int offset, gint length { /* Mark the most interesting characteristics on the vector dropdown line */ annotate_vector_chars(chars, vector_line); - /* Intentionally dont update offset, length_remaining. This is taken care of in the normal vchars parser below*/ + /* Intentionally don't update offset, length_remaining. This is taken care of in the normal vchars parser below*/ } /* Now all of the fixed length, fixed location stuff is over. Loop over the bits */ diff --git a/epan/dissectors/packet-quake3.c b/epan/dissectors/packet-quake3.c index c0bc9b194f..1a7b961fb9 100644 --- a/epan/dissectors/packet-quake3.c +++ b/epan/dissectors/packet-quake3.c @@ -343,7 +343,7 @@ dissect_quake3_server_commands(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { /* It is totally forbidden to decode this any further, - I wont do it. */ + I won't do it. */ call_dissector(data_handle,tvb, pinfo, tree); } diff --git a/epan/dissectors/packet-rlc.c b/epan/dissectors/packet-rlc.c index be0690f17f..d9e83eefd3 100644 --- a/epan/dissectors/packet-rlc.c +++ b/epan/dissectors/packet-rlc.c @@ -1435,7 +1435,7 @@ rlc_decipher_tvb(tvbuff_t *tvb, packet_info *pinfo, guint32 counter, guint8 rbid /*Location for decrypted data*/ out = g_malloc( tvb_length(tvb) ); - /*Build data input but dont send the header*/ + /*Build data input but don't send the header*/ for(i = 0; i< tvb_length(tvb)-header_size; i++ ){ out[i+header_size] = tvb_get_guint8(tvb, header_size+i); } @@ -1513,7 +1513,7 @@ rlc_decipher(tvbuff_t *tvb, packet_info * pinfo, proto_tree * tree, fp_info * fp /*Ciphering info singled in RRC by securitymodecommands */ c_inf = (rrc_ciphering_info *)g_tree_lookup(rrc_ciph_inf, GINT_TO_POINTER((gint)fpinf->com_context_id)); - /*TODO: This doesnt really work for all packets..*/ + /*TODO: This doesn't really work for all packets..*/ /*Check if we have ciphering info and that this frame is ciphered*/ if(c_inf!=NULL && ( (c_inf->setup_frame > 0 && c_inf->setup_frame < pinfo->fd->num && c_inf->seq_no[rlcinf->rbid[pos]][indx] == -1) || (c_inf->setup_frame < pinfo->fd->num && c_inf->seq_no[rlcinf->rbid[pos]][indx] >= 0 && c_inf->seq_no[rlcinf->rbid[pos]][indx] <= seq) )){ @@ -1552,7 +1552,7 @@ rlc_decipher(tvbuff_t *tvb, packet_info * pinfo, proto_tree * tree, fp_info * fp /*Update the maximal COUNTER value seen so far*/ max_counter = MAX(max_counter,((ps_counter[rlcinf->rbid[pos]][indx]) | seq) >> hfn_shift); - /*XXX:Since RBID in umts isnt configured properly..*/ + /*XXX: Since RBID in umts isn't configured properly..*/ if(rlcinf->rbid[pos] == 9 ){ if(tree){ guint32 frame_num[3]; diff --git a/epan/dissectors/packet-rpc.c b/epan/dissectors/packet-rpc.c index edcb224d20..5effaa77da 100644 --- a/epan/dissectors/packet-rpc.c +++ b/epan/dissectors/packet-rpc.c @@ -1479,7 +1479,7 @@ dissect_rpc_authgss_priv_data(tvbuff_t *tvb, proto_tree *tree, int offset, ENC_NA); - /* cant decrypt if we dont have SPNEGO */ + /* can't decrypt if we don't have SPNEGO */ if (!spnego_krb5_wrap_handle) { offset += length; return offset; @@ -1921,7 +1921,7 @@ dissect_rpc_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, return FALSE; } - /* XID can be anything, so dont check it. + /* XID can be anything, so don't check it. We already have the message type. Check whether an RPC version number of 2 is in the location where it would be, and that an RPC program diff --git a/epan/dissectors/packet-rtcp.c b/epan/dissectors/packet-rtcp.c index c9cc134bfd..25f2431994 100644 --- a/epan/dissectors/packet-rtcp.c +++ b/epan/dissectors/packet-rtcp.c @@ -2231,7 +2231,7 @@ dissect_rtcp_xr(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tree *tree, guint8 thinning = 0; /*gboolean valid = TRUE;*/ - /* Create a subtree for this block, dont know the length yet*/ + /* Create a subtree for this block, don't know the length yet*/ proto_item *block; proto_tree *xr_block_tree = proto_tree_add_subtree_format(tree, tvb, offset, -1, ett_xr_block, &block, "Block %u", block_num); proto_tree *content_tree; diff --git a/epan/dissectors/packet-rx.c b/epan/dissectors/packet-rx.c index 74ddd5968b..b8956fc807 100644 --- a/epan/dissectors/packet-rx.c +++ b/epan/dissectors/packet-rx.c @@ -160,7 +160,7 @@ dissect_rx_response_encrypted(tvbuff_t *tvb, proto_tree *parent_tree, int offset proto_tree_add_item(tree, hf_rx_cid, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - /*FIXME dont know how to handle this checksum, skipping it */ + /*FIXME don't know how to handle this checksum, skipping it */ offset += 4; /* sequrityindex : 1 byte */ @@ -372,16 +372,16 @@ dissect_rx_acks(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, int offset += 1; } - /* Some implementations adds some extra fields. + /* Some implementations add some extra fields. * As far as I can see, these first add 3 padding bytes and then * up to 4 32-bit values. (0,3,4 have been witnessed) * - * RX as a protocol seems to be completely nondefined and seems to lack + * RX as a protocol seems to be completely undefined and seems to lack * any sort of documentation other than "read the source of any of the * (compatible?) implementations. */ if (tvb_length_remaining(tvb, offset)>3) { - offset += 3; /* guess. some implementations adds 3 bytes */ + offset += 3; /* guess. some implementations add 3 bytes */ if (tvb_reported_length_remaining(tvb, offset) >= 4){ proto_tree_add_item(tree, hf_rx_maxmtu, tvb, offset, 4, @@ -535,8 +535,8 @@ dissect_rx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void *dat switch (type) { case RX_PACKET_TYPE_ACK: /*dissect_rx_acks(tvb, pinfo, parent_tree, offset, - cant create it in a parallell tree, then ett seasrch - wont work */ + can't create it in a parallel tree, then ett search + won't work */ dissect_rx_acks(tvb, pinfo, tree, offset, seq, callnumber); break; diff --git a/epan/dissectors/packet-scsi.c b/epan/dissectors/packet-scsi.c index 78fc2a8552..a6f6ea75a7 100644 --- a/epan/dissectors/packet-scsi.c +++ b/epan/dissectors/packet-scsi.c @@ -6026,7 +6026,7 @@ dissect_scsi_payload(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, } - /* If we dont know the CDB opcode there is no point in trying to + /* If we don't know the CDB opcode there is no point in trying to * dissect the data. */ if ( !itlq->first_exchange_frame ) { @@ -6046,7 +6046,7 @@ dissect_scsi_payload(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, } } - /* If we dont have the entire PDU there is no point in even trying + /* If we don't have the entire PDU there is no point in even trying * reassembly */ if (tvb_length_remaining(tvb, offset) != tvb_reported_length_remaining(tvb, offset)) { @@ -6072,7 +6072,7 @@ dissect_scsi_payload(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, expected_length = itlq->data_length; } - /* If this PDU already contains all the expected data we dont have to do + /* If this PDU already contains all the expected data we don't have to do * reassembly. */ if ( (!relative_offset) && ((guint32)tvb_length_remaining(tvb, offset) == expected_length) ) { @@ -6105,7 +6105,7 @@ dissect_scsi_payload(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, dissect_the_payload: if (!next_tvb) { - /* reassembly has not yet finished so we dont have a tvb yet */ + /* reassembly has not yet finished so we don't have a tvb yet */ goto end_of_payload; } if (tree == NULL) { @@ -6133,7 +6133,7 @@ dissect_the_payload: } else if (spc[opcode].func) { spc[opcode].func(next_tvb, pinfo, scsi_tree, offset, isreq, FALSE, payload_len, cdata); - } else { /* dont know this CDB */ + } else { /* don't know this CDB */ call_dissector(data_handle, next_tvb, pinfo, scsi_tree); } } diff --git a/epan/dissectors/packet-scsi.h b/epan/dissectors/packet-scsi.h index ecf511dd83..c94a2f1363 100644 --- a/epan/dissectors/packet-scsi.h +++ b/epan/dissectors/packet-scsi.h @@ -283,8 +283,8 @@ extern value_string_ext scsi_asc_val_ext; } else { \ /* We probably tried to dissect beyond the end \ * of the alloc len reported in the data \ - * pdu. This is not an error so dont flag it as \ - * one \ + * pdu. This is not an error so don't flag it \ + * as one \ * it is the alloc_len in the CDB that is the \ * important one \ */ \ diff --git a/epan/dissectors/packet-sigcomp.c b/epan/dissectors/packet-sigcomp.c index c6f6156b22..cfc10f4eec 100644 --- a/epan/dissectors/packet-sigcomp.c +++ b/epan/dissectors/packet-sigcomp.c @@ -436,7 +436,7 @@ try_again: octet = tvb_get_guint8(tvb,offset); if ( octet == 0xff ){ if ( offset +1 >= length ){ - /* if the tvb is short dont check for the second escape digit */ + /* if the tvb is short don't check for the second escape digit */ offset++; continue; } @@ -475,7 +475,7 @@ try_again: proto_tree_add_text(sigcomp_tree, tvb, offset, octet, " Copying %u bytes literally",octet); if( offset+octet >= length) - /* if the tvb is short dont copy further than the end */ + /* if the tvb is short don't copy further than the end */ octet = length - offset; for ( n=0; n < octet; n++ ){ buff[i] = tvb_get_guint8(tvb, offset); diff --git a/epan/dissectors/packet-smb-pipe.c b/epan/dissectors/packet-smb-pipe.c index 193dc53be7..e34003ee07 100644 --- a/epan/dissectors/packet-smb-pipe.c +++ b/epan/dissectors/packet-smb-pipe.c @@ -2638,7 +2638,7 @@ dissect_pipe_lanman(tvbuff_t *pd_tvb, tvbuff_t *p_tvb, tvbuff_t *d_tvb, offset += 2; if(!trp){ - return FALSE; /* cant dissect this request */ + return FALSE; /* can't dissect this request */ } /* @@ -3294,7 +3294,7 @@ dissect_pipe_dcerpc(tvbuff_t *d_tvb, packet_info *pinfo, proto_tree *parent_tree */ result = dissector_try_heuristic(smb_transact_heur_subdissector_list, d_tvb, pinfo, parent_tree, &hdtbl_entry, NULL); - /* no this didnt look like something we know */ + /* no this didn't look like something we know */ if(!result){ goto clean_up_and_exit; } @@ -3360,14 +3360,14 @@ dissect_pipe_dcerpc(tvbuff_t *d_tvb, packet_info *pinfo, proto_tree *parent_tree fd_head=fragment_add_check(&dcerpc_reassembly_table, d_tvb, 0, pinfo, fid, NULL, 0, 0, TRUE); if(!fd_head){ - /* we didnt find it, try any of the heuristic dissectors + /* we didn't find it, try any of the heuristic dissectors and bail out */ result = dissector_try_heuristic(smb_transact_heur_subdissector_list, d_tvb, pinfo, parent_tree, &hdtbl_entry, NULL); goto clean_up_and_exit; } if(!(fd_head->flags&FD_DEFRAGMENTED)){ - /* we dont have a fully reassembled frame */ + /* we don't have a fully reassembled frame */ result = dissector_try_heuristic(smb_transact_heur_subdissector_list, d_tvb, pinfo, parent_tree, &hdtbl_entry, NULL); goto clean_up_and_exit; } diff --git a/epan/dissectors/packet-smb-sidsnooping.c b/epan/dissectors/packet-smb-sidsnooping.c index 65a583b566..c2c51f8154 100644 --- a/epan/dissectors/packet-smb-sidsnooping.c +++ b/epan/dissectors/packet-smb-sidsnooping.c @@ -349,7 +349,7 @@ sid_snooping_init(void) /* this code needs to be rewritten from scratch - disabling it now so that it wont cause wireshark to abort due to + disabling it now so that it won't cause wireshark to abort due to unknown hf fields */ sid_name_snooping=0; diff --git a/epan/dissectors/packet-smb.c b/epan/dissectors/packet-smb.c index 951ba8009a..5720800bbd 100644 --- a/epan/dissectors/packet-smb.c +++ b/epan/dissectors/packet-smb.c @@ -6857,7 +6857,7 @@ dissect_write_andx_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, the first two bytes of the payload is the length of the data. Assume that all WriteAndX PDUs that have MESSAGE_START set to be over the IPC$ share and thus they all transport DCERPC. - (if we didnt already know that from the TreeConnect call) + (if we didn't already know that from the TreeConnect call) */ if (mode&WRITE_MODE_MESSAGE_START) { if (mode&WRITE_MODE_RAW) { @@ -7039,7 +7039,7 @@ dissect_session_setup_andx_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree if (!ntlmssp_tap_id) { GString *error_string; - /* We dont specify any callbacks at all. + /* We don't specify any callbacks at all. * Instead we manually fetch the tapped data after the * security blob has been fully dissected and before * we exit from this dissector. @@ -7449,7 +7449,7 @@ dissect_session_setup_andx_response(tvbuff_t *tvb, packet_info *pinfo, proto_tre proto_item *blob_item; /* security blob */ - /* dont try to eat too much of we might get an exception on + /* don't try to eat too much of we might get an exception on * short frames and then we will not see anything at all * of the security blob. */ @@ -8630,7 +8630,7 @@ dissect_nt_trans_data_request(tvbuff_t *tvb, packet_info *pinfo, int offset, pro break; } - /* ooops there were data we didnt know how to process */ + /* ooops there were data we didn't know how to process */ if ((offset-old_offset) < bc) { proto_tree_add_item(tree, hf_smb_unknown, tvb, offset, bc - (offset-old_offset), ENC_NA); @@ -11265,7 +11265,7 @@ dissect_transaction2_request_parameters(tvbuff_t *tvb, packet_info *pinfo, break; } - /* ooops there were data we didnt know how to process */ + /* ooops there were data we didn't know how to process */ if (bc != 0) { proto_tree_add_item(tree, hf_smb_unknown, tvb, offset, bc, ENC_NA); offset += bc; @@ -13513,13 +13513,13 @@ dissect_transaction2_request_data(tvbuff_t *tvb, packet_info *pinfo, switch(subcmd) { case 0x0000: /*TRANS2_OPEN2*/ - /* XXX dont know how to decode FEAList */ + /* XXX don't know how to decode FEAList */ break; case 0x0001: /*TRANS2_FIND_FIRST2*/ - /* XXX dont know how to decode FEAList */ + /* XXX don't know how to decode FEAList */ break; case 0x0002: /*TRANS2_FIND_NEXT2*/ - /* XXX dont know how to decode FEAList */ + /* XXX don't know how to decode FEAList */ break; case 0x0003: /*TRANS2_QUERY_FS_INFORMATION*/ /* no data field in this request */ @@ -13560,7 +13560,7 @@ dissect_transaction2_request_data(tvbuff_t *tvb, packet_info *pinfo, offset = dissect_spi_loi_vals(tvb, pinfo, tree, item, offset, &dc, si); break; case 0x0009: /*TRANS2_FSCTL*/ - /*XXX dont know how to decode this yet */ + /*XXX don't know how to decode this yet */ /* * XXX - "Microsoft Networks SMB File Sharing Protocol @@ -13571,7 +13571,7 @@ dissect_transaction2_request_data(tvbuff_t *tvb, packet_info *pinfo, */ break; case 0x000a: /*TRANS2_IOCTL2*/ - /*XXX dont know how to decode this yet */ + /*XXX don't know how to decode this yet */ /* * XXX - "Microsoft Networks SMB File Sharing Protocol @@ -13582,7 +13582,7 @@ dissect_transaction2_request_data(tvbuff_t *tvb, packet_info *pinfo, */ break; case 0x000b: /*TRANS2_FIND_NOTIFY_FIRST*/ - /*XXX dont know how to decode this yet */ + /*XXX don't know how to decode this yet */ /* * XXX - "Microsoft Networks SMB File Sharing Protocol @@ -13592,7 +13592,7 @@ dissect_transaction2_request_data(tvbuff_t *tvb, packet_info *pinfo, */ break; case 0x000c: /*TRANS2_FIND_NOTIFY_NEXT*/ - /*XXX dont know how to decode this yet */ + /*XXX don't know how to decode this yet */ /* * XXX - "Microsoft Networks SMB File Sharing Protocol @@ -13605,7 +13605,7 @@ dissect_transaction2_request_data(tvbuff_t *tvb, packet_info *pinfo, /* XXX optional FEAList, unknown what FEAList looks like*/ break; case 0x000e: /*TRANS2_SESSION_SETUP*/ - /*XXX dont know how to decode this yet */ + /*XXX don't know how to decode this yet */ break; case 0x0010: /*TRANS2_GET_DFS_REFERRAL*/ /* no data field in this request */ @@ -13615,7 +13615,7 @@ dissect_transaction2_request_data(tvbuff_t *tvb, packet_info *pinfo, break; } - /* ooops there were data we didnt know how to process */ + /* ooops there were data we didn't know how to process */ if (dc != 0) { proto_tree_add_item(tree, hf_smb_unknown, tvb, offset, dc, ENC_NA); offset += dc; @@ -16009,7 +16009,7 @@ dissect_transaction2_response_data(tvbuff_t *tvb, packet_info *pinfo, /* no data in this response */ break; case 0x0009: /*TRANS2_FSCTL*/ - /* XXX dont know how to dissect this one (yet)*/ + /* XXX don't know how to dissect this one (yet)*/ /* * XXX - "Microsoft Networks SMB File Sharing Protocol @@ -16021,7 +16021,7 @@ dissect_transaction2_response_data(tvbuff_t *tvb, packet_info *pinfo, */ break; case 0x000a: /*TRANS2_IOCTL2*/ - /* XXX dont know how to dissect this one (yet)*/ + /* XXX don't know how to dissect this one (yet)*/ /* * XXX - "Microsoft Networks SMB File Sharing Protocol @@ -16033,7 +16033,7 @@ dissect_transaction2_response_data(tvbuff_t *tvb, packet_info *pinfo, */ break; case 0x000b: /*TRANS2_FIND_NOTIFY_FIRST*/ - /* XXX dont know how to dissect this one (yet)*/ + /* XXX don't know how to dissect this one (yet)*/ /* * XXX - "Microsoft Networks SMB File Sharing Protocol @@ -16044,7 +16044,7 @@ dissect_transaction2_response_data(tvbuff_t *tvb, packet_info *pinfo, */ break; case 0x000c: /*TRANS2_FIND_NOTIFY_NEXT*/ - /* XXX dont know how to dissect this one (yet)*/ + /* XXX don't know how to dissect this one (yet)*/ /* * XXX - "Microsoft Networks SMB File Sharing Protocol @@ -16058,7 +16058,7 @@ dissect_transaction2_response_data(tvbuff_t *tvb, packet_info *pinfo, /* no data in this response */ break; case 0x000e: /*TRANS2_SESSION_SETUP*/ - /* XXX dont know how to dissect this one (yet)*/ + /* XXX don't know how to dissect this one (yet)*/ break; case 0x0010: /*TRANS2_GET_DFS_REFERRAL*/ offset = dissect_get_dfs_referral_data(tvb, pinfo, tree, offset, &dc, si->unicode); @@ -16076,7 +16076,7 @@ dissect_transaction2_response_data(tvbuff_t *tvb, packet_info *pinfo, break; } - /* ooops there were data we didnt know how to process */ + /* ooops there were data we didn't know how to process */ if (dc != 0) { proto_tree_add_item(tree, hf_smb_unknown, tvb, offset, dc, ENC_NA); offset += dc; @@ -16256,7 +16256,7 @@ dissect_transaction2_response_parameters(tvbuff_t *tvb, packet_info *pinfo, prot break; case 0x09: /*TRANS2_FSCTL*/ - /* XXX dont know how to dissect this one (yet)*/ + /* XXX don't know how to dissect this one (yet)*/ /* * XXX - "Microsoft Networks SMB File Sharing Protocol @@ -16268,7 +16268,7 @@ dissect_transaction2_response_parameters(tvbuff_t *tvb, packet_info *pinfo, prot */ break; case 0x0a: /*TRANS2_IOCTL2*/ - /* XXX dont know how to dissect this one (yet)*/ + /* XXX don't know how to dissect this one (yet)*/ /* * XXX - "Microsoft Networks SMB File Sharing Protocol @@ -16318,13 +16318,13 @@ dissect_transaction2_response_parameters(tvbuff_t *tvb, packet_info *pinfo, prot break; case 0x0e: /*TRANS2_SESSION_SETUP*/ - /* XXX dont know how to dissect this one (yet)*/ + /* XXX don't know how to dissect this one (yet)*/ break; case 0x10: /*TRANS2_GET_DFS_REFERRAL*/ - /* XXX dont know how to dissect this one (yet) see SNIA doc*/ + /* XXX don't know how to dissect this one (yet) see SNIA doc*/ break; case 0x11: /*TRANS2_REPORT_DFS_INCONSISTENCY*/ - /* XXX dont know how to dissect this one (yet) see SNIA doc*/ + /* XXX don't know how to dissect this one (yet) see SNIA doc*/ break; case -1: /* @@ -16335,7 +16335,7 @@ dissect_transaction2_response_parameters(tvbuff_t *tvb, packet_info *pinfo, prot break; } - /* ooops there were data we didnt know how to process */ + /* ooops there were data we didn't know how to process */ if (offset < pc) { proto_tree_add_item(tree, hf_smb_unknown, tvb, offset, pc-offset, ENC_NA); offset += pc-offset; @@ -16644,7 +16644,7 @@ dissect_transaction_response(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree - /* from now on, everything is in separate tvbuffs so we dont count + /* from now on, everything is in separate tvbuffs so we don't count the bytes with COUNT_BYTES any more. neither do we reference offset any more (which by now points to the first byte AFTER this PDU */ @@ -17623,7 +17623,7 @@ dissect_smb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) && (si->pid == 0) && (si->tid == 0) ) { /* this is a broadcast SMB packet, there will not be a reply. - We dont need to do anything + We don't need to do anything */ si->unidir = TRUE; } else if ( (si->cmd == SMB_COM_NT_CANCEL) /* NT Cancel */ @@ -17644,16 +17644,16 @@ dissect_smb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) The only thing we do in this case is trying to find which original request we match with and insert an entry for this "special" request for later reference. We continue to reference the original - requests smb_saved_info_t but we dont touch it or change anything + requests smb_saved_info_t but we don't touch it or change anything in it. */ - si->unidir = TRUE; /*we dont expect an answer to this one*/ + si->unidir = TRUE; /*we don't expect an answer to this one*/ if (!pinfo->fd->flags.visited) { /* try to find which original call we match and if we - find it add us to the matched table. Dont touch - anything else since we dont want this one to mess + find it add us to the matched table. Don't touch + anything else since we don't want this one to mess up the request/response matching. We still consider the initial call the real request and this is only some sort of continuation. @@ -17807,7 +17807,7 @@ dissect_smb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) * 2, <- Response MID:5 * 3, -> Request MID:5 (missing from capture) * 4, <- Response MID:5 - * We DONT want #4 to be presented as a response to #1 + * We DON'T want #4 to be presented as a response to #1 */ g_hash_table_remove(si->ct->unmatched, GUINT_TO_POINTER(pid_mid)); } else { diff --git a/epan/dissectors/packet-smb.h b/epan/dissectors/packet-smb.h index 435b709054..cefda1cb28 100644 --- a/epan/dissectors/packet-smb.h +++ b/epan/dissectors/packet-smb.h @@ -217,7 +217,7 @@ typedef struct { #define TRANSACTION_MAILSLOT 1 /* these are defines used to represent different types of TIDs. - dont use the value 0 for any of these */ + don't use the value 0 for any of these */ #define TID_NORMAL 1 #define TID_IPC 2 diff --git a/epan/dissectors/packet-smb2.c b/epan/dissectors/packet-smb2.c index f8ef9126f7..fb8796236e 100644 --- a/epan/dissectors/packet-smb2.c +++ b/epan/dissectors/packet-smb2.c @@ -587,7 +587,7 @@ smb2_saved_info_hash_matched(gconstpointer k) tid. qqq We might need to refine this if it occurs that tids are reused on a single - conversation. we dont worry about that yet for simplicity + conversation. we don't worry about that yet for simplicity */ static gint smb2_tid_info_equal(gconstpointer k1, gconstpointer k2) @@ -611,7 +611,7 @@ smb2_tid_info_hash(gconstpointer k) uid. qqq We might need to refine this if it occurs that uids are reused on a single - conversation. we dont worry about that yet for simplicity + conversation. we don't worry about that yet for simplicity */ static gint smb2_sesid_info_equal(gconstpointer k1, gconstpointer k2) @@ -839,7 +839,7 @@ static int dissect_smb2_file_full_ea_info(tvbuff_t *tvb, packet_info *pinfo, pro * * This function is called twice, first to decode the offset/length and * second time to dissect the actual string. - * It is done this way since there is no guarantee that we have the full packet and we dont + * It is done this way since there is no guarantee that we have the full packet and we don't * want to abort dissection too early if the packet ends somewhere between the * length/offset and the actual buffer. * @@ -1007,7 +1007,7 @@ dissect_smb2_olb_buffer(packet_info *pinfo, proto_tree *parent_tree, tvbuff_t *t return; } - /* if we dont want/need a subtree */ + /* if we don't want/need a subtree */ if (olb->hfindex == -1) { sub_item = parent_tree; sub_tree = parent_tree; @@ -2427,7 +2427,7 @@ dissect_smb2_session_setup_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree if (!ntlmssp_tap_id) { GString *error_string; - /* We dont specify any callbacks at all. + /* We don't specify any callbacks at all. * Instead we manually fetch the tapped data after the * security blob has been fully dissected and before * we exit from this dissector. @@ -3549,7 +3549,7 @@ dissect_smb2_getinfo_parameters(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre case SMB2_CLASS_FILE_INFO: switch (si->saved->infolevel) { default: - /* we dont handle this infolevel yet */ + /* we don't handle this infolevel yet */ proto_tree_add_item(tree, hf_smb2_unknown, tvb, offset, 16, ENC_NA); offset += tvb_length_remaining(tvb, offset); } @@ -3557,7 +3557,7 @@ dissect_smb2_getinfo_parameters(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre case SMB2_CLASS_FS_INFO: switch (si->saved->infolevel) { default: - /* we dont handle this infolevel yet */ + /* we don't handle this infolevel yet */ proto_tree_add_item(tree, hf_smb2_unknown, tvb, offset, 16, ENC_NA); offset += tvb_length_remaining(tvb, offset); } @@ -3568,13 +3568,13 @@ dissect_smb2_getinfo_parameters(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre dissect_security_information_mask(tvb, tree, offset+8); break; default: - /* we dont handle this infolevel yet */ + /* we don't handle this infolevel yet */ proto_tree_add_item(tree, hf_smb2_unknown, tvb, offset, 16, ENC_NA); offset += tvb_length_remaining(tvb, offset); } break; default: - /* we dont handle this class yet */ + /* we don't handle this class yet */ proto_tree_add_item(tree, hf_smb2_unknown, tvb, offset, 16, ENC_NA); offset += tvb_length_remaining(tvb, offset); } @@ -3747,7 +3747,7 @@ dissect_smb2_infolevel(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, offset = dissect_smb2_file_attribute_tag_info(tvb, pinfo, tree, offset, si); break; default: - /* we dont handle this infolevel yet */ + /* we don't handle this infolevel yet */ proto_tree_add_item(tree, hf_smb2_unknown, tvb, offset, tvb_length_remaining(tvb, offset), ENC_NA); offset += tvb_length_remaining(tvb, offset); } @@ -3776,7 +3776,7 @@ dissect_smb2_infolevel(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, offset = dissect_smb2_FS_OBJECTID_INFO(tvb, pinfo, tree, offset, si); break; default: - /* we dont handle this infolevel yet */ + /* we don't handle this infolevel yet */ proto_tree_add_item(tree, hf_smb2_unknown, tvb, offset, tvb_length_remaining(tvb, offset), ENC_NA); offset += tvb_length_remaining(tvb, offset); } @@ -3787,13 +3787,13 @@ dissect_smb2_infolevel(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, offset = dissect_smb2_sec_info_00(tvb, pinfo, tree, offset, si); break; default: - /* we dont handle this infolevel yet */ + /* we don't handle this infolevel yet */ proto_tree_add_item(tree, hf_smb2_unknown, tvb, offset, tvb_length_remaining(tvb, offset), ENC_NA); offset += tvb_length_remaining(tvb, offset); } break; default: - /* we dont handle this class yet */ + /* we don't handle this class yet */ proto_tree_add_item(tree, hf_smb2_unknown, tvb, offset, tvb_length_remaining(tvb, offset), ENC_NA); offset += tvb_length_remaining(tvb, offset); } @@ -5715,7 +5715,7 @@ dissect_smb2_create_response(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree offset = dissect_smb2_olb_tvb_max_offset(offset, &e_olb); - /* free si->saved->extra_info we dont need it any more */ + /* free si->saved->extra_info we don't need it any more */ if (si->saved && si->saved->extra_info_type == SMB2_EI_FILENAME) { g_free(si->saved->extra_info); si->saved->extra_info = NULL; @@ -6975,7 +6975,7 @@ dissect_smb2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, gboolea } if (!ssi) { - /* no we couldnt find it, so just add it then + /* no we couldn't find it, so just add it then * if was a request we are decoding */ ssi = wmem_new0(wmem_file_scope(), smb2_saved_info_t); @@ -6997,7 +6997,7 @@ dissect_smb2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, gboolea } else { /* see if we can find this msg_id in the matched table */ ssi = (smb2_saved_info_t *)g_hash_table_lookup(si->conv->matched, &ssi_key); - /* if we couldnt find it in the matched table, it might still + /* if we couldn't find it in the matched table, it might still * be in the unmatched table */ if (!ssi) { @@ -7045,7 +7045,7 @@ dissect_smb2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, gboolea } } } - /* if we dont have ssi yet we must fake it */ + /* if we don't have ssi yet we must fake it */ /*qqq*/ si->saved = ssi; diff --git a/epan/dissectors/packet-ssl.c b/epan/dissectors/packet-ssl.c index c7ca7c52f5..68487b299d 100644 --- a/epan/dissectors/packet-ssl.c +++ b/epan/dissectors/packet-ssl.c @@ -1218,7 +1218,7 @@ again: pinfo->can_desegment=2; /* we also have to prevent the dissector from changing the * PROTOCOL and INFO colums since what follows may be an - * incomplete PDU and we dont want it be changed back from + * incomplete PDU and we don't want it be changed back from * <Protocol> to <TCP> * XXX There is no good way to block the PROTOCOL column * from being changed yet so we set the entire row unwritable. diff --git a/epan/dissectors/packet-tcp.c b/epan/dissectors/packet-tcp.c index 47137c0e42..a6bf163d2f 100644 --- a/epan/dissectors/packet-tcp.c +++ b/epan/dissectors/packet-tcp.c @@ -923,7 +923,7 @@ pdu_store_sequencenumber_of_next_pdu(packet_info *pinfo, guint32 seq, guint32 nx /* This is called for SYN and SYN+ACK packets and the purpose is to verify * that we have seen window scaling in both directions. - * If we cant find window scaling being set in both directions + * If we can't find window scaling being set in both directions * that means it was present in the SYN but not in the SYN+ACK * (or the SYN was missing) and then we disable the window scaling * for this tcp session. diff --git a/epan/dissectors/packet-tcp.h b/epan/dissectors/packet-tcp.h index e01b2a6adf..b502527da6 100644 --- a/epan/dissectors/packet-tcp.h +++ b/epan/dissectors/packet-tcp.h @@ -172,7 +172,7 @@ typedef struct _tcp_flow_t { * fast retransmissions and outoforder */ guint32 window; /* last seen window */ - gint16 win_scale; /* -1 is we dont know, -2 is window scaling is not used */ + gint16 win_scale; /* -1 is we don't know, -2 is window scaling is not used */ gint16 scps_capable; /* flow advertised scps capabilities */ guint16 maxsizeacked; /* 0 if not yet known */ gboolean valid_bif; /* if lost pkts, disable BiF until ACK is recvd */ diff --git a/epan/dissectors/packet-telnet.c b/epan/dissectors/packet-telnet.c index 9a940b5f1f..7172413683 100644 --- a/epan/dissectors/packet-telnet.c +++ b/epan/dissectors/packet-telnet.c @@ -1099,7 +1099,7 @@ dissect_authentication_subopt(packet_info *pinfo, const char *optname _U_, tvbuf switch(acmd){ case TN_AC_REPLY: case TN_AC_IS: - /* XXX here we shouldnt just assume it is krb5 */ + /* XXX here we shouldn't just assume it is krb5 */ dissect_krb5_authentication_data(pinfo, tvb, offset, len, tree, acmd); break; case TN_AC_SEND: diff --git a/epan/dissectors/packet-umts_fp.c b/epan/dissectors/packet-umts_fp.c index d08ed7fa62..3ee66c3d8d 100644 --- a/epan/dissectors/packet-umts_fp.c +++ b/epan/dissectors/packet-umts_fp.c @@ -747,7 +747,7 @@ dissect_tb_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, (p_fp_info->chan_tf_size[chan] > 0)) { tvbuff_t *next_tvb; proto_item *item; - /* If this is DL we should not care about crci bits (since they dont exists)*/ + /* If this is DL we should not care about crci bits (since they don't exists)*/ if(p_fp_info->is_uplink){ @@ -2800,7 +2800,7 @@ dissect_e_dch_channel_info(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, ((bit_offset % 8) + size + 7) / 8, -1); - /*This was all previously stored in [0] rather than [macd_idx] and cur_tb wasnt updated!*/ + /*This was all previously stored in [0] rather than [macd_idx] and cur_tb wasn't updated!*/ /*Set up information needed for MAC and lower layers*/ macinf->content[macd_idx] = lchId_type_table[lchid]; /*Set the proper Content type for the mac layer.*/ macinf->lchid[macd_idx] = lchid; @@ -3169,7 +3169,7 @@ dissect_hsdsch_channel_info(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, /*Configure the pdus*/ for(i=0;i<number_of_pdus; i++){ macinf->content[i] = hsdsch_macdflow_id_mac_content_map[p_fp_info->hsdsch_macflowd_id]; /*MAC_CONTENT_PS_DTCH;*/ - macinf->lchid[i] = fake_lchid_macd_flow[p_fp_info->hsdsch_macflowd_id];/*Faked logical channel id 255 used as a mark it doesnt exists...*/ + macinf->lchid[i] = fake_lchid_macd_flow[p_fp_info->hsdsch_macflowd_id];/*Faked logical channel id 255 used as a mark if it doesn't exist...*/ macinf->fake_chid[i] = TRUE; /**/ macinf->macdflow_id[i] = p_fp_info->hsdsch_macflowd_id; /*Save the flow ID (+1 to make it human readable (it's zero indexed!))*/ /*Figure out RLC_MODE based on MACd-flow-ID, basically MACd-flow-ID = 0 then it's SRB0 == UM else AM*/ @@ -4215,7 +4215,7 @@ dissect_fp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (p_conv) { - /*Find correct conversation, basically find the on thats closest to this frame*/ + /*Find correct conversation, basically find the one that's closest to this frame*/ /*while(p_conv->next != NULL && p_conv->next->setup_frame < pinfo->fd->num){ p_conv = p_conv->next; }*/ diff --git a/epan/dissectors/packet-windows-common.c b/epan/dissectors/packet-windows-common.c index 3b728dfe46..e5e5127951 100644 --- a/epan/dissectors/packet-windows-common.c +++ b/epan/dissectors/packet-windows-common.c @@ -1343,7 +1343,7 @@ static value_string_ext wkwn_S_1_5_21_rids_ext = VALUE_STRING_EXT_INIT(wkwn_S_1_ /* Dissect an NT SID. Label it with 'name' and return a string version * of the SID in the 'sid_str' parameter which has a packet lifetime * scope and should NOT be freed by the caller. hf_sid can be -1 if - * the caller doesnt care what name is used and then "nt.sid" will be + * the caller doesn't care what name is used and then "nt.sid" will be * the default instead. If the caller wants a more appropriate hf * field, it will just pass a FT_STRING hf field here */ diff --git a/epan/dissectors/packet-windows-common.h b/epan/dissectors/packet-windows-common.h index d8b6c3b737..14153abcc5 100644 --- a/epan/dissectors/packet-windows-common.h +++ b/epan/dissectors/packet-windows-common.h @@ -258,7 +258,7 @@ typedef struct _sid_strings { /* Dissect a NT SID. Label it with 'name' and return a string version * of the SID in the 'sid_str' parameter which has a packet lifetime * scope and should NOT be freed by the caller. hf_sid can be -1 if - * the caller doesnt care what name is used and then "nt.sid" will be + * the caller doesn't care what name is used and then "nt.sid" will be * the default instead. If the caller wants a more appropriate hf * field, it will just pass a FT_STRING hf field here */ diff --git a/epan/dissectors/packet-ymsg.c b/epan/dissectors/packet-ymsg.c index 0c3e108819..f1b104b5f0 100644 --- a/epan/dissectors/packet-ymsg.c +++ b/epan/dissectors/packet-ymsg.c @@ -190,7 +190,7 @@ enum yahoo_status { YAHOO_STATUS_WEBLOGIN = 0x5a55aa55, YAHOO_STATUS_OFFLINE = 0x5a55aa56, /* don't ask */ YAHOO_STATUS_TYPING = 0x16, - YAHOO_STATUS_DISCONNECTED = -1 /* in ymsg 15. doesnt mean the normal sense of 'disconnected' */ + YAHOO_STATUS_DISCONNECTED = -1 /* in ymsg 15. doesn't mean the normal sense of 'disconnected' */ }; enum ypacket_status { |