forked from osmocom/wireshark
From beroset:
remove C++ incompatibilities from UAT_VS_DEF macro and all uses https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416 svn path=/trunk/; revision=48259
This commit is contained in:
Anders Broman
parent
d249e6111a
commit
d0efafbcb1
|
|
@ -2133,8 +2133,8 @@ UAT_LSTRING_CB_DEF(snmp_users,userName,snmp_ue_assoc_t,user.userName.data,user.u
|
|||
UAT_LSTRING_CB_DEF(snmp_users,authPassword,snmp_ue_assoc_t,user.authPassword.data,user.authPassword.len)
|
||||
UAT_LSTRING_CB_DEF(snmp_users,privPassword,snmp_ue_assoc_t,user.privPassword.data,user.privPassword.len)
|
||||
UAT_BUFFER_CB_DEF(snmp_users,engine_id,snmp_ue_assoc_t,engine.data,engine.len)
|
||||
UAT_VS_DEF(snmp_users,auth_model,snmp_ue_assoc_t,0,"MD5")
|
||||
UAT_VS_DEF(snmp_users,priv_proto,snmp_ue_assoc_t,0,"DES")
|
||||
UAT_VS_DEF(snmp_users,auth_model,snmp_ue_assoc_t,guint,0,"MD5")
|
||||
UAT_VS_DEF(snmp_users,priv_proto,snmp_ue_assoc_t,guint,0,"DES")
|
||||
|
||||
static void *
|
||||
snmp_specific_trap_copy_cb(void *dest, const void *orig, size_t len _U_)
|
||||
|
|
|
|||
|
|
@ -1199,7 +1199,7 @@ static void uat_bootp_record_free_cb(void*r) {
|
|||
|
||||
UAT_DEC_CB_DEF(uat_bootp_records, opt, uat_bootp_record_t)
|
||||
UAT_CSTRING_CB_DEF(uat_bootp_records, text, uat_bootp_record_t)
|
||||
UAT_VS_DEF(uat_bootp_records, ftype, uat_bootp_record_t, 0, "string")
|
||||
UAT_VS_DEF(uat_bootp_records, ftype, uat_bootp_record_t, enum field_type, special, "string")
|
||||
|
||||
|
||||
static struct opt_info* bootp_get_opt(unsigned int idx)
|
||||
|
|
|
|||
|
|
@ -1001,7 +1001,7 @@ static const value_string thales_ipm_id_modifier[] = {
|
|||
{ 0, NULL }
|
||||
};
|
||||
|
||||
UAT_VS_DEF(dmp_security_class, nation, dmp_security_class_t, 0, "None")
|
||||
UAT_VS_DEF(dmp_security_class, nation, dmp_security_class_t, guint, 0, "None")
|
||||
UAT_DEC_CB_DEF(dmp_security_class, sec_class, dmp_security_class_t)
|
||||
UAT_CSTRING_CB_DEF(dmp_security_class, name, dmp_security_class_t)
|
||||
|
||||
|
|
|
|||
|
|
@ -215,7 +215,7 @@ uat_wep_key_record_free_cb(void*r)
|
|||
if (key->string) g_free(key->string);
|
||||
}
|
||||
|
||||
UAT_VS_DEF(uat_wep_key_records, key, uat_wep_key_record_t, 0, STRING_KEY_TYPE_WEP)
|
||||
UAT_VS_DEF(uat_wep_key_records, key, uat_wep_key_record_t, guint8, 0, STRING_KEY_TYPE_WEP)
|
||||
UAT_CSTRING_CB_DEF(uat_wep_key_records, string, uat_wep_key_record_t)
|
||||
|
||||
/* Stuff for the WEP decoder */
|
||||
|
|
|
|||
|
|
@ -330,8 +330,8 @@ header_fields_free_cb(void *r)
|
|||
|
||||
UAT_CSTRING_CB_DEF(header_fields, header_name, header_field_t)
|
||||
UAT_CSTRING_CB_DEF(header_fields, description, header_field_t)
|
||||
UAT_VS_DEF(header_fields, header_format, header_field_t, 0, "Unstructured")
|
||||
UAT_VS_DEF(header_fields, add_to_col_info, header_field_t, 0, "No")
|
||||
UAT_VS_DEF(header_fields, header_format, header_field_t, guint, 0, "Unstructured")
|
||||
UAT_VS_DEF(header_fields, add_to_col_info, header_field_t, guint, 0, "No")
|
||||
|
||||
|
||||
/* Define media_type/Content type table */
|
||||
|
|
|
|||
|
|
@ -271,13 +271,13 @@ static void uat_esp_sa_record_free_cb(void*r) {
|
|||
g_free(rec->authentication_key);
|
||||
}
|
||||
|
||||
UAT_VS_DEF(uat_esp_sa_records, protocol, uat_esp_sa_record_t, IPSEC_SA_IPV4, "IPv4")
|
||||
UAT_VS_DEF(uat_esp_sa_records, protocol, uat_esp_sa_record_t, guint8, IPSEC_SA_IPV4, "IPv4")
|
||||
UAT_CSTRING_CB_DEF(uat_esp_sa_records, srcIP, uat_esp_sa_record_t)
|
||||
UAT_CSTRING_CB_DEF(uat_esp_sa_records, dstIP, uat_esp_sa_record_t)
|
||||
UAT_CSTRING_CB_DEF(uat_esp_sa_records, spi, uat_esp_sa_record_t)
|
||||
UAT_VS_DEF(uat_esp_sa_records, encryption_algo, uat_esp_sa_record_t, 0, "FIXX")
|
||||
UAT_VS_DEF(uat_esp_sa_records, encryption_algo, uat_esp_sa_record_t, guint8, 0, "FIXX")
|
||||
UAT_CSTRING_CB_DEF(uat_esp_sa_records, encryption_key, uat_esp_sa_record_t)
|
||||
UAT_VS_DEF(uat_esp_sa_records, authentication_algo, uat_esp_sa_record_t, 0, "FIXX")
|
||||
UAT_VS_DEF(uat_esp_sa_records, authentication_algo, uat_esp_sa_record_t, guint8, 0, "FIXX")
|
||||
UAT_CSTRING_CB_DEF(uat_esp_sa_records, authentication_key, uat_esp_sa_record_t)
|
||||
|
||||
/* Default ESP payload decode to off */
|
||||
|
|
|
|||
|
|
@ -4938,10 +4938,10 @@ UAT_BUFFER_CB_DEF(ikev2_users, spii, ikev2_uat_data_t, key.spii, key.spii_len)
|
|||
UAT_BUFFER_CB_DEF(ikev2_users, spir, ikev2_uat_data_t, key.spir, key.spir_len)
|
||||
UAT_BUFFER_CB_DEF(ikev2_users, sk_ei, ikev2_uat_data_t, sk_ei, sk_ei_len)
|
||||
UAT_BUFFER_CB_DEF(ikev2_users, sk_er, ikev2_uat_data_t, sk_er, sk_er_len)
|
||||
UAT_VS_DEF(ikev2_users, encr_alg, ikev2_uat_data_t, IKEV2_ENCR_3DES, IKEV2_ENCR_3DES_STR)
|
||||
UAT_VS_DEF(ikev2_users, encr_alg, ikev2_uat_data_t, guint, IKEV2_ENCR_3DES, IKEV2_ENCR_3DES_STR)
|
||||
UAT_BUFFER_CB_DEF(ikev2_users, sk_ai, ikev2_uat_data_t, sk_ai, sk_ai_len)
|
||||
UAT_BUFFER_CB_DEF(ikev2_users, sk_ar, ikev2_uat_data_t, sk_ar, sk_ar_len)
|
||||
UAT_VS_DEF(ikev2_users, auth_alg, ikev2_uat_data_t, IKEV2_AUTH_HMAC_SHA1_96, IKEV2_AUTH_HMAC_SHA1_96_STR)
|
||||
UAT_VS_DEF(ikev2_users, auth_alg, ikev2_uat_data_t, guint, IKEV2_AUTH_HMAC_SHA1_96, IKEV2_AUTH_HMAC_SHA1_96_STR)
|
||||
|
||||
static void ikev2_uat_data_update_cb(void* p, const char** err) {
|
||||
ikev2_uat_data_t *ud = p;
|
||||
|
|
|
|||
|
|
@ -877,9 +877,9 @@ typedef struct lcid_drb_mapping_t {
|
|||
static lcid_drb_mapping_t *lcid_drb_mappings = NULL;
|
||||
static guint num_lcid_drb_mappings = 0;
|
||||
|
||||
UAT_VS_DEF(lcid_drb_mappings, lcid, lcid_drb_mapping_t, 3, "LCID 3")
|
||||
UAT_VS_DEF(lcid_drb_mappings, lcid, lcid_drb_mapping_t, guint16, 3, "LCID 3")
|
||||
UAT_DEC_CB_DEF(lcid_drb_mappings, drbid, lcid_drb_mapping_t)
|
||||
UAT_VS_DEF(lcid_drb_mappings, channel_type, lcid_drb_mapping_t, 2, "AM")
|
||||
UAT_VS_DEF(lcid_drb_mappings, channel_type, lcid_drb_mapping_t, rlc_channel_type_t, rlcAM, "AM")
|
||||
|
||||
/* UAT object */
|
||||
static uat_t* lcid_drb_mappings_uat;
|
||||
|
|
|
|||
|
|
@ -760,7 +760,7 @@ static void uat_kindid_record_free_cb(void*r) {
|
|||
|
||||
UAT_DEC_CB_DEF(kindidlist_uats,id,kind_t)
|
||||
UAT_CSTRING_CB_DEF(kindidlist_uats,name,kind_t)
|
||||
UAT_VS_DEF(kindidlist_uats,data_model,kind_t,0,"string")
|
||||
UAT_VS_DEF(kindidlist_uats,data_model,kind_t,guint,0,"string")
|
||||
|
||||
|
||||
#define MSG_LENGH_OFFSET 16
|
||||
|
|
|
|||
|
|
@ -3461,7 +3461,7 @@ sccp_users_free_cb(void *r)
|
|||
UAT_DEC_CB_DEF(sccp_users, ni, sccp_user_t)
|
||||
UAT_RANGE_CB_DEF(sccp_users, called_pc,sccp_user_t)
|
||||
UAT_RANGE_CB_DEF(sccp_users, called_ssn,sccp_user_t)
|
||||
UAT_VS_DEF(sccp_users, user, sccp_user_t, SCCP_USER_DATA, "Data")
|
||||
UAT_VS_DEF(sccp_users, user, sccp_user_t, guint, SCCP_USER_DATA, "Data")
|
||||
|
||||
/** End SccpUsersTable **/
|
||||
|
||||
|
|
|
|||
|
|
@ -3357,8 +3357,8 @@ UAT_LSTRING_CB_DEF(snmp_users,userName,snmp_ue_assoc_t,user.userName.data,user.u
|
|||
UAT_LSTRING_CB_DEF(snmp_users,authPassword,snmp_ue_assoc_t,user.authPassword.data,user.authPassword.len)
|
||||
UAT_LSTRING_CB_DEF(snmp_users,privPassword,snmp_ue_assoc_t,user.privPassword.data,user.privPassword.len)
|
||||
UAT_BUFFER_CB_DEF(snmp_users,engine_id,snmp_ue_assoc_t,engine.data,engine.len)
|
||||
UAT_VS_DEF(snmp_users,auth_model,snmp_ue_assoc_t,0,"MD5")
|
||||
UAT_VS_DEF(snmp_users,priv_proto,snmp_ue_assoc_t,0,"DES")
|
||||
UAT_VS_DEF(snmp_users,auth_model,snmp_ue_assoc_t,guint,0,"MD5")
|
||||
UAT_VS_DEF(snmp_users,priv_proto,snmp_ue_assoc_t,guint,0,"DES")
|
||||
|
||||
static void *
|
||||
snmp_specific_trap_copy_cb(void *dest, const void *orig, size_t len _U_)
|
||||
|
|
|
|||
|
|
@ -170,7 +170,7 @@ static void user_free_cb(void* record)
|
|||
g_free(u->trailer_proto_name);
|
||||
}
|
||||
|
||||
UAT_VS_DEF(user_encap, encap, user_encap_t, WTAP_ENCAP_USER0, ENCAP0_STR)
|
||||
UAT_VS_DEF(user_encap, encap, user_encap_t, guint, WTAP_ENCAP_USER0, ENCAP0_STR)
|
||||
UAT_PROTO_DEF(user_encap, payload_proto, payload_proto, payload_proto_name, user_encap_t)
|
||||
UAT_DEC_CB_DEF(user_encap, header_size, user_encap_t)
|
||||
UAT_DEC_CB_DEF(user_encap, trailer_size, user_encap_t)
|
||||
|
|
|
|||
|
|
@ -181,7 +181,7 @@ static void uat_key_record_free_cb(void*r) {
|
|||
}
|
||||
|
||||
UAT_CSTRING_CB_DEF(uat_key_records, string, uat_key_record_t)
|
||||
UAT_VS_DEF(uat_key_records, byte_order, uat_key_record_t, 0, "Normal")
|
||||
UAT_VS_DEF(uat_key_records, byte_order, uat_key_record_t, guint8, 0, "Normal")
|
||||
UAT_CSTRING_CB_DEF(uat_key_records, label, uat_key_record_t)
|
||||
|
||||
static GSList *zbee_pc_keyring = NULL;
|
||||
|
|
|
|||
|
|
@ -487,14 +487,14 @@ static void basename ## _ ## field_name ## _tostr_cb(void* rec, const char** out
|
|||
* rec_t:
|
||||
* value
|
||||
*/
|
||||
#define UAT_VS_DEF(basename,field_name,rec_t,default_val,default_str) \
|
||||
#define UAT_VS_DEF(basename,field_name,rec_t,default_t,default_val,default_str) \
|
||||
static void basename ## _ ## field_name ## _set_cb(void* rec, const char* buf, guint len, const void* vs, const void* u2 _U_) {\
|
||||
guint i; \
|
||||
char* str = ep_strndup(buf,len); \
|
||||
const char* cstr; ((rec_t*)rec)->field_name = default_val; \
|
||||
for(i=0; ( cstr = ((value_string*)vs)[i].strptr ) ;i++) { \
|
||||
if (g_str_equal(cstr,str)) { \
|
||||
((rec_t*)rec)->field_name = ((value_string*)vs)[i].value; return; } } } \
|
||||
((rec_t*)rec)->field_name = (default_t)((value_string*)vs)[i].value; return; } } } \
|
||||
static void basename ## _ ## field_name ## _tostr_cb(void* rec, const char** out_ptr, unsigned* out_len, const void* vs, const void* u2 _U_) {\
|
||||
guint i; \
|
||||
*out_ptr = ep_strdup(default_str); \
|
||||
|
|
|
|||
Loading…
Reference in New Issue