osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Fix some spelling errors

This commit is contained in:
Martin Mathieson 2024-02-20 22:16:52 +00:00
parent b5ffe3deac
commit c72fc5b163
12 changed files with 56 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
epan/dissectors/packet-6lowpan.c
View File

@ -782,7 +782,7 @@ lowpan_context_insert(guint8 cid, guint16 pan, guint8 plen, ws_in6_addr *prefix,
data = wmem_new(NULL, lowpan_context_data);
data->frame = frame;
data->plen = plen;
memset(&data->prefix, 0, sizeof(ws_in6_addr)); /* Ensure zero paddeding */
memset(&data->prefix, 0, sizeof(ws_in6_addr)); /* Ensure zero padding */
lowpan_pfxcpy(&data->prefix, prefix, plen);
g_hash_table_insert(lowpan_context_table, pkey, data);
} /* lowpan_context_insert */

2
epan/dissectors/packet-f5ethtrailer.c
View File

@ -328,7 +328,7 @@ static gint hf_fi_session;
/* Wireshark preference to show RST cause in info column */
static gboolean rstcause_in_info = TRUE;
/** Wireshark prefrence to look at all trailer bytes for f5ethtrailer */
/** Wireshark preference to look at all trailer bytes for f5ethtrailer */
static gboolean pref_walk_trailer = FALSE;
/* Wireshark preference to enable/disable the population of other dissectors'
* fields.*/

7
epan/dissectors/packet-giop.c
View File

@ -554,7 +554,6 @@ static const value_string target_address_discriminant_vals[] = {
};
Bug fix:
https://gitlab.com/wireshark/wireshark/-/issues/2800
http://ethereal.netmirror.org/lists/ethereal-users/200303/msg00135.html
*/
static const value_string response_flags_vals[] = {
{ 0x0, "SyncScope NONE or WITH_TRANSPORT" },
@ -1468,7 +1467,7 @@ static void insert_in_objkey_hash(GHashTable *hash, const guint8 *obj, guint32 l
new_objkey_key->objkey = (guint8 *) wmem_memdup(wmem_file_scope(), obj, len); /* copy from object and allocate ptr */
objkey_val = wmem_new(wmem_file_scope(), struct giop_object_val);
objkey_val->repo_id = wmem_strdup(wmem_file_scope(), repoid); /* duplicate and store Respository ID string */
objkey_val->repo_id = wmem_strdup(wmem_file_scope(), repoid); /* duplicate and store Repository ID string */
objkey_val->src = src; /* where IOR came from */
@ -1560,7 +1559,7 @@ static void read_IOR_strings_from_file(const gchar *name, int max_iorlen) {
int ior_val_len; /* length after unstringifying. */
FILE *fp;
guint8 *out = NULL; /* ptr to unstringified IOR */
tvbuff_t *tvb; /* temp tvbuff for dissectin IORs */
tvbuff_t *tvb; /* temp tvbuff for dissecting IORs */
int my_offset = 0;
gboolean stream_is_big_endian;
@ -2305,7 +2304,7 @@ static void dissect_data_for_typecode_with_params(tvbuff_t *tvb, packet_info *pi
parameter = wmem_list_frame_next(parameter); // get struct name
// get count
// concatinating the struct name properly over strbuf
// concatenating the struct name properly over strbuf
strbuf = wmem_strbuf_new(pinfo->pool, "struct ");
wmem_strbuf_append(strbuf, wmem_list_frame_data(parameter));
mysubtree = proto_tree_add_subtree(tree, tvb, *offset, -1,

2
epan/dissectors/packet-isis-lsp.c
View File

@ -4181,7 +4181,7 @@ dissect_lsp_srv6_locator_entry(tvbuff_t *tvb, packet_info* pinfo,
return (-1);
}
/* (1) Detrmine the length of each SRv6 locator entry, first */
/* (1) Determine the length of each SRv6 locator entry, first */
/* Loc Size */
bit_length = tvb_get_guint8(tvb, offset+6);
if (bit_length <= 0 || bit_length > 128) {

54
epan/dissectors/packet-lldp.c
View File

@ -1411,18 +1411,18 @@ pow10_uint64(gint exponent){
return val;
}
// Decode uint fractionnal variable
// Decode uint fractional variable
static guint64
convertFractionalToFixedSizeDecimal(guint64 value, guint fractionnalBitSize, guint numberOfDigitToDisplay){
const guint64 resolution = G_GINT64_CONSTANT(0x1) << fractionnalBitSize;
convertFractionalToFixedSizeDecimal(guint64 value, guint fractionalBitSize, guint numberOfDigitToDisplay){
const guint64 resolution = G_GINT64_CONSTANT(0x1) << fractionalBitSize;
// => 0x02000000 for 25-bits
// => 0x00000100 for 8-bits
const guint64 fractionnalPortionMask = resolution - 1;
value &= fractionnalPortionMask;
const guint64 fractionalPortionMask = resolution - 1;
value &= fractionalPortionMask;
// Maximum value for numberOfDigitToDisplay is :
// log10(G_GINT64_CONSTANT(0xFFFFFFFFFFFFFFFF) / fractionnalPortionMask);
// log10(G_GINT64_CONSTANT(0xFFFFFFFFFFFFFFFF) / fractionalPortionMask);
// => if result is stored in 32-bits, numberOfDigitToDisplay max = 9
const guint64 displayMultiplier = pow10_uint64(numberOfDigitToDisplay);
value *= displayMultiplier;
@ -1455,23 +1455,23 @@ get_latitude_or_longitude(gchar *buf, int option, guint64 unmasked_value)
outside the range of -90 to 90 degrees MUST be considered invalid.
*/
const guint variableBitSize = 34;
const guint fractionnalBitSize = 25;
const guint64 maxlatitude = (G_GINT64_CONSTANT(0x1) << fractionnalBitSize) * G_GINT64_CONSTANT(90); // 90 degrees
const guint64 maxlongitude = (G_GINT64_CONSTANT(0x1) << fractionnalBitSize) * G_GINT64_CONSTANT(180); // 180 degrees
const guint fractionalBitSize = 25;
const guint64 maxlatitude = (G_GINT64_CONSTANT(0x1) << fractionalBitSize) * G_GINT64_CONSTANT(90); // 90 degrees
const guint64 maxlongitude = (G_GINT64_CONSTANT(0x1) << fractionalBitSize) * G_GINT64_CONSTANT(180); // 180 degrees
guint64 masked_value = getUint64MaskedValue(unmasked_value, variableBitSize); // get 34-bit value
// Get absoluste value of a 34-bit 2's variable
// Get absolute value of a 34-bit 2's variable
// => value is 33-bit
guint64 absolute_value = masked_value;
gboolean isNegative = get2sComplementAbsoluteValue(&absolute_value, variableBitSize);
// Get unsigned integer 8-bit value
guint32 integerPortion = (guint32)(absolute_value >> fractionnalBitSize);
guint32 integerPortion = (guint32)(absolute_value >> fractionalBitSize);
// Get fractionnal 25-bit value
// Get fractional 25-bit value
const guint numberOfDigitToDisplay = 4;
guint64 fixedSizeDecimal = convertFractionalToFixedSizeDecimal(absolute_value, fractionnalBitSize, numberOfDigitToDisplay);
guint64 fixedSizeDecimal = convertFractionalToFixedSizeDecimal(absolute_value, fractionalBitSize, numberOfDigitToDisplay);
const char *direction;
const char *err_str = "";
@ -1497,14 +1497,14 @@ get_latitude_or_longitude(gchar *buf, int option, guint64 unmasked_value)
}
}
const guint64 fractionalMask = (G_GINT64_CONSTANT(0x1) << fractionnalBitSize) - 1;
const guint64 fractionalMask = (G_GINT64_CONSTANT(0x1) << fractionalBitSize) - 1;
// %04 correspond to numberOfDigitToDisplay
snprintf(buf, ITEM_LABEL_LENGTH, "%s%u.%04" PRIu64 " degrees %s (0x%010" PRIX64 " - %u-bit integer part 0x%04" PRIX64 " / %u-bit fractional part 0x%08" PRIX64 ")",
err_str,
integerPortion, fixedSizeDecimal, direction, masked_value,
variableBitSize - fractionnalBitSize, masked_value >> fractionnalBitSize,
fractionnalBitSize, masked_value & fractionalMask
variableBitSize - fractionalBitSize, masked_value >> fractionalBitSize,
fractionalBitSize, masked_value & fractionalMask
);
}
@ -1543,21 +1543,21 @@ altitude_base(gchar *buf, guint32 unmasked_value) {
// Values above 30 (decimal) are undefined and reserved.
const guint variableBitSize = 30;
const guint fractionnalBitSize = 8;
const guint fractionalBitSize = 8;
guint64 masked_value = getUint64MaskedValue(unmasked_value, variableBitSize); // get 30-bit value
// Get absoluste value of a 30-bit 2's variable
// Get absolute value of a 30-bit 2's variable
// => value is 29-bit
guint64 absolute_value = masked_value;
gboolean isNegative = get2sComplementAbsoluteValue(&absolute_value, variableBitSize);
// Get unsigned integer 8-bit value
guint32 integerPortion = (guint32)(absolute_value >> fractionnalBitSize);
guint32 integerPortion = (guint32)(absolute_value >> fractionalBitSize);
// Get fractionnal 8-bit value
// Get fractional 8-bit value
const guint numberOfDigitToDisplay = 4;
guint64 fixedSizeDecimal = convertFractionalToFixedSizeDecimal(absolute_value, fractionnalBitSize, numberOfDigitToDisplay);
guint64 fixedSizeDecimal = convertFractionalToFixedSizeDecimal(absolute_value, fractionalBitSize, numberOfDigitToDisplay);
const char * sign;
if (isNegative){
@ -1567,13 +1567,13 @@ altitude_base(gchar *buf, guint32 unmasked_value) {
}
const guint64 fractionalMask = (G_GINT64_CONSTANT(0x1) << fractionnalBitSize) - 1;
const guint64 fractionalMask = (G_GINT64_CONSTANT(0x1) << fractionalBitSize) - 1;
// %04 correspond to numberOfDigitToDisplay
snprintf(buf, ITEM_LABEL_LENGTH, "%s%u.%04" PRIu64 " (0x%08" PRIX64 " - %u-bit integer part 0x%06" PRIX64 " / %u-bit fractional part 0x%02" PRIX64 ")",
sign, integerPortion, fixedSizeDecimal, masked_value,
variableBitSize - fractionnalBitSize, masked_value >> fractionnalBitSize,
fractionnalBitSize, masked_value & fractionalMask
variableBitSize - fractionalBitSize, masked_value >> fractionalBitSize,
fractionalBitSize, masked_value & fractionalMask
);
}
@ -1775,7 +1775,7 @@ dissect_lldp_chassis_id(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gui
idType="IA";
strPtr = tvb_format_stringzpad(pinfo->pool, tvb, offset, (dataLen - 1));
break;
case 6: /* Interfae name */
case 6: /* Interface name */
idType="IN";
strPtr = tvb_format_stringzpad(pinfo->pool, tvb, offset, (dataLen - 1));
break;
@ -4330,7 +4330,7 @@ dissect_hytec_tlv(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree)
} /* switch (identifier) */
break;
default: /* unknown group */
/* indentifier considered also unknown */
/* identifier considered also unknown */
proto_item_append_text(identifier_proto_item, "Unknown");
proto_tree_add_item(tree, hf_hytec_unknown_identifier_content, tvb, offset, -1, ENC_NA);
} /* switch (group) */
@ -4450,7 +4450,7 @@ dissect_hytec_tlv(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree)
} /* switch (identifier) */
break;
default: /* unknown group */
/* indentifier considered also unknown */
/* identifier considered also unknown */
proto_item_append_text(identifier_proto_item, "Unknown");
proto_tree_add_item(tree, hf_hytec_unknown_identifier_content, tvb, offset, -1, ENC_NA);
} /* switch (group) */

4
epan/dissectors/packet-nfs.c
View File

@ -10698,7 +10698,7 @@ dissect_nfs4_request_op(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tre
}
if (first_operation == 0)
/* Seperator between operation text */
/* Separator between operation text */
col_append_str(pinfo->cinfo, COL_INFO, " |");
if (wmem_strbuf_get_len(op_summary[summary_counter].optext) > 0)
@ -11245,7 +11245,7 @@ dissect_nfs4_response_op(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tr
}
if (first_operation == 0)
/* Seperator between operation text */
/* Separator between operation text */
col_append_str(pinfo->cinfo, COL_INFO, " |");
if (wmem_strbuf_get_len(op_summary[summary_counter].optext) > 0)

4
epan/print.c
View File

@ -2338,7 +2338,7 @@ static void format_field_values(output_fields_t* fields, gpointer field_index, g
if (NULL == value)
return;
/* Unwrap change made to disambiguiate zero / null */
/* Unwrap change made to disambiguate zero / null */
indx = GPOINTER_TO_UINT(field_index) - 1;
if (fields->field_values[indx] == NULL) {
@ -2376,7 +2376,7 @@ static void format_field_values(output_fields_t* fields, gpointer field_index, g
}
break;
case 'a':
/* print the value of all accurrences of the field */
/* print the value of all occurrences of the field */
break;
default:
ws_assert_not_reached();

2
epan/proto.c
View File

@ -596,7 +596,7 @@ proto_init(GSList *register_all_plugin_protocols_list,
/* Initialize the ftype subsystem */
ftypes_initialize();
/* Initialize the addres type subsystem */
/* Initialize the address type subsystem */
address_types_initialize();
/* Register one special-case FT_TEXT_ONLY field for use when

2
epan/protobuf-helper.c
View File

@ -35,7 +35,7 @@ pbw_reinit_DescriptorPool(PbwDescriptorPool** pool, const char** directories, pb
pbl_reinit_descriptor_pool((pbl_descriptor_pool_t**) pool, directories, (pbl_report_error_cb_t) error_cb);
}
/* load a proto file, return 0 if successed */
/* load a proto file, return 0 if succeeds */
int
pbw_load_proto_file(PbwDescriptorPool* pool, const char* filename) {
if (pbl_add_proto_file_to_be_parsed((pbl_descriptor_pool_t*) pool, filename)) {

2
epan/tvbuff.c
View File

@ -4621,7 +4621,7 @@ tvb_get_bcd_string(wmem_allocator_t *scope, tvbuff_t *tvb, const gint offset, gi
break;
}
if ((len == 1) && (odd == TRUE )){
/* Last octet, skipp last high nibble incase of odd number of digits*/
/* Last octet, skip last high nibble incase of odd number of digits */
break;
}
digit_str[i] = dgt->out[octet & 0x0f];

15
tools/wireshark_words.txt
View File

@ -2182,3 +2182,18 @@ zeroes
zigbee
zugtyp
zürich
nolintnextline
wsbuglink
srcip
saturates
toggles
retranslated
subchannelization
redissection
f5eth
requesters
concatenating
virtualized
filsfils
seqlen
refactoring

2
ui/qt/extcap_options_dialog.cpp
View File

@ -556,7 +556,7 @@ void ExtcapOptionsDialog::resetValues()
}
/* Values are stored when dialog is commited, just check validity*/
/* Values are stored when dialog is committed, just check validity */
anyValueChanged();
}
}