osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Fix various typos and spelling errors (mostly in text strings) 

svn path=/trunk/; revision=27050
This commit is contained in:
Bill Meier 2008-12-18 19:08:49 +00:00
parent dbd150e948
commit c544c20956
78 changed files with 240 additions and 239 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
asn1/ansi_map/ansi_map.asn
View File

@ -5561,8 +5561,8 @@ OriginationIndicator ::= ENUMERATED {
prior-agreement ( 1 ), prior-agreement ( 1 ),
origination-denied ( 2 ), origination-denied ( 2 ),
local-calls-only ( 3 ), local-calls-only ( 3 ),
selected-leading-digits-of-directorynumberor-of-international-E164-number ( 4 ), selected-leading-digits-of-directorynumber-or-of-international-E164-number ( 4 ),
selected-leading-digits-of-directorynumberor-of-international-E164-numbe-and-local-calls-only ( 5 ), selected-leading-digits-of-directorynumber-or-of-international-E164-number-and-local-calls-only ( 5 ),
national-long-distance ( 6 ), national-long-distance ( 6 ),
international-calls ( 7 ), international-calls ( 7 ),
single-directory-number-or-international-E164-number ( 8 ), single-directory-number-or-international-E164-number ( 8 ),

22
asn1/ansi_map/packet-ansi_map-template.c
View File

@ -290,7 +290,7 @@ static int hf_ansi_map_originationtriggers_eightdig = -1;
static int hf_ansi_map_originationtriggers_ninedig = -1; static int hf_ansi_map_originationtriggers_ninedig = -1;
static int hf_ansi_map_originationtriggers_tendig = -1; static int hf_ansi_map_originationtriggers_tendig = -1;
static int hf_ansi_map_originationtriggers_elevendig = -1; static int hf_ansi_map_originationtriggers_elevendig = -1;
static int hf_ansi_map_originationtriggers_thwelvedig = -1; static int hf_ansi_map_originationtriggers_twelvedig = -1;
static int hf_ansi_map_originationtriggers_thirteendig = -1; static int hf_ansi_map_originationtriggers_thirteendig = -1;
static int hf_ansi_map_originationtriggers_fourteendig = -1; static int hf_ansi_map_originationtriggers_fourteendig = -1;
static int hf_ansi_map_originationtriggers_fifteendig = -1; static int hf_ansi_map_originationtriggers_fifteendig = -1;
@ -2115,7 +2115,7 @@ static const true_false_string ansi_map_originationtriggers_elevendig_bool_val
"Trigger is not active" "Trigger is not active"
}; };
/* 1 digit (octet 4, bit E) */ /* 1 digit (octet 4, bit E) */
static const true_false_string ansi_map_originationtriggers_thwelvdig_bool_val = { static const true_false_string ansi_map_originationtriggers_twelvedig_bool_val = {
"Launch an OriginationRequest for any call attempt with 12 digits", "Launch an OriginationRequest for any call attempt with 12 digits",
"Trigger is not active" "Trigger is not active"
}; };
@ -2199,7 +2199,7 @@ dissect_ansi_map_originationtriggers(tvbuff_t *tvb, packet_info *pinfo _U_, prot
/* 13 digit (octet 4, bit F) */ /* 13 digit (octet 4, bit F) */
proto_tree_add_item(subtree, hf_ansi_map_originationtriggers_thirteendig, tvb, offset, 1, FALSE); proto_tree_add_item(subtree, hf_ansi_map_originationtriggers_thirteendig, tvb, offset, 1, FALSE);
/* 12 digit (octet 4, bit E) */ /* 12 digit (octet 4, bit E) */
proto_tree_add_item(subtree, hf_ansi_map_originationtriggers_thwelvedig, tvb, offset, 1, FALSE); proto_tree_add_item(subtree, hf_ansi_map_originationtriggers_twelvedig, tvb, offset, 1, FALSE);
/* 11 digit (octet 4, bit D) */ /* 11 digit (octet 4, bit D) */
proto_tree_add_item(subtree, hf_ansi_map_originationtriggers_elevendig, tvb, offset, 1, FALSE); proto_tree_add_item(subtree, hf_ansi_map_originationtriggers_elevendig, tvb, offset, 1, FALSE);
/* 10 digit (octet 4, bit C) */ /* 10 digit (octet 4, bit C) */
@ -3554,7 +3554,7 @@ static const value_string ansi_map_ReauthenticationReport_vals[] = {
{ 1, "Reauthentication not attempted"}, { 1, "Reauthentication not attempted"},
{ 2, "Reauthentication no response"}, { 2, "Reauthentication no response"},
{ 3, "Reauthentication successful"}, { 3, "Reauthentication successful"},
{ 4, "RReauthentication failed"}, { 4, "Reauthentication failed"},
{ 0, NULL } { 0, NULL }
}; };
@ -3618,7 +3618,7 @@ static const value_string ansi_map_VoicePrivacyReport_vals[] = {
{ 0, "Not used"}, { 0, "Not used"},
{ 1, "Voice Privacy not attempted"}, { 1, "Voice Privacy not attempted"},
{ 2, "Voice Privacy no response"}, { 2, "Voice Privacy no response"},
{ 3, "Voiec Privacy is active"}, { 3, "Voice Privacy is active"},
{ 4, "Voice Privacy failed"}, { 4, "Voice Privacy failed"},
{ 0, NULL } { 0, NULL }
}; };
@ -4466,9 +4466,9 @@ void proto_register_ansi_map(void) {
FT_BOOLEAN, 8, TFS(&ansi_map_pi_bool_val),0x02, FT_BOOLEAN, 8, TFS(&ansi_map_pi_bool_val),0x02,
"Presentation Indication", HFILL }}, "Presentation Indication", HFILL }},
{ &hf_ansi_map_navail, { &hf_ansi_map_navail,
{ "Numer available indication", "ansi_map.navail", { "Number available indication", "ansi_map.navail",
FT_BOOLEAN, 8, TFS(&ansi_map_navail_bool_val),0x04, FT_BOOLEAN, 8, TFS(&ansi_map_navail_bool_val),0x04,
"Numer available indication", HFILL }}, "Number available indication", HFILL }},
{ &hf_ansi_map_si, { &hf_ansi_map_si,
{ "Screening indication", "ansi_map.si", { "Screening indication", "ansi_map.si",
FT_UINT8, BASE_DEC, VALS(ansi_map_si_vals), 0x30, FT_UINT8, BASE_DEC, VALS(ansi_map_si_vals), 0x30,
@ -4826,7 +4826,7 @@ void proto_register_ansi_map(void) {
FT_BOOLEAN, 8, TFS(&ansi_map_CDMACallMode_cdma_bool_val),0x01, FT_BOOLEAN, 8, TFS(&ansi_map_CDMACallMode_cdma_bool_val),0x01,
"Call Mode", HFILL }}, "Call Mode", HFILL }},
{ &hf_ansi_map_cdmacallmode_amps, { &hf_ansi_map_cdmacallmode_amps,
{ "Call Mode", "ansi_map.ocdmacallmode.amps", { "Call Mode", "ansi_map.cdmacallmode.amps",
FT_BOOLEAN, 8, TFS(&ansi_map_CallMode_amps_bool_val),0x02, FT_BOOLEAN, 8, TFS(&ansi_map_CallMode_amps_bool_val),0x02,
"Call Mode", HFILL }}, "Call Mode", HFILL }},
{ &hf_ansi_map_cdmacallmode_namps, { &hf_ansi_map_cdmacallmode_namps,
@ -5094,9 +5094,9 @@ void proto_register_ansi_map(void) {
{ "11 digits", "ansi_map.originationtriggers.eleven", { "11 digits", "ansi_map.originationtriggers.eleven",
FT_BOOLEAN, 8, TFS(&ansi_map_originationtriggers_elevendig_bool_val),0x08, FT_BOOLEAN, 8, TFS(&ansi_map_originationtriggers_elevendig_bool_val),0x08,
"11 digits", HFILL }}, "11 digits", HFILL }},
{ &hf_ansi_map_originationtriggers_thwelvedig, { &hf_ansi_map_originationtriggers_twelvedig,
{ "12 digits", "ansi_map.originationtriggers.thwelv", { "12 digits", "ansi_map.originationtriggers.twelve",
FT_BOOLEAN, 8, TFS(&ansi_map_originationtriggers_thwelvdig_bool_val),0x10, FT_BOOLEAN, 8, TFS(&ansi_map_originationtriggers_twelvedig_bool_val),0x10,
"12 digits", HFILL }}, "12 digits", HFILL }},
{ &hf_ansi_map_originationtriggers_thirteendig, { &hf_ansi_map_originationtriggers_thirteendig,
{ "13 digits", "ansi_map.originationtriggers.thirteen", { "13 digits", "ansi_map.originationtriggers.thirteen",

2
asn1/sabp/packet-sabp-template.c
View File

@ -156,7 +156,7 @@ dissect_sabp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
dissect_SABP_PDU_PDU(tvb, pinfo, sabp_tree); dissect_SABP_PDU_PDU(tvb, pinfo, sabp_tree);
} }
/* Note a little bit of a hack assumes length max takes two bytes and that lenghth start at byte 4 */ /* Note a little bit of a hack assumes length max takes two bytes and that the length starts at byte 4 */
static void static void
dissect_sabp_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) dissect_sabp_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
{ {

6
epan/dissectors/packet-3com-njack.c
View File

@ -141,7 +141,7 @@ typedef enum {
NJACK_CMD_MASK = 0x04, NJACK_CMD_MASK = 0x04,
NJACK_CMD_MAXFRAMESIZE = 0x05, NJACK_CMD_MAXFRAMESIZE = 0x05,
NJACK_CMD_COUNTERMODE = 0x06, NJACK_CMD_COUNTERMODE = 0x06,
NJACK_CMD_QUEUEING = 0x0a, NJACK_CMD_QUEUING = 0x0a,
NJACK_CMD_ADDTAGSCHEME = 0x0b, NJACK_CMD_ADDTAGSCHEME = 0x0b,
NJACK_CMD_REMOVETAG = 0x0c, NJACK_CMD_REMOVETAG = 0x0c,
NJACK_CMD_GROUP = 0x0d, NJACK_CMD_GROUP = 0x0d,
@ -177,7 +177,7 @@ static const value_string njack_cmd_vals[] = {
{ NJACK_CMD_MASK, "IP netmask" }, { NJACK_CMD_MASK, "IP netmask" },
{ NJACK_CMD_MAXFRAMESIZE, "Max frame size" }, { NJACK_CMD_MAXFRAMESIZE, "Max frame size" },
{ NJACK_CMD_COUNTERMODE, "Countermode" }, { NJACK_CMD_COUNTERMODE, "Countermode" },
{ NJACK_CMD_QUEUEING, "Priority scheduling policy" }, { NJACK_CMD_QUEUING, "Priority scheduling policy" },
{ NJACK_CMD_ADDTAGSCHEME, "Add tag scheme" }, { NJACK_CMD_ADDTAGSCHEME, "Add tag scheme" },
{ NJACK_CMD_REMOVETAG, "Remove tag" }, { NJACK_CMD_REMOVETAG, "Remove tag" },
{ NJACK_CMD_GROUP, "Device group" }, { NJACK_CMD_GROUP, "Device group" },
@ -424,7 +424,7 @@ dissect_tlvs(tvbuff_t *tvb, proto_tree *njack_tree, guint32 offset)
tvb, offset, 1, FALSE); tvb, offset, 1, FALSE);
offset += 1; offset += 1;
break; break;
case NJACK_CMD_QUEUEING: case NJACK_CMD_QUEUING:
proto_tree_add_item(tlv_tree, hf_njack_tlv_scheduling, proto_tree_add_item(tlv_tree, hf_njack_tlv_scheduling,
tvb, offset, 1, FALSE); tvb, offset, 1, FALSE);
offset += 1; offset += 1;

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

@ -5237,7 +5237,7 @@ void
proto_register_amqp(void) proto_register_amqp(void)
{ {
proto_amqp = proto_register_protocol( proto_amqp = proto_register_protocol(
"Advanced Message Queueing Protocol", "AMQP", "amqp"); "Advanced Message Queuing Protocol", "AMQP", "amqp");
proto_register_field_array(proto_amqp, hf, array_length(hf)); proto_register_field_array(proto_amqp, hf, array_length(hf));
proto_register_subtree_array(ett, array_length(ett)); proto_register_subtree_array(ett, array_length(ett));
} }

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

@ -389,7 +389,7 @@ dissect_amr_be(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree){
if (tvb_reported_length_remaining(tvb, (bitcount+8)/8)>0) { if (tvb_reported_length_remaining(tvb, (bitcount+8)/8)>0) {
item = proto_tree_add_text(tree, tvb, bitcount/8, tvb_reported_length_remaining(tvb, bitcount/8), "Error:"); item = proto_tree_add_text(tree, tvb, bitcount/8, tvb_reported_length_remaining(tvb, bitcount/8), "Error:");
proto_item_append_text(item, " %d Bytes remaining - should be 0!",tvb_reported_length_remaining(tvb, (bitcount+8)/8)); proto_item_append_text(item, " %d Bytes remaining - should be 0!",tvb_reported_length_remaining(tvb, (bitcount+8)/8));
expert_add_info_format(pinfo, item, PI_MALFORMED, PI_ERROR, "Superflous data remaining"); expert_add_info_format(pinfo, item, PI_MALFORMED, PI_ERROR, "Superfluous data remaining");
/* Now check the paddings */ /* Now check the paddings */
if (bitcount%8 != 0) { if (bitcount%8 != 0) {

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

@ -671,7 +671,7 @@ tele_param_user_data(tvbuff_t *tvb, proto_tree *tree, guint len, guint32 offset)
} }
else else
{ {
ucs2_item = proto_tree_add_text(tree, tvb, offset, num_fields, "%s", "Failed on iso-8859-8 contact wireshark developers"); ucs2_item = proto_tree_add_text(tree, tvb, offset, num_fields, "%s", "Failed on iso-8859-8 contact Wireshark developers");
} }
if(utf8_text) if(utf8_text)
g_free(utf8_text); g_free(utf8_text);
@ -698,7 +698,7 @@ tele_param_user_data(tvbuff_t *tvb, proto_tree *tree, guint len, guint32 offset)
} }
else else
{ {
ucs2_item = proto_tree_add_text(tree, tvb, offset, num_fields, "%s", "Failed on iso-8859-1 contact wireshark developers"); ucs2_item = proto_tree_add_text(tree, tvb, offset, num_fields, "%s", "Failed on iso-8859-1 contact Wireshark developers");
} }
if(utf8_text) if(utf8_text)
g_free(utf8_text); g_free(utf8_text);

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

@ -954,7 +954,7 @@ pr_loc_response(tvbuff_t *tvb, proto_tree *tree, guint len, guint32 offset)
other_decode_bitfield_value(bigbuf, value, 0x003e, 16); other_decode_bitfield_value(bigbuf, value, 0x003e, 16);
proto_tree_add_text(tree, tvb, offset, 2, proto_tree_add_text(tree, tvb, offset, 2,
"%s : LOC_UNCRTNTY_P: Standard deviation of axis perpindicular to angle specified for position uncertainty (meters): %s", "%s : LOC_UNCRTNTY_P: Standard deviation of axis perpendicular to angle specified for position uncertainty (meters): %s",
bigbuf, bigbuf,
str); str);
@ -1316,7 +1316,7 @@ rev_req_gps_loc_ass(tvbuff_t *tvb, proto_tree *tree, guint len, guint32 offset)
proto_tree_add_text(tree, tvb, offset, 1, proto_tree_add_text(tree, tvb, offset, 1,
"%s : Coordinate type requested: %s coordinates", "%s : Coordinate type requested: %s coordinates",
bigbuf, bigbuf,
(oct & 0x80) ? "Sperical" : "Cartesian"); (oct & 0x80) ? "Spherical" : "Cartesian");
other_decode_bitfield_value(bigbuf, oct, 0x7f, 8); other_decode_bitfield_value(bigbuf, oct, 0x7f, 8);
proto_tree_add_text(tree, tvb, offset, 1, proto_tree_add_text(tree, tvb, offset, 1,

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

@ -4884,7 +4884,7 @@ elem_hho_params(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len, gcha
other_decode_bitfield_value(a_bigbuf, oct, 0x01, 8); other_decode_bitfield_value(a_bigbuf, oct, 0x01, 8);
proto_tree_add_text(tree, proto_tree_add_text(tree,
tvb, curr_offset, 1, tvb, curr_offset, 1,
"%s : FPC SubChannel Information Included", "%s : FPC Subchannel Information Included",
a_bigbuf); a_bigbuf);
curr_offset++; curr_offset++;

26
epan/dissectors/packet-ansi_map.c
View File

@ -298,7 +298,7 @@ static int hf_ansi_map_originationtriggers_eightdig = -1;
static int hf_ansi_map_originationtriggers_ninedig = -1; static int hf_ansi_map_originationtriggers_ninedig = -1;
static int hf_ansi_map_originationtriggers_tendig = -1; static int hf_ansi_map_originationtriggers_tendig = -1;
static int hf_ansi_map_originationtriggers_elevendig = -1; static int hf_ansi_map_originationtriggers_elevendig = -1;
static int hf_ansi_map_originationtriggers_thwelvedig = -1; static int hf_ansi_map_originationtriggers_twelvedig = -1;
static int hf_ansi_map_originationtriggers_thirteendig = -1; static int hf_ansi_map_originationtriggers_thirteendig = -1;
static int hf_ansi_map_originationtriggers_fourteendig = -1; static int hf_ansi_map_originationtriggers_fourteendig = -1;
static int hf_ansi_map_originationtriggers_fifteendig = -1; static int hf_ansi_map_originationtriggers_fifteendig = -1;
@ -2886,7 +2886,7 @@ static const true_false_string ansi_map_originationtriggers_elevendig_bool_val
"Trigger is not active" "Trigger is not active"
}; };
/* 1 digit (octet 4, bit E) */ /* 1 digit (octet 4, bit E) */
static const true_false_string ansi_map_originationtriggers_thwelvdig_bool_val = { static const true_false_string ansi_map_originationtriggers_twelvedig_bool_val = {
"Launch an OriginationRequest for any call attempt with 12 digits", "Launch an OriginationRequest for any call attempt with 12 digits",
"Trigger is not active" "Trigger is not active"
}; };
@ -2970,7 +2970,7 @@ dissect_ansi_map_originationtriggers(tvbuff_t *tvb, packet_info *pinfo _U_, prot
/* 13 digit (octet 4, bit F) */ /* 13 digit (octet 4, bit F) */
proto_tree_add_item(subtree, hf_ansi_map_originationtriggers_thirteendig, tvb, offset, 1, FALSE); proto_tree_add_item(subtree, hf_ansi_map_originationtriggers_thirteendig, tvb, offset, 1, FALSE);
/* 12 digit (octet 4, bit E) */ /* 12 digit (octet 4, bit E) */
proto_tree_add_item(subtree, hf_ansi_map_originationtriggers_thwelvedig, tvb, offset, 1, FALSE); proto_tree_add_item(subtree, hf_ansi_map_originationtriggers_twelvedig, tvb, offset, 1, FALSE);
/* 11 digit (octet 4, bit D) */ /* 11 digit (octet 4, bit D) */
proto_tree_add_item(subtree, hf_ansi_map_originationtriggers_elevendig, tvb, offset, 1, FALSE); proto_tree_add_item(subtree, hf_ansi_map_originationtriggers_elevendig, tvb, offset, 1, FALSE);
/* 10 digit (octet 4, bit C) */ /* 10 digit (octet 4, bit C) */
@ -4325,7 +4325,7 @@ static const value_string ansi_map_ReauthenticationReport_vals[] = {
{ 1, "Reauthentication not attempted"}, { 1, "Reauthentication not attempted"},
{ 2, "Reauthentication no response"}, { 2, "Reauthentication no response"},
{ 3, "Reauthentication successful"}, { 3, "Reauthentication successful"},
{ 4, "RReauthentication failed"}, { 4, "Reauthentication failed"},
{ 0, NULL } { 0, NULL }
}; };
@ -4389,7 +4389,7 @@ static const value_string ansi_map_VoicePrivacyReport_vals[] = {
{ 0, "Not used"}, { 0, "Not used"},
{ 1, "Voice Privacy not attempted"}, { 1, "Voice Privacy not attempted"},
{ 2, "Voice Privacy no response"}, { 2, "Voice Privacy no response"},
{ 3, "Voiec Privacy is active"}, { 3, "Voice Privacy is active"},
{ 4, "Voice Privacy failed"}, { 4, "Voice Privacy failed"},
{ 0, NULL } { 0, NULL }
}; };
@ -9567,8 +9567,8 @@ static const value_string ansi_map_OriginationIndicator_vals[] = {
{ 1, "prior-agreement" }, { 1, "prior-agreement" },
{ 2, "origination-denied" }, { 2, "origination-denied" },
{ 3, "local-calls-only" }, { 3, "local-calls-only" },
{ 4, "selected-leading-digits-of-directorynumberor-of-international-E164-number" }, { 4, "selected-leading-digits-of-directorynumber-or-of-international-E164-number" },
{ 5, "selected-leading-digits-of-directorynumberor-of-international-E164-numbe-and-local-calls-only" }, { 5, "selected-leading-digits-of-directorynumber-or-of-international-E164-number-and-local-calls-only" },
{ 6, "national-long-distance" }, { 6, "national-long-distance" },
{ 7, "international-calls" }, { 7, "international-calls" },
{ 8, "single-directory-number-or-international-E164-number" }, { 8, "single-directory-number-or-international-E164-number" },
@ -16001,9 +16001,9 @@ void proto_register_ansi_map(void) {
FT_BOOLEAN, 8, TFS(&ansi_map_pi_bool_val),0x02, FT_BOOLEAN, 8, TFS(&ansi_map_pi_bool_val),0x02,
"Presentation Indication", HFILL }}, "Presentation Indication", HFILL }},
{ &hf_ansi_map_navail, { &hf_ansi_map_navail,
{ "Numer available indication", "ansi_map.navail", { "Number available indication", "ansi_map.navail",
FT_BOOLEAN, 8, TFS(&ansi_map_navail_bool_val),0x04, FT_BOOLEAN, 8, TFS(&ansi_map_navail_bool_val),0x04,
"Numer available indication", HFILL }}, "Number available indication", HFILL }},
{ &hf_ansi_map_si, { &hf_ansi_map_si,
{ "Screening indication", "ansi_map.si", { "Screening indication", "ansi_map.si",
FT_UINT8, BASE_DEC, VALS(ansi_map_si_vals), 0x30, FT_UINT8, BASE_DEC, VALS(ansi_map_si_vals), 0x30,
@ -16361,7 +16361,7 @@ void proto_register_ansi_map(void) {
FT_BOOLEAN, 8, TFS(&ansi_map_CDMACallMode_cdma_bool_val),0x01, FT_BOOLEAN, 8, TFS(&ansi_map_CDMACallMode_cdma_bool_val),0x01,
"Call Mode", HFILL }}, "Call Mode", HFILL }},
{ &hf_ansi_map_cdmacallmode_amps, { &hf_ansi_map_cdmacallmode_amps,
{ "Call Mode", "ansi_map.ocdmacallmode.amps", { "Call Mode", "ansi_map.cdmacallmode.amps",
FT_BOOLEAN, 8, TFS(&ansi_map_CallMode_amps_bool_val),0x02, FT_BOOLEAN, 8, TFS(&ansi_map_CallMode_amps_bool_val),0x02,
"Call Mode", HFILL }}, "Call Mode", HFILL }},
{ &hf_ansi_map_cdmacallmode_namps, { &hf_ansi_map_cdmacallmode_namps,
@ -16629,9 +16629,9 @@ void proto_register_ansi_map(void) {
{ "11 digits", "ansi_map.originationtriggers.eleven", { "11 digits", "ansi_map.originationtriggers.eleven",
FT_BOOLEAN, 8, TFS(&ansi_map_originationtriggers_elevendig_bool_val),0x08, FT_BOOLEAN, 8, TFS(&ansi_map_originationtriggers_elevendig_bool_val),0x08,
"11 digits", HFILL }}, "11 digits", HFILL }},
{ &hf_ansi_map_originationtriggers_thwelvedig, { &hf_ansi_map_originationtriggers_twelvedig,
{ "12 digits", "ansi_map.originationtriggers.thwelv", { "12 digits", "ansi_map.originationtriggers.twelve",
FT_BOOLEAN, 8, TFS(&ansi_map_originationtriggers_thwelvdig_bool_val),0x10, FT_BOOLEAN, 8, TFS(&ansi_map_originationtriggers_twelvedig_bool_val),0x10,
"12 digits", HFILL }}, "12 digits", HFILL }},
{ &hf_ansi_map_originationtriggers_thirteendig, { &hf_ansi_map_originationtriggers_thirteendig,
{ "13 digits", "ansi_map.originationtriggers.thirteen", { "13 digits", "ansi_map.originationtriggers.thirteen",

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

@ -1,6 +1,6 @@
/* packet-asap.c /* packet-asap.c
* Routines for Aggregate Server Access Protocol (ASAP) * Routines for Aggregate Server Access Protocol (ASAP)
* It is hopefully (needs testing) compilant to * It is hopefully (needs testing) compliant to
* http://www.ietf.org/internet-drafts/draft-ietf-rserpool-common-param-17.txt * http://www.ietf.org/internet-drafts/draft-ietf-rserpool-common-param-17.txt
* http://www.ietf.org/internet-drafts/draft-ietf-rserpool-policies-08.txt * http://www.ietf.org/internet-drafts/draft-ietf-rserpool-policies-08.txt
* http://www.ietf.org/internet-drafts/draft-ietf-rserpool-asap-20.txt * http://www.ietf.org/internet-drafts/draft-ietf-rserpool-asap-20.txt

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

@ -1137,7 +1137,7 @@ dissect_asp_reply_get_status(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *
} }
/* else fall to default malformed record */ /* else fall to default malformed record */
default: default:
ti = proto_tree_add_text(adr_tree, tvb, ofs, len,"Unknow type : %u", type); ti = proto_tree_add_text(adr_tree, tvb, ofs, len,"Unknown type : %u", type);
break; break;
} }
len -= 2; len -= 2;

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

@ -140,7 +140,7 @@ static const value_string le_control_status_vals[] = {
{ 8, "Invalid REQUESTOR-ID" }, { 8, "Invalid REQUESTOR-ID" },
{ 9, "Invalid LAN destination" }, { 9, "Invalid LAN destination" },
{ 10, "Invalid ATM address" }, { 10, "Invalid ATM address" },
{ 20, "No configuraton" }, { 20, "No configuration" },
{ 21, "LE_CONFIGURE error" }, { 21, "LE_CONFIGURE error" },
{ 22, "Insufficient information" }, { 22, "Insufficient information" },
{ 24, "TLV not found" }, { 24, "TLV not found" },

6
epan/dissectors/packet-bacapp.c
View File

@ -412,7 +412,7 @@ BACnetEngineeringUnits [] = {
{10,"Megavolt Amperes"}, {10,"Megavolt Amperes"},
{11,"Volt Amperes Reactive"}, {11,"Volt Amperes Reactive"},
{12,"Kilovolt Amperes Reactive"}, {12,"Kilovolt Amperes Reactive"},
{13,"Megavolt Amperes Ractive"}, {13,"Megavolt Amperes Reactive"},
{14,"Degrees Phase"}, {14,"Degrees Phase"},
{15,"Power Factor"}, {15,"Power Factor"},
{16,"Joules"}, {16,"Joules"},
@ -427,7 +427,7 @@ BACnetEngineeringUnits [] = {
{25,"Cycles Per Hour"}, {25,"Cycles Per Hour"},
{26,"Cycles Per Minute"}, {26,"Cycles Per Minute"},
{27,"Hertz"}, {27,"Hertz"},
{28,"Gramms Of Water Per Kilogram Dry Air"}, {28,"Grams Of Water Per Kilogram Dry Air"},
{29,"Relative Humidity"}, {29,"Relative Humidity"},
{30,"Millimeters"}, {30,"Millimeters"},
{31,"Meters"}, {31,"Meters"},
@ -6089,7 +6089,7 @@ proto_register_bacapp(void)
}, },
{ &hf_bacapp_NAK, { &hf_bacapp_NAK,
{ "NAK", "bacapp.NAK", { "NAK", "bacapp.NAK",
FT_BOOLEAN, 8, NULL, 0x02, "negativ ACK", HFILL } FT_BOOLEAN, 8, NULL, 0x02, "negative ACK", HFILL }
}, },
{ &hf_bacapp_SRV, { &hf_bacapp_SRV,
{ "SRV", "bacapp.SRV", { "SRV", "bacapp.SRV",

6
epan/dissectors/packet-bctp.c
View File

@ -96,8 +96,8 @@ proto_register_bctp (void)
static hf_register_info hf[] = { static hf_register_info hf[] = {
{&hf_bctp_bvei, {"BVEI", "bctp.bvei", FT_UINT16, BASE_HEX, VALS(bvei_vals), 0x4000, "BCTP Version Error Indicator", HFILL }}, {&hf_bctp_bvei, {"BVEI", "bctp.bvei", FT_UINT16, BASE_HEX, VALS(bvei_vals), 0x4000, "BCTP Version Error Indicator", HFILL }},
{&hf_bctp_bvi, {"BVI", "bctp.bvi", FT_UINT16, BASE_HEX, NULL, 0x1F00, "BCTP Version Indicator", HFILL }}, {&hf_bctp_bvi, {"BVI", "bctp.bvi", FT_UINT16, BASE_HEX, NULL, 0x1F00, "BCTP Version Indicator", HFILL }},
{&hf_bctp_tpei, {"TPEI", "bctp.tpei", FT_UINT16, BASE_HEX, NULL, 0x0040, "Tunnelled Protocol Error Indicator", HFILL }}, {&hf_bctp_tpei, {"TPEI", "bctp.tpei", FT_UINT16, BASE_HEX, NULL, 0x0040, "Tunneled Protocol Error Indicator", HFILL }},
{&hf_bctp_tpi, {"TPI", "bctp.tpi", FT_UINT16, BASE_HEX, NULL, 0x003F, "Tunnelled Protocol Indicator", HFILL }}, {&hf_bctp_tpi, {"TPI", "bctp.tpi", FT_UINT16, BASE_HEX, NULL, 0x003F, "Tunneled Protocol Indicator", HFILL }},
}; };
static gint *ett[] = { static gint *ett[] = {
&ett_bctp &ett_bctp
@ -109,7 +109,7 @@ proto_register_bctp (void)
register_dissector("bctp", dissect_bctp, proto_bctp); register_dissector("bctp", dissect_bctp, proto_bctp);
bctp_dissector_table = register_dissector_table("bctp.tpi", "BCTP Tunnelled Protocol Indicator", FT_UINT32, BASE_DEC); bctp_dissector_table = register_dissector_table("bctp.tpi", "BCTP Tunneled Protocol Indicator", FT_UINT32, BASE_DEC);
} }
void void

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

@ -4235,7 +4235,7 @@ proto_register_ber(void)
VALS(ber_class_codes), 0xc0, "Class of BER TLV Identifier", HFILL }}, VALS(ber_class_codes), 0xc0, "Class of BER TLV Identifier", HFILL }},
{ &hf_ber_bitstring_padding, { { &hf_ber_bitstring_padding, {
"Padding", "ber.bitstring.padding", FT_UINT8, BASE_DEC, "Padding", "ber.bitstring.padding", FT_UINT8, BASE_DEC,
NULL, 0x0, "Number of unsused bits in the last octet of the bitstring", HFILL }}, NULL, 0x0, "Number of unused bits in the last octet of the bitstring", HFILL }},
{ &hf_ber_bitstring_empty, { { &hf_ber_bitstring_empty, {
"Empty", "ber.bitstring.empty", FT_UINT8, BASE_DEC, "Empty", "ber.bitstring.empty", FT_UINT8, BASE_DEC,
NULL, 0x0, "This is an empty bitstring", HFILL }}, NULL, 0x0, "This is an empty bitstring", HFILL }},

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

@ -180,7 +180,7 @@ static struct client_information peer_id[] = {
{"-LT", "libtorrent"}, {"-LT", "libtorrent"},
{"-BX", "Bittorrent X"}, {"-BX", "Bittorrent X"},
{"-TS", "Torrentstorm"}, {"-TS", "Torrentstorm"},
{"-TN", "TorrnetDotNET"}, {"-TN", "TorrentDotNET"},
{"-SS", "SwarmScope"}, {"-SS", "SwarmScope"},
{"-XT", "XanTorrent"}, {"-XT", "XanTorrent"},
{"-BS", "BTSlave"}, {"-BS", "BTSlave"},

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

@ -2313,9 +2313,9 @@ proto_register_bssap(void)
FT_NONE, BASE_NONE, NULL, 0, FT_NONE, BASE_NONE, NULL, 0,
"IMSI detach from GPRS service type IE", HFILL }}, "IMSI detach from GPRS service type IE", HFILL }},
{ &hf_bssap_imsi_det_from_non_gprs_serv_type_ie, { &hf_bssap_imsi_det_from_non_gprs_serv_type_ie,
{ "IMSI detach from non-GPRS servic IE", "bssap.msi_det_from_non_gprs_serv_type_ie", { "IMSI detach from non-GPRS service IE", "bssap.msi_det_from_non_gprs_serv_type_ie",
FT_NONE, BASE_NONE, NULL, 0, FT_NONE, BASE_NONE, NULL, 0,
"IMSI detach from non-GPRS servic IE", HFILL }}, "IMSI detach from non-GPRS service IE", HFILL }},
{ &hf_bssap_info_req_ie, { &hf_bssap_info_req_ie,
{ "Information requested IE", "bssap.info_req_ie", { "Information requested IE", "bssap.info_req_ie",
FT_NONE, BASE_NONE, NULL, 0, FT_NONE, BASE_NONE, NULL, 0,

43
epan/dissectors/packet-bssgp.c
View File

@ -114,7 +114,7 @@ static gint ett_bssgp_rrlp_flags = -1;
static gint ett_bssgp_rim_pdu_indications = -1; static gint ett_bssgp_rim_pdu_indications = -1;
static gint ett_bssgp_mcc = -1; static gint ett_bssgp_mcc = -1;
static gint ett_bssgp_mnc = -1; static gint ett_bssgp_mnc = -1;
static gint ett_bssgp_routeing_area = -1; static gint ett_bssgp_routing_area = -1;
static gint ett_bssgp_location_area = -1; static gint ett_bssgp_location_area = -1;
static gint ett_bssgp_rai_ci = -1; static gint ett_bssgp_rai_ci = -1;
static gint ett_bssgp_rim_routing_information =-1; static gint ett_bssgp_rim_routing_information =-1;
@ -270,7 +270,7 @@ static const value_string tab_bssgp_pdu_types[] = {
#define BSSGP_IEI_QOS_PROFILE 0x18 #define BSSGP_IEI_QOS_PROFILE 0x18
#define BSSGP_IEI_RADIO_CAUSE 0x19 #define BSSGP_IEI_RADIO_CAUSE 0x19
#define BSSGP_IEI_RA_CAP_UPD_CAUSE 0x1a #define BSSGP_IEI_RA_CAP_UPD_CAUSE 0x1a
#define BSSGP_IEI_ROUTEING_AREA 0x1b #define BSSGP_IEI_ROUTING_AREA 0x1b
#define BSSGP_IEI_R_DEFAULT_MS 0x1c #define BSSGP_IEI_R_DEFAULT_MS 0x1c
#define BSSGP_IEI_SUSPEND_REFERENCE_NUMBER 0x1d #define BSSGP_IEI_SUSPEND_REFERENCE_NUMBER 0x1d
#define BSSGP_IEI_TAG 0x1e #define BSSGP_IEI_TAG 0x1e
@ -359,7 +359,7 @@ static const value_string tab_bssgp_ie_types[] = {
{ BSSGP_IEI_QOS_PROFILE, "QoS Profile" }, { BSSGP_IEI_QOS_PROFILE, "QoS Profile" },
{ BSSGP_IEI_RADIO_CAUSE, "Radio Cause" }, { BSSGP_IEI_RADIO_CAUSE, "Radio Cause" },
{ BSSGP_IEI_RA_CAP_UPD_CAUSE, "RA-Cap-UPD-Cause" }, { BSSGP_IEI_RA_CAP_UPD_CAUSE, "RA-Cap-UPD-Cause" },
{ BSSGP_IEI_ROUTEING_AREA, "Routeing Area" }, { BSSGP_IEI_ROUTING_AREA, "Routing Area" },
{ BSSGP_IEI_R_DEFAULT_MS, "R_default_MS" }, { BSSGP_IEI_R_DEFAULT_MS, "R_default_MS" },
{ BSSGP_IEI_SUSPEND_REFERENCE_NUMBER, "Suspend Reference Number" }, { BSSGP_IEI_SUSPEND_REFERENCE_NUMBER, "Suspend Reference Number" },
{ BSSGP_IEI_TAG, "Tag" }, { BSSGP_IEI_TAG, "Tag" },
@ -2851,7 +2851,7 @@ decode_iei_ra_cap_upd_cause(bssgp_ie_t *ie, build_info_t *bi, int ie_start_offse
} }
static void static void
decode_iei_routeing_area(bssgp_ie_t *ie, build_info_t *bi, int ie_start_offset) { decode_iei_routing_area(bssgp_ie_t *ie, build_info_t *bi, int ie_start_offset) {
proto_item *ti; proto_item *ti;
proto_tree *tf; proto_tree *tf;
char *rai; char *rai;
@ -2861,7 +2861,7 @@ decode_iei_routeing_area(bssgp_ie_t *ie, build_info_t *bi, int ie_start_offset)
return; return;
} }
ti = bssgp_proto_tree_add_ie(ie, bi, ie_start_offset); ti = bssgp_proto_tree_add_ie(ie, bi, ie_start_offset);
tf = proto_item_add_subtree(ti, ett_bssgp_routeing_area); tf = proto_item_add_subtree(ti, ett_bssgp_routing_area);
rai = decode_rai(bi, tf); rai = decode_rai(bi, tf);
proto_item_append_text(ti, ": RAI %s", rai); proto_item_append_text(ti, ": RAI %s", rai);
@ -3361,7 +3361,7 @@ decode_iei_feature_bitmap(bssgp_ie_t *ie, build_info_t *bi, int ie_start_offset)
value = get_masked_guint8(data, MASK_INR); value = get_masked_guint8(data, MASK_INR);
pi = proto_tree_add_bitfield8(tf, bi->tvb, bi->offset, MASK_INR); pi = proto_tree_add_bitfield8(tf, bi->tvb, bi->offset, MASK_INR);
proto_item_append_text(pi, "INR: Inter-NSE re-routeing%s supported", proto_item_append_text(pi, "INR: Inter-NSE re-routing%s supported",
value == 0 ? " not" : ""); value == 0 ? " not" : "");
value = get_masked_guint8(data, MASK_CBL); value = get_masked_guint8(data, MASK_CBL);
@ -3778,7 +3778,7 @@ decode_iei_positioning_data(bssgp_ie_t *ie, build_info_t *bi, int ie_start_offse
pi = proto_tree_add_bitfield8(tf, bi->tvb, bi->offset, MASK_PDD); pi = proto_tree_add_bitfield8(tf, bi->tvb, bi->offset, MASK_PDD);
proto_item_append_text(pi, "Positioning Data Discriminator: %s", proto_item_append_text(pi, "Positioning Data Discriminator: %s",
value == 0 ? value == 0 ?
"Indicate usage of each positioning method that was attempted either successfully or unseccessfully" : "Indicate usage of each positioning method that was attempted either successfully or unsuccessfully" :
"Reserved"); "Reserved");
bi->offset++; bi->offset++;
@ -3816,8 +3816,9 @@ decode_iei_positioning_data(bssgp_ie_t *ie, build_info_t *bi, int ie_start_offse
case 0: proto_item_append_text(pi, " attempted unsuccessfully due to failure or interruption "); break; case 0: proto_item_append_text(pi, " attempted unsuccessfully due to failure or interruption "); break;
case 1: proto_item_append_text(pi, " attempted successfully: results not used to generate location"); break; case 1: proto_item_append_text(pi, " attempted successfully: results not used to generate location"); break;
case 2: proto_item_append_text(pi, " attempted successfully: results used to verify but not generate location"); break; case 2: proto_item_append_text(pi, " attempted successfully: results used to verify but not generate location"); break;
case 3: proto_item_append_text(pi, "attempted successfully: results used to generate location"); break; case 3: proto_item_append_text(pi, " attempted successfully: results used to generate location"); break;
case 4: proto_item_append_text(pi, "a temmpted successfully: case where MS supports multiple mobile based positioning methods and the actual method or methods used by the MS cannot be determined"); break; case 4: proto_item_append_text(pi, " attempted successfully: case where MS supports multiple mobile based"
" positioning methods and the actual method or methods used by the MS cannot be determined"); break;
default: ; /* ??? */ default: ; /* ??? */
} }
proto_item_append_text(pi, " (%#x)", value); /* Usage */ proto_item_append_text(pi, " (%#x)", value); /* Usage */
@ -3887,7 +3888,7 @@ decode_iei_lcs_cause(bssgp_ie_t *ie, build_info_t *bi, int ie_start_offset) {
{ 10, "Intra-BSC handover ongoing" }, { 10, "Intra-BSC handover ongoing" },
{ 11, "Congestion" }, { 11, "Congestion" },
{ 12, "Inter NSE cell change" }, { 12, "Inter NSE cell change" },
{ 13, "Routeing area update" }, { 13, "Routing area update" },
{ 14, "PTMSI reallocation" }, { 14, "PTMSI reallocation" },
{ 15, "Suspension of GPRS services" }, { 15, "Suspension of GPRS services" },
{ 0, NULL }, { 0, NULL },
@ -4504,8 +4505,8 @@ decode_ie(bssgp_ie_t *ie, build_info_t *bi) {
case BSSGP_IEI_RA_CAP_UPD_CAUSE: case BSSGP_IEI_RA_CAP_UPD_CAUSE:
decode_iei_ra_cap_upd_cause(ie, bi, org_offset); decode_iei_ra_cap_upd_cause(ie, bi, org_offset);
break; break;
case BSSGP_IEI_ROUTEING_AREA: case BSSGP_IEI_ROUTING_AREA:
decode_iei_routeing_area(ie, bi, org_offset); decode_iei_routing_area(ie, bi, org_offset);
break; break;
case BSSGP_IEI_R_DEFAULT_MS: case BSSGP_IEI_R_DEFAULT_MS:
decode_bucket_leak_rate(ie, bi, org_offset); decode_bucket_leak_rate(ie, bi, org_offset);
@ -4781,7 +4782,7 @@ decode_pdu_paging_ps(build_info_t *bi) {
{ BSSGP_IEI_LOCATION_AREA, NULL, { BSSGP_IEI_LOCATION_AREA, NULL,
BSSGP_IE_PRESENCE_C, BSSGP_IE_FORMAT_TLV, BSSGP_UNKNOWN, 7 }, BSSGP_IE_PRESENCE_C, BSSGP_IE_FORMAT_TLV, BSSGP_UNKNOWN, 7 },
{ BSSGP_IEI_ROUTEING_AREA, NULL, { BSSGP_IEI_ROUTING_AREA, NULL,
BSSGP_IE_PRESENCE_C, BSSGP_IE_FORMAT_TLV, BSSGP_UNKNOWN, 8 }, BSSGP_IE_PRESENCE_C, BSSGP_IE_FORMAT_TLV, BSSGP_UNKNOWN, 8 },
{ BSSGP_IEI_BSS_AREA_INDICATION, NULL, { BSSGP_IEI_BSS_AREA_INDICATION, NULL,
@ -4820,7 +4821,7 @@ decode_pdu_paging_cs(build_info_t *bi) {
{ BSSGP_IEI_LOCATION_AREA, NULL, { BSSGP_IEI_LOCATION_AREA, NULL,
BSSGP_IE_PRESENCE_C, BSSGP_IE_FORMAT_TLV, BSSGP_UNKNOWN, 7 }, BSSGP_IE_PRESENCE_C, BSSGP_IE_FORMAT_TLV, BSSGP_UNKNOWN, 7 },
{ BSSGP_IEI_ROUTEING_AREA, NULL, { BSSGP_IEI_ROUTING_AREA, NULL,
BSSGP_IE_PRESENCE_C, BSSGP_IE_FORMAT_TLV, BSSGP_UNKNOWN, 8 }, BSSGP_IE_PRESENCE_C, BSSGP_IE_FORMAT_TLV, BSSGP_UNKNOWN, 8 },
{ BSSGP_IEI_BSS_AREA_INDICATION, NULL, { BSSGP_IEI_BSS_AREA_INDICATION, NULL,
@ -4913,7 +4914,7 @@ decode_pdu_suspend(build_info_t *bi) {
{ BSSGP_IEI_TLLI, NULL, { BSSGP_IEI_TLLI, NULL,
BSSGP_IE_PRESENCE_M, BSSGP_IE_FORMAT_TLV, BSSGP_UNKNOWN, 6 }, BSSGP_IE_PRESENCE_M, BSSGP_IE_FORMAT_TLV, BSSGP_UNKNOWN, 6 },
{ BSSGP_IEI_ROUTEING_AREA, NULL, { BSSGP_IEI_ROUTING_AREA, NULL,
BSSGP_IE_PRESENCE_M, BSSGP_IE_FORMAT_TLV, BSSGP_UNKNOWN, 8 }, BSSGP_IE_PRESENCE_M, BSSGP_IE_FORMAT_TLV, BSSGP_UNKNOWN, 8 },
}; };
bi->dl_data = FALSE; bi->dl_data = FALSE;
@ -4928,7 +4929,7 @@ decode_pdu_suspend_ack(build_info_t *bi) {
{ BSSGP_IEI_TLLI, NULL, { BSSGP_IEI_TLLI, NULL,
BSSGP_IE_PRESENCE_M, BSSGP_IE_FORMAT_TLV, BSSGP_UNKNOWN, 6 }, BSSGP_IE_PRESENCE_M, BSSGP_IE_FORMAT_TLV, BSSGP_UNKNOWN, 6 },
{ BSSGP_IEI_ROUTEING_AREA, NULL, { BSSGP_IEI_ROUTING_AREA, NULL,
BSSGP_IE_PRESENCE_M, BSSGP_IE_FORMAT_TLV, BSSGP_UNKNOWN, 8 }, BSSGP_IE_PRESENCE_M, BSSGP_IE_FORMAT_TLV, BSSGP_UNKNOWN, 8 },
{ BSSGP_IEI_SUSPEND_REFERENCE_NUMBER, NULL, { BSSGP_IEI_SUSPEND_REFERENCE_NUMBER, NULL,
@ -4946,7 +4947,7 @@ decode_pdu_suspend_nack(build_info_t *bi) {
{ BSSGP_IEI_TLLI, NULL, { BSSGP_IEI_TLLI, NULL,
BSSGP_IE_PRESENCE_M, BSSGP_IE_FORMAT_TLV, BSSGP_UNKNOWN, 6 }, BSSGP_IE_PRESENCE_M, BSSGP_IE_FORMAT_TLV, BSSGP_UNKNOWN, 6 },
{ BSSGP_IEI_ROUTEING_AREA, NULL, { BSSGP_IEI_ROUTING_AREA, NULL,
BSSGP_IE_PRESENCE_M, BSSGP_IE_FORMAT_TLV, BSSGP_UNKNOWN, 8 }, BSSGP_IE_PRESENCE_M, BSSGP_IE_FORMAT_TLV, BSSGP_UNKNOWN, 8 },
{ BSSGP_IEI_CAUSE, NULL, { BSSGP_IEI_CAUSE, NULL,
@ -4964,7 +4965,7 @@ decode_pdu_resume(build_info_t *bi) {
{ BSSGP_IEI_TLLI, NULL, { BSSGP_IEI_TLLI, NULL,
BSSGP_IE_PRESENCE_M, BSSGP_IE_FORMAT_TLV, BSSGP_UNKNOWN, 6 }, BSSGP_IE_PRESENCE_M, BSSGP_IE_FORMAT_TLV, BSSGP_UNKNOWN, 6 },
{ BSSGP_IEI_ROUTEING_AREA, NULL, { BSSGP_IEI_ROUTING_AREA, NULL,
BSSGP_IE_PRESENCE_M, BSSGP_IE_FORMAT_TLV, BSSGP_UNKNOWN, 8 }, BSSGP_IE_PRESENCE_M, BSSGP_IE_FORMAT_TLV, BSSGP_UNKNOWN, 8 },
{ BSSGP_IEI_SUSPEND_REFERENCE_NUMBER, NULL, { BSSGP_IEI_SUSPEND_REFERENCE_NUMBER, NULL,
@ -4982,7 +4983,7 @@ decode_pdu_resume_ack(build_info_t *bi) {
{ BSSGP_IEI_TLLI, NULL, { BSSGP_IEI_TLLI, NULL,
BSSGP_IE_PRESENCE_M, BSSGP_IE_FORMAT_TLV, BSSGP_UNKNOWN, 6 }, BSSGP_IE_PRESENCE_M, BSSGP_IE_FORMAT_TLV, BSSGP_UNKNOWN, 6 },
{ BSSGP_IEI_ROUTEING_AREA, NULL, { BSSGP_IEI_ROUTING_AREA, NULL,
BSSGP_IE_PRESENCE_M, BSSGP_IE_FORMAT_TLV, BSSGP_UNKNOWN, 8 }, BSSGP_IE_PRESENCE_M, BSSGP_IE_FORMAT_TLV, BSSGP_UNKNOWN, 8 },
}; };
@ -4998,7 +4999,7 @@ decode_pdu_resume_nack(build_info_t *bi) {
{ BSSGP_IEI_TLLI, NULL, { BSSGP_IEI_TLLI, NULL,
BSSGP_IE_PRESENCE_M, BSSGP_IE_FORMAT_TLV, BSSGP_UNKNOWN, 6 }, BSSGP_IE_PRESENCE_M, BSSGP_IE_FORMAT_TLV, BSSGP_UNKNOWN, 6 },
{ BSSGP_IEI_ROUTEING_AREA, NULL, { BSSGP_IEI_ROUTING_AREA, NULL,
BSSGP_IE_PRESENCE_M, BSSGP_IE_FORMAT_TLV, BSSGP_UNKNOWN, 8 }, BSSGP_IE_PRESENCE_M, BSSGP_IE_FORMAT_TLV, BSSGP_UNKNOWN, 8 },
{ BSSGP_IEI_CAUSE, NULL, { BSSGP_IEI_CAUSE, NULL,
@ -6166,7 +6167,7 @@ proto_register_bssgp(void)
&ett_bssgp_rim_pdu_indications, &ett_bssgp_rim_pdu_indications,
&ett_bssgp_mcc, &ett_bssgp_mcc,
&ett_bssgp_mnc, &ett_bssgp_mnc,
&ett_bssgp_routeing_area, &ett_bssgp_routing_area,
&ett_bssgp_location_area, &ett_bssgp_location_area,
&ett_bssgp_rai_ci, &ett_bssgp_rai_ci,
&ett_bssgp_ran_information_request_application_container, &ett_bssgp_ran_information_request_application_container,

6
epan/dissectors/packet-bthci_cmd.c
View File

@ -636,13 +636,13 @@ static const value_string cmd_auto_acc_flag_values[] = {
}; };
static const value_string cmd_read_all_flag_values[] = { static const value_string cmd_read_all_flag_values[] = {
{0x00, "Return Link Key for speified BD_ADDR" }, {0x00, "Return Link Key for specified BD_ADDR" },
{0x01, "Return all stored Link Keys" }, {0x01, "Return all stored Link Keys" },
{0, NULL } {0, NULL }
}; };
static const value_string cmd_delete_all_flag_values[] = { static const value_string cmd_delete_all_flag_values[] = {
{0x00, "Delete only Link Key for speified BD_ADDR" }, {0x00, "Delete only Link Key for specified BD_ADDR" },
{0x01, "Delete all stored Link Keys" }, {0x01, "Delete all stored Link Keys" },
{0, NULL } {0, NULL }
}; };
@ -2240,7 +2240,7 @@ proto_register_bthci_cmd(void)
"Peak Bandwidth, in bytes per second", HFILL } "Peak Bandwidth, in bytes per second", HFILL }
}, },
{ &hf_bthci_cmd_latency, { &hf_bthci_cmd_latency,
{ "Latecy", "bthci_cmd.latency", { "Latency", "bthci_cmd.latency",
FT_UINT32, BASE_DEC, NULL, 0x0, FT_UINT32, BASE_DEC, NULL, 0x0,
"Latency, in microseconds", HFILL } "Latency, in microseconds", HFILL }
}, },

6
epan/dissectors/packet-bthci_evt.c
View File

@ -590,8 +590,8 @@ static const value_string evt_air_mode_values[] = {
}; };
static const value_string evt_flow_direction_values[] = { static const value_string evt_flow_direction_values[] = {
{0x0, "Outgoing Trafic" }, {0x0, "Outgoing Traffic" },
{0x1, "Incoming Trafic" }, {0x1, "Incoming Traffic" },
{0, NULL } {0, NULL }
}; };
@ -2707,7 +2707,7 @@ proto_register_bthci_evt(void)
"Available Peak Bandwidth, in bytes per second", HFILL } "Available Peak Bandwidth, in bytes per second", HFILL }
}, },
{ &hf_bthci_evt_latency, { &hf_bthci_evt_latency,
{ "Available Latecy", "bthci_evt.latency", { "Available Latency", "bthci_evt.latency",
FT_UINT32, BASE_DEC, NULL, 0x0, FT_UINT32, BASE_DEC, NULL, 0x0,
"Available Latency, in microseconds", HFILL } "Available Latency, in microseconds", HFILL }
}, },

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

@ -173,7 +173,7 @@ static const value_string configuration_result_vals[] = {
static const value_string status_vals[] = { static const value_string status_vals[] = {
{ 0x0000, "No further information available" }, { 0x0000, "No further information available" },
{ 0x0001, "Authentication panding" }, { 0x0001, "Authentication pending" },
{ 0x0002, "Authorization pending" }, { 0x0002, "Authorization pending" },
{ 0, NULL } { 0, NULL }
}; };
@ -1038,7 +1038,7 @@ proto_register_btl2cap(void)
{ &hf_btl2cap_psm, { &hf_btl2cap_psm,
{ "PSM", "btl2cap.psm", { "PSM", "btl2cap.psm",
FT_UINT16, BASE_HEX, VALS(psm_vals), 0x0, FT_UINT16, BASE_HEX, VALS(psm_vals), 0x0,
"Protocol/Service Multiplexor", HFILL } "Protocol/Service Multiplexer", HFILL }
}, },
{ &hf_btl2cap_scid, { &hf_btl2cap_scid,
{ "Source CID", "btl2cap.scid", { "Source CID", "btl2cap.scid",

10
epan/dissectors/packet-catapult-dct2000.c
View File

@ -1066,7 +1066,7 @@ dissect_catapult_dct2000(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
/* Note that the first item of pinfo->pseudo_header->dct2000 will contain /* Note that the first item of pinfo->pseudo_header->dct2000 will contain
the pseudo-header needed (in some cases) by the wireshark dissector that the pseudo-header needed (in some cases) by the Wireshark dissector that
this packet data will be handed off to. */ this packet data will be handed off to. */
@ -1740,22 +1740,22 @@ void proto_register_catapult_dct2000(void)
/* Determines whether for not-handled protocols we should try to parse it if: /* Determines whether for not-handled protocols we should try to parse it if:
- it looks like its embedded in an ipprim message, AND - it looks like its embedded in an ipprim message, AND
- the DCT2000 protocol name can be matched to a wireshark dissector name */ - the DCT2000 protocol name can be matched to a Wireshark dissector name */
prefs_register_bool_preference(catapult_dct2000_module, "ipprim_heuristic", prefs_register_bool_preference(catapult_dct2000_module, "ipprim_heuristic",
"Use IP Primitive heuristic", "Use IP Primitive heuristic",
"If a payload looks like its embedded in an " "If a payload looks like its embedded in an "
"IP primitive message, and there is a wireshark " "IP primitive message, and there is a Wireshark "
"dissector matching the DCT2000 protocol name, " "dissector matching the DCT2000 protocol name, "
"try parsing the payload using that dissector", "try parsing the payload using that dissector",
&catapult_dct2000_try_ipprim_heuristic); &catapult_dct2000_try_ipprim_heuristic);
/* Determines whether for not-handled protocols we should try to parse it if: /* Determines whether for not-handled protocols we should try to parse it if:
- it looks like its embedded in an sctpprim message, AND - it looks like its embedded in an sctpprim message, AND
- the DCT2000 protocol name can be matched to a wireshark dissector name */ - the DCT2000 protocol name can be matched to a Wireshark dissector name */
prefs_register_bool_preference(catapult_dct2000_module, "sctpprim_heuristic", prefs_register_bool_preference(catapult_dct2000_module, "sctpprim_heuristic",
"Use SCTP Primitive heuristic", "Use SCTP Primitive heuristic",
"If a payload looks like its embedded in an " "If a payload looks like its embedded in an "
"SCTP primitive message, and there is a wireshark " "SCTP primitive message, and there is a Wireshark "
"dissector matching the DCT2000 protocol name, " "dissector matching the DCT2000 protocol name, "
"try parsing the payload using that dissector", "try parsing the payload using that dissector",
&catapult_dct2000_try_sctpprim_heuristic); &catapult_dct2000_try_sctpprim_heuristic);

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

@ -47,7 +47,7 @@ static void dissect_cfm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
static int proto_cfm = -1; static int proto_cfm = -1;
static const value_string opcodetypenames[] = { static const value_string opcodetypenames[] = {
{ IEE8021, "Reserved for IEE 802.1" }, { IEEE8021, "Reserved for IEEE 802.1" },
{ CCM, "Continuity Check Message (CCM)" }, { CCM, "Continuity Check Message (CCM)" },
{ LBR, "Loopback Reply (LBR)" }, { LBR, "Loopback Reply (LBR)" },
{ LBM, "Loopback Message (LBM)" }, { LBM, "Loopback Message (LBM)" },

2
epan/dissectors/packet-cfm.h
View File

@ -26,7 +26,7 @@
#ifndef __PACKET_CFM_H__ #ifndef __PACKET_CFM_H__
#define __PACKET_CFM_H__ #define __PACKET_CFM_H__
#define IEE8021 0x00 #define IEEE8021 0x00
#define CCM 0x01 #define CCM 0x01
#define LBR 0x02 #define LBR 0x02
#define LBM 0x03 #define LBM 0x03

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

@ -363,7 +363,7 @@ const value_string cip_devtype_vals[] = {
{ DP_HMI, "Human-Machine Interface" }, { DP_HMI, "Human-Machine Interface" },
{ DP_MASS_FLOW_CNT, "Mass Flow Controller" }, { DP_MASS_FLOW_CNT, "Mass Flow Controller" },
{ DP_PNEUM_VALVE, "Pneumatic Valve" }, { DP_PNEUM_VALVE, "Pneumatic Valve" },
{ DP_VACUUM_PRES_GAUGE, "Vaccuum Pressure Gauge" }, { DP_VACUUM_PRES_GAUGE, "Vacuum Pressure Gauge" },
{ 0, NULL } { 0, NULL }
}; };

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

@ -317,7 +317,7 @@ static void dissect_my_state(tvbuff_t * tvb, int offset, proto_tree * tree) {
proto_tree_add_uint_format_value(tree, hf_ha_mode, tvb, offset, sizeof(hdr.ha_mode), hdr.ha_mode, "%d (%s)", hdr.ha_mode, ha_mode2str(hdr.ha_mode)); proto_tree_add_uint_format_value(tree, hf_ha_mode, tvb, offset, sizeof(hdr.ha_mode), hdr.ha_mode, "%d (%s)", hdr.ha_mode, ha_mode2str(hdr.ha_mode));
offset += sizeof(hdr.ha_mode); offset += sizeof(hdr.ha_mode);
proto_tree_add_uint_format_value(tree, hf_ha_time_unit, tvb, offset, sizeof(hdr.ha_time_unit), hdr.ha_time_unit, "%d miliseconds", hdr.ha_time_unit); proto_tree_add_uint_format_value(tree, hf_ha_time_unit, tvb, offset, sizeof(hdr.ha_time_unit), hdr.ha_time_unit, "%d milliseconds", hdr.ha_time_unit);
offset += sizeof(hdr.ha_time_unit); offset += sizeof(hdr.ha_time_unit);
rep_mode = is_report_ifs(hdr.report_code); rep_mode = is_report_ifs(hdr.report_code);

6
epan/dissectors/packet-dccp.c
View File

@ -70,7 +70,7 @@
/* Some definitions and the dissect_options() logic have been taken from Arnaldo Carvalho de Melo's DCCP implementation, thanks! */ /* Some definitions and the dissect_options() logic have been taken from Arnaldo Carvalho de Melo's DCCP implementation, thanks! */
#define DCCP_HDR_LEN 16 /* base DCCP header length, with 48 bits seqnos */ #define DCCP_HDR_LEN 16 /* base DCCP header length, with 48 bits seqnums */
#define DCCP_HDR_LEN_MIN 12 /* , with 24 bits seqnum */ #define DCCP_HDR_LEN_MIN 12 /* , with 24 bits seqnum */
#define DCCP_HDR_PKT_TYPES_LEN_MAX 12 /* max per packet type extra header length */ #define DCCP_HDR_PKT_TYPES_LEN_MAX 12 /* max per packet type extra header length */
#define DCCP_OPT_LEN_MAX 1008 #define DCCP_OPT_LEN_MAX 1008
@ -124,7 +124,7 @@ static const value_string dccp_feature_options_vals[] = {
static const value_string dccp_feature_numbers_vals[] = { static const value_string dccp_feature_numbers_vals[] = {
{0x01, "CCID"}, {0x01, "CCID"},
{0x02, "Allow Short Seqnos"}, {0x02, "Allow Short Seqnums"},
{0x03, "Sequence Window"}, {0x03, "Sequence Window"},
{0x04, "ECN Incapable"}, {0x04, "ECN Incapable"},
{0x05, "Ack Ratio"}, {0x05, "Ack Ratio"},
@ -311,7 +311,7 @@ static void dissect_feature_options(proto_tree *dccp_options_tree, tvbuff_t *tvb
switch (feature_number) { switch (feature_number) {
/* Server Priority features (RFC 4340, 6.3.1) */ /* Server Priority features (RFC 4340, 6.3.1) */
case 1: /* Congestion Control ID (CCID); fall through */ case 1: /* Congestion Control ID (CCID); fall through */
case 2: /* Allow Short Seqnos; fall through */ case 2: /* Allow Short Seqnums; fall through */
case 4: /* ECN Incapable; fall through */ case 4: /* ECN Incapable; fall through */
case 6: /* Send Ack Vector; fall through */ case 6: /* Send Ack Vector; fall through */
case 7: /* Send NDP Count; fall through */ case 7: /* Send NDP Count; fall through */

30
epan/dissectors/packet-dcm.c
View File

@ -337,11 +337,11 @@ typedef struct dcm_open_tag {
gchar *vr; /* Already decoded VR */ gchar *vr; /* Already decoded VR */
gboolean is_vl_long; /* If TRUE, Value Length is 4 Bytes, otherwise 2 */ gboolean is_vl_long; /* If TRUE, Value Length is 4 Bytes, otherwise 2 */
guint16 vl_1; /* Partially decoded 1st two bytes of lenght */ guint16 vl_1; /* Partially decoded 1st two bytes of length */
guint16 vl_2; /* Partially decoded 2nd two bytes of lenght */ guint16 vl_2; /* Partially decoded 2nd two bytes of length */
/* These ones are, where the value was truncated */ /* These ones are, where the value was truncated */
guint32 len_total; /* Tag lenght of 'oversized' tags. Used for display */ guint32 len_total; /* Tag length of 'oversized' tags. Used for display */
guint32 len_remaining; /* Remining tag bytes to 'decoded' as binary data after this PDV */ guint32 len_remaining; /* Remining tag bytes to 'decoded' as binary data after this PDV */
gchar *desc; /* Last decoded description */ gchar *desc; /* Last decoded description */
@ -4326,7 +4326,7 @@ dcm_export_create_header(guint32 *dcm_header_len, gchar *sop_class_uid, gchar *s
offset=dcm_export_create_tag_str(dcm_header, DCM_HEADER_MAX, offset, offset=dcm_export_create_tag_str(dcm_header, DCM_HEADER_MAX, offset,
0x0002, 0x0013, DCM_VR_SH, WIRESHARK_IMPLEMENTATION_VERSION); 0x0002, 0x0013, DCM_VR_SH, WIRESHARK_IMPLEMENTATION_VERSION);
/* Finally write the meta header lenght */ /* Finally write the meta header length */
dcm_export_create_tag_guint32(dcm_header, DCM_HEADER_MAX, offset_header_len, dcm_export_create_tag_guint32(dcm_header, DCM_HEADER_MAX, offset_header_len,
0x0002, 0x0000, DCM_VR_UL, offset-offset_header_len-12); 0x0002, 0x0000, DCM_VR_UL, offset-offset_header_len-12);
@ -4362,7 +4362,7 @@ dcm_export_create_object(packet_info *pinfo, dcm_state_assoc_t *assoc, dcm_state
gchar *sop_class_uid = NULL; gchar *sop_class_uid = NULL;
gchar *sop_instance_uid = NULL; gchar *sop_instance_uid = NULL;
/* Calculate total PDV lenghth, i.e. all packets until last PDV without continuation */ /* Calculate total PDV lengthh, i.e. all packets until last PDV without continuation */
pdv_curr = pdv; pdv_curr = pdv;
pdv_same_pkt = pdv; pdv_same_pkt = pdv;
pdv_combined_len=pdv_curr->data_len; pdv_combined_len=pdv_curr->data_len;
@ -4858,7 +4858,7 @@ dissect_dcm_assoc(tvbuff_t *tvb, packet_info *pinfo, proto_item *ti,
item_len = tvb_get_ntohs(tvb, 2 + offset); item_len = tvb_get_ntohs(tvb, 2 + offset);
if (item_len == 0) { if (item_len == 0) {
expert_add_info_format(pinfo, ti, PI_MALFORMED, PI_ERROR, "Invalid Association Item Lenght"); expert_add_info_format(pinfo, ti, PI_MALFORMED, PI_ERROR, "Invalid Association Item Length");
return endpos; return endpos;
} }
@ -5169,7 +5169,7 @@ dissect_dcm_tag_value(tvbuff_t *tvb, proto_tree *tree, dcm_state_pdv_t *pdv,
} }
} }
/* --------------------------------------------------------------------------- /* ---------------------------------------------------------------------------
Smaller types. vl/vl_max are not used. Fixed item lenght from 2 to 8 bytes Smaller types. vl/vl_max are not used. Fixed item length from 2 to 8 bytes
--------------------------------------------------------------------------- ---------------------------------------------------------------------------
*/ */
else if (strncmp(vr, "AT", 2) == 0) { /* Attribute Tag */ else if (strncmp(vr, "AT", 2) == 0) { /* Attribute Tag */
@ -5565,7 +5565,7 @@ dissect_dcm_tag(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
} }
/* Value Length. This is rather cumbersume code to get a 4 byte lenght, but in the /* Value Length. This is rather cumbersume code to get a 4 byte length, but in the
fragmented case, we have 2*2 bytes. So always use that pattern fragmented case, we have 2*2 bytes. So always use that pattern
*/ */
@ -5606,7 +5606,7 @@ dissect_dcm_tag(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
} }
/* Now we have most of the information, excpet for sequences and items with undefined /* Now we have most of the information, excpet for sequences and items with undefined
length :-/. But, whether we know the lenght or not, we now need to create the tree length :-/. But, whether we know the length or not, we now need to create the tree
item and subtree, before we can loop into sequences and items item and subtree, before we can loop into sequences and items
Display the information we collected so far. Don't wait until the value is parsed, Display the information we collected so far. Don't wait until the value is parsed,
@ -5686,7 +5686,7 @@ dissect_dcm_tag(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
} }
} }
/* Add lenght to tag detail */ /* Add length to tag detail */
proto_tree_add_uint_format(tag_ptree, hf_dcm_tag_vl, tvb, offset_vl, (is_vl_long ? 4 : 2), vl, "%-8.8s%u", "Length:", vl); proto_tree_add_uint_format(tag_ptree, hf_dcm_tag_vl, tvb, offset_vl, (is_vl_long ? 4 : 2), vl, "%-8.8s%u", "Length:", vl);
@ -5718,7 +5718,7 @@ dissect_dcm_tag(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
} }
} }
else { else {
/* Defined lenghth */ /* Defined lengthh */
endpos_item = offset + vl_max; endpos_item = offset + vl_max;
while (offset < endpos_item) { while (offset < endpos_item) {
@ -6047,7 +6047,7 @@ dcm_make_complete_pdu(tvbuff_t *tvb, guint32 offset, gboolean one_pdu_only)
offset += 2; /* PDU header */ offset += 2; /* PDU header */
pdu_len = tvb_get_ntohl(tvb, offset); pdu_len = tvb_get_ntohl(tvb, offset);
offset += 4; /* PDU Lenght */ offset += 4; /* PDU Length */
bytes_remaining = tlen - offset; bytes_remaining = tlen - offset;
@ -6159,7 +6159,7 @@ dissect_dcm_main(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolean r
a) need to eliminate PDU/PDV/Ctx header (12 bytes) a) need to eliminate PDU/PDV/Ctx header (12 bytes)
b) not show the true DICOM logic in transfer b) not show the true DICOM logic in transfer
The lenght check is tricky. If not a PDV continuation, 10 Bytes are required. For PDV continuation The length check is tricky. If not a PDV continuation, 10 Bytes are required. For PDV continuation
anything seems to be possible, depending on the buffer alignment of the sending process. anything seems to be possible, depending on the buffer alignment of the sending process.
I have seen a 4 Byte PDU 'Header' just at the end of a TCP packet, which will come in here I have seen a 4 Byte PDU 'Header' just at the end of a TCP packet, which will come in here
@ -6556,7 +6556,7 @@ proto_register_dcm(void)
FT_UINT32, BASE_HEX, NULL, 0, "", HFILL } }, FT_UINT32, BASE_HEX, NULL, 0, "", HFILL } },
{ &hf_dcm_tag_vr, { "VR", "dicom.tag.vr", { &hf_dcm_tag_vr, { "VR", "dicom.tag.vr",
FT_STRING, BASE_NONE, NULL, 0, "", HFILL } }, FT_STRING, BASE_NONE, NULL, 0, "", HFILL } },
{ &hf_dcm_tag_vl, { "Lenght", "dicom.tag.vl", { &hf_dcm_tag_vl, { "Length", "dicom.tag.vl",
FT_UINT32, BASE_HEX, NULL, 0, "", HFILL } }, FT_UINT32, BASE_HEX, NULL, 0, "", HFILL } },
{ &hf_dcm_tag_value_str, { "Value", "dicom.tag.value.str", { &hf_dcm_tag_value_str, { "Value", "dicom.tag.value.str",
@ -6631,7 +6631,7 @@ proto_register_dcm(void)
prefs_register_bool_preference(dcm_module, "seq_tree", prefs_register_bool_preference(dcm_module, "seq_tree",
"Create subtrees for Sequences and Items", "Create subtrees for Sequences and Items",
"Create a node for sequences and items, and show children in a hierachy. " "Create a node for sequences and items, and show children in a hierarchy. "
"Deselect this option, if you prefer a flat display or e.g. " "Deselect this option, if you prefer a flat display or e.g. "
"when using TShark to create a text output.", "when using TShark to create a text output.",
&global_dcm_seq_subtree); &global_dcm_seq_subtree);

4
epan/dissectors/packet-dis-enums.c
View File

@ -165,7 +165,7 @@ const value_string DIS_PDU_Domain_Strings[] =
{ DIS_DOMAIN_LAND, "Land" }, { DIS_DOMAIN_LAND, "Land" },
{ DIS_DOMAIN_AIR, "Air" }, { DIS_DOMAIN_AIR, "Air" },
{ DIS_DOMAIN_SURFACE, "Surface" }, { DIS_DOMAIN_SURFACE, "Surface" },
{ DIS_DOMAIN_SUBSURFACE, "Sursurface" }, { DIS_DOMAIN_SUBSURFACE, "Subsurface" },
{ DIS_DOMAIN_SPACE, "Space" }, { DIS_DOMAIN_SPACE, "Space" },
{ 0, NULL } { 0, NULL }
}; };
@ -225,7 +225,7 @@ const value_string DIS_PDU_Category_AirPlatform_Strings[] =
{ DIS_CATEGORY_AIRPLATFORM_CARGO_TANKER, "Cargo tanker" }, { DIS_CATEGORY_AIRPLATFORM_CARGO_TANKER, "Cargo tanker" },
{ DIS_CATEGORY_AIRPLATFORM_ASW_PATROL_OBSERVATION, "ASW / patrol / observation" }, { DIS_CATEGORY_AIRPLATFORM_ASW_PATROL_OBSERVATION, "ASW / patrol / observation" },
{ DIS_CATEGORY_AIRPLATFORM_ELECTRONIC_WARFARE, "Electronic warfare" }, { DIS_CATEGORY_AIRPLATFORM_ELECTRONIC_WARFARE, "Electronic warfare" },
{ DIS_CATEGORY_AIRPLATFORM_RECONAISSANCE, "Reconaissance" }, { DIS_CATEGORY_AIRPLATFORM_RECONNAISSANCE, "Reconnaissance" },
{ DIS_CATEGORY_AIRPLATFORM_SURVEILLANCE_C2, "Surveillance / C2" }, { DIS_CATEGORY_AIRPLATFORM_SURVEILLANCE_C2, "Surveillance / C2" },
{ DIS_CATEGORY_AIRPLATFORM_ATTACK_HELICOPTER, "Attack helicopter" }, { DIS_CATEGORY_AIRPLATFORM_ATTACK_HELICOPTER, "Attack helicopter" },
{ DIS_CATEGORY_AIRPLATFORM_UTILITY_HELICOPTER, "Utility helicopter" }, { DIS_CATEGORY_AIRPLATFORM_UTILITY_HELICOPTER, "Utility helicopter" },

2
epan/dissectors/packet-dis-enums.h
View File

@ -229,7 +229,7 @@ typedef enum
DIS_CATEGORY_AIRPLATFORM_CARGO_TANKER = 4, DIS_CATEGORY_AIRPLATFORM_CARGO_TANKER = 4,
DIS_CATEGORY_AIRPLATFORM_ASW_PATROL_OBSERVATION = 5, DIS_CATEGORY_AIRPLATFORM_ASW_PATROL_OBSERVATION = 5,
DIS_CATEGORY_AIRPLATFORM_ELECTRONIC_WARFARE = 6, DIS_CATEGORY_AIRPLATFORM_ELECTRONIC_WARFARE = 6,
DIS_CATEGORY_AIRPLATFORM_RECONAISSANCE = 7, DIS_CATEGORY_AIRPLATFORM_RECONNAISSANCE = 7,
DIS_CATEGORY_AIRPLATFORM_SURVEILLANCE_C2 = 8, DIS_CATEGORY_AIRPLATFORM_SURVEILLANCE_C2 = 8,
DIS_CATEGORY_AIRPLATFORM_ATTACK_HELICOPTER = 20, DIS_CATEGORY_AIRPLATFORM_ATTACK_HELICOPTER = 20,
DIS_CATEGORY_AIRPLATFORM_UTILITY_HELICOPTER = 21, DIS_CATEGORY_AIRPLATFORM_UTILITY_HELICOPTER = 21,

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

@ -335,7 +335,7 @@ static const value_string dlm3_msg[] = {
static const value_string dlm3_status[] = { static const value_string dlm3_status[] = {
{ DLM3_LKSTS_WAITING, "waiting" }, { DLM3_LKSTS_WAITING, "waiting" },
{ DLM3_LKSTS_GRANTED, "grandted" }, { DLM3_LKSTS_GRANTED, "granted" },
{ DLM3_LKSTS_CONVERT, "convert" }, { DLM3_LKSTS_CONVERT, "convert" },
{ 0, NULL } { 0, NULL }
}; };
@ -1168,7 +1168,7 @@ proto_register_dlm3(void)
DLM3_REGISTER_HF_ASTS(rl, 8), DLM3_REGISTER_HF_ASTS(rl, 8),
{ &hf_dlm3_rl_wait_type, { &hf_dlm3_rl_wait_type,
{ "Message Type the waiter wainting for", "dlm3.rl.wait_type", { "Message Type the waiter is waiting for", "dlm3.rl.wait_type",
FT_UINT16, BASE_DEC, VALS(dlm3_msg), 0x0, FT_UINT16, BASE_DEC, VALS(dlm3_msg), 0x0,
NULL, HFILL }}, NULL, HFILL }},

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

@ -2664,7 +2664,7 @@ proto_register_dnp3(void)
{ "Bad CRC", "dnp3.hdr.CRC_bad", FT_BOOLEAN, BASE_NONE, NULL, 0x0, "", HFILL }}, { "Bad CRC", "dnp3.hdr.CRC_bad", FT_BOOLEAN, BASE_NONE, NULL, 0x0, "", HFILL }},
{ &hf_dnp3_tr_ctl, { &hf_dnp3_tr_ctl,
{ "Transport Control", "dnp3.tr.ctl", FT_UINT8, BASE_HEX, NULL, 0x0, "Tranport Layer Control Byte", HFILL }}, { "Transport Control", "dnp3.tr.ctl", FT_UINT8, BASE_HEX, NULL, 0x0, "Transport Layer Control Byte", HFILL }},
{ &hf_dnp3_tr_fin, { &hf_dnp3_tr_fin,
{ "Final", "dnp3.tr.fin", FT_BOOLEAN, 8, TFS(&tfs_set_notset), DNP3_TR_FIN, "", HFILL }}, { "Final", "dnp3.tr.fin", FT_BOOLEAN, 8, TFS(&tfs_set_notset), DNP3_TR_FIN, "", HFILL }},

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

@ -1704,7 +1704,7 @@ dissect_dns_answer(tvbuff_t *tvb, int offsetx, int dns_data_offset,
rr_len -= gw_name_len; rr_len -= gw_name_len;
break; break;
default: default:
proto_tree_add_text(rr_tree, tvb, cur_offset, 0, "Gateway: Unknow gateway type(%u)", gw_type); proto_tree_add_text(rr_tree, tvb, cur_offset, 0, "Gateway: Unknown gateway type(%u)", gw_type);
break; break;
} }
if (rr_len != 0) if (rr_len != 0)

8
epan/dissectors/packet-dpnss.c
View File

@ -851,7 +851,7 @@ static const value_string dpnss_sup_serv_par_str_vals[] = {
{ DPNSS_CALL_ID_LENGTH, "Call Identity Length"}, { DPNSS_CALL_ID_LENGTH, "Call Identity Length"},
{ DPNSS_STATE_OF_DEST, "State of Destination"}, { DPNSS_STATE_OF_DEST, "State of Destination"},
{ DPNSS_STATE_OF_DEST_QUAL, "State of Destination Qualifier"}, { DPNSS_STATE_OF_DEST_QUAL, "State of Destination Qualifier"},
{ DPNSS_REASON_FOR_REDIR, "Reson For Redirection"}, { DPNSS_REASON_FOR_REDIR, "Reason For Redirection"},
{ DPNSS_CLEARING_CAUSE, "Clearing Cause"}, { DPNSS_CLEARING_CAUSE, "Clearing Cause"},
{ DPNSS_RECONT_ADDR, "Reconnect Address"}, { DPNSS_RECONT_ADDR, "Reconnect Address"},
{ DPNSS_STATE_OF_OPERATOR, "State of Operator"}, { DPNSS_STATE_OF_OPERATOR, "State of Operator"},
@ -863,7 +863,7 @@ static const value_string dpnss_sup_serv_par_str_vals[] = {
{ DPNSS_LOCATION, "Location"}, { DPNSS_LOCATION, "Location"},
{ DPNSS_SUBADDRESS, "Subaddress"}, { DPNSS_SUBADDRESS, "Subaddress"},
{ DPNSS_ALARM_LEVEL, "Alarm Level"}, { DPNSS_ALARM_LEVEL, "Alarm Level"},
{ DPNSS_STAFF_PRESENT, "Staff Pressent"}, { DPNSS_STAFF_PRESENT, "Staff Present"},
{ DPNSS_TIME_AND_DATE, "Time and Date"}, { DPNSS_TIME_AND_DATE, "Time and Date"},
{ DPNSS_SERVICES, "Services"}, { DPNSS_SERVICES, "Services"},
{ DPNSS_PBX_REFERENCE, "PBX Reference"}, { DPNSS_PBX_REFERENCE, "PBX Reference"},
@ -891,8 +891,8 @@ static const value_string dpnss_sup_serv_par_str_vals[] = {
{ DPNSS_ISDN_NUM_ATTR, "ISDM number attribute"}, { DPNSS_ISDN_NUM_ATTR, "ISDM number attribute"},
{ DPNSS_ISDN_DPNSS_SUBADDRESS, "ISDN DPNNS Subaddress"}, { DPNSS_ISDN_DPNSS_SUBADDRESS, "ISDN DPNNS Subaddress"},
{ DPNSS_ISDN_NUMBER_DIGITS, "ISDN Number Digits"}, { DPNSS_ISDN_NUMBER_DIGITS, "ISDN Number Digits"},
{ DPNSS_HIGH_LAYER_COMP, "High Layer Compability"}, { DPNSS_HIGH_LAYER_COMP, "High Layer Compatibility"},
{ DPNSS_LOW_LAYER_COMP, "Low layer Compability"}, { DPNSS_LOW_LAYER_COMP, "Low layer Compatibility"},
{ DPNSS_PROGRESS_INDICATOR, "Progress Indicator"}, { DPNSS_PROGRESS_INDICATOR, "Progress Indicator"},
{ DPNSS_VPN_ACCESS_REF_NUM, "VPN Access reference Number"}, { DPNSS_VPN_ACCESS_REF_NUM, "VPN Access reference Number"},
{ DPNSS_INDEX_NUMBER, "Index Number"}, { DPNSS_INDEX_NUMBER, "Index Number"},

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

@ -438,7 +438,7 @@ dissect_dsi_reply_get_status(tvbuff_t *tvb, proto_tree *tree, gint offset)
ip6_to_str((const struct e_in6_addr *)ip),port); ip6_to_str((const struct e_in6_addr *)ip),port);
break; break;
default: default:
ti = proto_tree_add_text(adr_tree, tvb, ofs, len,"Unknow type : %d", type); ti = proto_tree_add_text(adr_tree, tvb, ofs, len,"Unknown type : %d", type);
break; break;
} }
len -= 2; len -= 2;

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

@ -1237,7 +1237,7 @@ dissect_dtls_handshake(tvbuff_t *tvb, packet_info *pinfo,
} }
ssl->state |= SSL_HAVE_SESSION_KEY; ssl->state |= SSL_HAVE_SESSION_KEY;
ssl_save_session(ssl, dtls_session_hash); ssl_save_session(ssl, dtls_session_hash);
ssl_debug_printf("dissect_dtls_handshake session keys succesfully generated\n"); ssl_debug_printf("dissect_dtls_handshake session keys successfully generated\n");
} }
break; break;

6
epan/dissectors/packet-dua.c
View File

@ -1,7 +1,7 @@
/* packet-dua.c /* packet-dua.c
* Routines for DPNSS/DASS2-User Adaptation Layer dissection * Routines for DPNSS/DASS2-User Adaptation Layer dissection
* *
* It is hopefully (needs testing) compilant to * It is hopefully (needs testing) compliant to
* http://www.ietf.org/internet-drafts/draft-ietf-sigtran-dua-08.txt * http://www.ietf.org/internet-drafts/draft-ietf-sigtran-dua-08.txt
* http://www.ietf.org/internet-drafts/draft-ietf-sigtran-rfc3057bis-02.txt * http://www.ietf.org/internet-drafts/draft-ietf-sigtran-rfc3057bis-02.txt
* *
@ -235,7 +235,7 @@ dissect_traffic_mode_type_parameter(tvbuff_t *parameter_tvb, proto_tree *paramet
static const value_string error_code_values[] = { static const value_string error_code_values[] = {
{ INVALID_VERSION_ERROR, "Invalid version" }, { INVALID_VERSION_ERROR, "Invalid version" },
{ INVALID_INTERFACE_IDENTIFIER_ERROR, "Invalid interface identifier" }, { INVALID_INTERFACE_IDENTIFIER_ERROR, "Invalid interface identifier" },
{ UNSUPPORTED_MESSAGE_CLASS_ERROR, "Unsuported message class" }, { UNSUPPORTED_MESSAGE_CLASS_ERROR, "Unsupported message class" },
{ UNSUPPORTED_MESSAGE_TYPE_ERROR, "Unsupported message type" }, { UNSUPPORTED_MESSAGE_TYPE_ERROR, "Unsupported message type" },
{ UNSUPPORTED_TRAFFIC_HANDLING_MODE_ERROR, "Unsupported traffic handling mode" }, { UNSUPPORTED_TRAFFIC_HANDLING_MODE_ERROR, "Unsupported traffic handling mode" },
{ UNEXPECTED_MESSAGE_ERROR, "Unexpected message" }, { UNEXPECTED_MESSAGE_ERROR, "Unexpected message" },
@ -425,7 +425,7 @@ static const value_string parameter_tag_values[] = {
{ DLCI_PARAMETER_TAG, "DLCI" }, { DLCI_PARAMETER_TAG, "DLCI" },
{ DIAGNOSTIC_INFORMATION_PARAMETER_TAG, "Diagnostic information" }, { DIAGNOSTIC_INFORMATION_PARAMETER_TAG, "Diagnostic information" },
{ INTEGER_RANGE_INTERFACE_IDENTIFIER_PARAMETER_TAG, "Integer range interface identifier" }, { INTEGER_RANGE_INTERFACE_IDENTIFIER_PARAMETER_TAG, "Integer range interface identifier" },
{ HEARTBEAT_DATA_PARAMETER_TAG, "Hearbeat data" }, { HEARTBEAT_DATA_PARAMETER_TAG, "Heartbeat data" },
{ TRAFFIC_MODE_TYPE_PARAMETER_TAG, "Traffic mode type" }, { TRAFFIC_MODE_TYPE_PARAMETER_TAG, "Traffic mode type" },
{ ERROR_CODE_PARAMETER_TAG, "Error code" }, { ERROR_CODE_PARAMETER_TAG, "Error code" },
{ STATUS_TYPE_INDENTIFICATION_PARAMETER_TAG, "Status type/identification" }, { STATUS_TYPE_INDENTIFICATION_PARAMETER_TAG, "Status type/identification" },

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

@ -772,7 +772,7 @@ proto_register_enip(void)
{ &hf_enip_sendercontex, { &hf_enip_sendercontex,
{ "Sender Context", "enip.context", { "Sender Context", "enip.context",
FT_BYTES, BASE_HEX, NULL, 0, FT_BYTES, BASE_HEX, NULL, 0,
"Information pertient to the sender", HFILL } "Information pertinent to the sender", HFILL }
}, },
{ &hf_enip_options, { &hf_enip_options,
{ "Options", "enip.options", { "Options", "enip.options",

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

@ -1,6 +1,6 @@
/* packet-enrp.c /* packet-enrp.c
* Routines for Endpoint Handlespace Redundancy Protocol (ENRP) * Routines for Endpoint Handlespace Redundancy Protocol (ENRP)
* It is hopefully (needs testing) compilant to * It is hopefully (needs testing) compliant to
* http://www.ietf.org/internet-drafts/draft-ietf-rserpool-common-param-17.txt * http://www.ietf.org/internet-drafts/draft-ietf-rserpool-common-param-17.txt
* http://www.ietf.org/internet-drafts/draft-ietf-rserpool-policies-08.txt * http://www.ietf.org/internet-drafts/draft-ietf-rserpool-policies-08.txt
* http://www.ietf.org/internet-drafts/draft-ietf-rserpool-enrp-20.txt * http://www.ietf.org/internet-drafts/draft-ietf-rserpool-enrp-20.txt

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

@ -853,7 +853,7 @@ dissect_epl_asnd_ires(proto_tree *epl_tree, tvbuff_t *tvb, packet_info *pinfo, g
additional = tvb_get_letohs(tvb, offset+2); additional = tvb_get_letohs(tvb, offset+2);
proto_tree_add_string_format(epl_tree, hf_epl_asnd_identresponse_dt, tvb, offset, proto_tree_add_string_format(epl_tree, hf_epl_asnd_identresponse_dt, tvb, offset,
4, "", "Device Type: Profil %d (%s), Additional Information: 0x%4.4X", 4, "", "Device Type: Profil %d (%s), Additional Information: 0x%4.4X",
profile, val_to_str(profile, epl_device_profiles, "Unkown Profile"), additional); profile, val_to_str(profile, epl_device_profiles, "Unknown Profile"), additional);
proto_tree_add_item(epl_tree, hf_epl_asnd_identresponse_profile, tvb, offset, 2, TRUE); proto_tree_add_item(epl_tree, hf_epl_asnd_identresponse_profile, tvb, offset, 2, TRUE);
offset += 4; offset += 4;
@ -1436,7 +1436,7 @@ static hf_register_info hf[] = {
{ &hf_epl_asnd_statusresponse_seb_err_errorregister_u8_bit7, { "Manufacturer specific", "epl.asnd.res.seb.bit7", FT_UINT8, BASE_DEC, NULL, 0x80, "", HFILL }}, { &hf_epl_asnd_statusresponse_seb_err_errorregister_u8_bit7, { "Manufacturer specific", "epl.asnd.res.seb.bit7", FT_UINT8, BASE_DEC, NULL, 0x80, "", HFILL }},
{ &hf_epl_asnd_statusresponse_seb_devicespecific_err, { "Device profile specific", "epl.asnd.res.seb.devicespecific_err",FT_BYTES, BASE_DEC,NULL, 0x00, "", HFILL }}, { &hf_epl_asnd_statusresponse_seb_devicespecific_err, { "Device profile specific", "epl.asnd.res.seb.devicespecific_err",FT_BYTES, BASE_DEC,NULL, 0x00, "", HFILL }},
{ &hf_epl_asnd_statusresponse_el, { "ErrorsCodeList", "epl.asnd.sres.el", FT_BYTES, BASE_DEC, NULL, 0x00, "", HFILL }}, { &hf_epl_asnd_statusresponse_el, { "ErrorCodesList", "epl.asnd.sres.el", FT_BYTES, BASE_DEC, NULL, 0x00, "", HFILL }},
{ &hf_epl_asnd_statusresponse_el_entry, { "Entry", "epl.asnd.sres.el.entry", FT_BYTES, BASE_DEC, NULL, 0x00, "", HFILL }}, { &hf_epl_asnd_statusresponse_el_entry, { "Entry", "epl.asnd.sres.el.entry", FT_BYTES, BASE_DEC, NULL, 0x00, "", HFILL }},
/*List of Errors/Events*/ /*List of Errors/Events*/

10
epan/dissectors/packet-epl.h
View File

@ -381,19 +381,19 @@ static const value_string sdo_cmd_abort_code[] = {
{0x06010001, "Attempt to read a write-only object." }, {0x06010001, "Attempt to read a write-only object." },
{0x06010002, "Attempt to write a read-only object." }, {0x06010002, "Attempt to write a read-only object." },
{0x06020000, "Object does not exist in the object dictionary." }, {0x06020000, "Object does not exist in the object dictionary." },
{0x06040041, "Object can not be mapped to the PDO." }, {0x06040041, "Object cannot be mapped to the PDO." },
{0x06040042, "The number and length of the objects to be mapped would exceed PDO length." }, {0x06040042, "The number and length of the objects to be mapped would exceed PDO length." },
{0x06040043, "General parameter incompatibility." }, {0x06040043, "General parameter incompatibility." },
{0x06040047, "General internal incompatibility in the device." }, {0x06040047, "General internal incompatibility in the device." },
{0x06060000, "Access failed due to an hardware error." }, {0x06060000, "Access failed due to a hardware error." },
{0x06070010, "Data type does not match, length of service parameter does not match." }, {0x06070010, "Data type does not match, length of service parameter does not match." },
{0x06070012, "Data type does not match, length of service parameter too high." }, {0x06070012, "Data type does not match, length of service parameter too high." },
{0x06070013, "Data type does not match, length of service parameter too low." }, {0x06070013, "Data type does not match, length of service parameter too low." },
{0x06090011, "Sub-index does not exist." }, {0x06090011, "Sub-index does not exist." },
{0x06090030, "Value range of parameter exceeded (only for write access)." }, {0x06090030, "Value range of parameter exceeded (only for write access)." },
{0x06090031, "Value of parameter writen to high." }, {0x06090031, "Value of parameter written too high." },
{0x06090032, "Value of parameter writen to low." }, {0x06090032, "Value of parameter written too low." },
{0x06090036, "maximum value is less then minimum value." }, {0x06090036, "Maximum value is less then minimum value." },
{0x08000000, "General error" }, {0x08000000, "General error" },
{0x08000020, "Data cannot be transferred or stored to the application." }, {0x08000020, "Data cannot be transferred or stored to the application." },
{0x08000021, "Data cannot be transferred or stored to the application because of local control." }, {0x08000021, "Data cannot be transferred or stored to the application because of local control." },

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

@ -214,7 +214,7 @@ static dissector_handle_t ethwithfcs_handle, ethwithoutfcs_handle;
#define EHDR_CLASS_DROP_MASK 0x04 #define EHDR_CLASS_DROP_MASK 0x04
#define EHDR_CLASS_STER_MASK 0x03 #define EHDR_CLASS_STER_MASK 0x03
/* Header for ATM trafic identification */ /* Header for ATM traffic identification */
#define ATM_HDR_LENGTH 4 #define ATM_HDR_LENGTH 4
/* Multi Channel HDLC */ /* Multi Channel HDLC */

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

@ -267,7 +267,7 @@ static const value_string isup_numbering_plan_ind_value[] = {
static const true_false_string isup_inband_information_ind_value = { static const true_false_string isup_inband_information_ind_value = {
/* according 3.37/Q.763 */ /* according 3.37/Q.763 */
"in-band information or an appropirate pattern is now available", "in-band information or an appropriate pattern is now available",
"no indication" "no indication"
}; };
static const true_false_string isup_event_presentation_restricted_ind_value = { static const true_false_string isup_event_presentation_restricted_ind_value = {

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

@ -238,7 +238,7 @@ static const value_string fc_prli_fc4_val[] = {
static const value_string cbind_addr_mode_vals[] = { static const value_string cbind_addr_mode_vals[] = {
{0, "Address Translation mode"}, {0, "Address Translation mode"},
{1, "Address Transperent Mode"}, {1, "Address Transparent Mode"},
{0, NULL}, {0, NULL},
}; };

8
epan/dissectors/packet-fmp.c
View File

@ -1035,7 +1035,7 @@ dissect_fmp_notifyProtocol(tvbuff_t *tvb, int offset, proto_tree *tree)
break; break;
default: default:
proto_tree_add_text(tree, tvb, offset, 4, proto_tree_add_text(tree, tvb, offset, 4,
"Protocol: UNKNOW (%d)", "Protocol: UNKNOWN (%d)",
proto); proto);
break; break;
} }
@ -1106,7 +1106,7 @@ dissect_fmp_cerrInfo(tvbuff_t *tvb, int offset, proto_tree *tree)
default: default:
proto_tree_add_text(tree, tvb, offset, 4, proto_tree_add_text(tree, tvb, offset, 4,
"CLIENT Error Number: Unknow Error Number (%d)", "CLIENT Error Number: Unknown Error Number (%d)",
errorNum); errorNum);
break; break;
} }
@ -2096,8 +2096,8 @@ proto_register_fmp(void)
NULL, 0, "Seconds", HFILL }}, NULL, 0, "Seconds", HFILL }},
{ &hf_fmp_time_nsec, { { &hf_fmp_time_nsec, {
"nano seconds", "fmp.btime.nsec", FT_UINT32, BASE_DEC, "nanoseconds", "fmp.btime.nsec", FT_UINT32, BASE_DEC,
NULL, 0, "Nano-seconds", HFILL }}, NULL, 0, "Nanoseconds", HFILL }},
{ &hf_fmp_notifyPort, { { &hf_fmp_notifyPort, {
"Notify Port", "fmp.notifyPort", FT_UINT32, BASE_DEC, "Notify Port", "fmp.notifyPort", FT_UINT32, BASE_DEC,

6
epan/dissectors/packet-frame.c
View File

@ -121,7 +121,7 @@ dissect_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
frame_number=pinfo->fd->num; /* dummy so that the buildbot crashdumps frame_number=pinfo->fd->num; /* dummy so that the buildbot crashdumps
will show the packetnumber where the will show the packetnumber where the
crash occured. crash occurred.
*/ */
tree=parent_tree; tree=parent_tree;
@ -497,14 +497,14 @@ show_reported_bounds_error(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
item = proto_tree_add_protocol_format(tree, proto_unreassembled, item = proto_tree_add_protocol_format(tree, proto_unreassembled,
tvb, 0, 0, "[Unreassembled Packet%s: %s]", tvb, 0, 0, "[Unreassembled Packet%s: %s]",
pinfo->noreassembly_reason, pinfo->current_proto); pinfo->noreassembly_reason, pinfo->current_proto);
expert_add_info_format(pinfo, item, PI_REASSEMBLE, PI_WARN, "Unreassembled Packet (Exception occured)"); expert_add_info_format(pinfo, item, PI_REASSEMBLE, PI_WARN, "Unreassembled Packet (Exception occurred)");
} else { } else {
if (check_col(pinfo->cinfo, COL_INFO)) if (check_col(pinfo->cinfo, COL_INFO))
col_append_str(pinfo->cinfo, COL_INFO, col_append_str(pinfo->cinfo, COL_INFO,
"[Malformed Packet]"); "[Malformed Packet]");
item = proto_tree_add_protocol_format(tree, proto_malformed, item = proto_tree_add_protocol_format(tree, proto_malformed,
tvb, 0, 0, "[Malformed Packet: %s]", pinfo->current_proto); tvb, 0, 0, "[Malformed Packet: %s]", pinfo->current_proto);
expert_add_info_format(pinfo, item, PI_MALFORMED, PI_ERROR, "Malformed Packet (Exception occured)"); expert_add_info_format(pinfo, item, PI_MALFORMED, PI_ERROR, "Malformed Packet (Exception occurred)");
} }
} }

6
epan/dissectors/packet-gdsdb.c
View File

@ -1319,7 +1319,7 @@ proto_register_gdsdb(void)
NULL, HFILL } NULL, HFILL }
}, },
{ &hf_gdsdb_connect_pref, { &hf_gdsdb_connect_pref,
{ "Prefered version", "gdsdb.connect.pref", { "Preferred version", "gdsdb.connect.pref",
FT_NONE, BASE_NONE, NULL, 0x0, FT_NONE, BASE_NONE, NULL, 0x0,
NULL, HFILL } NULL, HFILL }
}, },
@ -1344,7 +1344,7 @@ proto_register_gdsdb(void)
NULL, HFILL } NULL, HFILL }
}, },
{ &hf_gdsdb_connect_pref_weight, { &hf_gdsdb_connect_pref_weight,
{ "Prefference weight", "gdsdb.connect.pref.weight", { "Preference weight", "gdsdb.connect.pref.weight",
FT_UINT32, BASE_DEC, NULL, 0x0, FT_UINT32, BASE_DEC, NULL, 0x0,
NULL, HFILL } NULL, HFILL }
}, },
@ -1414,7 +1414,7 @@ proto_register_gdsdb(void)
NULL, HFILL } NULL, HFILL }
}, },
{ &hf_gdsdb_receive_transaction, { &hf_gdsdb_receive_transaction,
{ "Transaction", "gdsdb.receive.transation", { "Transaction", "gdsdb.receive.transaction",
FT_UINT32, BASE_DEC, NULL, 0x0, FT_UINT32, BASE_DEC, NULL, 0x0,
NULL, HFILL } NULL, HFILL }
}, },

2
epan/dissectors/packet-gprs-llc.c
View File

@ -139,7 +139,7 @@ static dissector_table_t llcgprs_subdissector_table;
static const value_string sapi_t[] = { static const value_string sapi_t[] = {
{ 0, "Reserved"}, { 0, "Reserved"},
{ 1, "GPRS Mobility Management" }, { 1, "GPRS Mobility Management" },
{ 2, "Tunnelling of messages 2" }, { 2, "Tunneling of messages 2" },
{ 3, "User data 3"}, { 3, "User data 3"},
{ 4, "Reserved" }, { 4, "Reserved" },
{ 5, "User data 5" }, { 5, "User data 5" },

8
epan/dissectors/packet-gsm_a_bssmap.c
View File

@ -488,7 +488,7 @@ typedef enum
BE_TIME_IND, /. Time Indication ./ BE_TIME_IND, /. Time Indication ./
BE_RES_SIT, /. Resource Situation ./ BE_RES_SIT, /. Resource Situation ./
BE_CURR_CHAN_1, /. Current Channel Type 1 ./ BE_CURR_CHAN_1, /. Current Channel Type 1 ./
BE_QUE_IND, /. Queueing Indicator ./ BE_QUE_IND, /. Queuing Indicator ./
BE_SPEECH_VER, /. Speech Version ./ BE_SPEECH_VER, /. Speech Version ./
BE_ASS_REQ, /. Assignment Requirement ./ BE_ASS_REQ, /. Assignment Requirement ./
BE_TALKER_FLAG, /. Talker Flag ./ BE_TALKER_FLAG, /. Talker Flag ./
@ -3559,7 +3559,7 @@ guint8 (*bssmap_elem_fcn[])(tvbuff_t *tvb, proto_tree *tree, guint32 offset, gui
NULL, /* Time Indication */ NULL, /* Time Indication */
NULL, /* Resource Situation */ NULL, /* Resource Situation */
be_curr_chan_1, /* Current Channel Type 1 */ be_curr_chan_1, /* Current Channel Type 1 */
be_que_ind, /* Queueing Indicator */ be_que_ind, /* Queuing Indicator */
be_speech_ver, /* Speech Version */ be_speech_ver, /* Speech Version */
be_ass_req, /* Assignment Requirement */ be_ass_req, /* Assignment Requirement */
NULL /* no associated data */, /* Talker Flag */ NULL /* no associated data */, /* Talker Flag */
@ -3936,7 +3936,7 @@ bssmap_ho_reqd(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
ELEM_OPT_TV(gsm_bssmap_elem_strings[BE_CURR_CHAN_1].value, BSSAP_PDU_TYPE_BSSMAP, BE_CURR_CHAN_1, ""); ELEM_OPT_TV(gsm_bssmap_elem_strings[BE_CURR_CHAN_1].value, BSSAP_PDU_TYPE_BSSMAP, BE_CURR_CHAN_1, "");
/* Speech Version (Used) 3.2.2.51 BSS-MSC O (note 3) 2 */ /* Speech Version (Used) 3.2.2.51 BSS-MSC O (note 3) 2 */
ELEM_OPT_TV(gsm_bssmap_elem_strings[BE_SPEECH_VER].value, BSSAP_PDU_TYPE_BSSMAP, BE_SPEECH_VER, " (Used)"); ELEM_OPT_TV(gsm_bssmap_elem_strings[BE_SPEECH_VER].value, BSSAP_PDU_TYPE_BSSMAP, BE_SPEECH_VER, " (Used)");
/* Queueing Indicator 3.2.2.50 BSS-MSC O 2 */ /* Queuing Indicator 3.2.2.50 BSS-MSC O 2 */
ELEM_OPT_TV(gsm_bssmap_elem_strings[BE_QUE_IND].value, BSSAP_PDU_TYPE_BSSMAP, BE_QUE_IND, ""); ELEM_OPT_TV(gsm_bssmap_elem_strings[BE_QUE_IND].value, BSSAP_PDU_TYPE_BSSMAP, BE_QUE_IND, "");
/* Old BSS to New BSS Information 3.2.2.58 BSS-MSC O 2-n */ /* Old BSS to New BSS Information 3.2.2.58 BSS-MSC O 2-n */
ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_OLD2NEW_INFO].value, BSSAP_PDU_TYPE_BSSMAP, BE_OLD2NEW_INFO, ""); ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_OLD2NEW_INFO].value, BSSAP_PDU_TYPE_BSSMAP, BE_OLD2NEW_INFO, "");
@ -4466,7 +4466,7 @@ bssmap_cl3_info(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
EXTRANEOUS_DATA_CHECK(curr_len, 0); EXTRANEOUS_DATA_CHECK(curr_len, 0);
} }
/* /*
* 3.2.1.33 QUEUEING INDICATION * 3.2.1.33 QUEUING INDICATION
* No data * No data
*/ */

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

@ -2943,7 +2943,7 @@ de_prog_ind(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len _U_, gcha
case 4: str = "Call has returned to the PLMN/ISDN"; break; case 4: str = "Call has returned to the PLMN/ISDN"; break;
case 8: str = "In-band information or appropriate pattern now available"; break; case 8: str = "In-band information or appropriate pattern now available"; break;
case 32: str = "Call is end-to-end PLMN/ISDN"; break; case 32: str = "Call is end-to-end PLMN/ISDN"; break;
case 64: str = "Queueing"; break; case 64: str = "Queuing"; break;
default: default:
str = "Unspecific"; str = "Unspecific";
break; break;

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

@ -3236,7 +3236,7 @@ de_sm_pco(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len, gchar *add
} }
else else
{ {
proto_tree_add_text(tree,tvb, curr_offset-3, 2, "Protocol/Parameter: (%u) unknwown" , prot ); proto_tree_add_text(tree,tvb, curr_offset-3, 2, "Protocol/Parameter: (%u) unknown" , prot );
proto_tree_add_text(tree,tvb, curr_offset-1, 1, "Length: 0x%02x (%u)", e_len , e_len); proto_tree_add_text(tree,tvb, curr_offset-1, 1, "Length: 0x%02x (%u)", e_len , e_len);
/* /*
* dissect the embedded DATA message * dissect the embedded DATA message

6
epan/dissectors/packet-gsm_a_rr.c
View File

@ -9222,12 +9222,12 @@ proto_register_gsm_a_rr(void)
{ &hf_gsm_a_rr_dtx_bcch, { &hf_gsm_a_rr_dtx_bcch,
{ "DTX (BCCH)", "gsm_a.rr.dtx_bcch", { "DTX (BCCH)", "gsm_a.rr.dtx_bcch",
FT_UINT8, BASE_DEC, VALS(gsm_a_rr_dtx_bcch_vals), 0x30, FT_UINT8, BASE_DEC, VALS(gsm_a_rr_dtx_bcch_vals), 0x30,
"Discontinuous Tranmission (DTX-BCCH)", HFILL } "Discontinuous Transmission (DTX-BCCH)", HFILL }
}, },
{ &hf_gsm_a_rr_dtx_sacch, { &hf_gsm_a_rr_dtx_sacch,
{ "DTX (SACCH)", "gsm_a.rr.dtx_sacch", { "DTX (SACCH)", "gsm_a.rr.dtx_sacch",
FT_UINT8, BASE_DEC, VALS(gsm_a_rr_dtx_sacch_vals), 0xb0, FT_UINT8, BASE_DEC, VALS(gsm_a_rr_dtx_sacch_vals), 0xb0,
"Discontinuous Tranmission (DTX-SACCH)", HFILL } "Discontinuous Transmission (DTX-SACCH)", HFILL }
}, },
{ &hf_gsm_a_rr_radio_link_timeout, { &hf_gsm_a_rr_radio_link_timeout,
{ "Radio Link Timeout", "gsm_a.rr.radio_link_timeout", { "Radio Link Timeout", "gsm_a.rr.radio_link_timeout",
@ -9237,7 +9237,7 @@ proto_register_gsm_a_rr(void)
{ &hf_gsm_a_rr_cell_reselect_hyst, { &hf_gsm_a_rr_cell_reselect_hyst,
{ "Cell Reselection Hysteresis", "gsm_a.rr.cell_reselect_hyst", { "Cell Reselection Hysteresis", "gsm_a.rr.cell_reselect_hyst",
FT_UINT8, BASE_DEC, NULL, 0xe0, FT_UINT8, BASE_DEC, NULL, 0xe0,
"Cell Reslection Hysteresis (dB)", HFILL } "Cell Reselection Hysteresis (dB)", HFILL }
}, },
{ &hf_gsm_a_rr_ms_txpwr_max_cch, { &hf_gsm_a_rr_ms_txpwr_max_cch,
{ "MS TXPWR MAX CCH", "gsm_a.rr.ms_txpwr_max_cch", { "MS TXPWR MAX CCH", "gsm_a.rr.ms_txpwr_max_cch",

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

@ -1189,7 +1189,7 @@ static const value_string ranap_cause_type[] = {
{2, "Trelocoverall Expiry"}, {2, "Trelocoverall Expiry"},
{3, "Trelocprep Expiry"}, {3, "Trelocprep Expiry"},
{4, "Treloccomplete Expiry"}, {4, "Treloccomplete Expiry"},
{5, "Tqueing Expiry"}, {5, "Tqueuing Expiry"},
{6, "Relocation Triggered"}, {6, "Relocation Triggered"},
{7, "TRELOCalloc Expiry"}, {7, "TRELOCalloc Expiry"},
{8, "Unable to Establish During Relocation"}, {8, "Unable to Establish During Relocation"},
@ -1267,7 +1267,7 @@ static const value_string ranap_cause_type[] = {
{113, "O & M Intervention"}, {113, "O & M Intervention"},
{114, "No Resource Available"}, {114, "No Resource Available"},
{115, "Unspecified Failure"}, {115, "Unspecified Failure"},
{116, "Network Opimisation"}, {116, "Network Optimisation"},
/* Non-standard Cause (129-->255) */ /* Non-standard Cause (129-->255) */
/* ranap_CauseRadioNetworkExtension ?? /* ranap_CauseRadioNetworkExtension ??

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

@ -217,7 +217,7 @@ static gboolean dissect_h1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
{ {
col_append_fstr (pinfo->cinfo, COL_INFO, " %s", col_append_fstr (pinfo->cinfo, COL_INFO, " %s",
val_to_str (tvb_get_guint8(tvb,offset + position + 2), val_to_str (tvb_get_guint8(tvb,offset + position + 2),
returncode_vals,"Unknown Returcode (0x%2.2x")); returncode_vals,"Unknown Returncode (0x%2.2x"));
} }
break; break;
case EMPTY_BLOCK: case EMPTY_BLOCK:

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

@ -660,7 +660,7 @@ static const value_string h248_pkg_annexc_porttype_values[] = {
static const value_string h248_pkg_annexc_aal1st_values[] = { static const value_string h248_pkg_annexc_aal1st_values[] = {
{0x0,"null"}, {0x0,"null"},
{0x1,"voiceband signall transport on 64kbps"}, {0x1,"voiceband signal transport on 64kbps"},
{0x2,"circuit transport"}, {0x2,"circuit transport"},
{0x4,"high quality audio signal transport"}, {0x4,"high quality audio signal transport"},
{0x5,"video signal transport"}, {0x5,"video signal transport"},

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

@ -2089,7 +2089,7 @@ proto_register_iax2 (void)
{&hf_iax2_absts, {&hf_iax2_absts,
{"Absolute Time", "iax2.abstime", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x0, {"Absolute Time", "iax2.abstime", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x0,
"The absoulte time of this packet (calculated by adding the IAX timestamp to " "The absolute time of this packet (calculated by adding the IAX timestamp to "
" the start time of this call)", " the start time of this call)",
HFILL}}, HFILL}},

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

@ -1278,7 +1278,7 @@ icqv5_srv_meta_user(proto_tree* tree, /* Tree to put the data in */
/* Get the authorize setting */ /* Get the authorize setting */
auth = tvb_get_guint8(tvb, offset); auth = tvb_get_guint8(tvb, offset);
proto_tree_add_text(sstree, tvb, offset, 1, proto_tree_add_text(sstree, tvb, offset, 1,
"authorization: %s", (auth==0x01)?"Neccessary":"Who needs it"); "authorization: %s", (auth==0x01)?"Necessary":"Who needs it");
offset++; left--; offset++; left--;
/* Get x2 */ /* Get x2 */
proto_tree_add_text(sstree, tvb, offset, sizeof(guint16), proto_tree_add_text(sstree, tvb, offset, sizeof(guint16),
@ -1315,7 +1315,7 @@ icqv5_srv_meta_user(proto_tree* tree, /* Tree to put the data in */
"First name", "First name",
"Last name", "Last name",
"Primary email", "Primary email",
"Secundary email", "Secondary email",
"Old email", "Old email",
"City", "City",
"State", "State",

44
epan/dissectors/packet-ieee80211.c
View File

@ -997,16 +997,16 @@ static int ff_transceiver_noise_floor = -1;
static int ff_channel_width = -1; static int ff_channel_width = -1;
/*** End: Channel Width Fixed Field - Dustin Johnson ***/ /*** End: Channel Width Fixed Field - Dustin Johnson ***/
/*** Begin: QoS Inforamtion AP Fixed Field - Dustin Johnson ***/ /*** Begin: QoS Information AP Fixed Field - Dustin Johnson ***/
static int ff_qos_info_ap = -1; static int ff_qos_info_ap = -1;
static int ff_qos_info_ap_edca_param_set_counter = -1; static int ff_qos_info_ap_edca_param_set_counter = -1;
static int ff_qos_info_ap_q_ack = -1; static int ff_qos_info_ap_q_ack = -1;
static int ff_qos_info_ap_queue_req = -1; static int ff_qos_info_ap_queue_req = -1;
static int ff_qos_info_ap_txop_request = -1; static int ff_qos_info_ap_txop_request = -1;
static int ff_qos_info_ap_reserved = -1; static int ff_qos_info_ap_reserved = -1;
/*** End: QoS Inforamtion AP Fixed Field - Dustin Johnson ***/ /*** End: QoS Information AP Fixed Field - Dustin Johnson ***/
/*** Begin: QoS Inforamtion STA Fixed Field - Dustin Johnson ***/ /*** Begin: QoS Information STA Fixed Field - Dustin Johnson ***/
static int ff_qos_info_sta = -1; static int ff_qos_info_sta = -1;
static int ff_qos_info_sta_ac_vo = -1; static int ff_qos_info_sta_ac_vo = -1;
static int ff_qos_info_sta_ac_vi = -1; static int ff_qos_info_sta_ac_vi = -1;
@ -1015,7 +1015,7 @@ static int ff_qos_info_sta_ac_be = -1;
static int ff_qos_info_sta_q_ack = -1; static int ff_qos_info_sta_q_ack = -1;
static int ff_qos_info_sta_max_sp_len = -1; static int ff_qos_info_sta_max_sp_len = -1;
static int ff_qos_info_sta_more_data_ack = -1; static int ff_qos_info_sta_more_data_ack = -1;
/*** End: QoS Inforamtion STA Fixed Field - Dustin Johnson ***/ /*** End: QoS Information STA Fixed Field - Dustin Johnson ***/
/*** Begin: Spatial Multiplexing (SM) Power Control - Dustin Johnson ***/ /*** Begin: Spatial Multiplexing (SM) Power Control - Dustin Johnson ***/
static int ff_sm_pwr_save = -1; static int ff_sm_pwr_save = -1;
@ -1565,9 +1565,9 @@ static gint ett_ff_ba_ssc_tree = -1;
static gint ett_ff_delba_param_tree = -1; static gint ett_ff_delba_param_tree = -1;
/*** End: DELBA Parameter Set Fixed Field - Dustin Johnson ***/ /*** End: DELBA Parameter Set Fixed Field - Dustin Johnson ***/
/*** Begin: QoS Inforamtion AP/STA Fixed Field - Dustin Johnson ***/ /*** Begin: QoS Information AP/STA Fixed Field - Dustin Johnson ***/
static gint ett_ff_qos_info = -1; static gint ett_ff_qos_info = -1;
/*** End: QoS Inforamtion AP/STA Fixed Field - Dustin Johnson ***/ /*** End: QoS Information AP/STA Fixed Field - Dustin Johnson ***/
/*** Begin: Spatial Multiplexing (SM) Power Control - Dustin Johnson ***/ /*** Begin: Spatial Multiplexing (SM) Power Control - Dustin Johnson ***/
static gint ett_ff_sm_pwr_save = -1; static gint ett_ff_sm_pwr_save = -1;
@ -2540,7 +2540,7 @@ add_fixed_field(proto_tree * tree, tvbuff_t * tvb, int offset, int lfcode)
break; break;
/*** End: Channel Width Fixed Field - Dustin Johnson ***/ /*** End: Channel Width Fixed Field - Dustin Johnson ***/
/*** Begin: QoS Inforamtion AP Fixed Field - Dustin Johnson ***/ /*** Begin: QoS Information AP Fixed Field - Dustin Johnson ***/
case FIELD_QOS_INFO_AP: case FIELD_QOS_INFO_AP:
{ {
guint8 info; guint8 info;
@ -2560,9 +2560,9 @@ add_fixed_field(proto_tree * tree, tvbuff_t * tvb, int offset, int lfcode)
length +=1; length +=1;
break; break;
} }
/*** End: QoS Inforamtion AP Fixed Field - Dustin Johnson ***/ /*** End: QoS Information AP Fixed Field - Dustin Johnson ***/
/*** Begin: QoS Inforamtion STA Fixed Field - Dustin Johnson ***/ /*** Begin: QoS Information STA Fixed Field - Dustin Johnson ***/
case FIELD_QOS_INFO_STA: case FIELD_QOS_INFO_STA:
{ {
guint8 info; guint8 info;
@ -2585,7 +2585,7 @@ add_fixed_field(proto_tree * tree, tvbuff_t * tvb, int offset, int lfcode)
length +=1; length +=1;
break; break;
} }
/*** End: QoS Inforamtion STA Fixed Field - Dustin Johnson ***/ /*** End: QoS Information STA Fixed Field - Dustin Johnson ***/
/*** Begin: Spatial Multiplexing (SM) Power Control - Dustin Johnson ***/ /*** Begin: Spatial Multiplexing (SM) Power Control - Dustin Johnson ***/
case FIELD_SM_PWR_CNTRL: case FIELD_SM_PWR_CNTRL:
@ -8400,7 +8400,7 @@ proto_register_ieee80211 (void)
}; };
/*** End: Channel Width Fixed Field - Dustin Johnson ***/ /*** End: Channel Width Fixed Field - Dustin Johnson ***/
/*** Begin: QoS Inforamtion AP Fixed Field - Dustin Johnson ***/ /*** Begin: QoS Information AP Fixed Field - Dustin Johnson ***/
static const true_false_string ff_qos_info_ap_q_ack_flag = { static const true_false_string ff_qos_info_ap_q_ack_flag = {
"Implemented", "Implemented",
"Not Implemented" "Not Implemented"
@ -8415,9 +8415,9 @@ proto_register_ieee80211 (void)
"Can process a nonzero TXOP Duration Requested subfield in the QoS Control field in QoS data frames", "Can process a nonzero TXOP Duration Requested subfield in the QoS Control field in QoS data frames",
"Can NOT process a nonzero TXOP Duration Requested subfield in the QoS Control field in QoS data frames" "Can NOT process a nonzero TXOP Duration Requested subfield in the QoS Control field in QoS data frames"
}; };
/*** End: QoS Inforamtion AP Fixed Field - Dustin Johnson ***/ /*** End: QoS Information AP Fixed Field - Dustin Johnson ***/
/*** Begin: QoS Inforamtion STA Fixed Field - Dustin Johnson ***/ /*** Begin: QoS Information STA Fixed Field - Dustin Johnson ***/
static const true_false_string ff_qos_info_sta_ac_flag = { static const true_false_string ff_qos_info_sta_ac_flag = {
"Trigger-enabled and Delivery-enabled", "Trigger-enabled and Delivery-enabled",
"Neither Trigger-enabled nor Delivery-enabled" "Neither Trigger-enabled nor Delivery-enabled"
@ -8440,7 +8440,7 @@ proto_register_ieee80211 (void)
"Can process ACK frames with the More Data bit in the Frame Control field set to 1", "Can process ACK frames with the More Data bit in the Frame Control field set to 1",
"Can NOT process ACK frames with the More Data bit in the Frame Control field set to 1" "Can NOT process ACK frames with the More Data bit in the Frame Control field set to 1"
}; };
/*** End: QoS Inforamtion STA Fixed Field - Dustin Johnson ***/ /*** End: QoS Information STA Fixed Field - Dustin Johnson ***/
/*** Begin: Spatial Multiplexing (SM) Power Control - Dustin Johnson ***/ /*** Begin: Spatial Multiplexing (SM) Power Control - Dustin Johnson ***/
static const true_false_string ff_sm_pwr_save_enabled_flag = { static const true_false_string ff_sm_pwr_save_enabled_flag = {
@ -9996,10 +9996,10 @@ proto_register_ieee80211 (void)
FT_UINT8, BASE_HEX, VALS (ff_channel_width_vals), 0, "Supported Channel Width", HFILL }}, FT_UINT8, BASE_HEX, VALS (ff_channel_width_vals), 0, "Supported Channel Width", HFILL }},
/*** End: Channel Width Fixed Field - Dustin Johnson ***/ /*** End: Channel Width Fixed Field - Dustin Johnson ***/
/*** Begin: QoS Inforamtion AP Fixed Field - Dustin Johnson ***/ /*** Begin: QoS Information AP Fixed Field - Dustin Johnson ***/
{&ff_qos_info_ap, {&ff_qos_info_ap,
{"QoS Inforamtion (AP)", "wlan_mgt.fixed.qosinfo.ap", {"QoS Information (AP)", "wlan_mgt.fixed.qosinfo.ap",
FT_UINT8, BASE_HEX, NULL, 0, "QoS Inforamtion (AP)", HFILL }}, FT_UINT8, BASE_HEX, NULL, 0, "QoS Information (AP)", HFILL }},
{&ff_qos_info_ap_edca_param_set_counter, {&ff_qos_info_ap_edca_param_set_counter,
{"EDCA Parameter Set Update Count", "wlan_mgt.fixed.qosinfo.ap.edcaupdate", {"EDCA Parameter Set Update Count", "wlan_mgt.fixed.qosinfo.ap.edcaupdate",
@ -10020,12 +10020,12 @@ proto_register_ieee80211 (void)
{&ff_qos_info_ap_reserved, {&ff_qos_info_ap_reserved,
{"Reserved", "wlan_mgt.fixed.qosinfo.ap.reserved", {"Reserved", "wlan_mgt.fixed.qosinfo.ap.reserved",
FT_BOOLEAN, 8, NULL, 0x80, "Reserved", HFILL }}, FT_BOOLEAN, 8, NULL, 0x80, "Reserved", HFILL }},
/*** End: QoS Inforamtion AP Fixed Field - Dustin Johnson ***/ /*** End: QoS Information AP Fixed Field - Dustin Johnson ***/
/*** Begin: QoS Inforamtion STA Fixed Field - Dustin Johnson ***/ /*** Begin: QoS Information STA Fixed Field - Dustin Johnson ***/
{&ff_qos_info_sta, {&ff_qos_info_sta,
{"QoS Inforamtion (STA)", "wlan_mgt.fixed.qosinfo.sta", {"QoS Information (STA)", "wlan_mgt.fixed.qosinfo.sta",
FT_UINT8, BASE_HEX, NULL, 0, "QoS Inforamtion (STA)", HFILL }}, FT_UINT8, BASE_HEX, NULL, 0, "QoS Information (STA)", HFILL }},
{&ff_qos_info_sta_ac_vo, {&ff_qos_info_sta_ac_vo,
{"AC_VO", "wlan_mgt.fixed.qosinfo.sta.ac.vo", {"AC_VO", "wlan_mgt.fixed.qosinfo.sta.ac.vo",
@ -10054,7 +10054,7 @@ proto_register_ieee80211 (void)
{&ff_qos_info_sta_more_data_ack, {&ff_qos_info_sta_more_data_ack,
{"More Data Ack", "wlan_mgt.fixed.qosinfo.sta.moredataack", {"More Data Ack", "wlan_mgt.fixed.qosinfo.sta.moredataack",
FT_BOOLEAN, 8, TFS (&ff_qos_info_sta_more_data_ack_flag), 0x80, "More Data Ack", HFILL }}, FT_BOOLEAN, 8, TFS (&ff_qos_info_sta_more_data_ack_flag), 0x80, "More Data Ack", HFILL }},
/*** End: QoS Inforamtion STA Fixed Field - Dustin Johnson ***/ /*** End: QoS Information STA Fixed Field - Dustin Johnson ***/
/*** Begin: Spatial Multiplexing (SM) Power Control - Dustin Johnson ***/ /*** Begin: Spatial Multiplexing (SM) Power Control - Dustin Johnson ***/
{&ff_sm_pwr_save, {&ff_sm_pwr_save,

6
epan/dissectors/packet-igmp.c
View File

@ -1117,15 +1117,15 @@ proto_register_igmp(void)
{ &hf_max_resp_exp, { &hf_max_resp_exp,
{ "Exponent", "igmp.max_resp.exp", FT_UINT8, BASE_HEX, { "Exponent", "igmp.max_resp.exp", FT_UINT8, BASE_HEX,
NULL, IGMP_MAX_RESP_EXP, "Maxmimum Response Time, Exponent", HFILL }}, NULL, IGMP_MAX_RESP_EXP, "Maximum Response Time, Exponent", HFILL }},
{ &hf_max_resp_mant, { &hf_max_resp_mant,
{ "Mantissa", "igmp.max_resp.mant", FT_UINT8, BASE_HEX, { "Mantissa", "igmp.max_resp.mant", FT_UINT8, BASE_HEX,
NULL, IGMP_MAX_RESP_MANT, "Maxmimum Response Time, Mantissa", HFILL }}, NULL, IGMP_MAX_RESP_MANT, "Maximum Response Time, Mantissa", HFILL }},
{ &hf_mtrace_max_hops, { &hf_mtrace_max_hops,
{ "# hops", "igmp.mtrace.max_hops", FT_UINT8, BASE_DEC, { "# hops", "igmp.mtrace.max_hops", FT_UINT8, BASE_DEC,
NULL, 0, "Maxmimum Number of Hops to Trace", HFILL }}, NULL, 0, "Maximum Number of Hops to Trace", HFILL }},
{ &hf_mtrace_saddr, { &hf_mtrace_saddr,
{ "Source Address", "igmp.mtrace.saddr", FT_IPv4, BASE_NONE, { "Source Address", "igmp.mtrace.saddr", FT_IPv4, BASE_NONE,

6
epan/dissectors/packet-ipmi-app.c
View File

@ -242,7 +242,7 @@ static const struct true_false_string tfs_01_dev_avail = {
static const value_string vals_04_result[] = { static const value_string vals_04_result[] = {
{ 0x55, "No error. All Self Tests Passed" }, { 0x55, "No error. All Self Tests Passed" },
{ 0x56, "Self Test function not implemented in this controller" }, { 0x56, "Self Test function not implemented in this controller" },
{ 0x57, "Corrupted or inaccesible data or devices" }, { 0x57, "Corrupted or inaccessible data or devices" },
{ 0x58, "Fatal hardware error" }, { 0x58, "Fatal hardware error" },
{ 0xff, "Reserved" }, { 0xff, "Reserved" },
{ 0, NULL } { 0, NULL }
@ -268,7 +268,7 @@ static const value_string vals_06_syspwr[] = {
{ 0x06, "Set S4/S5" }, { 0x06, "Set S4/S5" },
{ 0x07, "Set G3" }, { 0x07, "Set G3" },
{ 0x08, "Sleeping" }, { 0x08, "Sleeping" },
{ 0x09, "G1 sleping" }, { 0x09, "G1 sleeping" },
{ 0x0a, "Set override" }, { 0x0a, "Set override" },
{ 0x20, "Set Legacy On" }, { 0x20, "Set Legacy On" },
{ 0x21, "Set Legacy Off" }, { 0x21, "Set Legacy Off" },
@ -297,7 +297,7 @@ static const value_string vals_07_syspwr[] = {
{ 0x06, "S4/S5" }, { 0x06, "S4/S5" },
{ 0x07, "G3" }, { 0x07, "G3" },
{ 0x08, "Sleeping" }, { 0x08, "Sleeping" },
{ 0x09, "G1 sleping" }, { 0x09, "G1 sleeping" },
{ 0x0a, "Override" }, { 0x0a, "Override" },
{ 0x20, "Legacy On" }, { 0x20, "Legacy On" },
{ 0x21, "Legacy Off" }, { 0x21, "Legacy Off" },

2
epan/dissectors/packet-ipmi-picmg.c
View File

@ -2190,7 +2190,7 @@ ipmi_register_picmg(gint proto_ipmi)
{ "Minor Firmware Revision (BCD encoded)", { "Minor Firmware Revision (BCD encoded)",
"ipmi.prop01.fw_minor", FT_UINT8, BASE_HEX, NULL, 0, "", HFILL }}, "ipmi.prop01.fw_minor", FT_UINT8, BASE_HEX, NULL, 0, "", HFILL }},
{ &hf_ipmi_picmg_prop01_fw_aux, { &hf_ipmi_picmg_prop01_fw_aux,
{ "Auxillary Firmware Revision Information", { "Auxiliary Firmware Revision Information",
"ipmi.prop01.fw_aux", FT_BYTES, BASE_HEX, NULL, 0, "", HFILL }}, "ipmi.prop01.fw_aux", FT_BYTES, BASE_HEX, NULL, 0, "", HFILL }},
{ &hf_ipmi_picmg_prop02_desc, { &hf_ipmi_picmg_prop02_desc,
{ "Description string", { "Description string",

6
epan/dissectors/packet-ipmi-se.c
View File

@ -722,7 +722,7 @@ static const value_string ssoff_12[] = {
{ 0x00, "System Reconfigured" }, { 0x00, "System Reconfigured" },
{ 0x01, "OEM System Boot Event" }, { 0x01, "OEM System Boot Event" },
{ 0x02, "Undetermined system hardware failure" }, { 0x02, "Undetermined system hardware failure" },
{ 0x03, "Entry added to Auxillary Log" }, { 0x03, "Entry added to Auxiliary Log" },
{ 0x04, "PEF Action" }, { 0x04, "PEF Action" },
{ 0x05, "Timestamp Clock Synch" }, { 0x05, "Timestamp Clock Synch" },
{ 0, NULL } { 0, NULL }
@ -1450,7 +1450,7 @@ ssi_2b_2(proto_tree *tree, tvbuff_t *tvb, const struct sensor_info *si _U_,
{ 0x03, "Management controller device revision" }, { 0x03, "Management controller device revision" },
{ 0x04, "Management controller manufacturer ID" }, { 0x04, "Management controller manufacturer ID" },
{ 0x05, "Management controller IPMI version" }, { 0x05, "Management controller IPMI version" },
{ 0x06, "Management controller auxillary firmware ID" }, { 0x06, "Management controller auxiliary firmware ID" },
{ 0x07, "Management controller firmware boot block" }, { 0x07, "Management controller firmware boot block" },
{ 0x08, "Other management controller firmware" }, { 0x08, "Other management controller firmware" },
{ 0x09, "System firmware (EFI/BIOS) change" }, { 0x09, "System firmware (EFI/BIOS) change" },
@ -2144,7 +2144,7 @@ static const struct true_false_string tfs_20_pop = {
static const value_string vals_28_act[] = { static const value_string vals_28_act[] = {
{ 0x00, "Do not change individual enables" }, { 0x00, "Do not change individual enables" },
{ 0x01, "Enable selected event messages" }, { 0x01, "Enable selected event messages" },
{ 0x02, "Disable selescted event messages" }, { 0x02, "Disable selected event messages" },
{ 0x03, "Reserved" }, { 0x03, "Reserved" },
{ 0, NULL } { 0, NULL }
}; };

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

@ -320,7 +320,7 @@ dissect_routing6(tvbuff_t *tvb, int offset, proto_tree *tree, packet_info *pinfo
ti = proto_tree_add_uint_format(tree, hf_ipv6_routing_hdr_opt, tvb, ti = proto_tree_add_uint_format(tree, hf_ipv6_routing_hdr_opt, tvb,
offset, len, rt.ip6r_type, offset, len, rt.ip6r_type,
"Routing Header, Type : %s (%u)", "Routing Header, Type : %s (%u)",
val_to_str(rt.ip6r_type, routing_header_type, "Unkown"), val_to_str(rt.ip6r_type, routing_header_type, "Unknown"),
rt.ip6r_type); rt.ip6r_type);
rthdr_tree = proto_item_add_subtree(ti, ett_ipv6); rthdr_tree = proto_item_add_subtree(ti, ett_ipv6);

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

@ -303,7 +303,7 @@ static const isis_clv_handle_t clv_l2_lsp_opts[] = {
}, },
{ {
ISIS_CLV_PARTITION_DIS, ISIS_CLV_PARTITION_DIS,
"Parition Designated Level 2 IS", "Partition Designated Level 2 IS",
&ett_isis_lsp_clv_partition_dis, &ett_isis_lsp_clv_partition_dis,
dissect_lsp_partition_dis_clv dissect_lsp_partition_dis_clv
}, },
@ -1713,7 +1713,7 @@ dissect_lsp_prefix_neighbors_clv(tvbuff_t *tvb, proto_tree *tree, int offset,
} }
if ( mylen > length) { if ( mylen > length) {
isis_dissect_unknown(tvb, tree, offset, isis_dissect_unknown(tvb, tree, offset,
"Interal length of prefix neighbor too long (%d vs %d)", "Integral length of prefix neighbor too long (%d vs %d)",
mylen, length ); mylen, length );
return; return;
} }

28
epan/dissectors/packet-isup.c
View File

@ -527,7 +527,7 @@ static const value_string ansi_isup_parameter_type_value[] = {
{ ANSI_ISUP_PARAM_TYPE_CVR_RESP_IND, "Circuit validation response indicator"}, { ANSI_ISUP_PARAM_TYPE_CVR_RESP_IND, "Circuit validation response indicator"},
{ ANSI_ISUP_PARAM_TYPE_OUT_TRK_GRP_NM,"Outgoing trunk group number"}, { ANSI_ISUP_PARAM_TYPE_OUT_TRK_GRP_NM,"Outgoing trunk group number"},
{ ANSI_ISUP_PARAM_TYPE_CI_NAME_IND, "Circuit identification name"}, { ANSI_ISUP_PARAM_TYPE_CI_NAME_IND, "Circuit identification name"},
{ ANSI_ISUP_PARAM_CLLI_CODE, "COMMON LANGUAGE location identificatio (CLLI) code"}, { ANSI_ISUP_PARAM_CLLI_CODE, "COMMON LANGUAGE location identification (CLLI) code"},
{ ANSI_ISUP_PARAM_ORIG_LINE_INF, "Originating line information"}, { ANSI_ISUP_PARAM_ORIG_LINE_INF, "Originating line information"},
{ ANSI_ISUP_PARAM_CHRG_NO, "Charge number"}, { ANSI_ISUP_PARAM_CHRG_NO, "Charge number"},
{ ANSI_ISUP_PARAM_SERV_CODE_IND, "Service code indicator"}, { ANSI_ISUP_PARAM_SERV_CODE_IND, "Service code indicator"},
@ -673,12 +673,12 @@ static const true_false_string isup_ISDN_user_part_ind_value = {
"ISDN user part not used all the way" "ISDN user part not used all the way"
}; };
#define ISUP_PREFERED_ALL_THE_WAY 0 #define ISUP_PREFERRED_ALL_THE_WAY 0
#define ISUP_NOT_REQUIRED_ALL_THE_WAY 1 #define ISUP_NOT_REQUIRED_ALL_THE_WAY 1
#define ISUP_REQUIRED_ALL_WAY 2 #define ISUP_REQUIRED_ALL_WAY 2
#define ISUP_ISDN_USER_PART_IND_SPARE 3 #define ISUP_ISDN_USER_PART_IND_SPARE 3
static const value_string isup_preferences_ind_value[] = { static const value_string isup_preferences_ind_value[] = {
{ ISUP_PREFERED_ALL_THE_WAY, "ISDN user part prefered all the way"}, { ISUP_PREFERRED_ALL_THE_WAY, "ISDN user part preferred all the way"},
{ ISUP_NOT_REQUIRED_ALL_THE_WAY, "ISDN user part not required all the way"}, { ISUP_NOT_REQUIRED_ALL_THE_WAY, "ISDN user part not required all the way"},
{ ISUP_REQUIRED_ALL_WAY, "ISDN user part required all the way"}, { ISUP_REQUIRED_ALL_WAY, "ISDN user part required all the way"},
{ ISUP_ISDN_USER_PART_IND_SPARE, "spare"}, { ISUP_ISDN_USER_PART_IND_SPARE, "spare"},
@ -772,13 +772,13 @@ const value_string isup_cvr_cg_car_ind_value[ ] = {
{ 0, NULL } { 0, NULL }
}; };
#define CVR_CG_IND_ALARM_CAR_IND_UNKNOW 0 #define CVR_CG_IND_ALARM_CAR_IND_UNKNOWN 0
#define CVR_CG_IND_ALARM_CAR_IND_SOFTWARE 1 #define CVR_CG_IND_ALARM_CAR_IND_SOFTWARE 1
#define CVR_CG_IND_ALARM_CAR_IND_HARDWARE 2 #define CVR_CG_IND_ALARM_CAR_IND_HARDWARE 2
#define CVR_CG_IND_ALARM_CAR_IND_SPARE 3 #define CVR_CG_IND_ALARM_CAR_IND_SPARE 3
const value_string isup_cvr_alarm_car_ind_value[ ] = { const value_string isup_cvr_alarm_car_ind_value[ ] = {
{ CVR_CG_IND_ALARM_CAR_IND_UNKNOW , "Alarm Carrier Ind Default"}, { CVR_CG_IND_ALARM_CAR_IND_UNKNOWN , "Alarm Carrier Ind Default"},
{ CVR_CG_IND_ALARM_CAR_IND_SOFTWARE , "Alarm Carrier Ind Software"}, { CVR_CG_IND_ALARM_CAR_IND_SOFTWARE , "Alarm Carrier Ind Software"},
{ CVR_CG_IND_ALARM_CAR_IND_HARDWARE , "Alarm Carrier Ind Hardware"}, { CVR_CG_IND_ALARM_CAR_IND_HARDWARE , "Alarm Carrier Ind Hardware"},
{ CVR_CG_IND_ALARM_CAR_IND_SPARE , "Alarm Carrier Ind Spare"}, { CVR_CG_IND_ALARM_CAR_IND_SPARE , "Alarm Carrier Ind Spare"},
@ -804,7 +804,7 @@ const value_string isup_cvr_cont_chk_ind_value[ ] = {
#define MEDIUM_3_1_KHZ_AUDIO 3 #define MEDIUM_3_1_KHZ_AUDIO 3
#define MEDIUM_RESERVED_SERVICE2_1 4 #define MEDIUM_RESERVED_SERVICE2_1 4
#define MEDIUM_RESERVED_SERVICE1_2 5 #define MEDIUM_RESERVED_SERVICE1_2 5
#define MEDIUM_64KBS_PREFERED 6 #define MEDIUM_64KBS_PREFERRED 6
#define MEDIUM_2_64KBS 7 #define MEDIUM_2_64KBS 7
#define MEDIUM_384KBS 8 #define MEDIUM_384KBS 8
#define MEDIUM_1536KBS 9 #define MEDIUM_1536KBS 9
@ -841,7 +841,7 @@ const value_string isup_transmission_medium_requirement_value[] = {
{ MEDIUM_3_1_KHZ_AUDIO, "3.1 kHz audio"}, { MEDIUM_3_1_KHZ_AUDIO, "3.1 kHz audio"},
{ MEDIUM_RESERVED_SERVICE2_1, "reserved for alternate speech (service 2)/64 kbit/s unrestricted (service 1)"}, { MEDIUM_RESERVED_SERVICE2_1, "reserved for alternate speech (service 2)/64 kbit/s unrestricted (service 1)"},
{ MEDIUM_RESERVED_SERVICE1_2, "reserved for alternate 64 kbit/s unrestricted (service 1)/speech (service 2)"}, { MEDIUM_RESERVED_SERVICE1_2, "reserved for alternate 64 kbit/s unrestricted (service 1)/speech (service 2)"},
{ MEDIUM_64KBS_PREFERED, "64 kbit/s prefered"}, { MEDIUM_64KBS_PREFERRED, "64 kbit/s preferred"},
{ MEDIUM_2_64KBS, "2x64 kbit/s unrestricted"}, { MEDIUM_2_64KBS, "2x64 kbit/s unrestricted"},
{ MEDIUM_384KBS, "384 kbit/s unrestricted"}, { MEDIUM_384KBS, "384 kbit/s unrestricted"},
{ MEDIUM_1536KBS, "1536 kbit/s unrestricted"}, { MEDIUM_1536KBS, "1536 kbit/s unrestricted"},
@ -878,7 +878,7 @@ static const value_string isup_transmission_medium_requirement_prime_value[] = {
{ MEDIUM_3_1_KHZ_AUDIO, "3.1 kHz audio"}, { MEDIUM_3_1_KHZ_AUDIO, "3.1 kHz audio"},
{ MEDIUM_RESERVED_SERVICE2_1, "reserved for alternate speech (service 2)/64 kbit/s unrestricted (service 1)"}, { MEDIUM_RESERVED_SERVICE2_1, "reserved for alternate speech (service 2)/64 kbit/s unrestricted (service 1)"},
{ MEDIUM_RESERVED_SERVICE1_2, "reserved for alternate 64 kbit/s unrestricted (service 1)/speech (service 2)"}, { MEDIUM_RESERVED_SERVICE1_2, "reserved for alternate 64 kbit/s unrestricted (service 1)/speech (service 2)"},
{ MEDIUM_64KBS_PREFERED, "reserved for 64 kbit/s prefered"}, { MEDIUM_64KBS_PREFERRED, "reserved for 64 kbit/s preferred"},
{ MEDIUM_2_64KBS, "reserved for 2x64 kbit/s unrestricted"}, { MEDIUM_2_64KBS, "reserved for 2x64 kbit/s unrestricted"},
{ MEDIUM_384KBS, "reserved for 384 kbit/s unrestricted"}, { MEDIUM_384KBS, "reserved for 384 kbit/s unrestricted"},
{ MEDIUM_1536KBS, "reserved for 1536 kbit/s unrestricted"}, { MEDIUM_1536KBS, "reserved for 1536 kbit/s unrestricted"},
@ -2157,7 +2157,7 @@ const value_string q850_cause_code_vals[] = {
{ 0x60, "Mandatory information element is missing" }, { 0x60, "Mandatory information element is missing" },
{ 0x61, "Message type non-existent or not implemented" }, { 0x61, "Message type non-existent or not implemented" },
{ 0x62, "Message not compatible with call state or message type non-existent or not implemented" }, { 0x62, "Message not compatible with call state or message type non-existent or not implemented" },
{ 0x63, "Information element nonexistant or not implemented" }, { 0x63, "Information element nonexistent or not implemented" },
{ 0x64, "Invalid information element contents" }, { 0x64, "Invalid information element contents" },
{ 0x65, "Message not compatible with call state" }, { 0x65, "Message not compatible with call state" },
{ 0x66, "Recovery on timer expiry" }, { 0x66, "Recovery on timer expiry" },
@ -2238,7 +2238,7 @@ static const value_string ansi_isup_cause_code_vals[] = {
{ 0x60, "Mandatory information element is missing" }, { 0x60, "Mandatory information element is missing" },
{ 0x61, "Message type non-existent or not implemented" }, { 0x61, "Message type non-existent or not implemented" },
{ 0x62, "Message not compatible with call state or message type non-existent or not implemented" }, { 0x62, "Message not compatible with call state or message type non-existent or not implemented" },
{ 0x63, "Information element nonexistant or not implemented" }, { 0x63, "Information element nonexistent or not implemented" },
{ 0x64, "Invalid information element contents" }, { 0x64, "Invalid information element contents" },
{ 0x65, "Message not compatible with call state" }, { 0x65, "Message not compatible with call state" },
{ 0x66, "Recovery on timer expiry" }, { 0x66, "Recovery on timer expiry" },
@ -4905,11 +4905,11 @@ dissect_isup_collect_call_request_parameter(tvbuff_t *parameter_tvb, proto_tree
indicator = tvb_get_guint8(parameter_tvb, 0); indicator = tvb_get_guint8(parameter_tvb, 0);
if ((indicator & A_8BIT_MASK) == 0) { if ((indicator & A_8BIT_MASK) == 0) {
proto_tree_add_text(parameter_tree, parameter_tvb, 0, COLLECT_CALL_REQUEST_LENGTH, "Collect call request indicator: no indication"); proto_tree_add_text(parameter_tree, parameter_tvb, 0, COLLECT_CALL_REQUEST_LENGTH, "Collect call request indicator: no indication");
proto_item_set_text(parameter_item, "Collect call reqeust: no indication (0x%x)", indicator); proto_item_set_text(parameter_item, "Collect call request: no indication (0x%x)", indicator);
} }
else { else {
proto_tree_add_text(parameter_tree, parameter_tvb, 0, COLLECT_CALL_REQUEST_LENGTH, "Collect call request indicator: collect call requested"); proto_tree_add_text(parameter_tree, parameter_tvb, 0, COLLECT_CALL_REQUEST_LENGTH, "Collect call request indicator: collect call requested");
proto_item_set_text(parameter_item, "Collect call reqeust: collect call requested (0x%x)", indicator); proto_item_set_text(parameter_item, "Collect call request: collect call requested (0x%x)", indicator);
} }
} }
/* ------------------------------------------------------------------ /* ------------------------------------------------------------------
@ -5764,10 +5764,10 @@ dissect_ansi_isup_circuit_validation_test_resp_message(tvbuff_t *message_tvb, pr
/* Do stuff for first mandatory fixed parameter: CVR Repsonse Indicator */ /* Do stuff for first mandatory fixed parameter: CVR Repsonse Indicator */
parameter_type = ANSI_ISUP_PARAM_TYPE_CVR_RESP_IND; parameter_type = ANSI_ISUP_PARAM_TYPE_CVR_RESP_IND;
parameter_item = proto_tree_add_text(isup_tree, message_tvb, offset, CVR_RESP_IND_LENGTH, "CVR Reponse Indicator"); parameter_item = proto_tree_add_text(isup_tree, message_tvb, offset, CVR_RESP_IND_LENGTH, "CVR Response Indicator");
parameter_tree = proto_item_add_subtree(parameter_item, ett_isup_parameter); parameter_tree = proto_item_add_subtree(parameter_item, ett_isup_parameter);
proto_tree_add_uint_format(parameter_tree, hf_isup_parameter_type, message_tvb, 0, 0, parameter_type, "Mandatory Parameter: %u (%s)", parameter_type, val_to_str(parameter_type, isup_parameter_type_value,"CVR Reponse Indicator")); proto_tree_add_uint_format(parameter_tree, hf_isup_parameter_type, message_tvb, 0, 0, parameter_type, "Mandatory Parameter: %u (%s)", parameter_type, val_to_str(parameter_type, isup_parameter_type_value,"CVR Response Indicator"));
actual_length = tvb_ensure_length_remaining(message_tvb, offset); actual_length = tvb_ensure_length_remaining(message_tvb, offset);

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

@ -244,7 +244,7 @@ proto_register_isup_thin(void)
"Version", HFILL } "Version", HFILL }
}, },
{ &hf_isup_thin_message_type, { &hf_isup_thin_message_type,
{ "Message Type", "isup_thin.messaget.type", { "Message Type", "isup_thin.message.type",
FT_UINT8, BASE_DEC,VALS(isup_thin_message_type_vals), 0x7f, FT_UINT8, BASE_DEC,VALS(isup_thin_message_type_vals), 0x7f,
"Message Type", HFILL } "Message Type", HFILL }
}, },

10
epan/dissectors/packet-iua.c
View File

@ -1,7 +1,7 @@
/* packet-iua.c /* packet-iua.c
* Routines for ISDN Q.921-User Adaptation Layer dissection * Routines for ISDN Q.921-User Adaptation Layer dissection
* *
* It is hopefully (needs testing) compilant to * It is hopefully (needs testing) compliant to
* http://www.ietf.org/rfc/rfc3057.txt * http://www.ietf.org/rfc/rfc3057.txt
* http://www.ietf.org/internet-drafts/draft-ietf-sigtran-iua-imp-guide-01.txt * http://www.ietf.org/internet-drafts/draft-ietf-sigtran-iua-imp-guide-01.txt
* To do: - provide better handling of length parameters * To do: - provide better handling of length parameters
@ -299,7 +299,7 @@ dissect_traffic_mode_type_parameter(tvbuff_t *parameter_tvb, proto_tree *paramet
static const value_string error_code_values[] = { static const value_string error_code_values[] = {
{ INVALID_VERSION_ERROR, "Invalid version" }, { INVALID_VERSION_ERROR, "Invalid version" },
{ INVALID_INTERFACE_IDENTIFIER_ERROR, "Invalid interface identifier" }, { INVALID_INTERFACE_IDENTIFIER_ERROR, "Invalid interface identifier" },
{ UNSUPPORTED_MESSAGE_CLASS_ERROR, "Unsuported message class" }, { UNSUPPORTED_MESSAGE_CLASS_ERROR, "Unsupported message class" },
{ UNSUPPORTED_MESSAGE_TYPE_ERROR, "Unsupported message type" }, { UNSUPPORTED_MESSAGE_TYPE_ERROR, "Unsupported message type" },
{ UNSUPPORTED_TRAFFIC_HANDLING_MODE_ERROR, "Unsupported traffic handling mode" }, { UNSUPPORTED_TRAFFIC_HANDLING_MODE_ERROR, "Unsupported traffic handling mode" },
{ UNEXPECTED_MESSAGE_ERROR, "Unexpected message" }, { UNEXPECTED_MESSAGE_ERROR, "Unexpected message" },
@ -314,7 +314,7 @@ static const value_string error_code_values[] = {
static const value_string error_code_ig_values[] = { static const value_string error_code_ig_values[] = {
{ INVALID_VERSION_ERROR, "Invalid version" }, { INVALID_VERSION_ERROR, "Invalid version" },
{ INVALID_INTERFACE_IDENTIFIER_ERROR, "Invalid interface identifier" }, { INVALID_INTERFACE_IDENTIFIER_ERROR, "Invalid interface identifier" },
{ UNSUPPORTED_MESSAGE_CLASS_ERROR, "Unsuported message class" }, { UNSUPPORTED_MESSAGE_CLASS_ERROR, "Unsupported message class" },
{ UNSUPPORTED_MESSAGE_TYPE_ERROR, "Unsupported message type" }, { UNSUPPORTED_MESSAGE_TYPE_ERROR, "Unsupported message type" },
{ UNSUPPORTED_TRAFFIC_HANDLING_MODE_ERROR, "Unsupported traffic handling mode" }, { UNSUPPORTED_TRAFFIC_HANDLING_MODE_ERROR, "Unsupported traffic handling mode" },
{ UNEXPECTED_MESSAGE_ERROR, "Unexpected message" }, { UNEXPECTED_MESSAGE_ERROR, "Unexpected message" },
@ -514,7 +514,7 @@ static const value_string parameter_tag_values[] = {
{ DLCI_PARAMETER_TAG, "DLCI" }, { DLCI_PARAMETER_TAG, "DLCI" },
{ DIAGNOSTIC_INFORMATION_PARAMETER_TAG, "Diagnostic information" }, { DIAGNOSTIC_INFORMATION_PARAMETER_TAG, "Diagnostic information" },
{ INTEGER_RANGE_INTERFACE_IDENTIFIER_PARAMETER_TAG, "Integer range interface identifier" }, { INTEGER_RANGE_INTERFACE_IDENTIFIER_PARAMETER_TAG, "Integer range interface identifier" },
{ HEARTBEAT_DATA_PARAMETER_TAG, "Hearbeat data" }, { HEARTBEAT_DATA_PARAMETER_TAG, "Heartbeat data" },
{ ASP_REASON_PARAMETER_TAG, "Reason" }, { ASP_REASON_PARAMETER_TAG, "Reason" },
{ TRAFFIC_MODE_TYPE_PARAMETER_TAG, "Traffic mode type" }, { TRAFFIC_MODE_TYPE_PARAMETER_TAG, "Traffic mode type" },
{ ERROR_CODE_PARAMETER_TAG, "Error code" }, { ERROR_CODE_PARAMETER_TAG, "Error code" },
@ -531,7 +531,7 @@ static const value_string parameter_tag_ig_values[] = {
{ DLCI_PARAMETER_TAG, "DLCI" }, { DLCI_PARAMETER_TAG, "DLCI" },
{ DIAGNOSTIC_INFORMATION_PARAMETER_TAG, "Diagnostic information" }, { DIAGNOSTIC_INFORMATION_PARAMETER_TAG, "Diagnostic information" },
{ INTEGER_RANGE_INTERFACE_IDENTIFIER_PARAMETER_TAG, "Integer range interface identifier" }, { INTEGER_RANGE_INTERFACE_IDENTIFIER_PARAMETER_TAG, "Integer range interface identifier" },
{ HEARTBEAT_DATA_PARAMETER_TAG, "Hearbeat data" }, { HEARTBEAT_DATA_PARAMETER_TAG, "Heartbeat data" },
{ TRAFFIC_MODE_TYPE_PARAMETER_TAG, "Traffic mode type" }, { TRAFFIC_MODE_TYPE_PARAMETER_TAG, "Traffic mode type" },
{ ERROR_CODE_PARAMETER_TAG, "Error code" }, { ERROR_CODE_PARAMETER_TAG, "Error code" },
{ STATUS_TYPE_INDENTIFICATION_PARAMETER_TAG, "Status type/identification" }, { STATUS_TYPE_INDENTIFICATION_PARAMETER_TAG, "Status type/identification" },

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

@ -171,7 +171,7 @@ proto_register_jpeg(void)
"", HFILL "", HFILL
}}, }},
{ &hf_rtp_jpeg_main_hdr_offs, { { &hf_rtp_jpeg_main_hdr_offs, {
"Fragement Offset", "Fragment Offset",
"jpeg.main_hdr.offset", "jpeg.main_hdr.offset",
FT_UINT24, BASE_DEC, NULL, 0, FT_UINT24, BASE_DEC, NULL, 0,
"", HFILL "", HFILL

28
epan/dissectors/packet-kerberos.c
View File

@ -243,7 +243,7 @@ static gint hf_krb_APOptions_mutual_required = -1;
static gint hf_krb_TicketFlags = -1; static gint hf_krb_TicketFlags = -1;
static gint hf_krb_TicketFlags_forwardable = -1; static gint hf_krb_TicketFlags_forwardable = -1;
static gint hf_krb_TicketFlags_forwarded = -1; static gint hf_krb_TicketFlags_forwarded = -1;
static gint hf_krb_TicketFlags_proxyable = -1; static gint hf_krb_TicketFlags_proxiable = -1;
static gint hf_krb_TicketFlags_proxy = -1; static gint hf_krb_TicketFlags_proxy = -1;
static gint hf_krb_TicketFlags_allow_postdate = -1; static gint hf_krb_TicketFlags_allow_postdate = -1;
static gint hf_krb_TicketFlags_postdated = -1; static gint hf_krb_TicketFlags_postdated = -1;
@ -257,7 +257,7 @@ static gint hf_krb_TicketFlags_ok_as_delegate = -1;
static gint hf_krb_KDCOptions = -1; static gint hf_krb_KDCOptions = -1;
static gint hf_krb_KDCOptions_forwardable = -1; static gint hf_krb_KDCOptions_forwardable = -1;
static gint hf_krb_KDCOptions_forwarded = -1; static gint hf_krb_KDCOptions_forwarded = -1;
static gint hf_krb_KDCOptions_proxyable = -1; static gint hf_krb_KDCOptions_proxiable = -1;
static gint hf_krb_KDCOptions_proxy = -1; static gint hf_krb_KDCOptions_proxy = -1;
static gint hf_krb_KDCOptions_allow_postdate = -1; static gint hf_krb_KDCOptions_allow_postdate = -1;
static gint hf_krb_KDCOptions_postdated = -1; static gint hf_krb_KDCOptions_postdated = -1;
@ -1509,7 +1509,7 @@ static const true_false_string krb5_kdcoptions_forwarded = {
"This ticket has been FORWARDED", "This ticket has been FORWARDED",
"This is NOT a forwarded ticket" "This is NOT a forwarded ticket"
}; };
static const true_false_string krb5_kdcoptions_proxyable = { static const true_false_string krb5_kdcoptions_proxiable = {
"PROXIABLE tickets are allowed/requested", "PROXIABLE tickets are allowed/requested",
"Do NOT use proxiable tickets" "Do NOT use proxiable tickets"
}; };
@ -1561,7 +1561,7 @@ static const true_false_string krb5_kdcoptions_validate = {
static int* KDCOptions_bits[] = { static int* KDCOptions_bits[] = {
&hf_krb_KDCOptions_forwardable, &hf_krb_KDCOptions_forwardable,
&hf_krb_KDCOptions_forwarded, &hf_krb_KDCOptions_forwarded,
&hf_krb_KDCOptions_proxyable, &hf_krb_KDCOptions_proxiable,
&hf_krb_KDCOptions_proxy, &hf_krb_KDCOptions_proxy,
&hf_krb_KDCOptions_allow_postdate, &hf_krb_KDCOptions_allow_postdate,
&hf_krb_KDCOptions_postdated, &hf_krb_KDCOptions_postdated,
@ -2371,7 +2371,7 @@ static const true_false_string krb5_ticketflags_forwarded = {
"This ticket has been FORWARDED", "This ticket has been FORWARDED",
"This is NOT a forwarded ticket" "This is NOT a forwarded ticket"
}; };
static const true_false_string krb5_ticketflags_proxyable = { static const true_false_string krb5_ticketflags_proxiable = {
"PROXIABLE tickets are allowed/requested", "PROXIABLE tickets are allowed/requested",
"Do NOT use proxiable tickets" "Do NOT use proxiable tickets"
}; };
@ -2419,7 +2419,7 @@ static const true_false_string krb5_ticketflags_ok_as_delegate = {
static int* TicketFlags_bits[] = { static int* TicketFlags_bits[] = {
&hf_krb_TicketFlags_forwardable, &hf_krb_TicketFlags_forwardable,
&hf_krb_TicketFlags_forwarded, &hf_krb_TicketFlags_forwarded,
&hf_krb_TicketFlags_proxyable, &hf_krb_TicketFlags_proxiable,
&hf_krb_TicketFlags_proxy, &hf_krb_TicketFlags_proxy,
&hf_krb_TicketFlags_allow_postdate, &hf_krb_TicketFlags_allow_postdate,
&hf_krb_TicketFlags_postdated, &hf_krb_TicketFlags_postdated,
@ -4908,13 +4908,13 @@ proto_register_kerberos(void)
NULL, 0, "Kerberos Ticket Flags", HFILL }}, NULL, 0, "Kerberos Ticket Flags", HFILL }},
{ &hf_krb_TicketFlags_forwardable, { { &hf_krb_TicketFlags_forwardable, {
"Forwardable", "kerberos.ticketflags.forwardable", FT_BOOLEAN, 32, "Forwardable", "kerberos.ticketflags.forwardable", FT_BOOLEAN, 32,
TFS(&krb5_ticketflags_forwardable), 0x40000000, "Flag controlling whether the tickes are forwardable or not", HFILL }}, TFS(&krb5_ticketflags_forwardable), 0x40000000, "Flag controlling whether the tickets are forwardable or not", HFILL }},
{ &hf_krb_TicketFlags_forwarded, { { &hf_krb_TicketFlags_forwarded, {
"Forwarded", "kerberos.ticketflags.forwarded", FT_BOOLEAN, 32, "Forwarded", "kerberos.ticketflags.forwarded", FT_BOOLEAN, 32,
TFS(&krb5_ticketflags_forwarded), 0x20000000, "Has this ticket been forwarded?", HFILL }}, TFS(&krb5_ticketflags_forwarded), 0x20000000, "Has this ticket been forwarded?", HFILL }},
{ &hf_krb_TicketFlags_proxyable, { { &hf_krb_TicketFlags_proxiable, {
"Proxyable", "kerberos.ticketflags.proxyable", FT_BOOLEAN, 32, "Proxiable", "kerberos.ticketflags.proxiable", FT_BOOLEAN, 32,
TFS(&krb5_ticketflags_proxyable), 0x10000000, "Flag controlling whether the tickes are proxyable or not", HFILL }}, TFS(&krb5_ticketflags_proxiable), 0x10000000, "Flag controlling whether the tickets are proxiable or not", HFILL }},
{ &hf_krb_TicketFlags_proxy, { { &hf_krb_TicketFlags_proxy, {
"Proxy", "kerberos.ticketflags.proxy", FT_BOOLEAN, 32, "Proxy", "kerberos.ticketflags.proxy", FT_BOOLEAN, 32,
TFS(&krb5_ticketflags_proxy), 0x08000000, "Has this ticket been proxied?", HFILL }}, TFS(&krb5_ticketflags_proxy), 0x08000000, "Has this ticket been proxied?", HFILL }},
@ -4959,13 +4959,13 @@ proto_register_kerberos(void)
NULL, 0, "Kerberos Encrypted PRIVate blob data", HFILL }}, NULL, 0, "Kerberos Encrypted PRIVate blob data", HFILL }},
{ &hf_krb_KDCOptions_forwardable, { { &hf_krb_KDCOptions_forwardable, {
"Forwardable", "kerberos.kdcoptions.forwardable", FT_BOOLEAN, 32, "Forwardable", "kerberos.kdcoptions.forwardable", FT_BOOLEAN, 32,
TFS(&krb5_kdcoptions_forwardable), 0x40000000, "Flag controlling whether the tickes are forwardable or not", HFILL }}, TFS(&krb5_kdcoptions_forwardable), 0x40000000, "Flag controlling whether the tickets are forwardable or not", HFILL }},
{ &hf_krb_KDCOptions_forwarded, { { &hf_krb_KDCOptions_forwarded, {
"Forwarded", "kerberos.kdcoptions.forwarded", FT_BOOLEAN, 32, "Forwarded", "kerberos.kdcoptions.forwarded", FT_BOOLEAN, 32,
TFS(&krb5_kdcoptions_forwarded), 0x20000000, "Has this ticket been forwarded?", HFILL }}, TFS(&krb5_kdcoptions_forwarded), 0x20000000, "Has this ticket been forwarded?", HFILL }},
{ &hf_krb_KDCOptions_proxyable, { { &hf_krb_KDCOptions_proxiable, {
"Proxyable", "kerberos.kdcoptions.proxyable", FT_BOOLEAN, 32, "Proxiable", "kerberos.kdcoptions.proxiable", FT_BOOLEAN, 32,
TFS(&krb5_kdcoptions_proxyable), 0x10000000, "Flag controlling whether the tickes are proxyable or not", HFILL }}, TFS(&krb5_kdcoptions_proxiable), 0x10000000, "Flag controlling whether the tickets are proxiable or not", HFILL }},
{ &hf_krb_KDCOptions_proxy, { { &hf_krb_KDCOptions_proxy, {
"Proxy", "kerberos.kdcoptions.proxy", FT_BOOLEAN, 32, "Proxy", "kerberos.kdcoptions.proxy", FT_BOOLEAN, 32,
TFS(&krb5_kdcoptions_proxy), 0x08000000, "Has this ticket been proxied?", HFILL }}, TFS(&krb5_kdcoptions_proxy), 0x08000000, "Has this ticket been proxied?", HFILL }},

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

@ -1,6 +1,6 @@
/* packet-m2ua.c /* packet-m2ua.c
* Routines for MTP2 User Adaptation Layer dissection * Routines for MTP2 User Adaptation Layer dissection
* It is hopefully (needs testing) compilant to * It is hopefully (needs testing) compliant to
* http://www.ietf.org/rfc/rfc3331.txt * http://www.ietf.org/rfc/rfc3331.txt
* To do: - provide better handling of length parameters * To do: - provide better handling of length parameters
* *

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

@ -1,6 +1,6 @@
/* packet-m3ua.c /* packet-m3ua.c
* Routines for MTP3 User Adaptation Layer dissection * Routines for MTP3 User Adaptation Layer dissection
* It is hopefully (needs testing) compilant to * It is hopefully (needs testing) compliant to
* http://www.ietf.org/internet-drafts/draft-ietf-sigtran-m3ua-05.txt (expired) * http://www.ietf.org/internet-drafts/draft-ietf-sigtran-m3ua-05.txt (expired)
* http://www.ietf.org/internet-drafts/draft-ietf-sigtran-m3ua-06.txt (expired) * http://www.ietf.org/internet-drafts/draft-ietf-sigtran-m3ua-06.txt (expired)
* http://www.ietf.org/internet-drafts/draft-ietf-sigtran-m3ua-07.txt (expired) * http://www.ietf.org/internet-drafts/draft-ietf-sigtran-m3ua-07.txt (expired)

2
epan/dissectors/packet-nasdaq-itch.c
View File

@ -490,7 +490,7 @@ dissect_nasdaq_itch(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
break; break;
default: default:
/* unknow */ /* unknown */
proto_tree_add_item(nasdaq_itch_tree, hf_nasdaq_itch_message, tvb, offset, -1, FALSE); proto_tree_add_item(nasdaq_itch_tree, hf_nasdaq_itch_message, tvb, offset, -1, FALSE);
offset += 5-1; offset += 5-1;
break; break;

2
epan/dissectors/packet-nasdaq-soup.c
View File

@ -136,7 +136,7 @@ dissect_nasdaq_soup_packet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent
/* no payload */ /* no payload */
break; break;
default: default:
/* unknow */ /* unknown */
proto_tree_add_item(tree, hf_nasdaq_soup_message, tvb, offset, linelen -1, FALSE); proto_tree_add_item(tree, hf_nasdaq_soup_message, tvb, offset, linelen -1, FALSE);
offset += linelen -1; offset += linelen -1;
break; break;

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

@ -1121,7 +1121,7 @@ dissect_netbios(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
if (check_col( pinfo->cinfo, COL_INFO)) /* print bad packet */ if (check_col( pinfo->cinfo, COL_INFO)) /* print bad packet */
col_set_str( pinfo->cinfo, COL_INFO, "Bad packet, no 0xEFFF marker"); col_set_str( pinfo->cinfo, COL_INFO, "Bad packet, no 0xEFFF marker");
return; /* this is an unknow packet, no marker */ return; /* this is an unknown packet, no marker */
} }
} }

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

@ -1657,7 +1657,7 @@ dissect_sabp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
dissect_SABP_PDU_PDU(tvb, pinfo, sabp_tree); dissect_SABP_PDU_PDU(tvb, pinfo, sabp_tree);
} }
/* Note a little bit of a hack assumes length max takes two bytes and that lenghth start at byte 4 */ /* Note a little bit of a hack assumes length max takes two bytes and that the length starts at byte 4 */
static void static void
dissect_sabp_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) dissect_sabp_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
{ {

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

@ -1,6 +1,6 @@
/* packet-sua.c /* packet-sua.c
* Routines for SS7 SCCP-User Adaptation Layer (SUA) dissection * Routines for SS7 SCCP-User Adaptation Layer (SUA) dissection
* It is hopefully (needs testing) compilant to * It is hopefully (needs testing) compliant to
* http://www.ietf.org/internet-drafts/draft-ietf-sigtran-sua-08.txt * http://www.ietf.org/internet-drafts/draft-ietf-sigtran-sua-08.txt
* http://www.ietf.org/rfc/rfc3868.txt * http://www.ietf.org/rfc/rfc3868.txt
* *

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

@ -2010,7 +2010,7 @@ dissect_tipc_int_prot_msg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tipc_tr
} }
/* determines the lenght of a TIPC package */ /* determines the length of a TIPC package */
static guint static guint
get_tipc_pdu_len(packet_info *pinfo _U_, tvbuff_t *tvb, int offset) get_tipc_pdu_len(packet_info *pinfo _U_, tvbuff_t *tvb, int offset)
{ {