update it

This commit is contained in:
Sukchan Lee 2017-02-21 23:37:21 +09:00
parent 5507119a1f
commit f2748e490d
2 changed files with 252 additions and 30 deletions

View File

@ -24,6 +24,8 @@ struct dict_object *s6a_pua;
struct dict_object *s6a_clr;
struct dict_object *s6a_cla;
struct dict_object *s6a_origin_host;
struct dict_object *s6a_origin_realm;
struct dict_object *s6a_destination_host;
struct dict_object *s6a_destination_realm;
struct dict_object *s6a_user_name;
@ -31,6 +33,8 @@ struct dict_object *s6a_session_id;
struct dict_object *s6a_auth_session_state;
struct dict_object *s6a_result_code;
struct dict_object *s6a_experimental_result;
struct dict_object *s6a_vendor_id;
struct dict_object *s6a_experimental_result_code;
struct dict_object *s6a_visited_plmn_id;
struct dict_object *s6a_rat_type;
@ -44,6 +48,53 @@ struct dict_object *s6a_authentication_info;
struct dict_object *s6a_re_synchronization_info;
struct dict_object *s6a_service_selection;
struct dict_object *s6a_ue_srvcc_cap;
struct dict_object *s6a_imsi;
struct dict_object *s6a_imei;
struct dict_object *s6a_software_version;
struct dict_object *s6a_supported_features;
struct dict_object *s6a_req_e_utran_auth_info;
struct dict_object *s6a_req_resync_info;
struct dict_object *s6a_req_nb_of_req_vectors;
struct dict_object *s6a_req_geran_auth_info;
struct dict_object *s6a_immediate_response_pref;
struct dict_object *s6a_visited_plmn_id;
struct dict_object *s6a_auth_session_state;
struct dict_object *s6a_authentication_info;
struct dict_object *s6a_e_utran_vector;
struct dict_object *s6a_rand;
struct dict_object *s6a_xres;
struct dict_object *s6a_autn;
struct dict_object *s6a_kasme;
struct dict_object *s6a_ulr_flags;
struct dict_object *s6a_ula_flags;
struct dict_object *s6a_pur_flags;
struct dict_object *s6a_pua_flags;
struct dict_object *s6a_rat_type;
struct dict_object *s6a_terminal_info;
struct dict_object *s6a_ue_srvcc_cap;
struct dict_object *s6a_gmlc_addr;
struct dict_object *s6a_subscription_data;
struct dict_object *s6a_subscriber_status;
struct dict_object *s6a_msisdn;
struct dict_object *s6a_ambr;
struct dict_object *s6a_network_access_mode;
struct dict_object *s6a_access_restriction_data;
struct dict_object *s6a_apn_configuration_profile;
struct dict_object *s6a_subscribed_rau_tau_timer;
struct dict_object *s6a_context_identifier;
struct dict_object *s6a_all_apn_conf_inc_ind;
struct dict_object *s6a_apn_configuration;
struct dict_object *s6a_max_bandwidth_ul;
struct dict_object *s6a_max_bandwidth_dl;
struct dict_object *s6a_pdn_type;
struct dict_object *s6a_service_selection;
struct dict_object *s6a_eps_subscribed_qos_profile;
struct dict_object *s6a_qos_class_identifier;
struct dict_object *s6a_allocation_retention_priority;
struct dict_object *s6a_priority_level;
struct dict_object *s6a_pre_emption_capability;
struct dict_object *s6a_pre_emption_vulnerability;
struct dict_object *s6a_served_party_ip_addr;
status_t s6a_ext_init()
{
@ -82,19 +133,12 @@ status_t s6a_dict_init()
return CORE_ERROR;
}
/*
* Pre-loading vendor object
*/
CHECK_FCT(fd_dict_search(fd_g_config->cnf_dict, DICT_VENDOR, VENDOR_BY_ID,
(void *)&vendor_3gpp, &s6a_vendor, ENOENT));
/*
* Pre-loading application object
*/
CHECK_FCT(fd_dict_search(fd_g_config->cnf_dict, DICT_APPLICATION,
APPLICATION_BY_ID, (void *)&app_s6a, &s6a_app, ENOENT));
/*
* Pre-loading commands objects
*/
CHECK_FCT(fd_dict_search(fd_g_config->cnf_dict, DICT_COMMAND, CMD_BY_NAME,
"Authentication-Information-Request", &s6a_air, ENOENT));
CHECK_FCT(fd_dict_search(fd_g_config->cnf_dict, DICT_COMMAND, CMD_BY_NAME,
@ -111,9 +155,11 @@ status_t s6a_dict_init()
"Cancel-Location-Request", &s6a_clr, ENOENT));
CHECK_FCT(fd_dict_search(fd_g_config->cnf_dict, DICT_COMMAND, CMD_BY_NAME,
"Cancel-Location-Answer", &s6a_cla, ENOENT));
/*
* Pre-loading base avps
*/
CHECK_FCT(fd_dict_search (fd_g_config->cnf_dict, DICT_AVP, AVP_BY_NAME,
"Origin-Host", &s6a_origin_host, ENOENT));
CHECK_FCT(fd_dict_search (fd_g_config->cnf_dict, DICT_AVP, AVP_BY_NAME,
"Origin-Realm", &s6a_origin_realm, ENOENT));
CHECK_FCT(fd_dict_search(fd_g_config->cnf_dict, DICT_AVP, AVP_BY_NAME,
"Destination-Host", &s6a_destination_host, ENOENT));
CHECK_FCT(fd_dict_search(fd_g_config->cnf_dict, DICT_AVP, AVP_BY_NAME,
@ -128,45 +174,170 @@ status_t s6a_dict_init()
"Result-Code", &s6a_result_code, ENOENT));
CHECK_FCT(fd_dict_search(fd_g_config->cnf_dict, DICT_AVP, AVP_BY_NAME,
"Experimental-Result", &s6a_experimental_result, ENOENT));
/*
* Pre-loading S6A specifics AVPs
*/
CHECK_FCT(fd_dict_search (fd_g_config->cnf_dict, DICT_AVP, AVP_BY_NAME,
"Vendor-Id", &s6a_vendor_id, ENOENT));
CHECK_FCT(fd_dict_search (fd_g_config->cnf_dict, DICT_AVP, AVP_BY_NAME,
"Experimental-Result-Code", &s6a_experimental_result_code, ENOENT));
CHECK_FCT(fd_dict_search(fd_g_config->cnf_dict, DICT_AVP,
AVP_BY_NAME_ALL_VENDORS, "Visited-PLMN-Id",
&s6a_visited_plmn_id, ENOENT));
&s6a_visited_plmn_id, ENOENT));
CHECK_FCT(fd_dict_search(fd_g_config->cnf_dict, DICT_AVP,
AVP_BY_NAME_ALL_VENDORS, "RAT-Type",
&s6a_rat_type, ENOENT));
AVP_BY_NAME_ALL_VENDORS, "RAT-Type", &s6a_rat_type, ENOENT));
CHECK_FCT(fd_dict_search(fd_g_config->cnf_dict, DICT_AVP,
AVP_BY_NAME_ALL_VENDORS, "ULR-Flags",
&s6a_ulr_flags, ENOENT));
AVP_BY_NAME_ALL_VENDORS, "ULR-Flags", &s6a_ulr_flags, ENOENT));
CHECK_FCT(fd_dict_search(fd_g_config->cnf_dict, DICT_AVP,
AVP_BY_NAME_ALL_VENDORS, "ULA-Flags",
&s6a_ula_flags, ENOENT));
AVP_BY_NAME_ALL_VENDORS, "ULA-Flags", &s6a_ula_flags, ENOENT));
CHECK_FCT(fd_dict_search(fd_g_config->cnf_dict, DICT_AVP,
AVP_BY_NAME_ALL_VENDORS, "Subscription-Data",
&s6a_subscription_data, ENOENT));
&s6a_subscription_data, ENOENT));
CHECK_FCT(fd_dict_search(fd_g_config->cnf_dict, DICT_AVP,
AVP_BY_NAME_ALL_VENDORS, "Requested-EUTRAN-Authentication-Info",
&s6a_req_eutran_auth_info, ENOENT));
&s6a_req_eutran_auth_info, ENOENT));
CHECK_FCT(fd_dict_search(fd_g_config->cnf_dict, DICT_AVP,
AVP_BY_NAME_ALL_VENDORS, "Number-Of-Requested-Vectors",
&s6a_number_of_requested_vectors, ENOENT));
&s6a_number_of_requested_vectors, ENOENT));
CHECK_FCT(fd_dict_search(fd_g_config->cnf_dict, DICT_AVP,
AVP_BY_NAME_ALL_VENDORS, "Immediate-Response-Preferred",
&s6a_immediate_response_pref, ENOENT));
&s6a_immediate_response_pref, ENOENT));
CHECK_FCT(fd_dict_search(fd_g_config->cnf_dict, DICT_AVP,
AVP_BY_NAME_ALL_VENDORS, "Authentication-Info",
&s6a_authentication_info, ENOENT));
&s6a_authentication_info, ENOENT));
CHECK_FCT(fd_dict_search(fd_g_config->cnf_dict, DICT_AVP,
AVP_BY_NAME_ALL_VENDORS, "Re-Synchronization-Info",
&s6a_re_synchronization_info, ENOENT));
&s6a_re_synchronization_info, ENOENT));
CHECK_FCT(fd_dict_search(fd_g_config->cnf_dict, DICT_AVP,
AVP_BY_NAME_ALL_VENDORS, "Service-Selection",
&s6a_service_selection, ENOENT));
&s6a_service_selection, ENOENT));
CHECK_FCT(fd_dict_search(fd_g_config->cnf_dict, DICT_AVP,
AVP_BY_NAME_ALL_VENDORS, "UE-SRVCC-Capability",
&s6a_ue_srvcc_cap, ENOENT));
&s6a_ue_srvcc_cap, ENOENT));
CHECK_FCT(fd_dict_search (fd_g_config->cnf_dict, DICT_AVP,
AVP_BY_NAME_ALL_VENDORS, "User-Name", &s6a_imsi, ENOENT));
CHECK_FCT(fd_dict_search (fd_g_config->cnf_dict, DICT_AVP,
AVP_BY_NAME_ALL_VENDORS, "IMEI", &s6a_imei, ENOENT));
CHECK_FCT(fd_dict_search (fd_g_config->cnf_dict, DICT_AVP,
AVP_BY_NAME_ALL_VENDORS, "Software-Version",
&s6a_software_version, ENOENT));
CHECK_FCT(fd_dict_search (fd_g_config->cnf_dict, DICT_AVP,
AVP_BY_NAME_ALL_VENDORS, "Supported-Features",
&s6a_supported_features, ENOENT));
CHECK_FCT(fd_dict_search (fd_g_config->cnf_dict, DICT_AVP,
AVP_BY_NAME_ALL_VENDORS, "Requested-EUTRAN-Authentication-Info",
&s6a_req_e_utran_auth_info, ENOENT));
CHECK_FCT(fd_dict_search (fd_g_config->cnf_dict, DICT_AVP,
AVP_BY_NAME_ALL_VENDORS, "Number-Of-Requested-Vectors",
&s6a_req_nb_of_req_vectors, ENOENT));
CHECK_FCT(fd_dict_search (fd_g_config->cnf_dict, DICT_AVP,
AVP_BY_NAME_ALL_VENDORS, "Re-Synchronization-Info",
&s6a_req_resync_info, ENOENT));
CHECK_FCT(fd_dict_search (fd_g_config->cnf_dict, DICT_AVP,
AVP_BY_NAME_ALL_VENDORS, "Requested-UTRAN-GERAN-Authentication-Info",
&s6a_req_geran_auth_info, ENOENT));
CHECK_FCT(fd_dict_search (fd_g_config->cnf_dict, DICT_AVP,
AVP_BY_NAME_ALL_VENDORS, "Immediate-Response-Preferred",
&s6a_immediate_response_pref, ENOENT));
CHECK_FCT(fd_dict_search (fd_g_config->cnf_dict, DICT_AVP,
AVP_BY_NAME_ALL_VENDORS, "Visited-PLMN-Id",
&s6a_visited_plmn_id, ENOENT));
CHECK_FCT(fd_dict_search(fd_g_config->cnf_dict, DICT_AVP,
AVP_BY_NAME_ALL_VENDORS, "Auth-Session-State",
&s6a_auth_session_state, ENOENT));
CHECK_FCT(fd_dict_search(fd_g_config->cnf_dict, DICT_AVP,
AVP_BY_NAME_ALL_VENDORS, "Authentication-Info",
&s6a_authentication_info, ENOENT));
CHECK_FCT(fd_dict_search(fd_g_config->cnf_dict, DICT_AVP,
AVP_BY_NAME_ALL_VENDORS, "E-UTRAN-Vector",
&s6a_e_utran_vector, ENOENT));
CHECK_FCT(fd_dict_search(fd_g_config->cnf_dict, DICT_AVP,
AVP_BY_NAME_ALL_VENDORS, "RAND", &s6a_rand, ENOENT));
CHECK_FCT(fd_dict_search(fd_g_config->cnf_dict, DICT_AVP,
AVP_BY_NAME_ALL_VENDORS, "XRES", &s6a_xres, ENOENT));
CHECK_FCT(fd_dict_search(fd_g_config->cnf_dict, DICT_AVP,
AVP_BY_NAME_ALL_VENDORS, "AUTN", &s6a_autn, ENOENT));
CHECK_FCT(fd_dict_search(fd_g_config->cnf_dict, DICT_AVP,
AVP_BY_NAME_ALL_VENDORS, "KASME", &s6a_kasme, ENOENT));
CHECK_FCT(fd_dict_search(fd_g_config->cnf_dict, DICT_AVP,
AVP_BY_NAME_ALL_VENDORS, "ULR-Flags", &s6a_ulr_flags, ENOENT));
CHECK_FCT(fd_dict_search(fd_g_config->cnf_dict, DICT_AVP,
AVP_BY_NAME_ALL_VENDORS, "ULA-Flags", &s6a_ula_flags, ENOENT));
CHECK_FCT(fd_dict_search(fd_g_config->cnf_dict, DICT_AVP,
AVP_BY_NAME_ALL_VENDORS, "PUR-Flags", &s6a_pur_flags, ENOENT));
CHECK_FCT(fd_dict_search(fd_g_config->cnf_dict, DICT_AVP,
AVP_BY_NAME_ALL_VENDORS, "PUA-Flags", &s6a_pua_flags, ENOENT));
CHECK_FCT(fd_dict_search(fd_g_config->cnf_dict, DICT_AVP,
AVP_BY_NAME_ALL_VENDORS, "RAT-Type", &s6a_rat_type, ENOENT));
CHECK_FCT(fd_dict_search(fd_g_config->cnf_dict, DICT_AVP,
AVP_BY_NAME_ALL_VENDORS, "Terminal-Information",
&s6a_terminal_info, ENOENT));
CHECK_FCT(fd_dict_search(fd_g_config->cnf_dict, DICT_AVP,
AVP_BY_NAME_ALL_VENDORS, "UE-SRVCC-Capability",
&s6a_ue_srvcc_cap, ENOENT));
CHECK_FCT(fd_dict_search(fd_g_config->cnf_dict, DICT_AVP,
AVP_BY_NAME_ALL_VENDORS, "GMLC-Address", &s6a_gmlc_addr, ENOENT));
CHECK_FCT(fd_dict_search(fd_g_config->cnf_dict, DICT_AVP,
AVP_BY_NAME_ALL_VENDORS, "Subscription-Data",
&s6a_subscription_data, ENOENT));
CHECK_FCT(fd_dict_search(fd_g_config->cnf_dict, DICT_AVP,
AVP_BY_NAME_ALL_VENDORS, "Subscriber-Status",
&s6a_subscriber_status, ENOENT));
CHECK_FCT(fd_dict_search(fd_g_config->cnf_dict, DICT_AVP,
AVP_BY_NAME_ALL_VENDORS, "MSISDN", &s6a_msisdn, ENOENT));
CHECK_FCT(fd_dict_search(fd_g_config->cnf_dict, DICT_AVP,
AVP_BY_NAME_ALL_VENDORS, "AMBR", &s6a_ambr, ENOENT));
CHECK_FCT(fd_dict_search(fd_g_config->cnf_dict, DICT_AVP,
AVP_BY_NAME_ALL_VENDORS, "Network-Access-Mode",
&s6a_network_access_mode, ENOENT));
CHECK_FCT(fd_dict_search(fd_g_config->cnf_dict, DICT_AVP,
AVP_BY_NAME_ALL_VENDORS, "Access-Restriction-Data",
&s6a_access_restriction_data, ENOENT));
CHECK_FCT(fd_dict_search(fd_g_config->cnf_dict, DICT_AVP,
AVP_BY_NAME_ALL_VENDORS, "APN-Configuration-Profile",
&s6a_apn_configuration_profile, ENOENT));
CHECK_FCT(fd_dict_search(fd_g_config->cnf_dict, DICT_AVP,
AVP_BY_NAME_ALL_VENDORS, "Subscribed-Periodic-RAU-TAU-Timer",
&s6a_subscribed_rau_tau_timer, ENOENT));
CHECK_FCT(fd_dict_search(fd_g_config->cnf_dict, DICT_AVP,
AVP_BY_NAME_ALL_VENDORS, "Context-Identifier",
&s6a_context_identifier, ENOENT));
CHECK_FCT(fd_dict_search(fd_g_config->cnf_dict, DICT_AVP,
AVP_BY_NAME_ALL_VENDORS, "All-APN-Configurations-Included-Indicator",
&s6a_all_apn_conf_inc_ind, ENOENT));
CHECK_FCT(fd_dict_search(fd_g_config->cnf_dict, DICT_AVP,
AVP_BY_NAME_ALL_VENDORS, "APN-Configuration",
&s6a_apn_configuration, ENOENT));
CHECK_FCT(fd_dict_search(fd_g_config->cnf_dict, DICT_AVP,
AVP_BY_NAME_ALL_VENDORS, "Max-Requested-Bandwidth-UL",
&s6a_max_bandwidth_ul, ENOENT));
CHECK_FCT(fd_dict_search(fd_g_config->cnf_dict, DICT_AVP,
AVP_BY_NAME_ALL_VENDORS, "Max-Requested-Bandwidth-DL",
&s6a_max_bandwidth_dl, ENOENT));
CHECK_FCT(fd_dict_search(fd_g_config->cnf_dict, DICT_AVP,
AVP_BY_NAME_ALL_VENDORS, "PDN-Type", &s6a_pdn_type, ENOENT));
CHECK_FCT(fd_dict_search(fd_g_config->cnf_dict, DICT_AVP,
AVP_BY_NAME_ALL_VENDORS, "Service-Selection",
&s6a_service_selection, ENOENT));
CHECK_FCT(fd_dict_search(fd_g_config->cnf_dict, DICT_AVP,
AVP_BY_NAME_ALL_VENDORS, "EPS-Subscribed-QoS-Profile",
&s6a_eps_subscribed_qos_profile, ENOENT));
CHECK_FCT(fd_dict_search(fd_g_config->cnf_dict, DICT_AVP,
AVP_BY_NAME_ALL_VENDORS, "QoS-Class-Identifier",
&s6a_qos_class_identifier, ENOENT));
CHECK_FCT(fd_dict_search(fd_g_config->cnf_dict, DICT_AVP,
AVP_BY_NAME_ALL_VENDORS, "Allocation-Retention-Priority",
&s6a_allocation_retention_priority, ENOENT));
CHECK_FCT(fd_dict_search(fd_g_config->cnf_dict, DICT_AVP,
AVP_BY_NAME_ALL_VENDORS, "Priority-Level",
&s6a_priority_level, ENOENT));
CHECK_FCT(fd_dict_search(fd_g_config->cnf_dict, DICT_AVP,
AVP_BY_NAME_ALL_VENDORS, "Pre-emption-Capability",
&s6a_pre_emption_capability, ENOENT));
CHECK_FCT(fd_dict_search(fd_g_config->cnf_dict, DICT_AVP,
AVP_BY_NAME_ALL_VENDORS, "Pre-emption-Vulnerability",
&s6a_pre_emption_vulnerability, ENOENT));
CHECK_FCT(fd_dict_search(fd_g_config->cnf_dict, DICT_AVP,
AVP_BY_NAME_ALL_VENDORS, "Served-Party-IP-Address",
&s6a_served_party_ip_addr, ENOENT));
return CORE_OK;
}

View File

@ -36,6 +36,8 @@ extern struct dict_object *s6a_pua;
extern struct dict_object *s6a_clr;
extern struct dict_object *s6a_cla;
extern struct dict_object *s6a_origin_host;
extern struct dict_object *s6a_origin_realm;
extern struct dict_object *s6a_destination_host;
extern struct dict_object *s6a_destination_realm;
extern struct dict_object *s6a_user_name;
@ -43,6 +45,8 @@ extern struct dict_object *s6a_session_id;
extern struct dict_object *s6a_auth_session_state;
extern struct dict_object *s6a_result_code;
extern struct dict_object *s6a_experimental_result;
extern struct dict_object *s6a_vendor_id;
extern struct dict_object *s6a_experimental_result_code;
extern struct dict_object *s6a_visited_plmn_id;
extern struct dict_object *s6a_rat_type;
@ -56,6 +60,53 @@ extern struct dict_object *s6a_authentication_info;
extern struct dict_object *s6a_re_synchronization_info;
extern struct dict_object *s6a_service_selection;
extern struct dict_object *s6a_ue_srvcc_cap;
extern struct dict_object *s6a_imsi;
extern struct dict_object *s6a_imei;
extern struct dict_object *s6a_software_version;
extern struct dict_object *s6a_supported_features;
extern struct dict_object *s6a_req_e_utran_auth_info;
extern struct dict_object *s6a_req_resync_info;
extern struct dict_object *s6a_req_nb_of_req_vectors;
extern struct dict_object *s6a_req_geran_auth_info;
extern struct dict_object *s6a_immediate_response_pref;
extern struct dict_object *s6a_visited_plmn_id;
extern struct dict_object *s6a_auth_session_state;
extern struct dict_object *s6a_authentication_info;
extern struct dict_object *s6a_e_utran_vector;
extern struct dict_object *s6a_rand;
extern struct dict_object *s6a_xres;
extern struct dict_object *s6a_autn;
extern struct dict_object *s6a_kasme;
extern struct dict_object *s6a_ulr_flags;
extern struct dict_object *s6a_ula_flags;
extern struct dict_object *s6a_pur_flags;
extern struct dict_object *s6a_pua_flags;
extern struct dict_object *s6a_rat_type;
extern struct dict_object *s6a_terminal_info;
extern struct dict_object *s6a_ue_srvcc_cap;
extern struct dict_object *s6a_gmlc_addr;
extern struct dict_object *s6a_subscription_data;
extern struct dict_object *s6a_subscriber_status;
extern struct dict_object *s6a_msisdn;
extern struct dict_object *s6a_ambr;
extern struct dict_object *s6a_network_access_mode;
extern struct dict_object *s6a_access_restriction_data;
extern struct dict_object *s6a_apn_configuration_profile;
extern struct dict_object *s6a_subscribed_rau_tau_timer;
extern struct dict_object *s6a_context_identifier;
extern struct dict_object *s6a_all_apn_conf_inc_ind;
extern struct dict_object *s6a_apn_configuration;
extern struct dict_object *s6a_max_bandwidth_ul;
extern struct dict_object *s6a_max_bandwidth_dl;
extern struct dict_object *s6a_pdn_type;
extern struct dict_object *s6a_service_selection;
extern struct dict_object *s6a_eps_subscribed_qos_profile;
extern struct dict_object *s6a_qos_class_identifier;
extern struct dict_object *s6a_allocation_retention_priority;
extern struct dict_object *s6a_priority_level;
extern struct dict_object *s6a_pre_emption_capability;
extern struct dict_object *s6a_pre_emption_vulnerability;
extern struct dict_object *s6a_served_party_ip_addr;
#ifdef __cplusplus
}