Fix a lot of typos and misspellings

Change-Id: I8512cfa1d424f82a873a0e0e1d22c7b075fdd7f3
Reviewed-on: https://code.wireshark.org/review/13069
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
This commit is contained in:
moshekaplan 2016-01-05 19:58:42 -05:00 committed by Michael Mann
parent c1bcbb6eee
commit cd7026951b
197 changed files with 493 additions and 493 deletions

View File

@ -199,7 +199,7 @@ dissect_acse(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* d
case SES_DISCONNECT: /* RLRQ */ case SES_DISCONNECT: /* RLRQ */
case SES_FINISH: /* RLRE */ case SES_FINISH: /* RLRE */
case SES_ABORT: /* ABRT */ case SES_ABORT: /* ABRT */
case CLSES_UNIT_DATA: /* AARQ Connetctionless session */ case CLSES_UNIT_DATA: /* AARQ Connectionless session */
break; break;
case SES_DATA_TRANSFER: case SES_DATA_TRANSFER:
oid=find_oid_by_pres_ctx_id(pinfo, indir_ref); oid=find_oid_by_pres_ctx_id(pinfo, indir_ref);

View File

@ -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. * Checks to make sure that a complete, valid BER-encoded length is in the buffer.
* *
* \param tvb contains the buffer to be examined * \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 * \returns TRUE if a complete, valid BER-encoded length is in the buffer; otherwise FALSE
*/ */
static gboolean static gboolean

View File

@ -2336,7 +2336,7 @@ VariablePartsArray ::= SEQUENCE SIZE (1..5) OF VariablePart
-- InitialDPArgExtension notes: not recursive, exported, -- InitialDPArgExtension notes: not recursive, exported,
-- locally refd 1 times, import refd 0 times -- 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 { InitialDPArgExtension ::= SEQUENCE {
gmscAddress [0] ISDN-AddressString OPTIONAL, gmscAddress [0] ISDN-AddressString OPTIONAL,
forwardingDestinationNumber [1] CalledPartyNumber OPTIONAL, forwardingDestinationNumber [1] CalledPartyNumber OPTIONAL,

View File

@ -145,7 +145,7 @@ PrioritisedObject B "2.9.3.2.7.48" "userObject(48)"
ActiveDestination B "2.9.3.2.7.49" "activeDestination(49)" ActiveDestination B "2.9.3.2.7.49" "activeDestination(49)"
Allomorphs B "2.9.3.2.7.50" "allomorphs(50)" Allomorphs B "2.9.3.2.7.50" "allomorphs(50)"
BackUpDestinationList B "2.9.3.2.7.51" "backUpDestinationList(51)" 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)" ConfirmedMode B "2.9.3.2.7.53" "confirmedMode(53)"
CurrentLogSize B "2.9.3.2.7.54" "currentLogSize(54)" CurrentLogSize B "2.9.3.2.7.54" "currentLogSize(54)"
Destination B "2.9.3.2.7.55" "destination(55)" Destination B "2.9.3.2.7.55" "destination(55)"

View File

@ -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. -- 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 --ManagementExtension
--FROM Attribute-ASN1Module {joint-iso-itu-t ms (9) smi (3) part2 (2) asn1Module (2) 1} --FROM Attribute-ASN1Module {joint-iso-itu-t ms (9) smi (3) part2 (2) asn1Module (2) 1}
-- --

View File

@ -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; ret = (dissector_try_uint_new(ranap_ies_dissector_table, key, tvb, pinfo, tree, FALSE, NULL)) ? tvb_captured_length(tvb) : 0;
break; break;
} }
/* Fall trough */ /* Fall through */
default: default:
/* no special handling */ /* no special handling */
ret = (dissector_try_uint_new(ranap_ies_dissector_table, ProtocolIE_ID, tvb, pinfo, tree, FALSE, NULL)) ? tvb_captured_length(tvb) : 0; ret = (dissector_try_uint_new(ranap_ies_dissector_table, ProtocolIE_ID, tvb, pinfo, tree, FALSE, NULL)) ? tvb_captured_length(tvb) : 0;

View File

@ -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); proto_tree_add_item(tree, saved_hf, parameter_tvb, 0, 4, ENC_BIG_ENDIAN);
#.FN_HDR SourceRNC-ToTargetRNC-TransparentContainer #.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 dissect_ranap_SourceRNC_ToTargetRNC_TransparentContainer_PDU
ProtocolIE_ID may be unset ProtocolIE_ID may be unset
*/ */

View File

@ -319,7 +319,7 @@ tvbuff_t *parameter_tvb=NULL;
handover_type_value = 0; handover_type_value = 0;
#.FN_BODY Source-ToTarget-TransparentContainer VAL_PTR = &parameter_tvb #.FN_BODY Source-ToTarget-TransparentContainer VAL_PTR = &parameter_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) # (Compare RANAP)
# Annex A # Annex A
# ...Therefore the container content is encoded according to the # ...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); col_set_writable(actx->pinfo->cinfo, TRUE);
} }
#.FN_BODY Target-ToSource-TransparentContainer VAL_PTR = &parameter_tvb #.FN_BODY Target-ToSource-TransparentContainer VAL_PTR = &parameter_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 # See Target-ToSource-TransparentContainer in RANAP
tvbuff_t *parameter_tvb; tvbuff_t *parameter_tvb;

View File

@ -1643,7 +1643,7 @@ TYPE3-IDENTIFIER ::= ENUMERATED
GROUP-IDENTITY-DOWNLINK ::= SEQUENCE GROUP-IDENTITY-DOWNLINK ::= SEQUENCE
{ {
attach-detach-identifiet CHOICE{ attach-detach-identifier CHOICE{
attach SEQUENCE{ attach SEQUENCE{
lifetime INTEGER(0..3), lifetime INTEGER(0..3),
class-of-usage INTEGER(0..7) class-of-usage INTEGER(0..7)
@ -1666,16 +1666,16 @@ GROUP-IDENTITY-DOWNLINK ::= SEQUENCE
GROUP-IDENTITY-UPLINK ::= SEQUENCE GROUP-IDENTITY-UPLINK ::= SEQUENCE
{ {
attach-detach-identifiet CHOICE{ attach-detach-identifier CHOICE{
attach SEQUENCE{ attach SEQUENCE{
class-of-usage INTEGER(0..7) class-of-usage INTEGER(0..7)
}, },
detach SEQUENCE{ detach SEQUENCE{
detach-uplike ENUMERATED{ detach-uplike ENUMERATED{
unknow-gssi(0), unknow-gssi(0),
unvaild-cipher(1), invalid-cipher(1),
user-intitial(2), user-intitial(2),
reseverd(3) reserved(3)
} }
} }
}, },
@ -2330,4 +2330,4 @@ Modify-type ::= SEQUENCE{
END END

View File

@ -1324,7 +1324,7 @@ manuf_name_lookup(const guint8 *addr)
} }
/* Mask out the broadcast/multicast flag but not the locally /* 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. * by the IEEE but the local administrator instead.
* 0x01 multicast / broadcast bit * 0x01 multicast / broadcast bit
* 0x02 locally administered bit */ * 0x02 locally administered bit */

View File

@ -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 * disallows sending UDP datagrams without checksums. Likewise, 6LoWPAN
* requires that we recompute the checksum. * 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 #if 0
/* /*

View File

@ -65,8 +65,8 @@
* @_9P_RCREATE: response with file access information * @_9P_RCREATE: response with file access information
* @_9P_TREAD: request to transfer data from a file or directory * @_9P_TREAD: request to transfer data from a file or directory
* @_9P_RREAD: response with data requested * @_9P_RREAD: response with data requested
* @_9P_TWRITE: reuqest to transfer data to a file * @_9P_TWRITE: request to transfer data to a file
* @_9P_RWRITE: response with out much data was transfered to 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_TCLUNK: forget about a handle to an entity within the file system
* @_9P_RCLUNK: response when server has forgotten about the handle * @_9P_RCLUNK: response when server has forgotten about the handle
* @_9P_TREMOVE: request to remove an entity from the hierarchy * @_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 * QID types are a subset of permissions - they are primarily
* used to differentiate semantics for a file system entity via * 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 * of the permission_t
* *
* See Also: http://plan9.bell-labs.com/magic/man2html/2/stat * 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) { if (!val) {
val = _9p_hash_new_val(0); val = _9p_hash_new_val(0);
val->data = wmem_tree_new(wmem_file_scope()); 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); _9p_hash_set(pinfo, _9P_NOTAG, fid, val);
} }

View File

@ -1319,7 +1319,7 @@ dissect_acn_dmp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int off
case ACN_DMP_VECTOR_UNKNOWN: case ACN_DMP_VECTOR_UNKNOWN:
break; break;
case ACN_DMP_VECTOR_GET_PROPERTY: case ACN_DMP_VECTOR_GET_PROPERTY:
/* Rip trough property address */ /* Rip through property address */
while (data_offset < end_offset) { while (data_offset < end_offset) {
old_offset = data_offset; old_offset = data_offset;
data_offset = acn_add_dmp_address(tvb, pinfo, pdu_tree, data_offset, &adt); 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; break;
case ACN_DMP_VECTOR_UNMAP_PROPERTY: case ACN_DMP_VECTOR_UNMAP_PROPERTY:
/* Rip trough Actaul Proptery Address */ /* Rip through Actual Property Address */
while (data_offset < end_offset) { while (data_offset < end_offset) {
old_offset = data_offset; old_offset = data_offset;
data_offset = acn_add_dmp_address(tvb, pinfo, pdu_tree, data_offset, &adt); 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; break;
case ACN_DMP_VECTOR_SUBSCRIBE: case ACN_DMP_VECTOR_SUBSCRIBE:
/* Rip trough Proptery Address */ /* Rip through Property Address */
while (data_offset < end_offset) { while (data_offset < end_offset) {
old_offset = data_offset; old_offset = data_offset;
data_offset = acn_add_dmp_address(tvb, pinfo, pdu_tree, data_offset, &adt); 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; break;
case ACN_DMP_VECTOR_UNSUBSCRIBE: case ACN_DMP_VECTOR_UNSUBSCRIBE:
/* Rip trough Proptery Address */ /* Rip through Property Address */
while (data_offset < end_offset) { while (data_offset < end_offset) {
old_offset = data_offset; old_offset = data_offset;
data_offset = acn_add_dmp_address(tvb, pinfo, pdu_tree, data_offset, &adt); 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; break;
case ACN_DMP_VECTOR_GET_PROPERTY_FAIL: case ACN_DMP_VECTOR_GET_PROPERTY_FAIL:
/* Rip trough Address-Reason Code Pairs */ /* Rip through Address-Reason Code Pairs */
while (data_offset < end_offset) { while (data_offset < end_offset) {
old_offset = data_offset; old_offset = data_offset;
data_offset = acn_add_dmp_address(tvb, pinfo, pdu_tree, data_offset, &adt); 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; break;
case ACN_DMP_VECTOR_SET_PROPERTY_FAIL: case ACN_DMP_VECTOR_SET_PROPERTY_FAIL:
/* Rip trough Address-Reason Code Pairs */ /* Rip through Address-Reason Code Pairs */
while (data_offset < end_offset) { while (data_offset < end_offset) {
old_offset = data_offset; old_offset = data_offset;
data_offset = acn_add_dmp_address(tvb, pinfo, pdu_tree, data_offset, &adt); 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; break;
case ACN_DMP_VECTOR_MAP_PROPERTY_FAIL: case ACN_DMP_VECTOR_MAP_PROPERTY_FAIL:
/* Rip trough Address-Reason Code Pairs */ /* Rip through Address-Reason Code Pairs */
while (data_offset < end_offset) { while (data_offset < end_offset) {
old_offset = data_offset; old_offset = data_offset;
data_offset = acn_add_dmp_address(tvb, pinfo, pdu_tree, data_offset, &adt); 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; break;
case ACN_DMP_VECTOR_SUBSCRIBE_ACCEPT: case ACN_DMP_VECTOR_SUBSCRIBE_ACCEPT:
/* Rip through Property Addrsses */ /* Rip through Property Addresses */
while (data_offset < end_offset) { while (data_offset < end_offset) {
old_offset = data_offset; old_offset = data_offset;
data_offset = acn_add_dmp_address(tvb, pinfo, pdu_tree, data_offset, &adt); 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; break;
case ACN_DMP_VECTOR_SUBSCRIBE_REJECT: case ACN_DMP_VECTOR_SUBSCRIBE_REJECT:
/* Rip trough Address-Reason Code Pairs */ /* Rip through Address-Reason Code Pairs */
while (data_offset < end_offset) { while (data_offset < end_offset) {
old_offset = data_offset; old_offset = data_offset;
data_offset = acn_add_dmp_address(tvb, pinfo, pdu_tree, data_offset, &adt); 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 */ /* level : 8 bit value */
/* string : pointer to buffer to fill */ /* string : pointer to buffer to fill */
/* leading_char: character to buffer left of digits */ /* 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 */ /* show_zero: show zeros or dots */
/* also adds a space to right end */ /* also adds a space to right end */
/* */ /* */

View File

@ -1750,7 +1750,7 @@ dissect_acse(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* d
case SES_DISCONNECT: /* RLRQ */ case SES_DISCONNECT: /* RLRQ */
case SES_FINISH: /* RLRE */ case SES_FINISH: /* RLRE */
case SES_ABORT: /* ABRT */ case SES_ABORT: /* ABRT */
case CLSES_UNIT_DATA: /* AARQ Connetctionless session */ case CLSES_UNIT_DATA: /* AARQ Connectionless session */
break; break;
case SES_DATA_TRANSFER: case SES_DATA_TRANSFER:
oid=find_oid_by_pres_ctx_id(pinfo, indir_ref); oid=find_oid_by_pres_ctx_id(pinfo, indir_ref);

View File

@ -891,7 +891,7 @@ proto_register_adb(void)
module = prefs_register_protocol(proto_adb, NULL); module = prefs_register_protocol(proto_adb, NULL);
prefs_register_static_text_preference(module, "version", 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."); "Version of protocol supported by this dissector.");
} }

View File

@ -422,7 +422,7 @@ proto_register_adb_cs(void)
module = prefs_register_protocol(proto_adb_cs, NULL); module = prefs_register_protocol(proto_adb_cs, NULL);
prefs_register_static_text_preference(module, "version", 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."); "Version of protocol supported by this dissector.");
prefs_register_uint_preference(module, "server_port", prefs_register_uint_preference(module, "server_port",

View File

@ -813,7 +813,7 @@ proto_register_adb_service(void)
module = prefs_register_protocol(proto_adb_service, NULL); module = prefs_register_protocol(proto_adb_service, NULL);
prefs_register_static_text_preference(module, "version", 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."); "Version of protocol supported by this dissector.");
prefs_register_bool_preference(module, "framebuffer_more_details", prefs_register_bool_preference(module, "framebuffer_more_details",

View File

@ -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 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 http://developer.apple.com/mac/library/documentation/Networking/Reference/AFP_Reference/Reference/reference.html
Current AFP 3.x programming guide, in HTML form, at Current AFP 3.x programming guide, in HTML form, at

View File

@ -78,7 +78,7 @@ void proto_reg_handoff_ajp13(void);
* looking at raw network packets, aren't we? The stuff on the * looking at raw network packets, aren't we? The stuff on the
* wire. Wireshark has been getting better and better at helping * wire. Wireshark has been getting better and better at helping
* dissectors with this. I'm a little fuzzy on the details, but my * 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 * 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 * 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. * 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 * PDU can stretch across multiple TCP segments. Assembling them is
* obviously possible, but a royal pain. During the "phase one" * obviously possible, but a royal pain. During the "phase one"
* in-order pass you have to keep track of a bunch of offsets and * 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()" * (0.9.4+) versions of wireshark provide the "tcp_dissect_pdus()"
* function that takes care of much of the work. See the comments in * 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 * packet-tcp.c, the example code in packet-dns.c, or check the

View File

@ -1503,7 +1503,7 @@ proto_register_alcap(void)
{ &hf_alcap_compat_pass_on_sni, { &hf_alcap_compat_pass_on_sni,
{ "Pass-On SNI", "alcap.compat.pass.sni", { "Pass-On SNI", "alcap.compat.pass.sni",
FT_UINT8, BASE_DEC, VALS(send_notification), 0x40, FT_UINT8, BASE_DEC, VALS(send_notification), 0x40,
"Send Notificaation Indicator", HFILL } "Send Notification Indicator", HFILL }
}, },
{ &hf_alcap_compat_pass_on_ii, { &hf_alcap_compat_pass_on_ii,
{ "Pass-On II", "alcap.compat.pass.ii", { "Pass-On II", "alcap.compat.pass.ii",
@ -1513,7 +1513,7 @@ proto_register_alcap(void)
{ &hf_alcap_compat_general_sni, { &hf_alcap_compat_general_sni,
{ "General SNI", "alcap.compat.general.sni", { "General SNI", "alcap.compat.general.sni",
FT_UINT8, BASE_DEC, VALS(send_notification), 0x04, FT_UINT8, BASE_DEC, VALS(send_notification), 0x04,
"Send Notificaation Indicator", HFILL } "Send Notification Indicator", HFILL }
}, },
{ &hf_alcap_compat_general_ii, { &hf_alcap_compat_general_ii,
{ "General II", "alcap.compat.general.ii", { "General II", "alcap.compat.general.ii",

View File

@ -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. */ #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 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_SYN 0x01
#define ARDP_ACK 0x02 #define ARDP_ACK 0x02
#define ARDP_EAK 0x04 #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_fss = -1; /* fragment starting sequence number */
static int hf_ardp_fcnt = -1; /* fragment count */ static int hf_ardp_fcnt = -1; /* fragment count */
static int hf_ardp_bmp = -1; /* EACK bitmap */ 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_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_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). */ 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 /* This is used to round up offsets into a packet to an even two byte
* boundary from starting_offset. * boundary from starting_offset.
* @param current_offset is the current offset into the packet. * @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. * the message.
* @returns the offset rounded up to the next even two byte boundary from * @returns the offset rounded up to the next even two byte boundary from
start of the message. 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 /* This is used to round up offsets into a packet to an even four byte
* boundary from starting_offset. * boundary from starting_offset.
* @param current_offset is the current offset into the packet. * @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. * the message.
* @returns the offset rounded up to the next even four byte boundary from * @returns the offset rounded up to the next even four byte boundary from
start of the message. 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 /* This is used to round up offsets into a packet to an even eight byte
* boundary from starting_offset. * boundary from starting_offset.
* @param current_offset is the current offset into the packet. * @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. * the message.
* @returns the offset rounded up to the next even eight byte boundary from * @returns the offset rounded up to the next even eight byte boundary from
start of the message. 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 /* This is called by dissect_AllJoyn_message() to handle the initial byte for
* a connect message. * 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 * the number of bytes consumed out of the packet. If not an connect initial
* byte message or unhandled return 0. * byte message or unhandled return 0.
* @param tvb is the incoming network data buffer. * @param tvb is the incoming network data buffer.
@ -423,7 +423,7 @@ handle_message_connect(tvbuff_t *tvb,
if(0 == the_one_byte) { if(0 == the_one_byte) {
col_set_str(pinfo->cinfo, COL_INFO, "CONNECT-initial 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); proto_tree_add_item(message_tree, hf_alljoyn_connect_byte_value, tvb, offset, 1, ENC_NA);
offset += 1; 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. * 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 item is the item to append the signature data to.
* @param signature points to the signature to be appended. * @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. * @param type_stop is the character when indicates the end of the signature.
*/ */
static void static void
@ -1046,7 +1046,7 @@ parse_arg(tvbuff_t *tvb,
header_type_name = "object path"; header_type_name = "object path";
length = get_uint32(tvb, offset, encoding) + 1; 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. */ 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)) { 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.", 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 tvb is the incoming network data buffer.
* @param pinfo contains information about the incoming packet which * @param pinfo contains information about the incoming packet which
* we update as we dissect the packet. * 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 static void
ardp_parse_header(tvbuff_t *tvb, 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, {&hf_alljoyn_string,
{"Bus Name", "alljoyn.string", {"Bus Name", "alljoyn.string",

View File

@ -1408,7 +1408,7 @@ static int hf_amqp_1_0_replyTo_str = -1;
static int hf_amqp_1_0_mechanisms_sym = -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, /* 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} * Each row contains synonym fields for {FT_NONE, FT_UINT, FT_STRING, FT_BYTES, FT_GUID}
* NULL indicates no synonym of a given type * NULL indicates no synonym of a given type
* FT_NONE field must be always present * 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) else if(code == AMQP_1_0_TYPE_NULL)
{ {
/* null value says that a particular field was optional and is omited /* null value says that a particular field was optional and is omitted
* the omited fields of standard structutes are not shown * the omitted fields of standard structures are not shown
* however, we still display null values of custom lists, maps and arrays */ * however, we still display null values of custom lists, maps and arrays */
if(hf_amqp_type == hf_amqp_1_0_list) if(hf_amqp_type == hf_amqp_1_0_list)
{ {

View File

@ -526,7 +526,7 @@ dissect_amr_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint amr
bit_offset += 4; bit_offset += 4;
proto_tree_add_bits_item(toc_tree, hf_amr_toc_q, tvb, bit_offset, 1, ENC_BIG_ENDIAN); proto_tree_add_bits_item(toc_tree, hf_amr_toc_q, tvb, bit_offset, 1, ENC_BIG_ENDIAN);
bit_offset += 1; bit_offset += 1;
/* 2 pading bits */ /* 2 padding bits */
bit_offset += 2; bit_offset += 2;
offset += 1; offset += 1;
} }

View File

@ -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) /* 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 * 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 ) { if ( conversation_established ) {
return TRUE; return TRUE;
} }

View File

@ -3604,7 +3604,7 @@ dissect_ber_GeneralizedTime(gboolean implicit_tag, asn1_ctx_t *actx, proto_tree
first_delim[0] = 0; first_delim[0] = 0;
second_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); 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) { if (ret < 1) {
/* Nothing matched */ /* Nothing matched */
goto invalid; 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); tree = proto_item_get_subtree(actx->created_item);
if (bit_fields && tree && tmp_tvb) { if (bit_fields && tree && tmp_tvb) {
/* tmp_tvb points to the actual bitstring (including any pad bits at the end. /* 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. * so we have to read it byte by byte.
*/ */
val = 0; val = 0;

View File

@ -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 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 /* Heuristic is done in two phases
* First we try to identify the as length (2 or 4 bytes) * First we try to identify the as length (2 or 4 bytes)
* then we do check that our assumption is ok * 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 is used to navigate into the AS_PATH */
k = as_path_offset; k = as_path_offset;
/* case of AS_PATH type being explicitly 4 bytes ASN */ /* 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; *number_as_segment = counter_as_segment;
return(bgp_asn_len); return(bgp_asn_len);
} }
/* case of a empty path attribut */ /* case of a empty path attribute */
if (as_path_offset == end_attr_offset) if (as_path_offset == end_attr_offset)
{ {
*number_as_segment = 0; *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 */ /* we do run the heuristic on first segment and look at next segment if it exists */
k++; k++;
length = tvb_get_guint8(tvb, 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; offset_check = k + 2*length;
next_type = tvb_get_guint8(tvb, offset_check); 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 /* we do have one segment made of 2 bytes ASN we do reach the end of the attribute taking

View File

@ -537,7 +537,7 @@ x8f Priority Class Indicator
*/ */
/* Macros */ /* 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) \ #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) \ 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 /* 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 * 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, 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 * 11.3.21 MS Bucket Size

View File

@ -359,11 +359,11 @@ static const enum_val_t pref_vdp_codec[] = {
/* APT-X Codec */ /* APT-X Codec */
static int proto_aptx = -1; static int proto_aptx = -1;
static int hf_aptx_data = -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_delta_time = -1;
static int hf_aptx_avrcp_song_position = -1; static int hf_aptx_avrcp_song_position = -1;
static int hf_aptx_delta_time_from_the_beginning = -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 int hf_aptx_diff = -1;
static gint ett_aptx = -1; static gint ett_aptx = -1;
static dissector_handle_t aptx_handle; 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 *previous_media_packet_info;
media_packet_info_t *current_media_packet_info; media_packet_info_t *current_media_packet_info;
nstime_t first_abs_ts; nstime_t first_abs_ts;
gdouble cummulative_frame_duration; gdouble cumulative_frame_duration;
gdouble avrcp_song_position = -1.0; gdouble avrcp_song_position = -1.0;
btavrcp_song_position_data_t *song_position_data; 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 ) { 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; sep_data.previous_media_packet_info = previous_media_packet_info;
first_abs_ts = previous_media_packet_info->first_abs_ts; 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) if (avrcp_song_position == -1.0)
avrcp_song_position = previous_media_packet_info->avrcp_song_position; avrcp_song_position = previous_media_packet_info->avrcp_song_position;
else else
@ -1518,11 +1518,11 @@ dissect_btavdtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
if (avrcp_song_position == -1.0) if (avrcp_song_position == -1.0)
avrcp_song_position = 0.0; avrcp_song_position = 0.0;
first_abs_ts = pinfo->fd->abs_ts; 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 = (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->abs_ts = pinfo->fd->abs_ts;
sep_data.previous_media_packet_info->first_abs_ts = first_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->avrcp_song_position = avrcp_song_position;
sep_data.previous_media_packet_info->stream_number = sep_data.stream_number; 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 = wmem_new(wmem_file_scope(), media_packet_info_t);
current_media_packet_info->abs_ts = pinfo->fd->abs_ts; current_media_packet_info->abs_ts = pinfo->fd->abs_ts;
current_media_packet_info->first_abs_ts = first_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->avrcp_song_position = avrcp_song_position;
current_media_packet_info->stream_number = sep_data.stream_number; 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_tree *aptx_tree;
proto_item *pitem; proto_item *pitem;
bta2dp_codec_info_t *info; bta2dp_codec_info_t *info;
gdouble cummulative_frame_duration = 0; gdouble cumulative_frame_duration = 0;
info = (bta2dp_codec_info_t *) data; 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; expected_speed_data = frequency * (sample_bits / 8.0) * number_of_channels;
frame_duration = (((double) frame_length / (double) expected_speed_data) * 1000.0); 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_append_text(pitem, " ms");
PROTO_ITEM_SET_GENERATED(pitem); 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); PROTO_ITEM_SET_GENERATED(pitem);
if (!pinfo->fd->flags.visited) 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_append_text(pitem, " ms");
PROTO_ITEM_SET_GENERATED(pitem); 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_append_text(pitem, " ms");
PROTO_ITEM_SET_GENERATED(pitem); PROTO_ITEM_SET_GENERATED(pitem);
} }
@ -2893,8 +2893,8 @@ proto_register_aptx(void)
FT_BYTES, BASE_NONE, NULL, 0x00, FT_BYTES, BASE_NONE, NULL, 0x00,
NULL, HFILL } NULL, HFILL }
}, },
{ &hf_aptx_cummulative_frame_duration, { &hf_aptx_cumulative_frame_duration,
{ "Cummulative Frame Duration", "aptx.cummulative_frame_duration", { "Cumulative Frame Duration", "aptx.cumulative_frame_duration",
FT_DOUBLE, BASE_NONE, NULL, 0x00, FT_DOUBLE, BASE_NONE, NULL, 0x00,
NULL, HFILL } NULL, HFILL }
}, },
@ -2913,8 +2913,8 @@ proto_register_aptx(void)
FT_DOUBLE, BASE_NONE, NULL, 0x00, FT_DOUBLE, BASE_NONE, NULL, 0x00,
NULL, HFILL } NULL, HFILL }
}, },
{ &hf_aptx_cummulative_duration, { &hf_aptx_cumulative_duration,
{ "Cummulative Music Duration", "aptx.cummulative_music_duration", { "Cumulative Music Duration", "aptx.cumulative_music_duration",
FT_DOUBLE, BASE_NONE, NULL, 0x00, FT_DOUBLE, BASE_NONE, NULL, 0x00,
NULL, HFILL } 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; bta2dp_codec_info.current_media_packet_info = sep_data.current_media_packet_info;
#if RTP_PLAYER_WORKAROUND == TRUE #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) */ 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->srcport = sep_data.stream_number;
pinfo->destport = 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; btvdp_codec_info.content_protection_type = sep_data.content_protection_type;
#if RTP_PLAYER_WORKAROUND == TRUE #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) */ 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->srcport = sep_data.stream_number;
pinfo->destport = sep_data.stream_number; pinfo->destport = sep_data.stream_number;

View File

@ -30,7 +30,7 @@
typedef struct _media_packet_info_t { typedef struct _media_packet_info_t {
nstime_t abs_ts; nstime_t abs_ts;
nstime_t first_abs_ts; nstime_t first_abs_ts;
gdouble cummulative_frame_duration; gdouble cumulative_frame_duration;
gdouble avrcp_song_position; gdouble avrcp_song_position;
guint32 stream_number; guint32 stream_number;
} media_packet_info_t; } media_packet_info_t;

View File

@ -2784,7 +2784,7 @@ proto_register_btobex(void)
NULL, HFILL} NULL, HFILL}
}, },
{ &hf_authentication_parameter, { &hf_authentication_parameter,
{ "Autentication Parameter", "btobex.authentication", { "Authentication Parameter", "btobex.authentication",
FT_UINT8, BASE_HEX, NULL, 0x00, FT_UINT8, BASE_HEX, NULL, 0x00,
NULL, HFILL} NULL, HFILL}
}, },

View File

@ -168,7 +168,7 @@
/* This structure is passed to other dissectors /* This structure is passed to other dissectors
* and contains information about the relation between service, PSM/server * and contains information about the relation between service, PSM/server
* channel, local/remote service. The btrfcomm and btl2cap dissectors * 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. * dynamically assigned server channels and PSM's, respectively.
*/ */
typedef struct _btsdp_data_t { typedef struct _btsdp_data_t {

View File

@ -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. * Checks to make sure that a complete, valid BER-encoded length is in the buffer.
* *
* \param tvb contains the buffer to be examined * \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 * \returns TRUE if a complete, valid BER-encoded length is in the buffer; otherwise FALSE
*/ */
static gboolean static gboolean

View File

@ -30,7 +30,7 @@
#include "packet-cip.h" #include "packet-cip.h"
void proto_register_cipmotion(void); 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); void proto_reg_handoff_cipmotion(void);
/* Protocol handle for CIP Motion */ /* Protocol handle for CIP Motion */

View File

@ -35,7 +35,7 @@
void proto_register_cipsafety(void); void proto_register_cipsafety(void);
void proto_reg_handoff_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 */ /* Protocol handle for CIP Safety */
static int proto_cipsafety = -1; static int proto_cipsafety = -1;

View File

@ -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.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.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.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.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.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)"); register_ber_oid_dissector("2.9.3.2.7.55", dissect_Destination_PDU, proto_cmip, "destination(55)");

View File

@ -1,5 +1,5 @@
/* packet-corosync-totemsrp.c /* 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 <yamato@redhat.com> * Copyright 2007 2009 2010 2014 Masatake YAMATO <yamato@redhat.com>
* Copyright (c) 2010 2014 Red Hat, Inc. * Copyright (c) 2010 2014 Red Hat, Inc.
* *
@ -1129,9 +1129,9 @@ proto_register_corosync_totemsrp(void)
FT_UINT32, BASE_DEC, NULL, 0x0, FT_UINT32, BASE_DEC, NULL, 0x0,
NULL, HFILL}}, NULL, HFILL}},
/* token_hold_canel */ /* token_hold_cancel */
{ &hf_corosync_totemsrp_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, FT_NONE, BASE_NONE, NULL, 0x0,
NULL, HFILL}}, NULL, HFILL}},
}; };

View File

@ -147,7 +147,7 @@ enum {
DHCP_FO_PD_BINDING_STATUS, DHCP_FO_PD_BINDING_STATUS,
DHCP_FO_PD_ASSIGNED_IP_ADDRESS, DHCP_FO_PD_ASSIGNED_IP_ADDRESS,
DHCP_FO_PD_SENDING_SERVER_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_IDENTIFIER,
DHCP_FO_PD_CLIENT_HARDWARE_ADDRESS, DHCP_FO_PD_CLIENT_HARDWARE_ADDRESS,
DHCP_FO_PD_FTDDNS, 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_BINDING_STATUS, "binding-status"},
{DHCP_FO_PD_ASSIGNED_IP_ADDRESS, "assigned-IP-address"}, {DHCP_FO_PD_ASSIGNED_IP_ADDRESS, "assigned-IP-address"},
{DHCP_FO_PD_SENDING_SERVER_IP_ADDRESS, "sending-server-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_IDENTIFIER, "client-identifier"},
{DHCP_FO_PD_CLIENT_HARDWARE_ADDRESS, "client-hardware-address"}, {DHCP_FO_PD_CLIENT_HARDWARE_ADDRESS, "client-hardware-address"},
{DHCP_FO_PD_FTDDNS, "FTDDNS"}, {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); offset, option_length, ENC_BIG_ENDIAN);
break; break;
case DHCP_FO_PD_ADDRESSES_TRANSFERED: case DHCP_FO_PD_ADDRESSES_TRANSFERRED:
if (option_length != 4) { if (option_length != 4) {
expert_add_info_format(pinfo, oi, &ei_dhcpfo_bad_length, "addresses transferred is not 4 bytes long"); expert_add_info_format(pinfo, oi, &ei_dhcpfo_bad_length, "addresses transferred is not 4 bytes long");
break; break;

View File

@ -377,7 +377,7 @@ diameterstat_init(struct register_srt* srt _U_, GArray* srt_array, srt_gui_init_
srt_stat_table *diameter_srt_table; srt_stat_table *diameter_srt_table;
int* idx; 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. */ level doesn't need to be supported. */
if (diameterstat_cmd_str_hash != NULL) 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); g_hash_table_insert(diameterstat_cmd_str_hash, "Unknown", idx);
/** @todo the filter to use in stead of NULL is "diameter.cmd.code" /** @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 * Note to make it work the command code must be stored rather than the
* index. * index.
*/ */
@ -408,7 +408,7 @@ diameterstat_packet(void *pss, packet_info *pinfo, epan_dissect_t *edt _U_, cons
int* idx = NULL; int* idx = NULL;
/* Process only answers where corresponding request is found. /* 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. */ * Return 0, since redraw is not needed. */
if(!diameter || diameter->processing_request || !diameter->req_frame) if(!diameter || diameter->processing_request || !diameter->req_frame)
return 0; 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 /* 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: * In case if you don't need unpaired requests/answers use:
* if (diameter_pair->processing_request || !diameter_pair->req_frame) * if (diameter_pair->processing_request || !diameter_pair->req_frame)
* return; * return;
@ -2371,7 +2371,7 @@ proto_reg_handoff_diameter(void)
/* AVP Code: 97 Framed-IPv6-Address */ /* AVP Code: 97 Framed-IPv6-Address */
dissector_add_uint("diameter.base", 97, create_dissector_handle(dissect_diameter_base_framed_ipv6_prefix, proto_diameter)); 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)); dissector_add_uint("diameter.base", 265, create_dissector_handle(dissect_diameter_vendor_id, proto_diameter));
/* AVP Code: 266 Vendor-Id */ /* AVP Code: 266 Vendor-Id */

View File

@ -2084,7 +2084,7 @@ proto_register_diameter_3gpp(void)
NULL, HFILL } NULL, HFILL }
}, },
{ &hf_diameter_3gpp_feature_list_gx_flags_bit21, { &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, FT_BOOLEAN, 32, TFS(&tfs_supported_not_supported), 0x00200000,
NULL, HFILL } NULL, HFILL }
}, },

View File

@ -70,7 +70,7 @@ extern void proto_reg_handoff_distcc(void);
#define DESEGMENT_TCP(x) \ #define DESEGMENT_TCP(x) \
if(distcc_desegment && pinfo->can_desegment){\ 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(tvb_captured_length_remaining(tvb, offset)==tvb_reported_length_remaining(tvb, offset)){\
if(parameter>tvb_captured_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]");\ proto_tree_add_expert_format(tree, pinfo, &ei_distcc_short_pdu, tvb, offset-12, -1, "[Short " x " PDU]");\

View File

@ -244,7 +244,7 @@ dissect_djiuav_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *da
pdu_length - 1 - offset, ENC_NA); pdu_length - 1 - offset, ENC_NA);
offset += pdu_length - 1 - offset; 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, proto_tree_add_item(djiuav_tree, hf_djiuav_checksum, tvb, offset, 1,
ENC_BIG_ENDIAN); ENC_BIG_ENDIAN);
offset += 1; offset += 1;

View File

@ -2369,7 +2369,7 @@ static void cyclic_setup(packet_info* pinfo, guint16 offset, gboolean request, t
case 1: /* edit */ case 1: /* edit */
case 2: /* finalise */ case 2: /* finalise */
case 3: /* delete */ case 3: /* delete */
/* no mode specific datan */ /* no mode specific data */
break; break;
case 4: /* exist */ case 4: /* exist */
@ -2501,7 +2501,7 @@ static void program_control(int offset, gboolean request, tvbuff_t *tvb, proto_t
/* */ /* */
/* Returns: nothing */ /* 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". */ /* for responses, the "offset" points to the "status". */
/* */ /* */
/* sample ECMP Request Frame */ /* sample ECMP Request Frame */
@ -2559,7 +2559,7 @@ static void modbus_pdu(int offset, gboolean request, tvbuff_t *tvb, packet_info*
/* */ /* */
/* Returns: nothing */ /* 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. */ /* for responses, the "offset" points to the size. */
/* */ /* */
/* sample ECMP Request Frame (Read Holding Registers) */ /* sample ECMP Request Frame (Read Holding Registers) */
@ -2629,7 +2629,7 @@ static void interrogate(packet_info* pinfo, int offset, gboolean request, tvbuff
/* */ /* */
/* Returns: nothing */ /* 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". */ /* for responses, the "offset" points to the "item type". */
/* */ /* */
/* sample ECMP Request Frame */ /* sample ECMP Request Frame */

View File

@ -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 subindex
* - 1 byte for reserved and padding */ * - 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 */ * padding was checked above, but to be sure, this remains here */
if ( (guint32)( padding + 8 ) >= datalength ) if ( (guint32)( padding + 8 ) >= datalength )
break; break;

View File

@ -264,7 +264,7 @@ proto_register_epon(void)
}, },
{ &ei_epon_dpoe_bad, { &ei_epon_dpoe_bad,
{ "epon.dpoe.expert", PI_MALFORMED, PI_ERROR, { "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, { &ei_epon_dpoe_encrypted_data,
{ "epon.dpoe.encrypted.expert", PI_UNDECODED, PI_NOTE, { "epon.dpoe.encrypted.expert", PI_UNDECODED, PI_NOTE,

View File

@ -1434,7 +1434,7 @@ dissect_erf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
hdlc_type = ERF_HDLC_CHDLC; hdlc_type = ERF_HDLC_CHDLC;
else { else {
/* Anything to check for to recognize Frame Relay or MTP2? /* 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; hdlc_type = ERF_HDLC_PPP;
} }
} }

View File

@ -681,7 +681,7 @@ add_ethernet_trailer(packet_info *pinfo, proto_tree *tree, proto_tree *fh_tree,
if (fcs_len != 0) { if (fcs_len != 0) {
/* If fcs_len is 4, we assume we definitely have an FCS. /* If fcs_len is 4, we assume we definitely have an FCS.
Otherwise, then, if the frame is big enough that, if we 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 enough space in the trailer for the FCS, we assume we
have an FCS. have an FCS.
@ -903,7 +903,7 @@ proto_register_eth(void)
{ &hf_eth_fcs_bad, { &hf_eth_fcs_bad,
{ "FCS Bad", "eth.fcs_bad", FT_BOOLEAN, BASE_NONE, NULL, 0x0, { "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, { &hf_eth_lg,
{ "LG bit", "eth.lg", FT_BOOLEAN, 24, { "LG bit", "eth.lg", FT_BOOLEAN, 24,

View File

@ -50,7 +50,7 @@ const value_string etype_vals[] = {
{ ETHERTYPE_VLAN, "802.1Q Virtual LAN" }, { ETHERTYPE_VLAN, "802.1Q Virtual LAN" },
{ ETHERTYPE_ARP, "ARP" }, { ETHERTYPE_ARP, "ARP" },
{ ETHERTYPE_WLCCP, "Cisco Wireless Lan Context Control Protocol" }, { 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_CENTRINO_PROMISC, "IEEE 802.11 (Centrino promiscuous)" },
{ ETHERTYPE_XNS_IDP, "XNS Internet Datagram Protocol" }, { ETHERTYPE_XNS_IDP, "XNS Internet Datagram Protocol" },
{ ETHERTYPE_X25L3, "X.25 Layer 3" }, { ETHERTYPE_X25L3, "X.25 Layer 3" },

View File

@ -661,7 +661,7 @@ static const value_string bearer_descr_vals[] = {
{ 0x01, "CSD" }, { 0x01, "CSD" },
{ 0x02, "GPRS / UTRAN packet service / E-UTRAN" }, { 0x02, "GPRS / UTRAN packet service / E-UTRAN" },
{ 0x03, "default bearer for requested transport layer" }, { 0x03, "default bearer for requested transport layer" },
{ 0x04, "local link techonlogy independent" }, { 0x04, "local link technology independent" },
{ 0x05, "Bluetooth" }, { 0x05, "Bluetooth" },
{ 0x06, "IrDA" }, { 0x06, "IrDA" },
{ 0x07, "RS232" }, { 0x07, "RS232" },
@ -790,7 +790,7 @@ static const value_string transport_ptype_vals[] = {
{ 0x02, "TCP, UICC in client mode, remote connection" }, { 0x02, "TCP, UICC in client mode, remote connection" },
{ 0x03, "TCP, UICC in server mode" }, { 0x03, "TCP, UICC in server mode" },
{ 0x04, "UDP, UICC in client mode, local connection" }, { 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" }, { 0x06, "direct communication channel" },
{ 0, NULL } { 0, NULL }
}; };
@ -1684,7 +1684,7 @@ proto_register_card_app_toolkit(void)
NULL, HFILL }, NULL, HFILL },
}, },
{ &hf_ctlv_bearer_gprs_mean, { &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, FT_UINT8, BASE_DEC, NULL, 0,
NULL, HFILL }, NULL, HFILL },
}, },

View File

@ -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 */ case EDP_TYPE_ESRP: /* Extreme Standby Router Protocol */
dissect_esrp_tlv(tvb, pinfo, offset, tlv_length, edp_tree); dissect_esrp_tlv(tvb, pinfo, offset, tlv_length, edp_tree);
break; 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); dissect_eaps_tlv(tvb, pinfo, offset, tlv_length, edp_tree);
break; break;
case EDP_TYPE_ESL: /* EAPS shared link */ case EDP_TYPE_ESL: /* EAPS shared link */

View File

@ -778,7 +778,7 @@ proto_register_forces(void)
FT_UINT32, BASE_DEC, VALS(association_setup_result_at_vals), 0x0, NULL, HFILL } FT_UINT32, BASE_DEC, VALS(association_setup_result_at_vals), 0x0, NULL, HFILL }
}, },
{ &hf_forces_astreason_tlv_teardown_reason, { &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 } FT_UINT32, BASE_DEC, VALS(teardown_reason_at_vals), 0x0, NULL, HFILL }
}, },
{ &hf_forces_unknown_tlv, { &hf_forces_unknown_tlv,

View File

@ -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, proto_tree_add_item(tree, hf_ipaccess_attr_string,
tvb, offset+3, len-1, ENC_ASCII|ENC_NA); tvb, offset+3, len-1, ENC_ASCII|ENC_NA);
break; break;
case 0x01: /* a single-byte reqest for a certain attr */ case 0x01: /* a single-byte request for a certain attr */
len = 0; len = 0;
proto_tree_add_item(tree, hf_ipaccess_attr_tag, proto_tree_add_item(tree, hf_ipaccess_attr_tag,
tvb, offset+1, 1, ENC_BIG_ENDIAN); tvb, offset+1, 1, ENC_BIG_ENDIAN);

View File

@ -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"); 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_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_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); proto_tree_add_item(imsc_server_tree, hf_gtpv2_tra_info_lmsc_mc, tvb, offset, 1, ENC_BIG_ENDIAN);

View File

@ -1324,7 +1324,7 @@ dissect_h223_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, circuit
* PDU. * PDU.
* *
* However, if we return that, it means that we get called twice * 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 * the stream we are and we have to start messing about with
* getting the seqno from the superdissector's private data. So we * getting the seqno from the superdissector's private data. So we
* don't do that. * don't do that.

View File

@ -98,7 +98,7 @@ static expert_field ei_ros_undecoded = EI_INIT;
/* Subdissectors */ /* Subdissectors */
static dissector_handle_t data_handle = NULL; static dissector_handle_t data_handle = NULL;
/* Gloabl variables */ /* Global variables */
static gint32 problem_val; static gint32 problem_val;
static gchar problem_str[64]; static gchar problem_str[64];
static tvbuff_t *arg_next_tvb, *res_next_tvb, *err_next_tvb; static tvbuff_t *arg_next_tvb, *res_next_tvb, *err_next_tvb;

View File

@ -1019,7 +1019,7 @@ proto_register_hartip(void)
"Error Code", HFILL } "Error Code", HFILL }
}, },
/* HARTIP Pass-through commads. */ /* HARTIP Pass-through commands. */
{ &hf_hartip_pt_preambles, { &hf_hartip_pt_preambles,
{ "Preambles", "hart_ip.pt.preambles", { "Preambles", "hart_ip.pt.preambles",
FT_BYTES, BASE_NONE, NULL, 0x0, FT_BYTES, BASE_NONE, NULL, 0x0,

View File

@ -1176,7 +1176,7 @@ dissect_idrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_
tvb, offset, 4, ENC_BIG_ENDIAN); tvb, offset, 4, ENC_BIG_ENDIAN);
offset += 4; offset += 4;
/* 4 octets Achnowledge */ /* 4 octets Acknowledge */
proto_tree_add_item(idrp_tree, hf_idrp_ack, proto_tree_add_item(idrp_tree, hf_idrp_ack,
tvb, offset, 4, ENC_BIG_ENDIAN); tvb, offset, 4, ENC_BIG_ENDIAN);
offset += 4; offset += 4;
@ -1240,7 +1240,7 @@ void proto_register_idrp(void)
VALS(idrp_pdu_types), 0xff, NULL, HFILL}}, VALS(idrp_pdu_types), 0xff, NULL, HFILL}},
{&hf_idrp_sequence, {&hf_idrp_sequence,
{"Sequence Number", "idrp.seq", FT_UINT32, BASE_DEC, NULL, 0x0, {"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, {&hf_idrp_ack,
{"Acknowledgment number", "idrp.ack", FT_UINT32, BASE_DEC, NULL, 0x0, {"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", "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, {&hf_idrp_open_rib_attr_security_reg_id,
{"Rib Attribute Value Security Registration ID", {"Rib Attribute Value Security Registration ID",
"idrp.open.rib-attr.security.reg-id", FT_BYTES, BASE_NONE, "idrp.open.rib-attr.security.reg-id", FT_BYTES, BASE_NONE,
NULL, 0, "Identifys the Security Authority" , NULL, 0, "Identifies the Security Authority" ,
HFILL}}, HFILL}},
{&hf_idrp_open_rib_attr_security_info, {&hf_idrp_open_rib_attr_security_info,
{"Rib Attribute Value Security Registration ID", {"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, {&hf_idrp_update_path_attr_dist_list_incl_nb_rdi,
{"Path Attribute Value Dist List Incl Number of RDIs", {"Path Attribute Value Dist List Incl Number of RDIs",
"idrp.update.path-attr.dist-list-incl.number-rdi", FT_UINT8, BASE_DEC, "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}}, HFILL}},
{&hf_idrp_update_path_attr_dist_list_incl_rdi, {&hf_idrp_update_path_attr_dist_list_incl_rdi,
{"Path Attribute Value Dist List Incl RDI", {"Path Attribute Value Dist List Incl RDI",
"idrp.update.path-attr.dist-list-incl.rdi", FT_BYTES, BASE_NONE, "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}}, HFILL}},
{&hf_idrp_update_path_attr_dist_list_excl_nb_rdi, {&hf_idrp_update_path_attr_dist_list_excl_nb_rdi,
{"Path Attribute Value Dist List Excl Number of RDIs", {"Path Attribute Value Dist List Excl Number of RDIs",
"idrp.update.path-attr.dist-list-excl.number-rdi", FT_UINT8, BASE_DEC, "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}}, HFILL}},
{&hf_idrp_update_path_attr_dist_list_excl_rdi, {&hf_idrp_update_path_attr_dist_list_excl_rdi,
{"Path Attribute Value Dist List Excl RDI", {"Path Attribute Value Dist List Excl RDI",
"idrp.update.path-attr.dist-list-excl.rdi", FT_BYTES, BASE_NONE, "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}}, HFILL}},
{&hf_idrp_update_path_attr_multi_exit_disc, {&hf_idrp_update_path_attr_multi_exit_disc,
{"Path Attribute Value 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, {&hf_idrp_update_path_attr_security_reg_id,
{"Path Attribute Value Security Registration ID", {"Path Attribute Value Security Registration ID",
"idrp.update.path-attr.security.reg-id", FT_BYTES, BASE_NONE, "idrp.update.path-attr.security.reg-id", FT_BYTES, BASE_NONE,
NULL, 0, "Identifys the Security Authority" , NULL, 0, "Identifies the Security Authority" ,
HFILL}}, HFILL}},
{&hf_idrp_update_path_attr_security_info, {&hf_idrp_update_path_attr_security_info,
{"Path Attribute Value Security Registration ID", {"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", "Diagnosis data that depends upon the error code and error subcode",
HFILL}}, HFILL}},
{&hf_idrp_rib_refresh_opcode, {&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), VALS(idrp_error_rib_refresh_subcodes),
0xff, NULL, HFILL}}, 0xff, NULL, HFILL}},
{&hf_idrp_rib_refresh_rib_attr_locally_defined_qos_nsap, {&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, {&hf_idrp_rib_refresh_rib_attr_security_reg_id,
{"Rib Attribute Value Security Registration ID", {"Rib Attribute Value Security Registration ID",
"idrp.rib-refresh.rib-attr.security.reg-id", FT_BYTES, BASE_NONE, "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}}, HFILL}},
{&hf_idrp_rib_refresh_rib_attr_security_info, {&hf_idrp_rib_refresh_rib_attr_security_info,
{"Rib Attribute Value Security Registration ID", {"Rib Attribute Value Security Registration ID",

View File

@ -112,7 +112,7 @@ static const value_string apci_types [] = {
}; };
/* Constants relative to the filed, independent of the field position in the byte */ /* 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_ACT 0x01
#define U_STARTDT_CON 0x02 #define U_STARTDT_CON 0x02
#define U_STOPDT_ACT 0x04 #define U_STOPDT_ACT 0x04
@ -363,7 +363,7 @@ static const td_asdu_length asdu_length [] = {
{ 0, 0 } { 0, 0 }
}; };
/* Cause of Transmision (CauseTx) */ /* Cause of Transmission (CauseTx) */
#define Per_Cyc 1 #define Per_Cyc 1
#define Back 2 #define Back 2
#define Spont 3 #define Spont 3
@ -489,22 +489,22 @@ static const value_string coi_r_types[] = {
static const value_string qoi_r_types[] = { static const value_string qoi_r_types[] = {
{ 0, "Not specified" }, { 0, "Not specified" },
{ 20, "Station interrogation (global)" }, { 20, "Station interrogation (global)" },
{ 21, "Group 1 interrotagion" }, { 21, "Group 1 interrogation" },
{ 22, "Group 2 interrotagion" }, { 22, "Group 2 interrogation" },
{ 23, "Group 3 interrotagion" }, { 23, "Group 3 interrogation" },
{ 24, "Group 4 interrotagion" }, { 24, "Group 4 interrogation" },
{ 25, "Group 5 interrotagion" }, { 25, "Group 5 interrogation" },
{ 26, "Group 6 interrotagion" }, { 26, "Group 6 interrogation" },
{ 27, "Group 7 interrotagion" }, { 27, "Group 7 interrogation" },
{ 28, "Group 8 interrotagion" }, { 28, "Group 8 interrogation" },
{ 29, "Group 9 interrotagion" }, { 29, "Group 9 interrogation" },
{ 30, "Group 10 interrotagion" }, { 30, "Group 10 interrogation" },
{ 31, "Group 11 interrotagion" }, { 31, "Group 11 interrogation" },
{ 32, "Group 12 interrotagion" }, { 32, "Group 12 interrogation" },
{ 33, "Group 13 interrotagion" }, { 33, "Group 13 interrogation" },
{ 34, "Group 14 interrotagion" }, { 34, "Group 14 interrogation" },
{ 35, "Group 15 interrotagion" }, { 35, "Group 15 interrogation" },
{ 36, "Group 16 interrotagion" }, { 36, "Group 16 interrogation" },
{ 0, NULL } { 0, NULL }
}; };

View File

@ -5051,7 +5051,7 @@ proto_register_17221(void)
}, },
#endif #endif
{ &hf_adp_assoc_id, { &hf_adp_assoc_id,
{ "Assocation ID", "ieee17221.assocation_id", { "Association ID", "ieee17221.association_id",
FT_UINT64, BASE_HEX, NULL, 0x00, NULL, HFILL } FT_UINT64, BASE_HEX, NULL, 0x00, NULL, HFILL }
}, },
#if 0 #if 0
@ -5226,7 +5226,7 @@ proto_register_17221(void)
/* ACQUIRE_ENTITY */ /* ACQUIRE_ENTITY */
{ &hf_aecp_persistent_flag, { &hf_aecp_persistent_flag,
{ "Peristent Flag", "ieee17221.flags.persistent", { "Persistent Flag", "ieee17221.flags.persistent",
FT_BOOLEAN, 32, NULL, AECP_PERSISTENT_FLAG_MASK, NULL, HFILL } FT_BOOLEAN, 32, NULL, AECP_PERSISTENT_FLAG_MASK, NULL, HFILL }
}, },
{ &hf_aecp_release_flag, { &hf_aecp_release_flag,
@ -5323,7 +5323,7 @@ proto_register_17221(void)
FT_UINT64, BASE_HEX, NULL, 0x00, NULL, HFILL } FT_UINT64, BASE_HEX, NULL, 0x00, NULL, HFILL }
}, },
{ &hf_aecp_avb_info_propegation_delay, { &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 } FT_UINT32, BASE_DEC, NULL, 0x00, NULL, HFILL }
}, },
{ &hf_aecp_avb_info_gptp_domain_number, { &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 * },/* draft spec says this is defined by control_type field *
* start_operation does not include a control type field * * start_operation does not include a control type field *
* There is an operation type table 7.83 that has not * * 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 */ * descriptor; will check */
/* ABORT_OPERATION */ /* ABORT_OPERATION */
@ -6421,7 +6421,7 @@ proto_register_17221(void)
FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL } FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }
}, },
{ &hf_aem_avb_offset_scaled_log_variance, { &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 } FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }
}, },
{ &hf_aem_avb_clock_accuracy, { &hf_aem_avb_clock_accuracy,
@ -6923,7 +6923,7 @@ proto_register_17221(void)
FT_UINT8, BASE_HEX, NULL, 0x00, NULL, HFILL } FT_UINT8, BASE_HEX, NULL, 0x00, NULL, HFILL }
}, },
{ &hf_aem_color_space, { &hf_aem_color_space,
{"Color Space", "ieee17221.color_sapce", {"Color Space", "ieee17221.color_space",
FT_UINT8, BASE_HEX, NULL, 0x00, NULL, HFILL } FT_UINT8, BASE_HEX, NULL, 0x00, NULL, HFILL }
}, },
#if 0 #if 0

View File

@ -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); 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 = tvb_get_guint8(tvb, IEEE_1722A_CD_OFFSET);
subtype &= IEEE_1722A_SUBTYPE_MASK; subtype &= IEEE_1722A_SUBTYPE_MASK;

View File

@ -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 * Oh God! The specification is so bad. This is the worst
* case of design-by-committee I've ever seen in my life. * 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. * to decipher which key is used for which message.
* *
* Let's hope it's simpler to implement for dissecting only. * 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_m = captured_len;
guint l_a = offset; 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)) { if (!IEEE802154_IS_ENCRYPTED(packet->security_level)) {
l_a += l_m; l_a += l_m;
l_m = 0; l_m = 0;
@ -2434,7 +2434,7 @@ gboolean ieee802154_long_addr_equal(gconstpointer a, gconstpointer b)
*@param short_addr 16-bit short address *@param short_addr 16-bit short address
*@param pan 16-bit PAN id *@param pan 16-bit PAN id
*@param long_addr 64-bit long (extended) address *@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 *@param fnum Frame number this mapping became valid
*@return TRUE Record was updated, FALSE Couldn't find it *@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 *Marks a mapping record associated with device with short_addr
*as invalid at a certain frame number, typically when a *as invalid at a certain frame number, typically when a
*dissassociation occurs. *disassociation occurs.
* *
*@param short_addr 16-bit short address *@param short_addr 16-bit short address
*@param pan 16-bit PAN id *@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 * Mark a mapping record associated with device with long_addr
* as invalid at a certain frame number, typically when a * as invalid at a certain frame number, typically when a
* dissassociation occurs. * disassociation occurs.
* *
*@param long_addr 16-bit short address *@param long_addr 16-bit short address
*@param fnum Frame number when mapping became invalid *@param fnum Frame number when mapping became invalid

View File

@ -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); proto_tree_add_item(tree, hf_igap_challenge, tvb, offset, msize, ENC_NA);
break; break;
case IGAP_SUBTYPE_AUTH_MESSAGE: 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]); proto_tree_add_uint(tree, hf_igap_authentication_result, tvb, offset, msize, message[0]);
break; break;
case IGAP_SUBTYPE_ACCOUNTING_MESSAGE: case IGAP_SUBTYPE_ACCOUNTING_MESSAGE:

View File

@ -130,7 +130,7 @@ dissect_ipmi_session(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *
payloadtype &= 0x3f; payloadtype &= 0x3f;
/* IPMI v2.0 packets have session ID BEFORE the session /* 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 types. The OEM Explicit payload type has 6 more bytes
(IANA + Payload ID) before the session ID. */ (IANA + Payload ID) before the session ID. */
if (payloadtype == IPMI_OEM_EXPLICIT) { if (payloadtype == IPMI_OEM_EXPLICIT) {

View File

@ -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). /* 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. in order to keep code paths common.
Note that an attempt to match with these entries will be made *before* entries Note that an attempt to match with these entries will be made *before* entries
added through the UAT entry interface/file. */ 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 Return : Return the remaining number of char of the IPv6 address parsed
Params: Params:
- char *ipv6_addr : the valid ipv6 address to parse in char * - 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 ex: if IPv6 address is "3ffe::1" the IPv6 expanded address
will be "3FFE0000000000000000000000000001" and the function will return 0 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. the previous one was valid.
Params: Params:
- char *ipv4_addr : the valid ipv4 address to parse in char * - 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 ex: if IPv4 address is "190.*.*.1" the IPv4 expanded address will be "BE****01" and
the function will return 0 the function will return 0
@ -997,7 +997,7 @@ filter_spi_match(gchar *spi, gchar *filter)
gcry_cipher_hd_t **cipher_hd, gcry_cipher_hd_t **cipher_hd,
gboolean **cipher_hd_created 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. Return: If the SA is not present, FALSE is then returned.
Params: Params:
- g_esp_sa_database *sad : the Security Association Database - 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; *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 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 = &record->cipher_hd;
*cipher_hd_created = &record->cipher_hd_created; *cipher_hd_created = &record->cipher_hd_created;
} }
@ -1224,7 +1224,7 @@ Return : void
Params: Params:
- proto_tree *tree : the current tree - proto_tree *tree : the current tree
- tvbuff_t *tvb : the tvbuffer - 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 - 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 - 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 - gboolean authentication_ok : set to true if the authentication checking has been run successfully

View File

@ -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 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 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){ if(tvb_get_guint8(tvb, offset+8)&0x40){
/* volume set addressing */ /* 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); 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); 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); col_set_fence(pinfo->cinfo, COL_INFO);
/* where there any ImmediateData ? */ /* where there any ImmediateData ? */

View File

@ -1977,7 +1977,7 @@ proto_register_isi(void)
{ &hf_isi_gps_satellites, { &hf_isi_gps_satellites,
{ "Visible Satellites", "isi.gps.satellites", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { "Visible Satellites", "isi.gps.satellites", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }},
{ &hf_isi_gps_prn, { &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, { &hf_isi_gps_sat_used,
{ "in use", "isi.gps.sat.used", FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { "in use", "isi.gps.sat.used", FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL }},
{ &hf_isi_gps_sat_strength, { &hf_isi_gps_sat_strength,

View File

@ -644,7 +644,7 @@ dissect_hello_ipv6_int_addr_clv(tvbuff_t *tvb, packet_info* pinfo,
* Name: dissect_hello_authentication_clv() * Name: dissect_hello_authentication_clv()
* *
* Description: * Description:
* Decode for a hello packets authenticaion clv. * Decode for a hello packets authentication clv.
* Calls into the CLV common one. * Calls into the CLV common one.
* *
* Input: * Input:
@ -668,7 +668,7 @@ dissect_hello_authentication_clv(tvbuff_t *tvb, packet_info* pinfo,
* Name: dissect_hello_ip_authentication_clv() * Name: dissect_hello_ip_authentication_clv()
* *
* Description: * Description:
* Decode for a hello packets IP authenticaion clv. * Decode for a hello packets IP authentication clv.
* Calls into the CLV common one. * Calls into the CLV common one.
* *
* Input: * Input:

View File

@ -589,7 +589,7 @@ dissect_lsp_mt_id(tvbuff_t *tvb, proto_tree *tree, int offset)
* Name: dissect_metric() * Name: dissect_metric()
* *
* Description: * 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 * metric per prefix (default, delay, expense, and error). This
* routine assists other dissectors by adding a single one of * routine assists other dissectors by adding a single one of
* these to the display tree.. * 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() * Name: dissect_lsp_authentication_clv()
* *
* Description: * Description:
* Decode for a lsp packets authenticaion clv. Calls into the * Decode for a lsp packets authentication clv. Calls into the
* clv common one. * clv common one.
* *
* Input: * Input:
@ -2153,7 +2153,7 @@ dissect_lsp_authentication_clv(tvbuff_t *tvb, packet_info* pinfo, proto_tree *tr
* Name: dissect_lsp_ip_authentication_clv() * Name: dissect_lsp_ip_authentication_clv()
* *
* Description: * Description:
* Decode for a lsp packets authenticaion clv. Calls into the * Decode for a lsp packets authentication clv. Calls into the
* clv common one. * clv common one.
* *
* Input: * 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(). * Description: Called by function dissect_lsp_ext_is_reachability_clv().
* *
* This function is called by 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: * Input:
* tvbuff_t * : tvbuffer for packet data * tvbuff_t * : tvbuffer for packet data

View File

@ -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); 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 Catch BoundsError and ReportedBoundsError, so that if the
reported length of "next_tvb" was reduced by some dissector reported length of "next_tvb" was reduced by some dissector

View File

@ -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 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) */ 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 s_offset;
offset_struct* poffset; offset_struct* poffset;
guint16 nbmessage_bytes; /*nb of message data bytes */ guint16 nbmessage_bytes; /*nb of message data bytes */

View File

@ -264,7 +264,7 @@ dissect_ismp_edp(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tree *ismp
proto_tree *edp_tuples_leaf_tree; 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_set_str(pinfo->cinfo, COL_PROTOCOL, "ISMP.EDP");
col_clear(pinfo->cinfo, COL_INFO); col_clear(pinfo->cinfo, COL_INFO);

View File

@ -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 isns PDU
*/ */

View File

@ -1066,7 +1066,7 @@ proto_register_iso14443(void)
FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL } FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }
}, },
{ &hf_iso14443_bit_frame_anticoll, { &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 } FT_UINT8, BASE_HEX, NULL, 0x1F, NULL, HFILL }
}, },
{ &hf_iso14443_apf, { &hf_iso14443_apf,

View File

@ -6,7 +6,7 @@
* <anders.broman@ericsson.com> * <anders.broman@ericsson.com>
* Inserted routines for BICC dissection according to Q.765.5 Q.1902 Q.1970 Q.1990, * Inserted routines for BICC dissection according to Q.765.5 Q.1902 Q.1970 Q.1990,
* calling SDP dissector for RFC2327 decoding. * 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 * Content type application/ISUP RFC 3204 used in SIP-T
* *
* Copyright 2004-2005, Anders Broman <anders.broman@ericsson.com> * Copyright 2004-2005, Anders Broman <anders.broman@ericsson.com>
@ -2357,7 +2357,7 @@ static const true_false_string isup_solicited_information_ind_value = {
static const true_false_string isup_continuity_ind_value = { static const true_false_string isup_continuity_ind_value = {
"Continuity check successful", "Continuity check successful",
"Continuity ckec failed" "Continuity check failed"
}; };
#define CHARGE_NO_IND 0 #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_max_codec_modes = -1;
static int hf_bearer_control_tunneling = -1; static int hf_bearer_control_tunneling = -1;
static int hf_Local_BCU_ID = -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_signal = -1;
static int hf_bat_ase_duration = -1; static int hf_bat_ase_duration = -1;
static int hf_bat_ase_bearer_redir_ind = -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" "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 supported",
"Late Cut-through not 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"}, { 0x02, "BICC data with unrecognized information element, discarded"},
{ 0, NULL } { 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. * because of use from other disectors.
*/ */
extern int dissect_codec_mode(proto_tree *tree, tvbuff_t *tvb, int offset, int len) { 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)")); val_to_str_ext(identifier, &bat_ase_list_of_Identifiers_vals_ext, "unknown (%u)"));
if (identifier != CODEC) { 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 */ /* 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, proto_tree_add_uint(bat_ase_element_tree , hf_bat_ase_identifier , parameter_tvb,
offset - length_ind_len, 1, identifier); offset - length_ind_len, 1, identifier);
@ -4913,7 +4913,7 @@ dissect_bat_ase_Encapsulated_Application_Information(tvbuff_t *parameter_tvb, pa
break; break;
case BEARER_REDIRECTION_CAPABILITY : case BEARER_REDIRECTION_CAPABILITY :
tempdata = tvb_get_guint8(parameter_tvb, offset); 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; offset = offset + content_len;
break; break;
case BEARER_REDIRECTION_INDICATORS : 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[] = { static const value_string isup_redirection_presentation_indicator_vals[] = {
{ 0x00 , "Presentation allowed" }, { 0x00 , "Presentation allowed" },
@ -6594,7 +6594,7 @@ dissect_isup_redirect_capability_parameter(tvbuff_t *parameter_tvb, proto_tree *
switch (itu_isup_variant) { switch (itu_isup_variant) {
case ISUP_JAPAN_VARIANT: case ISUP_JAPAN_VARIANT:
/* Fall trough */ /* Fall through */
case ISUP_JAPAN_TTC_VARIANT: 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_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); 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) { switch (itu_isup_variant) {
case ISUP_JAPAN_VARIANT: case ISUP_JAPAN_VARIANT:
/* Fall trough */ /* Fall through */
case ISUP_JAPAN_TTC_VARIANT: case ISUP_JAPAN_TTC_VARIANT:
proto_tree_add_item(parameter_tree, hf_japan_isup_redirect_counter, parameter_tvb, 0, 1, ENC_BIG_ENDIAN); proto_tree_add_item(parameter_tree, hf_japan_isup_redirect_counter, parameter_tvb, 0, 1, ENC_BIG_ENDIAN);
break; break;
@ -8339,7 +8339,7 @@ dissect_isup_optional_parameter(tvbuff_t *optional_parameters_tvb, packet_info *
guint16 chg_inf_type = 0xffff; guint16 chg_inf_type = 0xffff;
/* Dissect all optional parameters while end of message isn't reached */ /* 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)) { 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); 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 */ /* Handle national extensions here */
switch (itu_isup_variant) { switch (itu_isup_variant) {
case ISUP_JAPAN_VARIANT: case ISUP_JAPAN_VARIANT:
/* Fall trough */ /* Fall through */
case ISUP_JAPAN_TTC_VARIANT: 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, proto_tree_add_uint_format_value(parameter_tree, hf_isup_opt_parameter_type, optional_parameters_tvb, offset, PARAMETER_TYPE_LENGTH,
parameter_type, parameter_type,
@ -8630,7 +8630,7 @@ dissect_isup_optional_parameter(tvbuff_t *optional_parameters_tvb, packet_info *
default: default:
switch (itu_isup_variant) { switch (itu_isup_variant) {
case ISUP_JAPAN_VARIANT: case ISUP_JAPAN_VARIANT:
/* Fall trough */ /* Fall through */
case ISUP_JAPAN_TTC_VARIANT: case ISUP_JAPAN_TTC_VARIANT:
switch (parameter_type) { switch (parameter_type) {
case JAPAN_ISUP_PARAM_CALLED_DIRECTORY_NUMBER: 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 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 static void
dissect_ansi_isup_optional_parameter(tvbuff_t *optional_parameters_tvb, packet_info *pinfo, proto_tree *isup_tree, guint8 itu_isup_variant) 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; guint8 octet;
/* Dissect all optional parameters while end of message isn't reached */ /* 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)) { 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); 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 offset = 0;
gint parameter_type, actual_length; 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_type = ANSI_ISUP_PARAM_TYPE_CVR_RESP_IND;
parameter_tree = proto_tree_add_subtree(isup_tree, message_tvb, offset, CVR_RESP_IND_LENGTH, parameter_tree = proto_tree_add_subtree(isup_tree, message_tvb, offset, CVR_RESP_IND_LENGTH,
ett_isup_parameter, &parameter_item, "CVR Response Indicator"); ett_isup_parameter, &parameter_item, "CVR Response Indicator");
@ -10314,7 +10314,7 @@ dissect_isup_message(tvbuff_t *message_tvb, packet_info *pinfo, proto_tree *isup
message_type); message_type);
break; break;
case ISUP_JAPAN_VARIANT: case ISUP_JAPAN_VARIANT:
/* Fall trough */ /* Fall through */
case ISUP_JAPAN_TTC_VARIANT: 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, type_item = proto_tree_add_uint_format_value(isup_tree, hf_isup_message_type, message_tvb, 0, MESSAGE_TYPE_LENGTH, message_type,
"%s (%u)", "%s (%u)",
@ -10593,7 +10593,7 @@ dissect_isup_message(tvbuff_t *message_tvb, packet_info *pinfo, proto_tree *isup
} }
break; break;
case ISUP_JAPAN_VARIANT: case ISUP_JAPAN_VARIANT:
/* Fall trough */ /* Fall through */
case ISUP_JAPAN_TTC_VARIANT: case ISUP_JAPAN_TTC_VARIANT:
switch (message_type) { switch (message_type) {
case MESSAGE_TYPE_JAPAN_CHARG_INF: 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; used_value_string_ext = &russian_isup_message_type_value_acro_ext;
break; break;
case ISUP_JAPAN_VARIANT: case ISUP_JAPAN_VARIANT:
/* Fall trough */ /* Fall through */
case ISUP_JAPAN_TTC_VARIANT: case ISUP_JAPAN_TTC_VARIANT:
col_set_str(pinfo->cinfo, COL_PROTOCOL, "BICC(Japan)"); col_set_str(pinfo->cinfo, COL_PROTOCOL, "BICC(Japan)");
used_value_string_ext = &japan_isup_message_type_value_acro_ext; used_value_string_ext = &japan_isup_message_type_value_acro_ext;
@ -11228,7 +11228,7 @@ proto_register_isup(void)
NULL, HFILL }}, NULL, HFILL }},
{ &hf_isup_solicited_indicator, { &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, FT_BOOLEAN, 16, TFS(&isup_solicited_information_ind_value), H_16BIT_MASK,
NULL, HFILL }}, NULL, HFILL }},
@ -11348,7 +11348,7 @@ proto_register_isup(void)
NULL, HFILL }}, NULL, HFILL }},
{ &hf_isup_event_presentation_restricted_ind, { &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, FT_BOOLEAN, 8, TFS(&isup_event_presentation_restricted_ind_value), H_8BIT_MASK,
NULL, HFILL }}, NULL, HFILL }},
@ -11827,9 +11827,9 @@ proto_register_isup(void)
FT_UINT32, BASE_HEX, NULL, 0x0, FT_UINT32, BASE_HEX, NULL, 0x0,
NULL, HFILL }}, NULL, HFILL }},
{ &hf_late_cut_trough_cap_ind, { &hf_late_cut_through_cap_ind,
{ "Late Cut-through capability indicator", "bat_ase.late_cut_trough_cap_ind", { "Late Cut-through capability indicator", "bat_ase.late_cut_through_cap_ind",
FT_BOOLEAN, 8, TFS(&late_cut_trough_cap_ind_value), 0x01, FT_BOOLEAN, 8, TFS(&late_cut_through_cap_ind_value), 0x01,
NULL, HFILL }}, NULL, HFILL }},
{ &hf_bat_ase_signal, { &hf_bat_ase_signal,

View File

@ -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 * 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 static guint32
fpdu_total_length(struct tcpinfo *tcpinfo) fpdu_total_length(struct tcpinfo *tcpinfo)
@ -350,7 +350,7 @@ is_mpa_req(tvbuff_t *tvb, packet_info *pinfo)
*/ */
state = init_mpa_state(); state = init_mpa_state();
/* anaylize MPA connection parameter and record them */ /* analyze MPA connection parameter and record them */
mcrres = tvb_get_guint8(tvb, 16); mcrres = tvb_get_guint8(tvb, 16);
state->ini_exp_m_res = mcrres & MPA_MARKER_FLAG; state->ini_exp_m_res = mcrres & MPA_MARKER_FLAG;
state->crc = mcrres & MPA_CRC_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 * libpcap was not able to capture every packet) or lost alignment (the
* MPA FPDU header does not start right after TCP header). * MPA FPDU header does not start right after TCP header).
* We consider the above to be an error since we make the assumption * 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. * always either with a Marker or the ULPDU_LENGTH header field.
*/ */
exp_ulpdu_length = expected_ulpdu_length(state, tcpinfo, endpoint); exp_ulpdu_length = expected_ulpdu_length(state, tcpinfo, endpoint);

View File

@ -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, 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); 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); vht_user_pos = (vht_user_pos & 0x03);
proto_tree_add_uint_format(tap_tree, hf_radiotap_vht_user_pos, 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); tvb, offset, 1, vht_user_pos, "VHT User Pos: %u ",vht_user_pos);

View File

@ -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 */ /* Create a buffer pointer for the next dissector */
next_tvb = tvb_new_subset_remaining(tvb, offset); 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); return MIRROR_HDR_SZ + call_dissector(dissector_handle, next_tvb, pinfo, tree);
} }

View File

@ -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)) if (!dissector_try_uint(payload_table, proto, next_tvb, pinfo, tree))
{ {
/* XXX - left in for posterity, dissection was never done */ /* 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); call_dissector(data_handle, next_tvb, pinfo, tree);
} }

View File

@ -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); proto_tree_add_protocol_format(tree, proto_kingfisher, tvb, 0, -1, "Kingfisher Protocol, %s", func_string);
return TRUE; return TRUE;
} }
/* othervise it is way too short to be kingfisger */ /* otherwise it is way too short to be kingfisher */
return FALSE; return FALSE;
} }

View File

@ -1,6 +1,6 @@
/* packet-kink.c /* packet-kink.c
* Routines for KINK packet disassembly * 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 <T.Nakashima@jp.yokogawa.com> * Copyright 2004, Takeshi Nakashima <T.Nakashima@jp.yokogawa.com>
* *
@ -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); proto_tree_add_uint(kink_tree, hf_kink_next_payload, tvb, offset, 1, next_payload);
offset ++; 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. * The logical product of 1octet value and 0x80 is performed.
* And It is performed 7bit right shift. * And It is performed 7bit right shift.
*/ */

View File

@ -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 * 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) { if (linelen < 8) {
/* /*
@ -238,7 +238,7 @@ dissect_kismet(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, void * da
t.nsecs = 0; 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); 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); proto_tree_add_time_format_value(reqresp_tree, hf_kismet_time, tvb, offset, tokenlen, &t, "%s", ptr);

View File

@ -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 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 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 SEQUENCE_BIT(msg_info) (msg_info & 0x0800) /* SEQUENCE bit = 1 Ns and Nr fields */
#define OFFSET_BIT(msg_info) (msg_info & 0x0200) /* Offset */ #define OFFSET_BIT(msg_info) (msg_info & 0x0200) /* Offset */
#define PRIORITY_BIT(msg_info) (msg_info & 0x0100) /* Priority */ #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" }, { 103, "Downstream QAM Channel Modulation" },
{ 104, "Downstream QAM Channel J.83 Annex" }, { 104, "Downstream QAM Channel J.83 Annex" },
{ 105, "Downstream QAM Channel Symbol Rate" }, { 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" }, { 107, "Downstream QAM Channel RF Block Muting53" },
/* 7.5.4 DEPI Redundancy Capabilities AVPs */ /* 7.5.4 DEPI Redundancy Capabilities AVPs */
{ 200, "DEPI Redundancy Capabilities" }, { 200, "DEPI Redundancy Capabilities" },
@ -2733,7 +2733,7 @@ proto_register_l2tp(void)
{ &hf_l2tp_offset, { &hf_l2tp_offset,
{ "Offset","l2tp.offset", FT_UINT16, BASE_DEC, NULL, 0x0, { "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, { &hf_l2tp_avp_mandatory,
{ "Mandatory", "l2tp.avp.mandatory", FT_BOOLEAN, 16, NULL, 0x8000, { "Mandatory", "l2tp.avp.mandatory", FT_BOOLEAN, 16, NULL, 0x8000,

View File

@ -169,7 +169,7 @@ typedef struct lapd_byte_state {
typedef struct lapd_ppi { typedef struct lapd_ppi {
gboolean has_crc; /* CRC is captured with LAPD the frames */ 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; } lapd_ppi_t;
/* Fill values in lapd_byte_state struct */ /* Fill values in lapd_byte_state struct */

View File

@ -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_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) #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 typedef struct
{ {
lbm_uint8_t next_hdr; 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_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) #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 typedef struct
{ {
lbm_uint8_t next_hdr; lbm_uint8_t next_hdr;

View File

@ -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? */ /* how many sequence numbers will be there? */
/* this is not implemented due to a lack of documentation with */ /* 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 */ /* guess there will be padding if the Seqno doesn't reach */
/* a 32bit boundary */ /* a 32bit boundary */

View File

@ -1986,7 +1986,7 @@ dissect_ieee_802_1_tlv(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree,
} }
case 0x04: /* Protocol ID */ case 0x04: /* Protocol ID */
{ {
/* Get protocal id length */ /* Get protocol id length */
tempByte = tvb_get_guint8(tvb, offset); tempByte = tvb_get_guint8(tvb, offset);
proto_tree_add_item(tree, hf_ieee_802_1_proto_id_length, tvb, offset, 1, ENC_BIG_ENDIAN); 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); proto_tree_add_item(tree, hf_ieee_8021az_feature_flag_cbs, tvb, offset, 1, ENC_BIG_ENDIAN);
tempByte = (tvb_get_guint8(tvb, offset) & 0x7); 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); proto_tree_add_uint_format_value(tree, hf_ieee_8021az_maxtcs, tvb, offset, 1, tempByte, "%u (0x%X)", tempByte ? tempByte : 8, tempByte);
offset++; offset++;

View File

@ -640,7 +640,7 @@ static const value_string tlv_type[] = {
{ LLRP_TLV_C1G2_INVENTORY_COMMAND, "C1G2 Inventory Command" }, { LLRP_TLV_C1G2_INVENTORY_COMMAND, "C1G2 Inventory Command" },
{ LLRP_TLV_C1G2_FILTER, "C1G2 Filter" }, { LLRP_TLV_C1G2_FILTER, "C1G2 Filter" },
{ LLRP_TLV_C1G2_TAG_INV_MASK, "C1G2 Tag Inventory Mask" }, { 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_TAG_INV_UNAWR_FLTR, "C1G2 Tag Inventory State-Unaware Filter Action" },
{ LLRP_TLV_C1G2_RF_CONTROL, "C1G2 RF Control" }, { LLRP_TLV_C1G2_RF_CONTROL, "C1G2 RF Control" },
{ LLRP_TLV_C1G2_SINGULATION_CTRL, "C1G2 Singulation Control" }, { LLRP_TLV_C1G2_SINGULATION_CTRL, "C1G2 Singulation Control" },

View File

@ -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 & 0x02) ? "Line/MS Overhead Transparency " : "",
(l & 0x04) ? "Section/RS 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); 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 */ /* Min and Max NCC */
@ -2349,7 +2349,7 @@ proto_register_lmp(void)
{ "Summary - Unacceptable non-negotiable parameters", "lmp.error.summary_bad_params", { "Summary - Unacceptable non-negotiable parameters", "lmp.error.summary_bad_params",
FT_BOOLEAN, 8, NULL, 0x01, NULL, HFILL }}, FT_BOOLEAN, 8, NULL, 0x01, NULL, HFILL }},
{&hf_lmp_filter[LMPF_VAL_ERROR_SUMMARY_RENEGOTIATE], {&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 }}, FT_BOOLEAN, 8, NULL, 0x02, NULL, HFILL }},
{&hf_lmp_filter[LMPF_VAL_ERROR_SUMMARY_BAD_TE_LINK], {&hf_lmp_filter[LMPF_VAL_ERROR_SUMMARY_BAD_TE_LINK],
{ "Summary - Bad TE Link Object", "lmp.error.summary_bad_te_link", { "Summary - Bad TE Link Object", "lmp.error.summary_bad_te_link",

View File

@ -565,7 +565,7 @@ proto_reg_handoff_lwapp(void)
* becoming obscelete, but we still wanted to dissect the * becoming obscelete, but we still wanted to dissect the
* packets. * 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 * is the new-style. In this case, LWAP headers are just transmitted
* via UDP. * via UDP.
* *

View File

@ -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, static guint16 dissect_mausb_mgmt_pkt_flds(struct mausb_header *header,
proto_tree *tree, tvbuff_t *tvb, proto_tree *tree, tvbuff_t *tvb,
packet_info *pinfo, gint16 start) packet_info *pinfo, gint16 start)

View File

@ -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. */ /* "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 */ /* 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 */ /* 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_lo = tvb_get_ntohs(next_tvb, data_offset);
modflt_hi = tvb_get_ntohs(next_tvb, data_offset+2); modflt_hi = tvb_get_ntohs(next_tvb, data_offset+2);

View File

@ -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_field_array(proto_mcpe, hf, array_length(hf));
proto_register_subtree_array(ett, array_length(ett)); proto_register_subtree_array(ett, array_length(ett));

View File

@ -2407,7 +2407,7 @@ dissect_megaco_servicechangedescriptor(tvbuff_t *tvb, proto_tree *megaco_tree,
case MEGACO_PROFILE_TOKEN: case MEGACO_PROFILE_TOKEN:
case MEGACO_VERSION_TOKEN: case MEGACO_VERSION_TOKEN:
case MEGACO_METHOD_TOKEN: case MEGACO_METHOD_TOKEN:
/* No special dissection: fall trough */ /* No special dissection: fall through */
default: default:
/* Unknown or: /* Unknown or:
* extension = extensionParameter parmValue * extension = extensionParameter parmValue

View File

@ -863,8 +863,8 @@ static const value_string op_mode_vals[] = {
static const value_string link_param_qos_vals[] = { static const value_string link_param_qos_vals[] = {
{0, "Max no of differentiable classes"}, {0, "Max no of differentiable classes"},
{1, "Min Packet transfer delay"}, {1, "Min Packet transfer delay"},
{2, "Avg packet ransfer delay"}, {2, "Avg packet transfer delay"},
{3, "Max packet ransfer delay"}, {3, "Max packet transfer delay"},
{4, "delay jitter"}, {4, "delay jitter"},
{5, "Packet loss"}, {5, "Packet loss"},
{0, NULL} {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) static gint16 dissect_rq_result(tvbuff_t *tvb, gint16 offset, proto_tree *tlv_tree)
{ {
proto_tree *subtree; 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_link_poa(tvb, offset, subtree);
offset = dissect_qos_list(tvb, offset, tlv_tree); offset = dissect_qos_list(tvb, offset, tlv_tree);
offset++; offset++;
@ -2202,7 +2202,7 @@ static int dissect_mih(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void
return tvb_captured_length(tvb); return tvb_captured_length(tvb);
} }
/*dissector initialistaion*/ /*dissector initialisation*/
void proto_register_mih(void) void proto_register_mih(void)
{ {
static hf_register_info hf[] = static hf_register_info hf[] =

View File

@ -168,7 +168,7 @@ static header_field_info hfi_mint_data_vlan MINT_HF_INIT =
0x0, NULL, HFILL }; 0x0, NULL, HFILL };
static header_field_info hfi_mint_data_seqno MINT_HF_INIT = 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 }; 0x0, NULL, HFILL };
static header_field_info hfi_mint_data_unknown1 MINT_HF_INIT = static header_field_info hfi_mint_data_unknown1 MINT_HF_INIT =

View File

@ -144,7 +144,7 @@ typedef enum {
MIP_NATT_TUNNEL_DATA = 4, MIP_NATT_TUNNEL_DATA = 4,
MIP_REGISTRATION_REVOCATION = 7, MIP_REGISTRATION_REVOCATION = 7,
MIP_REGISTRATION_REVOCATION_ACK = 15, MIP_REGISTRATION_REVOCATION_ACK = 15,
MIP_HANDOFF_REQEST = 16, MIP_HANDOFF_REQUEST = 16,
MIP_HANDOFF_REPLY = 17, MIP_HANDOFF_REPLY = 17,
MIP_REGIONAL_REG_REQ = 18, MIP_REGIONAL_REG_REQ = 18,
MIP_REGIONAL_REG_REP = 19, MIP_REGIONAL_REG_REP = 19,
@ -159,7 +159,7 @@ static const value_string mip_types[] = {
{MIP_NATT_TUNNEL_DATA, "NAT Traversal Tunnel Data"}, {MIP_NATT_TUNNEL_DATA, "NAT Traversal Tunnel Data"},
{MIP_REGISTRATION_REVOCATION, "Registration Revocation"}, {MIP_REGISTRATION_REVOCATION, "Registration Revocation"},
{MIP_REGISTRATION_REVOCATION_ACK, "Registration Revocation Acknowledgement"}, {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_HANDOFF_REPLY, "NAT Traversal Tunnel Data"},
{MIP_REGIONAL_REG_REQ, "NAT Traversal Tunnel Data"}, {MIP_REGIONAL_REG_REQ, "NAT Traversal Tunnel Data"},
{MIP_REGIONAL_REG_REP, "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; offset+=2;
switch(type){ 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); proto_tree_add_item(tree, hf_mip_nvse_3gpp2_type16_value, tvb, offset, 2, ENC_BIG_ENDIAN);
break; break;
case 17: /* DNS server IP address X.S0011-002-C v3.0*/ case 17: /* DNS server IP address X.S0011-002-C v3.0*/

View File

@ -5122,7 +5122,7 @@ proto_register_mip6(void)
{ &hf_pmip6_lra_status, { &hf_pmip6_lra_status,
{ "Status", "mip6.lra.status", { "Status", "mip6.lra.status",
FT_UINT8, BASE_DEC, VALS(pmip6_lra_status_vals), 0x0, 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, { &hf_pmip6_lra_lifetime,

View File

@ -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_CONTENT_HDR 0xAE /* Content */
#define MM_START_HDR 0xAF /* X-Mms-Start */ #define MM_START_HDR 0xAF /* X-Mms-Start */
#define MM_ADDITIONAL_HDR 0xB0 /* Additional-headers */ #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_ELEMENT_DESCR_HDR 0xB2 /* X-Mms-Element-Descriptor */
#define MM_LIMIT_HDR 0xB3 /* X-Mms-Limit */ #define MM_LIMIT_HDR 0xB3 /* X-Mms-Limit */

View File

@ -123,7 +123,7 @@ static const value_string mount3_mountstat3[] =
* Formally, hf_mount3_status only define the status codes returned by version * Formally, hf_mount3_status only define the status codes returned by version
* 3 of the protocol. * 3 of the protocol.
* Though not formally defined in the standard, we use the same * 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. * is consistant with most v1 and v2 implementations.
*/ */
static int static int

View File

@ -282,7 +282,7 @@ typedef struct mp2t_analysis_data {
/* This structure contains a tree containing data for the /* This structure contains a tree containing data for the
* individual pid's, this is only used when packets are * individual pid's, this is only used when packets are
* processed sequencially. * processed sequentially.
*/ */
wmem_tree_t *pid_table; wmem_tree_t *pid_table;
@ -339,7 +339,7 @@ typedef struct pid_analysis_data {
typedef struct ts_analysis_data { typedef struct ts_analysis_data {
guint16 pid; guint16 pid;
gint8 cc_prev; /* Previous CC number */ gint8 cc_prev; /* Previous CC number */
guint8 skips; /* Skips between CCs max 14 */ guint8 skips; /* Skips between Ccs max 14 */
} ts_analysis_data_t; } 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) || if ( (pload_type == pid_pload_docsis && remaining_len < 4) ||
(pload_type == pid_pload_sect && remaining_len < 3) || (pload_type == pid_pload_sect && remaining_len < 3) ||
(pload_type == pid_pload_pes && remaining_len < 5) ) { (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 */ /* Just add the fragment and we'll check out the length later */
return -1; return -1;
} }
@ -855,9 +855,9 @@ detect_cc_drops(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo,
gboolean detected_drop = FALSE; gboolean detected_drop = FALSE;
guint32 skips = 0; guint32 skips = 0;
/* The initial sequencial processing stage */ /* The initial sequential processing stage */
if (!pinfo->fd->flags.visited) { 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); pid_data = get_pid_analysis(mp2t_data, pid);
cc_prev = pid_data->cc_prev; cc_prev = pid_data->cc_prev;

View File

@ -732,7 +732,7 @@ dissect_mp4ves(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _
GOV - Group_of_VideoObjectPlane GOV - Group_of_VideoObjectPlane
VOP - Video Object Plane VOP - Video Object Plane
VP - Video 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 visual_object_sequence_start_code: The visual_object_sequence_start_code is
the bit string '000001B0' in hexadecimal. It initiates a visual session. the bit string '000001B0' in hexadecimal. It initiates a visual session.

Some files were not shown because too many files have changed in this diff Show More