1berry/wireshark
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix another few spelling errors.

Browse Source 
applicaton -> application
    atribut -> attribute
    deliminator -> delimiter
    depricated -> deprecated
    disect -> dissect
    parmeter/paramater -> parameter
    poitner -> pointer
    recomment -> recommend
    suport -> support (except one instance in packet-windows-common.h from source material)
    uncertaintly -> uncertainty
    unkown -> unknown

Re-generate packet-fix.h.
This commit is contained in:
Darius Davis 2024-11-24 23:47:56 +10:00 committed by Alexis La Goutte
parent 8f2cb5f54a
commit ba0ee80259
27 changed files with 83 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/http3.md
View File

@ -8,7 +8,7 @@ At the moment, the following aspects of HTTP3 are supported:
- Dissection of HTTP header fields - Dissection of HTTP header fields
- Dissection of QPACK instructions - Dissection of QPACK instructions
In addition, the dissector suports decoding of the HTTP3 In addition, the dissector supports decoding of the HTTP3
header fields. This ability requires `nghttp3` third-party library. header fields. This ability requires `nghttp3` third-party library.
## High-level overview ## High-level overview
@ -100,4 +100,4 @@ as well as mapping to the underlying QUIC streams.
The `http3_header_field_t` keeps the information about a single HTTP header. The `http3_header_field_t` keeps the information about a single HTTP header.
It contains both the encoded and the decoded representation of the header. It contains both the encoded and the decoded representation of the header.
The actual decoded strings are stored in `HTTP3_HEADER_CACHE`/`HTTP3_HEADER_DEF_CACHE`; The actual decoded strings are stored in `HTTP3_HEADER_CACHE`/`HTTP3_HEADER_DEF_CACHE`;
the individual `http3_header_field_t` instances contain pointers to the strings. the individual `http3_header_field_t` instances contain pointers to the strings.

2
doc/man_pages/etwdump.adoc
View File

@ -95,7 +95,7 @@ To see interface configuration options:
.Example output .Example output
arg {number=0}{call=--etlfile}{display=etl file}{type=fileselect}{tooltip=Select etl file to display in Wireshark}{group=Capture} arg {number=0}{call=--etlfile}{display=etl file}{type=fileselect}{tooltip=Select etl file to display in Wireshark}{group=Capture}
arg {number=1}{call=--params}{display=filter parmeters}{type=string}{tooltip=Input providers, keyword and level filters for the etl file and live session}{group=Capture} arg {number=1}{call=--params}{display=filter parameters}{type=string}{tooltip=Input providers, keyword and level filters for the etl file and live session}{group=Capture}
arg {number=2}{call=--iue}{display=Should undecidable events be included}{type=boolflag}{default=false}{tooltip=Choose if the undecidable event is included}{group=Capture} arg {number=2}{call=--iue}{display=Should undecidable events be included}{type=boolflag}{default=false}{tooltip=Choose if the undecidable event is included}{group=Capture}
To capture: To capture:

2
dumpcap.c
View File

@ -4204,7 +4204,7 @@ handle_npcap_bug(char *adapter_name _U_, char *cap_err_str _U_)
if (!have_npcap) { if (!have_npcap) {
/* /*
* We're not using Npcap, so don't recomment a user * We're not using Npcap, so don't recommend a user
* file a bug against Npcap. * file a bug against Npcap.
*/ */
return g_strdup(""); return g_strdup("");

2
epan/dissectors/dcerpc/idl2wrs.c
View File

@ -2626,7 +2626,7 @@ static void parsefunction(int pass)
num_pointers++; num_pointers++;
} }
/* now that we know how many real poitner there were we must /* now that we know how many real pointer there were we must
prepend default pointers to the list so it has the right prepend default pointers to the list so it has the right
length. length.
*/ */

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

@ -149,7 +149,7 @@ typedef enum
* *
* sz * sz
* - is the name of the parameter within the descr where their unpacked or packed value shall be stored or fetched. * - is the name of the parameter within the descr where their unpacked or packed value shall be stored or fetched.
* This paramater is pointed out by the offset parameter in the same CSN_DESCR variable as the sz. * This parameter is pointed out by the offset parameter in the same CSN_DESCR variable as the sz.
* - the free text used by the CSN_TRAP_ERROR (the same as parameter "i") * - the free text used by the CSN_TRAP_ERROR (the same as parameter "i")
* *
* serialize * serialize

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

@ -825,7 +825,7 @@ static int read_c2(tvbuff_t *tvb, int offset, uint16_t *v, int *len);
static void validate_c2(packet_info *pinfo, proto_item *pi, uint16_t, int len); static void validate_c2(packet_info *pinfo, proto_item *pi, uint16_t, int len);
static int dof_dissect_pdu(dissector_t dissector, tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *result); static int dof_dissect_pdu(dissector_t dissector, tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *result);
static int dof_dissect_pdu_as_field(dissector_t disector, tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset, int item, int ett, void *result); static int dof_dissect_pdu_as_field(dissector_t dissector, tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset, int item, int ett, void *result);
#if 0 /* TODO not used yet */ #if 0 /* TODO not used yet */
static void dof_session_add_proto_data(dof_session_data *session, int proto, void *proto_data); static void dof_session_add_proto_data(dof_session_data *session, int proto, void *proto_data);

6
epan/dissectors/packet-dvb-s2-table.c
View File

@ -87,7 +87,7 @@ static int hf_dvb_s2_table_superframe_loop_count;
static int hf_dvb_s2_table_superframe; static int hf_dvb_s2_table_superframe;
static int hf_dvb_s2_table_sf_sequence; static int hf_dvb_s2_table_sf_sequence;
static int hf_dvb_s2_table_sf_id; static int hf_dvb_s2_table_sf_id;
static int hf_dvb_s2_table_sf_large_timing_uncertaintly_flag; static int hf_dvb_s2_table_sf_large_timing_uncertainty_flag;
static int hf_dvb_s2_table_sf_uplink_polarization; static int hf_dvb_s2_table_sf_uplink_polarization;
static int hf_dvb_s2_table_sf_absolute_time; static int hf_dvb_s2_table_sf_absolute_time;
static int hf_dvb_s2_table_sf_duration; static int hf_dvb_s2_table_sf_duration;
@ -1504,7 +1504,7 @@ static int dissect_dvb_s2_table_sct(tvbuff_t *tvb, int cur_off, proto_tree *dvb_
else if (dvb_s2_rcs_version == DVB_S2_RCS2_TABLE_DECODING) else if (dvb_s2_rcs_version == DVB_S2_RCS2_TABLE_DECODING)
proto_tree_add_item(dvb_s2_hdr_table_sf_tree, hf_dvb_s2_table_sf_sequence, tvb, cur_off + new_off, 1, ENC_NA); proto_tree_add_item(dvb_s2_hdr_table_sf_tree, hf_dvb_s2_table_sf_sequence, tvb, cur_off + new_off, 1, ENC_NA);
new_off += 1; new_off += 1;
proto_tree_add_item(dvb_s2_hdr_table_sf_tree, hf_dvb_s2_table_sf_large_timing_uncertaintly_flag, tvb, cur_off + new_off, 1, ENC_NA); proto_tree_add_item(dvb_s2_hdr_table_sf_tree, hf_dvb_s2_table_sf_large_timing_uncertainty_flag, tvb, cur_off + new_off, 1, ENC_NA);
proto_tree_add_item(dvb_s2_hdr_table_sf_tree, hf_dvb_s2_table_sf_uplink_polarization, tvb, cur_off + new_off, 1, ENC_NA); proto_tree_add_item(dvb_s2_hdr_table_sf_tree, hf_dvb_s2_table_sf_uplink_polarization, tvb, cur_off + new_off, 1, ENC_NA);
new_off += 1; new_off += 1;
proto_tree_add_item(dvb_s2_hdr_table_sf_tree, hf_dvb_s2_table_sf_absolute_time , tvb, cur_off + new_off, 6, ENC_NA); proto_tree_add_item(dvb_s2_hdr_table_sf_tree, hf_dvb_s2_table_sf_absolute_time , tvb, cur_off + new_off, 6, ENC_NA);
@ -2706,7 +2706,7 @@ void proto_register_dvb_s2_table(void)
FT_UINT8, BASE_HEX, NULL, 0x0, FT_UINT8, BASE_HEX, NULL, 0x0,
NULL, HFILL} NULL, HFILL}
}, },
{&hf_dvb_s2_table_sf_large_timing_uncertaintly_flag, { {&hf_dvb_s2_table_sf_large_timing_uncertainty_flag, {
"Superframe large timing uncertainty flag", "dvb-s2_table.sf.large_timing_uncertainty_flag", "Superframe large timing uncertainty flag", "dvb-s2_table.sf.large_timing_uncertainty_flag",
FT_UINT8, BASE_HEX, NULL, DVB_S2_TABLE_SCT_LARGE_TIMING_FLAG_MASK, FT_UINT8, BASE_HEX, NULL, DVB_S2_TABLE_SCT_LARGE_TIMING_FLAG_MASK,
NULL, HFILL} NULL, HFILL}

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

@ -921,7 +921,7 @@ static void add_attributes(packet_info* pinfo, int offset, tvbuff_t *tvb, proto_
wmem_strbuf_append_hex(pStr, check); wmem_strbuf_append_hex(pStr, check);
} }
} }
/*display last version summary parameter, e.g 'FW', 'BL', 'HW' as no deliminator to check for, just prints out rest of version string*/ /*display last version summary parameter, e.g 'FW', 'BL', 'HW' as no delimiter to check for, just prints out rest of version string*/
proto_tree_add_string(ecmp_attribute_data_tree, hf_ecmp_version_summary, tvb, offset-b, b, wmem_strbuf_get_str(pStr)); proto_tree_add_string(ecmp_attribute_data_tree, hf_ecmp_version_summary, tvb, offset-b, b, wmem_strbuf_get_str(pStr));
offset-= 1; offset-= 1;
} }

4
epan/dissectors/packet-fix.h
View File

@ -1221,7 +1221,7 @@ typedef struct _fix_field {
{ "COMPOUND", "COMPOUND YIELD" }, { "COMPOUND", "COMPOUND YIELD" },
{ "CURRENT", "CURRENT YIELD" }, { "CURRENT", "CURRENT YIELD" },
{ "GOVTEQUIV", "GVNT EQUIVALENT YIELD" }, { "GOVTEQUIV", "GVNT EQUIVALENT YIELD" },
{ "GROSS", "true GROSS YIELD" }, { "GROSS", "TRUE GROSS YIELD" },
{ "INFLATION", "YIELD WITH INFLATION ASSUMPTION" }, { "INFLATION", "YIELD WITH INFLATION ASSUMPTION" },
{ "INVERSEFLOATER", "INVERSE FLOATER BOND YIELD" }, { "INVERSEFLOATER", "INVERSE FLOATER BOND YIELD" },
{ "LASTCLOSE", "MOST RECENT CLOSING YIELD" }, { "LASTCLOSE", "MOST RECENT CLOSING YIELD" },
@ -1241,7 +1241,7 @@ typedef struct _fix_field {
{ "SIMPLE", "SIMPLE YIELD" }, { "SIMPLE", "SIMPLE YIELD" },
{ "TAXEQUIV", "TAX EQUIVALENT YIELD" }, { "TAXEQUIV", "TAX EQUIVALENT YIELD" },
{ "TENDER", "YIELD TO TENDER DATE" }, { "TENDER", "YIELD TO TENDER DATE" },
{ "TRUE", "true YIELD" }, { "TRUE", "TRUE YIELD" },
{ "VALUE1_32", "YIELD VALUE OF 1 32" }, { "VALUE1_32", "YIELD VALUE OF 1 32" },
{ "WORST", "YIELD TO WORST" }, { "WORST", "YIELD TO WORST" },
{ 0, NULL } { 0, NULL }

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

@ -1244,7 +1244,7 @@ const value_string isup_parameter_type_value[] = {
/* 116 */ { PARAM_TYPE_UID_ACTION_IND, "UID action indicators"}, /* 116 */ { PARAM_TYPE_UID_ACTION_IND, "UID action indicators"},
/* 117 */ { PARAM_TYPE_UID_CAPAB_IND, "UID capability indicators"}, /* 117 */ { PARAM_TYPE_UID_CAPAB_IND, "UID capability indicators"},
/* 119 */ { PARAM_TYPE_REDIRECT_COUNTER, "Redirect counter (reserved for national use)"}, /* 119 */ { PARAM_TYPE_REDIRECT_COUNTER, "Redirect counter (reserved for national use)"},
/* 120 */ { PARAM_TYPE_APPLICATON_TRANS, "Application transport"}, /* 120 */ { PARAM_TYPE_APPLICATION_TRANS, "Application transport"},
/* 121 */ { PARAM_TYPE_COLLECT_CALL_REQ, "Collect call request"}, /* 121 */ { PARAM_TYPE_COLLECT_CALL_REQ, "Collect call request"},
/* 122 */ { 122, "Not used"}, /* 122 */ { 122, "Not used"},
/* 123 */ { 123, "Not used"}, /* 123 */ { 123, "Not used"},
@ -1391,7 +1391,7 @@ static const value_string japan_isup_parameter_type_value[] = {
/* 116 */ { PARAM_TYPE_UID_ACTION_IND, "UID action indicators"}, /* 116 */ { PARAM_TYPE_UID_ACTION_IND, "UID action indicators"},
/* 117 */ { PARAM_TYPE_UID_CAPAB_IND, "UID capability indicators"}, /* 117 */ { PARAM_TYPE_UID_CAPAB_IND, "UID capability indicators"},
/* 119 */ { PARAM_TYPE_REDIRECT_COUNTER, "Redirect counter (reserved for national use)"}, /* 119 */ { PARAM_TYPE_REDIRECT_COUNTER, "Redirect counter (reserved for national use)"},
/* 120 */ { PARAM_TYPE_APPLICATON_TRANS, "Application transport"}, /* 120 */ { PARAM_TYPE_APPLICATION_TRANS, "Application transport"},
/* 121 */ { PARAM_TYPE_COLLECT_CALL_REQ, "Collect call request"}, /* 121 */ { PARAM_TYPE_COLLECT_CALL_REQ, "Collect call request"},
/* 122 */ { 122, "Not used"}, /* 122 */ { 122, "Not used"},
/* 123 */ { 123, "Not used"}, /* 123 */ { 123, "Not used"},
@ -1540,7 +1540,7 @@ static const value_string ansi_isup_parameter_type_value[] = {
/* 116 */ { PARAM_TYPE_UID_ACTION_IND, "UID action indicators"}, /* 116 */ { PARAM_TYPE_UID_ACTION_IND, "UID action indicators"},
/* 117 */ { PARAM_TYPE_UID_CAPAB_IND, "UID capability indicators"}, /* 117 */ { PARAM_TYPE_UID_CAPAB_IND, "UID capability indicators"},
/* 119 */ { PARAM_TYPE_REDIRECT_COUNTER, "Redirect counter (reserved for national use)"}, /* 119 */ { PARAM_TYPE_REDIRECT_COUNTER, "Redirect counter (reserved for national use)"},
/* 120 */ { PARAM_TYPE_APPLICATON_TRANS, "Application transport"}, /* 120 */ { PARAM_TYPE_APPLICATION_TRANS, "Application transport"},
/* 121 */ { PARAM_TYPE_COLLECT_CALL_REQ, "Collect call request"}, /* 121 */ { PARAM_TYPE_COLLECT_CALL_REQ, "Collect call request"},
/* 122 */ { 122, "Not used"}, /* 122 */ { 122, "Not used"},
/* 123 */ { 123, "Not used"}, /* 123 */ { 123, "Not used"},
@ -4745,7 +4745,7 @@ static const value_string BAT_ASE_Report_Reason_vals[] = {
{ 0, NULL } { 0, NULL }
}; };
/* This routine should be called with offset at Organization_Identifier not the lengh indicator /* This routine should be called with offset at Organization_Identifier not the lengh indicator
* because of use from other disectors. * because of use from other dissectors.
*/ */
extern int dissect_codec_mode(proto_tree *tree, tvbuff_t *tvb, int offset, int len) { extern int dissect_codec_mode(proto_tree *tree, tvbuff_t *tvb, int offset, int len) {
uint8_t tempdata; uint8_t tempdata;
@ -8322,7 +8322,7 @@ dissect_isup_optional_parameter(tvbuff_t *optional_parameters_tvb, packet_info *
case PARAM_TYPE_GENERIC_DIGITS: case PARAM_TYPE_GENERIC_DIGITS:
dissect_isup_generic_digits_parameter(parameter_tvb, parameter_tree, parameter_item); dissect_isup_generic_digits_parameter(parameter_tvb, parameter_tree, parameter_item);
break; break;
case PARAM_TYPE_APPLICATON_TRANS: case PARAM_TYPE_APPLICATION_TRANS:
dissect_isup_application_transport_parameter(parameter_tvb, pinfo, parameter_tree, parameter_item); dissect_isup_application_transport_parameter(parameter_tvb, pinfo, parameter_tree, parameter_item);
break; break;
@ -8695,7 +8695,7 @@ dissect_ansi_isup_optional_parameter(tvbuff_t *optional_parameters_tvb, packet_i
case PARAM_TYPE_CHARGE_NR: case PARAM_TYPE_CHARGE_NR:
dissect_isup_charge_number_parameter(parameter_tvb, pinfo, parameter_tree, parameter_item); dissect_isup_charge_number_parameter(parameter_tvb, pinfo, parameter_tree, parameter_item);
break; break;
case PARAM_TYPE_APPLICATON_TRANS: case PARAM_TYPE_APPLICATION_TRANS:
dissect_isup_application_transport_parameter(parameter_tvb, pinfo, parameter_tree, parameter_item); dissect_isup_application_transport_parameter(parameter_tvb, pinfo, parameter_tree, parameter_item);
break; break;
case ANSI_ISUP_PARAM_TYPE_CARRIER_ID: case ANSI_ISUP_PARAM_TYPE_CARRIER_ID:

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

@ -118,7 +118,7 @@ WS_DLL_PUBLIC value_string_ext q850_cause_code_vals_ext;
#define PARAM_TYPE_UID_ACTION_IND 116 #define PARAM_TYPE_UID_ACTION_IND 116
#define PARAM_TYPE_UID_CAPAB_IND 117 #define PARAM_TYPE_UID_CAPAB_IND 117
#define PARAM_TYPE_REDIRECT_COUNTER 119 #define PARAM_TYPE_REDIRECT_COUNTER 119
#define PARAM_TYPE_APPLICATON_TRANS 120 #define PARAM_TYPE_APPLICATION_TRANS 120
#define PARAM_TYPE_COLLECT_CALL_REQ 121 #define PARAM_TYPE_COLLECT_CALL_REQ 121
#define PARAM_TYPE_CALLING_GEODETIC_LOCATION 129 /* ANSI is the same */ #define PARAM_TYPE_CALLING_GEODETIC_LOCATION 129 /* ANSI is the same */
#define PARAM_TYPE_GENERIC_NR 192 #define PARAM_TYPE_GENERIC_NR 192

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

@ -220,7 +220,7 @@ dissect_li5g_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat
if(tvb_get_ntohs(tvb, 2) < 1 || tvb_get_ntohs(tvb, 2) > 4) if(tvb_get_ntohs(tvb, 2) < 1 || tvb_get_ntohs(tvb, 2) > 4)
return false; return false;
/* TLS can hold it, no need to find the dissect every time */ /* TLS can hold it, no need to find the dissector every time */
*(tlsinfo->app_handle) = li5g_handle; *(tlsinfo->app_handle) = li5g_handle;
dissect_li5g(tvb, pinfo, tree, data); dissect_li5g(tvb, pinfo, tree, data);

4
epan/dissectors/packet-ms-do.c
View File

@ -426,7 +426,7 @@ dissect_do_heap_spraying(tvbuff_t* tvb, packet_info* pinfo, proto_tree* message_
* Just adds its size (which we have from the message header) to the offset. * Just adds its size (which we have from the message header) to the offset.
*/ */
static bool static bool
dissect_do_unkown_message(tvbuff_t* tvb, packet_info* pinfo, proto_tree* message_tree, uint32_t message_size, uint8_t message_id, unsigned* offset_ptr) dissect_do_unknown_message(tvbuff_t* tvb, packet_info* pinfo, proto_tree* message_tree, uint32_t message_size, uint8_t message_id, unsigned* offset_ptr)
{ {
proto_tree_add_expert_format(message_tree, pinfo, &ei_do_invalid_message_id, tvb, *offset_ptr, message_size - 1, proto_tree_add_expert_format(message_tree, pinfo, &ei_do_invalid_message_id, tvb, *offset_ptr, message_size - 1,
"Unknown message ID: %u", message_id); "Unknown message ID: %u", message_id);
@ -458,7 +458,7 @@ message_id_to_callback(uint8_t message_id)
case DO_HEAPSPRAYING_ID: case DO_HEAPSPRAYING_ID:
return &dissect_do_heap_spraying; return &dissect_do_heap_spraying;
default: default:
return &dissect_do_unkown_message; return &dissect_do_unknown_message;
} }
} }

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

@ -9125,7 +9125,7 @@ dissect_nfs4_devices_file(tvbuff_t *tvb, int offset, proto_tree *tree)
unsigned i, j; unsigned i, j;
uint32_t num_indices, num_multipath, num_addr; uint32_t num_indices, num_multipath, num_addr;
/* disect indices */ /* dissect indices */
num_indices = tvb_get_ntohl(tvb, offset); num_indices = tvb_get_ntohl(tvb, offset);
offset += 4; offset += 4;
for (i = 0; i < num_indices; i++) { for (i = 0; i < num_indices; i++) {
@ -9153,7 +9153,7 @@ dissect_nfs4_devices_flexfile(tvbuff_t *tvb, int offset, proto_tree *tree)
uint32_t num_addr; uint32_t num_addr;
uint32_t num_vers; uint32_t num_vers;
/* disect indices */ /* dissect indices */
num_addr = tvb_get_ntohl(tvb, offset); num_addr = tvb_get_ntohl(tvb, offset);
offset += 4; offset += 4;
for (i = 0; i < num_addr; i++) { for (i = 0; i < num_addr; i++) {

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

@ -6113,7 +6113,7 @@ dissect_ppp_usb( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data
(tvb_memeql(tvb, 0, &buf2[1], sizeof(buf2) - 1) == 0)) { (tvb_memeql(tvb, 0, &buf2[1], sizeof(buf2) - 1) == 0)) {
/* It's missing the 0x7e framing character. What TODO? /* It's missing the 0x7e framing character. What TODO?
* Should we try faking it by sticking 0x7e in front? Or try telling * Should we try faking it by sticking 0x7e in front? Or try telling
* dissect_ppp_raw_hdlc() NOT to look for the 0x7e frame deliminator? * dissect_ppp_raw_hdlc() NOT to look for the 0x7e frame delimiter?
* Or is this a bug in libpcap (used 1.1.0)? * Or is this a bug in libpcap (used 1.1.0)?
* Or a bug in the Linux kernel (tested with 2.6.24.4) Or a bug in * Or a bug in the Linux kernel (tested with 2.6.24.4) Or a bug in
* usbmon? Or is the data we're looking at really just part of the * usbmon? Or is the data we're looking at really just part of the

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

@ -2253,7 +2253,7 @@ dissect_sip_reason_header(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, i
if (semi_colon_offset == -1){ if (semi_colon_offset == -1){
length = line_end_offset - current_offset; length = line_end_offset - current_offset;
} else { } else {
/* Text parmeter exist, set length accordingly */ /* Text parameter exist, set length accordingly */
length = semi_colon_offset - current_offset; length = semi_colon_offset - current_offset;
} }

86
epan/dissectors/packet-smc.c
View File

@ -91,7 +91,7 @@ typedef enum {
SMC_CLC_OS_ZOS = 1, SMC_CLC_OS_ZOS = 1,
SMC_CLC_OS_LINUX = 2, SMC_CLC_OS_LINUX = 2,
SMC_CLC_OS_AIX = 3, SMC_CLC_OS_AIX = 3,
SMC_CLC_OS_UNKOWN = 15, SMC_CLC_OS_UNKNOWN = 15,
} clc_os_message; } clc_os_message;
typedef enum { typedef enum {
@ -103,7 +103,7 @@ static const value_string smc_clc_os_message_txt[] = {
{ SMC_CLC_OS_ZOS, "z/OS" }, { SMC_CLC_OS_ZOS, "z/OS" },
{ SMC_CLC_OS_LINUX, "Linux" }, { SMC_CLC_OS_LINUX, "Linux" },
{ SMC_CLC_OS_AIX, "AIX" }, { SMC_CLC_OS_AIX, "AIX" },
{ SMC_CLC_OS_UNKOWN, "Unknown" }, { SMC_CLC_OS_UNKNOWN, "Unknown" },
{ 0, NULL } { 0, NULL }
}; };
@ -442,7 +442,7 @@ static dissector_handle_t smc_tcp_handle;
static dissector_handle_t smc_infiniband_handle; static dissector_handle_t smc_infiniband_handle;
static void static void
disect_smc_uncompress_size(proto_item* ti, unsigned size, unsigned max_valid) dissect_smc_uncompress_size(proto_item* ti, unsigned size, unsigned max_valid)
{ {
if (size <= max_valid) { if (size <= max_valid) {
proto_item_append_text(ti, " (Size: %dk)", 1 << (size + 4)); /* uncompressed size */ proto_item_append_text(ti, " (Size: %dk)", 1 << (size + 4)); /* uncompressed size */
@ -452,7 +452,7 @@ disect_smc_uncompress_size(proto_item* ti, unsigned size, unsigned max_valid)
} }
static void static void
disect_smcr_translate_qp_mtu(proto_item* ti, unsigned qp_num) dissect_smcr_translate_qp_mtu(proto_item* ti, unsigned qp_num)
{ {
if (qp_num > 0 && qp_num < SMC_MAX_QP_NUM) { if (qp_num > 0 && qp_num < SMC_MAX_QP_NUM) {
proto_item_append_text(ti, " (MTU: %d)", 1 << (7 + qp_num)); /* translated MTU size (1-5) */ proto_item_append_text(ti, " (MTU: %d)", 1 << (7 + qp_num)); /* translated MTU size (1-5) */
@ -462,7 +462,7 @@ disect_smcr_translate_qp_mtu(proto_item* ti, unsigned qp_num)
} }
static void static void
disect_smc_proposal(tvbuff_t *tvb, proto_tree *tree, bool is_ipv6) dissect_smc_proposal(tvbuff_t *tvb, proto_tree *tree, bool is_ipv6)
{ {
unsigned offset; unsigned offset;
uint16_t ip_subnet_ext_offset = 0, v2_ext_offset; uint16_t ip_subnet_ext_offset = 0, v2_ext_offset;
@ -649,7 +649,7 @@ disect_smc_proposal(tvbuff_t *tvb, proto_tree *tree, bool is_ipv6)
} }
static void static void
disect_smcd_accept(tvbuff_t* tvb, proto_tree* tree) dissect_smcd_accept(tvbuff_t* tvb, proto_tree* tree)
{ {
unsigned offset, dmbe_size; unsigned offset, dmbe_size;
proto_item* accept_flag_item; proto_item* accept_flag_item;
@ -689,7 +689,7 @@ disect_smcd_accept(tvbuff_t* tvb, proto_tree* tree)
accept_flag2_tree = proto_item_add_subtree(accept_flag2_item, ett_smcd_accept_flag2); accept_flag2_tree = proto_item_add_subtree(accept_flag2_item, ett_smcd_accept_flag2);
ti = proto_tree_add_item(accept_flag2_tree, hf_accept_dmb_buffer_size, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN); ti = proto_tree_add_item(accept_flag2_tree, hf_accept_dmb_buffer_size, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN);
dmbe_size = tvb_get_int8(tvb, offset) >> 4; dmbe_size = tvb_get_int8(tvb, offset) >> 4;
disect_smc_uncompress_size(ti, dmbe_size, SMCD_MAX_BUFSIZE_NUM); dissect_smc_uncompress_size(ti, dmbe_size, SMCD_MAX_BUFSIZE_NUM);
offset += FLAG_BYTE_LEN; offset += FLAG_BYTE_LEN;
proto_tree_add_item(tree, hf_smc_reserved, tvb, offset, TWO_BYTE_RESERVED, ENC_NA); proto_tree_add_item(tree, hf_smc_reserved, tvb, offset, TWO_BYTE_RESERVED, ENC_NA);
offset += TWO_BYTE_RESERVED; /* reserved */ offset += TWO_BYTE_RESERVED; /* reserved */
@ -725,7 +725,7 @@ disect_smcd_accept(tvbuff_t* tvb, proto_tree* tree)
} }
static void static void
disect_smcd_confirm(tvbuff_t* tvb, proto_tree* tree) dissect_smcd_confirm(tvbuff_t* tvb, proto_tree* tree)
{ {
unsigned offset, dmbe_size; unsigned offset, dmbe_size;
proto_item* confirm_flag_item; proto_item* confirm_flag_item;
@ -765,7 +765,7 @@ disect_smcd_confirm(tvbuff_t* tvb, proto_tree* tree)
confirm_flag2_tree = proto_item_add_subtree(confirm_flag2_item, ett_smcd_confirm_flag2); confirm_flag2_tree = proto_item_add_subtree(confirm_flag2_item, ett_smcd_confirm_flag2);
ti = proto_tree_add_item(confirm_flag2_tree, hf_smcd_confirm_dmb_buffer_size, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN); ti = proto_tree_add_item(confirm_flag2_tree, hf_smcd_confirm_dmb_buffer_size, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN);
dmbe_size = tvb_get_int8(tvb, offset) >> 4; dmbe_size = tvb_get_int8(tvb, offset) >> 4;
disect_smc_uncompress_size(ti, dmbe_size, SMCD_MAX_BUFSIZE_NUM); dissect_smc_uncompress_size(ti, dmbe_size, SMCD_MAX_BUFSIZE_NUM);
offset += FLAG_BYTE_LEN; offset += FLAG_BYTE_LEN;
proto_tree_add_item(tree, hf_smc_reserved, tvb, offset, TWO_BYTE_RESERVED, ENC_NA); proto_tree_add_item(tree, hf_smc_reserved, tvb, offset, TWO_BYTE_RESERVED, ENC_NA);
offset += TWO_BYTE_RESERVED; /* reserved */ offset += TWO_BYTE_RESERVED; /* reserved */
@ -799,7 +799,7 @@ disect_smcd_confirm(tvbuff_t* tvb, proto_tree* tree)
} }
static void static void
disect_smcr_accept(tvbuff_t *tvb, proto_tree *tree) dissect_smcr_accept(tvbuff_t *tvb, proto_tree *tree)
{ {
unsigned offset, qp_num, rmbe_size; unsigned offset, qp_num, rmbe_size;
proto_item *accept_flag_item; proto_item *accept_flag_item;
@ -847,10 +847,10 @@ disect_smcr_accept(tvbuff_t *tvb, proto_tree *tree)
accept_flag2_tree = proto_item_add_subtree(accept_flag2_item, ett_accept_flag2); accept_flag2_tree = proto_item_add_subtree(accept_flag2_item, ett_accept_flag2);
ti = proto_tree_add_item(accept_flag2_tree, hf_accept_rmb_buffer_size, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN); ti = proto_tree_add_item(accept_flag2_tree, hf_accept_rmb_buffer_size, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN);
rmbe_size = tvb_get_int8(tvb, offset) >> 4; rmbe_size = tvb_get_int8(tvb, offset) >> 4;
disect_smc_uncompress_size(ti, rmbe_size, SMCR_MAX_BUFSIZE_NUM); dissect_smc_uncompress_size(ti, rmbe_size, SMCR_MAX_BUFSIZE_NUM);
ti = proto_tree_add_item(accept_flag2_tree, hf_accept_qp_mtu_value, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN); ti = proto_tree_add_item(accept_flag2_tree, hf_accept_qp_mtu_value, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN);
qp_num = tvb_get_int8(tvb, offset) & 0x0F; qp_num = tvb_get_int8(tvb, offset) & 0x0F;
disect_smcr_translate_qp_mtu(ti, qp_num); dissect_smcr_translate_qp_mtu(ti, qp_num);
offset += FLAG_BYTE_LEN; offset += FLAG_BYTE_LEN;
proto_tree_add_item(tree, hf_smc_reserved, tvb, offset, ONE_BYTE_RESERVED, ENC_NA); proto_tree_add_item(tree, hf_smc_reserved, tvb, offset, ONE_BYTE_RESERVED, ENC_NA);
offset += ONE_BYTE_RESERVED; /* reserved */ offset += ONE_BYTE_RESERVED; /* reserved */
@ -890,7 +890,7 @@ disect_smcr_accept(tvbuff_t *tvb, proto_tree *tree)
} }
static void static void
disect_smcr_confirm(tvbuff_t *tvb, proto_tree *tree) dissect_smcr_confirm(tvbuff_t *tvb, proto_tree *tree)
{ {
unsigned offset, qp_num, rmbe_size; unsigned offset, qp_num, rmbe_size;
proto_item *confirm_flag_item; proto_item *confirm_flag_item;
@ -940,10 +940,10 @@ disect_smcr_confirm(tvbuff_t *tvb, proto_tree *tree)
confirm_flag2_tree = proto_item_add_subtree(confirm_flag2_item, ett_confirm_flag2); confirm_flag2_tree = proto_item_add_subtree(confirm_flag2_item, ett_confirm_flag2);
ti = proto_tree_add_item(confirm_flag2_tree, hf_confirm_rmb_buffer_size, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN); ti = proto_tree_add_item(confirm_flag2_tree, hf_confirm_rmb_buffer_size, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN);
rmbe_size = tvb_get_int8(tvb, offset) >> 4; rmbe_size = tvb_get_int8(tvb, offset) >> 4;
disect_smc_uncompress_size(ti, rmbe_size, SMCR_MAX_BUFSIZE_NUM); dissect_smc_uncompress_size(ti, rmbe_size, SMCR_MAX_BUFSIZE_NUM);
ti = proto_tree_add_item(confirm_flag2_tree, hf_confirm_qp_mtu_value, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN); ti = proto_tree_add_item(confirm_flag2_tree, hf_confirm_qp_mtu_value, tvb, offset, FLAG_BYTE_LEN, ENC_BIG_ENDIAN);
qp_num = tvb_get_int8(tvb, offset) & 0x0F; qp_num = tvb_get_int8(tvb, offset) & 0x0F;
disect_smcr_translate_qp_mtu(ti, qp_num); dissect_smcr_translate_qp_mtu(ti, qp_num);
offset += FLAG_BYTE_LEN; offset += FLAG_BYTE_LEN;
proto_tree_add_item(tree, hf_smc_reserved, tvb, offset, ONE_BYTE_RESERVED, ENC_NA); proto_tree_add_item(tree, hf_smc_reserved, tvb, offset, ONE_BYTE_RESERVED, ENC_NA);
offset += ONE_BYTE_RESERVED; /* reserved */ offset += ONE_BYTE_RESERVED; /* reserved */
@ -993,7 +993,7 @@ disect_smcr_confirm(tvbuff_t *tvb, proto_tree *tree)
} }
static void static void
disect_smc_decline(tvbuff_t *tvb, proto_tree *tree) dissect_smc_decline(tvbuff_t *tvb, proto_tree *tree)
{ {
proto_item* decline_flag_item; proto_item* decline_flag_item;
proto_tree* decline_flag_tree; proto_tree* decline_flag_tree;
@ -1043,7 +1043,7 @@ disect_smc_decline(tvbuff_t *tvb, proto_tree *tree)
} }
static void static void
disect_smcr_confirm_link(tvbuff_t *tvb, proto_tree *tree) dissect_smcr_confirm_link(tvbuff_t *tvb, proto_tree *tree)
{ {
unsigned offset; unsigned offset;
proto_item *confirm_flag_item; proto_item *confirm_flag_item;
@ -1075,7 +1075,7 @@ disect_smcr_confirm_link(tvbuff_t *tvb, proto_tree *tree)
} }
static void static void
disect_smcr_add_link(tvbuff_t *tvb, proto_tree *tree, bool is_smc_v2) dissect_smcr_add_link(tvbuff_t *tvb, proto_tree *tree, bool is_smc_v2)
{ {
unsigned offset, rkey_count, qp_num; unsigned offset, rkey_count, qp_num;
proto_item *add_link_flag_item; proto_item *add_link_flag_item;
@ -1114,7 +1114,7 @@ disect_smcr_add_link(tvbuff_t *tvb, proto_tree *tree, bool is_smc_v2)
add_link_flag2_tree = proto_item_add_subtree(add_link_flag2_item, ett_add_link_flag2); add_link_flag2_tree = proto_item_add_subtree(add_link_flag2_item, ett_add_link_flag2);
ti = proto_tree_add_item(add_link_flag2_tree, hf_smcr_add_link_qp_mtu_value, tvb, offset, 1, ENC_BIG_ENDIAN); ti = proto_tree_add_item(add_link_flag2_tree, hf_smcr_add_link_qp_mtu_value, tvb, offset, 1, ENC_BIG_ENDIAN);
qp_num = tvb_get_int8(tvb, offset) & 0x0F; qp_num = tvb_get_int8(tvb, offset) & 0x0F;
disect_smcr_translate_qp_mtu(ti, qp_num); dissect_smcr_translate_qp_mtu(ti, qp_num);
offset += 1; offset += 1;
proto_tree_add_item(tree, hf_smcr_add_link_initial_psn, tvb, proto_tree_add_item(tree, hf_smcr_add_link_initial_psn, tvb,
offset, PSN_LEN, ENC_BIG_ENDIAN); offset, PSN_LEN, ENC_BIG_ENDIAN);
@ -1149,7 +1149,7 @@ disect_smcr_add_link(tvbuff_t *tvb, proto_tree *tree, bool is_smc_v2)
} }
static void static void
disect_smcr_add_continuation(tvbuff_t *tvb, proto_tree *tree) dissect_smcr_add_continuation(tvbuff_t *tvb, proto_tree *tree)
{ {
unsigned offset; unsigned offset;
uint8_t num_of_keys; uint8_t num_of_keys;
@ -1194,7 +1194,7 @@ disect_smcr_add_continuation(tvbuff_t *tvb, proto_tree *tree)
} }
static void static void
disect_smcr_request_add_link(tvbuff_t* tvb, proto_tree* tree) dissect_smcr_request_add_link(tvbuff_t* tvb, proto_tree* tree)
{ {
bool is_response = tvb_get_uint8(tvb, LLC_CMD_RSP_OFFSET) & LLC_FLAG_RESP; bool is_response = tvb_get_uint8(tvb, LLC_CMD_RSP_OFFSET) & LLC_FLAG_RESP;
proto_item* add_link_flag_item; proto_item* add_link_flag_item;
@ -1225,7 +1225,7 @@ disect_smcr_request_add_link(tvbuff_t* tvb, proto_tree* tree)
} }
static void static void
disect_smcr_delete_link(tvbuff_t *tvb, proto_tree *tree) dissect_smcr_delete_link(tvbuff_t *tvb, proto_tree *tree)
{ {
unsigned offset; unsigned offset;
proto_item *delete_link_flag_item; proto_item *delete_link_flag_item;
@ -1246,7 +1246,7 @@ disect_smcr_delete_link(tvbuff_t *tvb, proto_tree *tree)
} }
static void static void
disect_smcr_confirm_rkey(tvbuff_t *tvb, proto_tree *tree) dissect_smcr_confirm_rkey(tvbuff_t *tvb, proto_tree *tree)
{ {
unsigned offset; unsigned offset;
uint8_t num_entries; uint8_t num_entries;
@ -1290,7 +1290,7 @@ disect_smcr_confirm_rkey(tvbuff_t *tvb, proto_tree *tree)
} }
static void static void
disect_smcr_confirm_rkey_cont(tvbuff_t *tvb, proto_tree *tree) dissect_smcr_confirm_rkey_cont(tvbuff_t *tvb, proto_tree *tree)
{ {
unsigned offset; unsigned offset;
proto_item *confirm_rkey_flag_item; proto_item *confirm_rkey_flag_item;
@ -1327,7 +1327,7 @@ disect_smcr_confirm_rkey_cont(tvbuff_t *tvb, proto_tree *tree)
} }
static void static void
disect_smcr_delete_rkey(tvbuff_t *tvb, proto_tree *tree, bool is_smc_v2) dissect_smcr_delete_rkey(tvbuff_t *tvb, proto_tree *tree, bool is_smc_v2)
{ {
unsigned offset; unsigned offset;
uint8_t count; uint8_t count;
@ -1367,7 +1367,7 @@ disect_smcr_delete_rkey(tvbuff_t *tvb, proto_tree *tree, bool is_smc_v2)
} }
static void static void
disect_smcr_test_link(tvbuff_t *tvb, proto_tree *tree) dissect_smcr_test_link(tvbuff_t *tvb, proto_tree *tree)
{ {
unsigned offset; unsigned offset;
proto_item *test_link_flag_item; proto_item *test_link_flag_item;
@ -1380,7 +1380,7 @@ disect_smcr_test_link(tvbuff_t *tvb, proto_tree *tree)
} }
static void static void
disect_smcr_rmbe_ctrl(tvbuff_t *tvb, proto_tree *tree) dissect_smcr_rmbe_ctrl(tvbuff_t *tvb, proto_tree *tree)
{ {
int offset; int offset;
proto_item *rmbe_ctrl_rw_status_flag_item; proto_item *rmbe_ctrl_rw_status_flag_item;
@ -1542,22 +1542,22 @@ dissect_smc_tcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
ENC_BIG_ENDIAN); ENC_BIG_ENDIAN);
switch (clc_msgid) { switch (clc_msgid) {
case SMC_CLC_PROPOSAL: case SMC_CLC_PROPOSAL:
disect_smc_proposal(tvb, smc_tree, is_ipv6); dissect_smc_proposal(tvb, smc_tree, is_ipv6);
break; break;
case SMC_CLC_ACCEPT: case SMC_CLC_ACCEPT:
if (is_smcd) if (is_smcd)
disect_smcd_accept(tvb, smc_tree); dissect_smcd_accept(tvb, smc_tree);
else else
disect_smcr_accept(tvb, smc_tree); dissect_smcr_accept(tvb, smc_tree);
break; break;
case SMC_CLC_CONFIRMATION: case SMC_CLC_CONFIRMATION:
if (is_smcd) if (is_smcd)
disect_smcd_confirm(tvb, smc_tree); dissect_smcd_confirm(tvb, smc_tree);
else else
disect_smcr_confirm(tvb, smc_tree); dissect_smcr_confirm(tvb, smc_tree);
break; break;
case SMC_CLC_DECLINE: case SMC_CLC_DECLINE:
disect_smc_decline(tvb, smc_tree); dissect_smc_decline(tvb, smc_tree);
break; break;
default: default:
/* Unknown Command */ /* Unknown Command */
@ -1609,48 +1609,48 @@ dissect_smcr_infiniband(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, voi
switch (llc_msgid) { switch (llc_msgid) {
case LLC_CONFIRM_LINK: case LLC_CONFIRM_LINK:
case LLC_CONFIRM_LINK_V2: case LLC_CONFIRM_LINK_V2:
disect_smcr_confirm_link(tvb, smcr_tree); dissect_smcr_confirm_link(tvb, smcr_tree);
break; break;
case LLC_ADD_LINK: case LLC_ADD_LINK:
case LLC_ADD_LINK_V2: case LLC_ADD_LINK_V2:
disect_smcr_add_link(tvb, smcr_tree, is_smc_v2); dissect_smcr_add_link(tvb, smcr_tree, is_smc_v2);
break; break;
case LLC_ADD_LINK_CONT: case LLC_ADD_LINK_CONT:
disect_smcr_add_continuation(tvb, smcr_tree); dissect_smcr_add_continuation(tvb, smcr_tree);
break; break;
case LLC_DEL_LINK: case LLC_DEL_LINK:
case LLC_DEL_LINK_V2: case LLC_DEL_LINK_V2:
disect_smcr_delete_link(tvb, smcr_tree); dissect_smcr_delete_link(tvb, smcr_tree);
break; break;
case LLC_CONFIRM_RKEY: case LLC_CONFIRM_RKEY:
case LLC_CONFIRM_RKEY_V2: case LLC_CONFIRM_RKEY_V2:
disect_smcr_confirm_rkey(tvb, smcr_tree); dissect_smcr_confirm_rkey(tvb, smcr_tree);
break; break;
case LLC_CONFIRM_RKEY_CONT: case LLC_CONFIRM_RKEY_CONT:
disect_smcr_confirm_rkey_cont(tvb, smcr_tree); dissect_smcr_confirm_rkey_cont(tvb, smcr_tree);
break; break;
case LLC_DELETE_RKEY: case LLC_DELETE_RKEY:
case LLC_DELETE_RKEY_V2: case LLC_DELETE_RKEY_V2:
disect_smcr_delete_rkey(tvb, smcr_tree, is_smc_v2); dissect_smcr_delete_rkey(tvb, smcr_tree, is_smc_v2);
break; break;
case LLC_TEST_LINK: case LLC_TEST_LINK:
case LLC_TEST_LINK_V2: case LLC_TEST_LINK_V2:
disect_smcr_test_link(tvb, smcr_tree); dissect_smcr_test_link(tvb, smcr_tree);
break; break;
case LLC_REQUEST_ADD_LINK_V2: case LLC_REQUEST_ADD_LINK_V2:
disect_smcr_request_add_link(tvb, smcr_tree); dissect_smcr_request_add_link(tvb, smcr_tree);
break; break;
case RMBE_CTRL: case RMBE_CTRL:
disect_smcr_rmbe_ctrl(tvb, smcr_tree); dissect_smcr_rmbe_ctrl(tvb, smcr_tree);
break; break;
default: default:

2
epan/dissectors/packet-xmpp-utils.h
View File

@ -69,7 +69,7 @@ typedef struct _xmpp_attr_info{
bool in_short_list; bool in_short_list;
/*function validates this attribute /*function validates this attribute
it may impose other restrictions (e.g. validating atribut's name, ...)*/ it may impose other restrictions (e.g. validating attribute's name, ...)*/
void (*val_func)(packet_info *pinfo, proto_item *item, const char *name, const char *value, const void *data); void (*val_func)(packet_info *pinfo, proto_item *item, const char *name, const char *value, const void *data);
void *data; void *data;
} xmpp_attr_info; } xmpp_attr_info;

2
epan/dissectors/pidl/samr/samr.idl
View File

@ -1110,7 +1110,7 @@ import "misc.idl", "lsa.idl";
/* Function 0x26 */ /* Function 0x26 */
/* /*
this is a password change interface that doesn't give this is a password change interface that doesn't give
the server the plaintext password. Depricated. the server the plaintext password. Deprecated.
*/ */
NTSTATUS samr_ChangePasswordUser( NTSTATUS samr_ChangePasswordUser(
[in,ref] policy_handle *user_handle, [in,ref] policy_handle *user_handle,

2
fix/FIX.xml
View File

@ -8952,7 +8952,7 @@
<field number='847' name='TargetStrategy' type='INT'> <field number='847' name='TargetStrategy' type='INT'>
<value enum='1' description='VWAP' /> <value enum='1' description='VWAP' />
<value enum='2' description='PARTICIPATE' /> <value enum='2' description='PARTICIPATE' />
<value enum='3' description='MININIZE_MARKET_IMPACT' /> <value enum='3' description='MINIMIZE_MARKET_IMPACT' />
</field> </field>
<field number='848' name='TargetStrategyParameters' type='STRING' /> <field number='848' name='TargetStrategyParameters' type='STRING' />
<field number='849' name='ParticipationRate' type='PERCENTAGE' /> <field number='849' name='ParticipationRate' type='PERCENTAGE' />

2
fix/FIX50.xml
View File

@ -7519,7 +7519,7 @@
<field number='847' name='TargetStrategy' type='INT'> <field number='847' name='TargetStrategy' type='INT'>
<value enum='1' description='VWAP' /> <value enum='1' description='VWAP' />
<value enum='2' description='PARTICIPATE' /> <value enum='2' description='PARTICIPATE' />
<value enum='3' description='MININIZE_MARKET_IMPACT' /> <value enum='3' description='MINIMIZE_MARKET_IMPACT' />
</field> </field>
<field number='848' name='TargetStrategyParameters' type='STRING' /> <field number='848' name='TargetStrategyParameters' type='STRING' />
<field number='849' name='ParticipationRate' type='PERCENTAGE' /> <field number='849' name='ParticipationRate' type='PERCENTAGE' />

2
fix/FIX50SP1.xml
View File

@ -8376,7 +8376,7 @@
<field number='847' name='TargetStrategy' type='INT'> <field number='847' name='TargetStrategy' type='INT'>
<value enum='1' description='VWAP' /> <value enum='1' description='VWAP' />
<value enum='2' description='PARTICIPATE' /> <value enum='2' description='PARTICIPATE' />
<value enum='3' description='MININIZE_MARKET_IMPACT' /> <value enum='3' description='MINIMIZE_MARKET_IMPACT' />
</field> </field>
<field number='848' name='TargetStrategyParameters' type='STRING' /> <field number='848' name='TargetStrategyParameters' type='STRING' />
<field number='849' name='ParticipationRate' type='PERCENTAGE' /> <field number='849' name='ParticipationRate' type='PERCENTAGE' />

6
fix/FIX50SP2.xml
View File

@ -7903,14 +7903,14 @@
<field number='532' name='MassCancelRejectReason' type='INT'> <field number='532' name='MassCancelRejectReason' type='INT'>
<value enum='0' description='MASS_CANCEL_NOT_SUPPORTED' /> <value enum='0' description='MASS_CANCEL_NOT_SUPPORTED' />
<value enum='1' description='INVALID_OR_UNKNOWN_SECURITY' /> <value enum='1' description='INVALID_OR_UNKNOWN_SECURITY' />
<value enum='2' description='INVALID_OR_UNKOWN_UNDERLYING_SECURITY' /> <value enum='2' description='INVALID_OR_UNKNOWN_UNDERLYING_SECURITY' />
<value enum='3' description='INVALID_OR_UNKNOWN_PRODUCT' /> <value enum='3' description='INVALID_OR_UNKNOWN_PRODUCT' />
<value enum='4' description='INVALID_OR_UNKNOWN_CFICODE' /> <value enum='4' description='INVALID_OR_UNKNOWN_CFICODE' />
<value enum='5' description='INVALID_OR_UNKNOWN_SECURITYTYPE' /> <value enum='5' description='INVALID_OR_UNKNOWN_SECURITYTYPE' />
<value enum='6' description='INVALID_OR_UNKNOWN_TRADING_SESSION' /> <value enum='6' description='INVALID_OR_UNKNOWN_TRADING_SESSION' />
<value enum='99' description='OTHER' /> <value enum='99' description='OTHER' />
<value enum='7' description='INVALID_OR_UNKNOWN_MARKET' /> <value enum='7' description='INVALID_OR_UNKNOWN_MARKET' />
<value enum='8' description='INVALID_OR_UNKOWN_MARKET_SEGMENT' /> <value enum='8' description='INVALID_OR_UNKNOWN_MARKET_SEGMENT' />
<value enum='9' description='INVALID_OR_UNKNOWN_SECURITY_GROUP' /> <value enum='9' description='INVALID_OR_UNKNOWN_SECURITY_GROUP' />
<value enum='10' description='INVALID_OR_UNKNOWN_SECURITY_ISSUER' /> <value enum='10' description='INVALID_OR_UNKNOWN_SECURITY_ISSUER' />
<value enum='11' description='INVALID_OR_UNKNOWN_ISSUER_OF_UNDERLYING_SECURITY' /> <value enum='11' description='INVALID_OR_UNKNOWN_ISSUER_OF_UNDERLYING_SECURITY' />
@ -8886,7 +8886,7 @@
<field number='847' name='TargetStrategy' type='INT'> <field number='847' name='TargetStrategy' type='INT'>
<value enum='1' description='VWAP' /> <value enum='1' description='VWAP' />
<value enum='2' description='PARTICIPATE' /> <value enum='2' description='PARTICIPATE' />
<value enum='3' description='MININIZE_MARKET_IMPACT' /> <value enum='3' description='MINIMIZE_MARKET_IMPACT' />
</field> </field>
<field number='848' name='TargetStrategyParameters' type='STRING' /> <field number='848' name='TargetStrategyParameters' type='STRING' />
<field number='849' name='ParticipationRate' type='PERCENTAGE' /> <field number='849' name='ParticipationRate' type='PERCENTAGE' />

2
tools/asn2wrs.py
View File

@ -332,7 +332,7 @@ StringTypes = ['Numeric', 'Printable', 'IA5', 'BMP', 'Universal', 'UTF8',
# for the known-multiplier character string types (X.691 27.1) # for the known-multiplier character string types (X.691 27.1)
# #
# XXX: This should include BMPString (UCS2) and UniversalString (UCS4), # XXX: This should include BMPString (UCS2) and UniversalString (UCS4),
# but asn2wrs only suports the RestrictedCharacterStringValue # but asn2wrs only supports the RestrictedCharacterStringValue
# notation of "cstring", but not that of "CharacterStringList", # notation of "cstring", but not that of "CharacterStringList",
# "Quadruple", or "Tuple" (See X.680 41.8), and packet-per.c does # "Quadruple", or "Tuple" (See X.680 41.8), and packet-per.c does
# not support members of the permitted-alphabet being outside the # not support members of the permitted-alphabet being outside the

2
tools/asterix/update-specs.py
View File

@ -794,7 +794,7 @@ def main():
template_lines = f.readlines() template_lines = f.readlines()
# All input is collected and rendered. # All input is collected and rendered.
# It's safe to update the disector. # It's safe to update the dissector.
# copy each line of the template to required output, # copy each line of the template to required output,
# if the 'insertion' is found in the template, # if the 'insertion' is found in the template,

2
wiretap/erf.c
View File

@ -2662,7 +2662,7 @@ static int populate_capture_host_info(erf_t *erf_priv, wtap *wth, union wtap_pse
if (app_name || app_version) { if (app_name || app_version) {
/* /*
* If we have no app_name, we use "(Unknown applicaton)". * If we have no app_name, we use "(Unknown application)".
* *
* If we have no app_version, this will just use app_name. * If we have no app_version, this will just use app_name.
*/ */

4
wiretap/pppdump.c
View File

@ -40,11 +40,11 @@ Daniel Thompson (STMicroelectronics) <daniel.thompson@st.com>
+------+------+------+------+ +------+------+------+------+
+------+ +------+
| 0x04 | Receive deliminator (not seen in practice) | 0x04 | Receive delimiter (not seen in practice)
+------+ +------+
+------+ +------+
| 0x03 | Send deliminator (not seen in practice) | 0x03 | Send delimiter (not seen in practice)
+------+ +------+
+------+ +------+