forked from osmocom/wireshark
Signal-PDU: reformatting for consistency
The code was not formatted consistently. This patch cleans this up.
This commit is contained in:
Dr. Lars Völker
parent
a68fd7b09d
commit
0f2cf2b331
|
|
@ -333,7 +333,7 @@ register_signal_pdu_can(void) {
|
|||
|
||||
GList *tmp;
|
||||
for (tmp = keys; tmp != NULL; tmp = tmp->next) {
|
||||
gint32 id = (*(gint32*)tmp->data);
|
||||
gint32 id = (*(gint32 *)tmp->data);
|
||||
|
||||
if ((id & CAN_EFF_FLAG) == CAN_EFF_FLAG) {
|
||||
dissector_add_uint("can.extended_id", id & CAN_EFF_MASK, signal_pdu_handle_can);
|
||||
|
|
@ -360,7 +360,7 @@ register_signal_pdu_lin(void) {
|
|||
|
||||
GList *tmp;
|
||||
for (tmp = keys; tmp != NULL; tmp = tmp->next) {
|
||||
gint32 *id = (gint32*)tmp->data;
|
||||
gint32 *id = (gint32 *)tmp->data;
|
||||
/* we register the combination of bus and frame id */
|
||||
dissector_add_uint("lin.frame_id", *id, signal_pdu_handle_lin);
|
||||
}
|
||||
|
|
@ -383,7 +383,7 @@ register_signal_pdu_someip(void) {
|
|||
|
||||
GList *tmp;
|
||||
for (tmp = keys; tmp != NULL; tmp = tmp->next) {
|
||||
gint64 *id = (gint64*)tmp->data;
|
||||
gint64 *id = (gint64 *)tmp->data;
|
||||
guint32 message_id = (guint32)((guint64)(*id)) & 0xffffffff;
|
||||
dissector_add_uint("someip.messageid", message_id, signal_pdu_handle_someip);
|
||||
}
|
||||
|
|
@ -406,7 +406,7 @@ register_signal_pdu_pdu_transport(void) {
|
|||
|
||||
GList *tmp;
|
||||
for (tmp = keys; tmp != NULL; tmp = tmp->next) {
|
||||
gint64 *id = (gint64*)tmp->data;
|
||||
gint64 *id = (gint64 *)tmp->data;
|
||||
dissector_add_uint("pdu_transport.id", ((guint32)((guint64)(*id)) & 0xffffffff), signal_pdu_handle_pdu_transport);
|
||||
}
|
||||
|
||||
|
|
@ -428,7 +428,7 @@ register_signal_pdu_ipdum_ids(void) {
|
|||
|
||||
GList *tmp;
|
||||
for (tmp = keys; tmp != NULL; tmp = tmp->next) {
|
||||
gint64 *id = (gint64*)tmp->data;
|
||||
gint64 *id = (gint64 *)tmp->data;
|
||||
dissector_add_uint("ipdum.pdu.id", ((guint32)((guint64)(*id)) & 0xffffffff), signal_pdu_handle_ipdum);
|
||||
}
|
||||
|
||||
|
|
@ -450,7 +450,7 @@ spdu_payload_free_generic_data(gpointer data _U_) {
|
|||
/* ID -> Name */
|
||||
static void *
|
||||
copy_generic_one_id_string_cb(void *n, const void *o, size_t size _U_) {
|
||||
generic_one_id_string_t *new_rec = (generic_one_id_string_t *)n;
|
||||
generic_one_id_string_t *new_rec = (generic_one_id_string_t *)n;
|
||||
const generic_one_id_string_t *old_rec = (const generic_one_id_string_t *)o;
|
||||
|
||||
if (old_rec->name == NULL) {
|
||||
|
|
@ -514,14 +514,14 @@ post_update_one_id_string_template_cb(generic_one_id_string_t *data, guint data_
|
|||
|
||||
|
||||
/*** Signal PDU Messages ***/
|
||||
UAT_HEX_CB_DEF (spdu_message_ident, id, generic_one_id_string_t)
|
||||
UAT_CSTRING_CB_DEF (spdu_message_ident, name, generic_one_id_string_t)
|
||||
UAT_HEX_CB_DEF(spdu_message_ident, id, generic_one_id_string_t)
|
||||
UAT_CSTRING_CB_DEF(spdu_message_ident, name, generic_one_id_string_t)
|
||||
|
||||
static void
|
||||
post_update_spdu_message_cb(void) {
|
||||
/* destroy old hash table, if it exists */
|
||||
if (data_spdu_messages) {
|
||||
g_hash_table_destroy (data_spdu_messages);
|
||||
g_hash_table_destroy(data_spdu_messages);
|
||||
data_spdu_messages = NULL;
|
||||
}
|
||||
|
||||
|
|
@ -530,7 +530,7 @@ post_update_spdu_message_cb(void) {
|
|||
post_update_one_id_string_template_cb(spdu_message_ident, spdu_message_ident_num, data_spdu_messages);
|
||||
}
|
||||
|
||||
static char*
|
||||
static char *
|
||||
get_message_name(guint32 id) {
|
||||
guint32 tmp = id;
|
||||
|
||||
|
|
@ -560,8 +560,8 @@ UAT_BOOL_CB_DEF(spdu_signal_list, hidden, spdu_signal_list_uat_t)
|
|||
|
||||
static void *
|
||||
copy_spdu_signal_list_cb(void *n, const void *o, size_t size _U_) {
|
||||
spdu_signal_list_uat_t *new_rec = (spdu_signal_list_uat_t *)n;
|
||||
const spdu_signal_list_uat_t *old_rec = (const spdu_signal_list_uat_t *)o;
|
||||
spdu_signal_list_uat_t *new_rec = (spdu_signal_list_uat_t *)n;
|
||||
const spdu_signal_list_uat_t *old_rec = (const spdu_signal_list_uat_t *)o;
|
||||
|
||||
new_rec->id = old_rec->id;
|
||||
new_rec->num_of_params = old_rec->num_of_params;
|
||||
|
|
@ -743,7 +743,7 @@ update_spdu_signal_list(void *r, char **err) {
|
|||
}
|
||||
|
||||
static void
|
||||
free_spdu_signal_list_cb(void*r) {
|
||||
free_spdu_signal_list_cb(void *r) {
|
||||
spdu_signal_list_uat_t *rec = (spdu_signal_list_uat_t *)r;
|
||||
if (rec->name) {
|
||||
g_free(rec->name);
|
||||
|
|
@ -777,9 +777,9 @@ deregister_user_data(void)
|
|||
}
|
||||
}
|
||||
|
||||
static spdu_signal_value_name_t* get_signal_value_name_config(guint32 id, guint16 pos);
|
||||
static spdu_signal_value_name_t *get_signal_value_name_config(guint32 id, guint16 pos);
|
||||
|
||||
static gint*
|
||||
static gint *
|
||||
create_hf_entry(guint i, guint32 id, guint32 pos, gchar *name, gchar *filter_string, spdu_dt_t data_type, gboolean scale_or_offset, gboolean raw) {
|
||||
if (i >= dynamic_hf_size) {
|
||||
return NULL;
|
||||
|
|
@ -951,14 +951,14 @@ reset_spdu_signal_list(void)
|
|||
deregister_user_data();
|
||||
}
|
||||
|
||||
static spdu_signal_list_t*
|
||||
static spdu_signal_list_t *
|
||||
get_parameter_config(guint64 id) {
|
||||
if (data_spdu_signal_list == NULL) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
gint64 key = (gint64)id;
|
||||
return (spdu_signal_list_t*)g_hash_table_lookup(data_spdu_signal_list, &key);
|
||||
return (spdu_signal_list_t *)g_hash_table_lookup(data_spdu_signal_list, &key);
|
||||
}
|
||||
|
||||
/* UAT: Value Names */
|
||||
|
|
@ -1013,7 +1013,7 @@ update_spdu_signal_value_name(void *r, char **err) {
|
|||
}
|
||||
|
||||
static void
|
||||
free_spdu_signal_value_name_cb(void*r) {
|
||||
free_spdu_signal_value_name_cb(void *r) {
|
||||
spdu_signal_value_name_uat_t *rec = (spdu_signal_value_name_uat_t *)r;
|
||||
if (rec->value_name) {
|
||||
g_free(rec->value_name);
|
||||
|
|
@ -1094,14 +1094,14 @@ post_update_spdu_signal_value_names_cb(void) {
|
|||
post_update_spdu_signal_value_names_read_in_data(spdu_signal_value_names, spdu_parameter_value_names_num, data_spdu_signal_value_names);
|
||||
}
|
||||
|
||||
static spdu_signal_value_name_t*
|
||||
static spdu_signal_value_name_t *
|
||||
get_signal_value_name_config(guint32 id, guint16 pos) {
|
||||
if (data_spdu_signal_list == NULL) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
gint64 key = (guint64)id | (guint64)pos << 32;
|
||||
return (spdu_signal_value_name_t*)g_hash_table_lookup(data_spdu_signal_value_names, &key);
|
||||
return (spdu_signal_value_name_t *)g_hash_table_lookup(data_spdu_signal_value_names, &key);
|
||||
}
|
||||
|
||||
/* UAT: SOME/IP Mapping */
|
||||
|
|
@ -1118,7 +1118,7 @@ spdu_someip_key(guint16 service_id, guint16 method_id, guint8 major_version, gui
|
|||
|
||||
static void *
|
||||
copy_spdu_someip_mapping_cb(void *n, const void *o, size_t size _U_) {
|
||||
spdu_someip_mapping_uat_t *new_rec = (spdu_someip_mapping_uat_t *)n;
|
||||
spdu_someip_mapping_uat_t *new_rec = (spdu_someip_mapping_uat_t *)n;
|
||||
const spdu_someip_mapping_uat_t *old_rec = (const spdu_someip_mapping_uat_t *)o;
|
||||
|
||||
new_rec->service_id = old_rec->service_id;
|
||||
|
|
@ -1142,18 +1142,18 @@ update_spdu_someip_mapping(void *r, char **err) {
|
|||
|
||||
if (rec->method_id > 0xffff) {
|
||||
*err = ws_strdup_printf("We currently only support 16 bit SOME/IP Method IDs (Service-ID: %x Method-ID: %x MsgType: %x Version: %i)",
|
||||
rec->service_id, rec->method_id, rec->message_type, rec->major_version);
|
||||
rec->service_id, rec->method_id, rec->message_type, rec->major_version);
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
if (rec->major_version > 0xff) {
|
||||
*err = ws_strdup_printf("We currently only support 8 bit SOME/IP major versions (Service-ID: %x Method-ID: %x MsgType: %x Version: %i)",
|
||||
rec->service_id, rec->method_id, rec->message_type, rec->major_version);
|
||||
rec->service_id, rec->method_id, rec->message_type, rec->major_version);
|
||||
}
|
||||
|
||||
if (rec->message_type > 0xff) {
|
||||
*err = ws_strdup_printf("We currently only support 8 bit SOME/IP message types (Service-ID: %x Method-ID: %x MsgType: %x Version: %i)",
|
||||
rec->service_id, rec->method_id, rec->message_type, rec->major_version);
|
||||
rec->service_id, rec->method_id, rec->message_type, rec->major_version);
|
||||
}
|
||||
|
||||
return TRUE;
|
||||
|
|
@ -1191,14 +1191,14 @@ post_update_spdu_someip_mapping_cb(void) {
|
|||
register_signal_pdu_someip();
|
||||
}
|
||||
|
||||
static spdu_someip_mapping_t*
|
||||
static spdu_someip_mapping_t *
|
||||
get_someip_mapping(guint16 service_id, guint16 method_id, guint8 major_version, guint8 message_type) {
|
||||
if (data_spdu_someip_mappings == NULL) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
gint64 key = spdu_someip_key(service_id, method_id, major_version, message_type);
|
||||
return (spdu_someip_mapping_t*)g_hash_table_lookup(data_spdu_someip_mappings, &key);
|
||||
return (spdu_someip_mapping_t *)g_hash_table_lookup(data_spdu_someip_mappings, &key);
|
||||
}
|
||||
|
||||
/* UAT: CAN Mapping */
|
||||
|
|
@ -1208,7 +1208,7 @@ UAT_HEX_CB_DEF(spdu_can_mapping, message_id, spdu_can_mapping_uat_t)
|
|||
|
||||
static void *
|
||||
copy_spdu_can_mapping_cb(void *n, const void *o, size_t size _U_) {
|
||||
spdu_can_mapping_uat_t *new_rec = (spdu_can_mapping_uat_t *)n;
|
||||
spdu_can_mapping_uat_t *new_rec = (spdu_can_mapping_uat_t *)n;
|
||||
const spdu_can_mapping_uat_t *old_rec = (const spdu_can_mapping_uat_t *)o;
|
||||
|
||||
new_rec->can_id = old_rec->can_id;
|
||||
|
|
@ -1265,7 +1265,7 @@ post_update_spdu_can_mapping_cb(void) {
|
|||
register_signal_pdu_can();
|
||||
}
|
||||
|
||||
static spdu_can_mapping_t*
|
||||
static spdu_can_mapping_t *
|
||||
get_can_mapping(guint32 id, guint16 bus_id) {
|
||||
if (data_spdu_can_mappings == NULL) {
|
||||
return NULL;
|
||||
|
|
@ -1292,7 +1292,7 @@ UAT_HEX_CB_DEF(spdu_flexray_mapping, message_id, spdu_flexray_mapping_uat_t)
|
|||
|
||||
static void *
|
||||
copy_spdu_flexray_mapping_cb(void *n, const void *o, size_t size _U_) {
|
||||
spdu_flexray_mapping_uat_t *new_rec = (spdu_flexray_mapping_uat_t *)n;
|
||||
spdu_flexray_mapping_uat_t *new_rec = (spdu_flexray_mapping_uat_t *)n;
|
||||
const spdu_flexray_mapping_uat_t *old_rec = (const spdu_flexray_mapping_uat_t *)o;
|
||||
|
||||
new_rec->channel = old_rec->channel;
|
||||
|
|
@ -1348,14 +1348,14 @@ post_update_spdu_flexray_mapping_cb(void) {
|
|||
}
|
||||
}
|
||||
|
||||
static spdu_flexray_mapping_t*
|
||||
static spdu_flexray_mapping_t *
|
||||
get_flexray_mapping(guint8 channel, guint8 cycle, guint16 flexray_id) {
|
||||
if (data_spdu_flexray_mappings == NULL) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
gint64 key = (channel << 24) | (cycle << 16) | flexray_id;
|
||||
return (spdu_flexray_mapping_t*)g_hash_table_lookup(data_spdu_flexray_mappings, &key);
|
||||
return (spdu_flexray_mapping_t *)g_hash_table_lookup(data_spdu_flexray_mappings, &key);
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -1366,8 +1366,8 @@ UAT_HEX_CB_DEF(spdu_lin_mapping, message_id, spdu_lin_mapping_uat_t)
|
|||
|
||||
static void *
|
||||
copy_spdu_lin_mapping_cb(void *n, const void *o, size_t size _U_) {
|
||||
spdu_lin_mapping_uat_t *new_rec = (spdu_lin_mapping_uat_t*)n;
|
||||
const spdu_lin_mapping_uat_t *old_rec = (const spdu_lin_mapping_uat_t*)o;
|
||||
spdu_lin_mapping_uat_t *new_rec = (spdu_lin_mapping_uat_t *)n;
|
||||
const spdu_lin_mapping_uat_t *old_rec = (const spdu_lin_mapping_uat_t *)o;
|
||||
|
||||
new_rec->frame_id = old_rec->frame_id;
|
||||
new_rec->bus_id = old_rec->bus_id;
|
||||
|
|
@ -1412,7 +1412,7 @@ post_update_spdu_lin_mapping_cb(void) {
|
|||
guint i;
|
||||
for (i = 0; i < spdu_lin_mapping_num; i++) {
|
||||
gint *key = wmem_new(wmem_epan_scope(), gint);
|
||||
*key = (spdu_lin_mapping[i].frame_id)&LIN_ID_MASK;
|
||||
*key = (spdu_lin_mapping[i].frame_id) & LIN_ID_MASK;
|
||||
*key |= ((spdu_lin_mapping[i].bus_id) & 0xffff) << 16;
|
||||
|
||||
g_hash_table_insert(data_spdu_lin_mappings, key, &spdu_lin_mapping[i]);
|
||||
|
|
@ -1423,20 +1423,20 @@ post_update_spdu_lin_mapping_cb(void) {
|
|||
register_signal_pdu_lin();
|
||||
}
|
||||
|
||||
static spdu_lin_mapping_t*
|
||||
static spdu_lin_mapping_t *
|
||||
get_lin_mapping(lin_info_t *lininfo) {
|
||||
if (data_spdu_lin_mappings == NULL) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
gint32 key = ((lininfo->id)&LIN_ID_MASK) | (((lininfo->bus_id) & 0xffff) << 16);
|
||||
gint32 key = ((lininfo->id) & LIN_ID_MASK) | (((lininfo->bus_id) & 0xffff) << 16);
|
||||
|
||||
spdu_lin_mapping_uat_t *tmp = (spdu_lin_mapping_uat_t*)g_hash_table_lookup(data_spdu_lin_mappings, &key);
|
||||
spdu_lin_mapping_uat_t *tmp = (spdu_lin_mapping_uat_t *)g_hash_table_lookup(data_spdu_lin_mappings, &key);
|
||||
|
||||
if (tmp == NULL) {
|
||||
/* try again without Bus ID set */
|
||||
key = (lininfo->id) & LIN_ID_MASK;
|
||||
tmp = (spdu_lin_mapping_uat_t*)g_hash_table_lookup(data_spdu_lin_mappings, &key);
|
||||
tmp = (spdu_lin_mapping_uat_t *)g_hash_table_lookup(data_spdu_lin_mappings, &key);
|
||||
}
|
||||
|
||||
return tmp;
|
||||
|
|
@ -1448,8 +1448,8 @@ UAT_HEX_CB_DEF(spdu_pdu_transport_mapping, message_id, spdu_pdu_transport_mappin
|
|||
|
||||
static void *
|
||||
copy_spdu_pdu_transport_mapping_cb(void *n, const void *o, size_t size _U_) {
|
||||
spdu_pdu_transport_mapping_uat_t *new_rec = (spdu_pdu_transport_mapping_uat_t*)n;
|
||||
const spdu_pdu_transport_mapping_uat_t *old_rec = (const spdu_pdu_transport_mapping_uat_t*)o;
|
||||
spdu_pdu_transport_mapping_uat_t *new_rec = (spdu_pdu_transport_mapping_uat_t *)n;
|
||||
const spdu_pdu_transport_mapping_uat_t *old_rec = (const spdu_pdu_transport_mapping_uat_t *)o;
|
||||
|
||||
new_rec->pdu_id = old_rec->pdu_id;
|
||||
new_rec->message_id = old_rec->message_id;
|
||||
|
|
@ -1498,14 +1498,14 @@ post_update_spdu_pdu_transport_mapping_cb(void) {
|
|||
register_signal_pdu_pdu_transport();
|
||||
}
|
||||
|
||||
static spdu_pdu_transport_mapping_t*
|
||||
static spdu_pdu_transport_mapping_t *
|
||||
get_pdu_transport_mapping(guint32 pdu_transport_id) {
|
||||
if (data_spdu_pdu_transport_mappings == NULL) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
gint64 key = pdu_transport_id;
|
||||
return (spdu_pdu_transport_mapping_uat_t*)g_hash_table_lookup(data_spdu_pdu_transport_mappings, &key);
|
||||
return (spdu_pdu_transport_mapping_uat_t *)g_hash_table_lookup(data_spdu_pdu_transport_mappings, &key);
|
||||
}
|
||||
|
||||
/* UAT: IPduM Mapping */
|
||||
|
|
@ -1514,8 +1514,8 @@ UAT_HEX_CB_DEF(spdu_ipdum_mapping, message_id, spdu_ipdum_mapping_uat_t)
|
|||
|
||||
static void *
|
||||
copy_spdu_ipdum_mapping_cb(void *n, const void *o, size_t size _U_) {
|
||||
spdu_ipdum_mapping_uat_t *new_rec = (spdu_ipdum_mapping_uat_t*)n;
|
||||
const spdu_ipdum_mapping_uat_t *old_rec = (const spdu_ipdum_mapping_uat_t*)o;
|
||||
spdu_ipdum_mapping_uat_t *new_rec = (spdu_ipdum_mapping_uat_t *)n;
|
||||
const spdu_ipdum_mapping_uat_t *old_rec = (const spdu_ipdum_mapping_uat_t *)o;
|
||||
|
||||
new_rec->pdu_id = old_rec->pdu_id;
|
||||
new_rec->message_id = old_rec->message_id;
|
||||
|
|
@ -1564,14 +1564,14 @@ post_update_spdu_ipdum_mapping_cb(void) {
|
|||
register_signal_pdu_ipdum_ids();
|
||||
}
|
||||
|
||||
static spdu_ipdum_mapping_uat_t*
|
||||
static spdu_ipdum_mapping_uat_t *
|
||||
get_ipdum_mapping(guint32 pdu_id) {
|
||||
if (data_spdu_ipdum_mappings == NULL) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
gint64 key = pdu_id;
|
||||
return (spdu_ipdum_mapping_uat_t*)g_hash_table_lookup(data_spdu_ipdum_mappings, &key);
|
||||
return (spdu_ipdum_mapping_uat_t *)g_hash_table_lookup(data_spdu_ipdum_mappings, &key);
|
||||
}
|
||||
|
||||
/* UAT: DLT Mapping */
|
||||
|
|
@ -1953,7 +1953,7 @@ dissect_spdu_payload_signal(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
|
|||
subtree = proto_item_add_subtree(ti, ett_spdu_signal);
|
||||
ti = proto_tree_add_uint64(subtree, hf_id_raw, tvb, offset, signal_length, value_guint64);
|
||||
proto_item_append_text(ti, " (0x%" PRIx64 ")", value_guint64);
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
||||
case SPDU_DATA_TYPE_INT: {
|
||||
|
|
@ -2028,9 +2028,9 @@ dissect_spdu_payload_signal(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
|
|||
}
|
||||
|
||||
if (item->big_endian) {
|
||||
proto_tree_add_item_ret_length(tree, hf_id_effective, tvb, offset, signal_length, ENC_ASCII|ENC_BIG_ENDIAN, &string_length);
|
||||
proto_tree_add_item_ret_length(tree, hf_id_effective, tvb, offset, signal_length, ENC_ASCII | ENC_BIG_ENDIAN, &string_length);
|
||||
} else {
|
||||
proto_tree_add_item_ret_length(tree, hf_id_effective, tvb, offset, signal_length, ENC_ASCII|ENC_LITTLE_ENDIAN, &string_length);
|
||||
proto_tree_add_item_ret_length(tree, hf_id_effective, tvb, offset, signal_length, ENC_ASCII | ENC_LITTLE_ENDIAN, &string_length);
|
||||
}
|
||||
string_length = string_length * 8 - (gint)item->bitlength_encoded_type;
|
||||
break;
|
||||
|
|
@ -2111,7 +2111,7 @@ dissect_spdu_payload(tvbuff_t *tvb, packet_info *pinfo, proto_tree *root_tree, g
|
|||
|
||||
static int
|
||||
dissect_spdu_message_someip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) {
|
||||
someip_info_t *someip_info = (someip_info_t*)data;
|
||||
someip_info_t *someip_info = (someip_info_t *)data;
|
||||
|
||||
DISSECTOR_ASSERT(someip_info);
|
||||
|
||||
|
|
@ -2149,7 +2149,7 @@ dissect_spdu_message_can_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre
|
|||
|
||||
static int
|
||||
dissect_spdu_message_flexray(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) {
|
||||
struct flexray_info *flexray_data = (struct flexray_info*)data;
|
||||
struct flexray_info *flexray_data = (struct flexray_info *)data;
|
||||
DISSECTOR_ASSERT(flexray_data);
|
||||
|
||||
spdu_flexray_mapping_t *flexray_mapping = get_flexray_mapping(flexray_data->ch, flexray_data->cc, flexray_data->id);
|
||||
|
|
@ -2246,21 +2246,21 @@ proto_register_signal_pdu(void) {
|
|||
expert_module_t *expert_module_lpdu;
|
||||
|
||||
/* UAT for naming */
|
||||
uat_t *spdu_messages_uat;
|
||||
uat_t *spdu_messages_uat;
|
||||
|
||||
/* the UATs for parsing the message*/
|
||||
uat_t *spdu_signal_list_uat;
|
||||
uat_t *spdu_parameter_value_names_uat;
|
||||
uat_t *spdu_signal_list_uat;
|
||||
uat_t *spdu_parameter_value_names_uat;
|
||||
|
||||
/* UATs for mapping different incoming payloads to messages*/
|
||||
uat_t *spdu_someip_mapping_uat;
|
||||
uat_t *spdu_can_mapping_uat;
|
||||
uat_t *spdu_flexray_mapping_uat;
|
||||
uat_t *spdu_lin_mapping_uat;
|
||||
uat_t *spdu_pdu_transport_mapping_uat;
|
||||
uat_t *spdu_ipdum_mapping_uat;
|
||||
uat_t *spdu_dlt_mapping_uat;
|
||||
uat_t *spdu_uds_mapping_uat;
|
||||
uat_t *spdu_someip_mapping_uat;
|
||||
uat_t *spdu_can_mapping_uat;
|
||||
uat_t *spdu_flexray_mapping_uat;
|
||||
uat_t *spdu_lin_mapping_uat;
|
||||
uat_t *spdu_pdu_transport_mapping_uat;
|
||||
uat_t *spdu_ipdum_mapping_uat;
|
||||
uat_t *spdu_dlt_mapping_uat;
|
||||
uat_t *spdu_uds_mapping_uat;
|
||||
|
||||
/* data fields */
|
||||
static hf_register_info hf[] = {
|
||||
|
|
@ -2394,7 +2394,7 @@ proto_register_signal_pdu(void) {
|
|||
sizeof(generic_one_id_string_t), /* record size */
|
||||
DATAFILE_SPDU_MESSAGES, /* filename */
|
||||
TRUE, /* from profile */
|
||||
(void**) &spdu_message_ident, /* data_ptr */
|
||||
(void **)&spdu_message_ident, /* data_ptr */
|
||||
&spdu_message_ident_num, /* numitems_ptr */
|
||||
UAT_AFFECTS_DISSECTION, /* but not fields */
|
||||
NULL, /* help */
|
||||
|
|
@ -2429,7 +2429,7 @@ proto_register_signal_pdu(void) {
|
|||
|
||||
spdu_parameter_value_names_uat = uat_new("Signal Value Names",
|
||||
sizeof(spdu_signal_value_name_uat_t), DATAFILE_SPDU_VALUE_NAMES, TRUE,
|
||||
(void**)&spdu_signal_value_names,
|
||||
(void **)&spdu_signal_value_names,
|
||||
&spdu_parameter_value_names_num,
|
||||
UAT_AFFECTS_DISSECTION,
|
||||
NULL, /* help */
|
||||
|
|
@ -2445,11 +2445,12 @@ proto_register_signal_pdu(void) {
|
|||
prefs_register_uat_preference(spdu_module, "_spdu_parameter_value_names", "Value Names",
|
||||
"A table to define names of signal values", spdu_parameter_value_names_uat);
|
||||
|
||||
|
||||
spdu_signal_list_uat = uat_new("Signal PDU Signal List",
|
||||
sizeof(spdu_signal_list_uat_t), DATAFILE_SPDU_SIGNALS, TRUE,
|
||||
(void**)&spdu_signal_list,
|
||||
(void **)&spdu_signal_list,
|
||||
&spdu_signal_list_num,
|
||||
UAT_AFFECTS_DISSECTION|UAT_AFFECTS_FIELDS,
|
||||
UAT_AFFECTS_DISSECTION | UAT_AFFECTS_FIELDS,
|
||||
NULL, /* help */
|
||||
copy_spdu_signal_list_cb,
|
||||
update_spdu_signal_list,
|
||||
|
|
@ -2459,17 +2460,17 @@ proto_register_signal_pdu(void) {
|
|||
spdu_signal_list_uat_fields
|
||||
);
|
||||
|
||||
|
||||
prefs_register_uat_preference(spdu_module, "_spdu_signal_list", "Signal List",
|
||||
"A table to define names of signals", spdu_signal_list_uat);
|
||||
|
||||
|
||||
prefs_register_static_text_preference(spdu_module, "empty2", "", NULL);
|
||||
prefs_register_static_text_preference(spdu_module, "map", "Protocol Mappings:", NULL);
|
||||
|
||||
|
||||
spdu_someip_mapping_uat = uat_new("SOME/IP",
|
||||
sizeof(spdu_someip_mapping_uat_t), DATAFILE_SPDU_SOMEIP_MAPPING, TRUE,
|
||||
(void**)&spdu_someip_mapping,
|
||||
(void **)&spdu_someip_mapping,
|
||||
&spdu_someip_mapping_num,
|
||||
UAT_AFFECTS_DISSECTION,
|
||||
NULL, /* help */
|
||||
|
|
@ -2487,7 +2488,7 @@ proto_register_signal_pdu(void) {
|
|||
|
||||
spdu_can_mapping_uat = uat_new("CAN",
|
||||
sizeof(spdu_can_mapping_uat_t), DATAFILE_SPDU_CAN_MAPPING, TRUE,
|
||||
(void**)&spdu_can_mapping,
|
||||
(void **)&spdu_can_mapping,
|
||||
&spdu_can_mapping_num,
|
||||
UAT_AFFECTS_DISSECTION,
|
||||
NULL, /* help */
|
||||
|
|
@ -2505,7 +2506,7 @@ proto_register_signal_pdu(void) {
|
|||
|
||||
spdu_flexray_mapping_uat = uat_new("FlexRay",
|
||||
sizeof(spdu_flexray_mapping_uat_t), DATAFILE_SPDU_FLEXRAY_MAPPING, TRUE,
|
||||
(void**)&spdu_flexray_mapping,
|
||||
(void **)&spdu_flexray_mapping,
|
||||
&spdu_flexray_mapping_num,
|
||||
UAT_AFFECTS_DISSECTION,
|
||||
NULL, /* help */
|
||||
|
|
@ -2523,7 +2524,7 @@ proto_register_signal_pdu(void) {
|
|||
|
||||
spdu_lin_mapping_uat = uat_new("LIN",
|
||||
sizeof(spdu_lin_mapping_uat_t), DATAFILE_SPDU_LIN_MAPPING, TRUE,
|
||||
(void**)&spdu_lin_mapping,
|
||||
(void **)&spdu_lin_mapping,
|
||||
&spdu_lin_mapping_num,
|
||||
UAT_AFFECTS_DISSECTION,
|
||||
NULL, /* help */
|
||||
|
|
@ -2541,7 +2542,7 @@ proto_register_signal_pdu(void) {
|
|||
|
||||
spdu_pdu_transport_mapping_uat = uat_new("PDU Transport",
|
||||
sizeof(spdu_pdu_transport_mapping_uat_t), DATAFILE_SPDU_PDU_TRANSPORT_MAPPING, TRUE,
|
||||
(void**)&spdu_pdu_transport_mapping,
|
||||
(void **)&spdu_pdu_transport_mapping,
|
||||
&spdu_pdu_transport_mapping_num,
|
||||
UAT_AFFECTS_DISSECTION,
|
||||
NULL, /* help */
|
||||
|
|
@ -2559,7 +2560,7 @@ proto_register_signal_pdu(void) {
|
|||
|
||||
spdu_ipdum_mapping_uat = uat_new("AUTOSAR I-PduM",
|
||||
sizeof(spdu_ipdum_mapping_uat_t), DATAFILE_SPDU_IPDUM_MAPPING, TRUE,
|
||||
(void**)&spdu_ipdum_mapping,
|
||||
(void **)&spdu_ipdum_mapping,
|
||||
&spdu_ipdum_mapping_num,
|
||||
UAT_AFFECTS_DISSECTION,
|
||||
NULL, /* help */
|
||||
|
|
|
|||
Loading…
Reference in New Issue