Navigation

Changeset 120:d7acdc46134d in freeDiameter for extensions/test_app/ta_dict.c


Ignore:
Timestamp:
Dec 9, 2009, 5:36:38 PM (14 years ago)
Author:
Sebastien Decugis <sdecugis@nict.go.jp>
Branch:
default
Phase:
public
Message:

Renamed several extensions

File:
1 moved

Legend:

Unmodified
Added
Removed

  • extensions/test_app/ta_dict.c

    r93 r120  
    3636/* Install the dictionary objects */
    3737
    38 #include "app_test.h"
     38#include "test_app.h"
    3939
    40 struct dict_object * atst_vendor = NULL;
    41 struct dict_object * atst_appli = NULL;
    42 struct dict_object * atst_cmd_r = NULL;
    43 struct dict_object * atst_cmd_a = NULL;
    44 struct dict_object * atst_avp = NULL;
     40struct dict_object * ta_vendor = NULL;
     41struct dict_object * ta_appli = NULL;
     42struct dict_object * ta_cmd_r = NULL;
     43struct dict_object * ta_cmd_a = NULL;
     44struct dict_object * ta_avp = NULL;
    4545
    46 struct dict_object * atst_sess_id = NULL;
    47 struct dict_object * atst_origin_host = NULL;
    48 struct dict_object * atst_origin_realm = NULL;
    49 struct dict_object * atst_dest_host = NULL;
    50 struct dict_object * atst_dest_realm = NULL;
    51 struct dict_object * atst_res_code = NULL;
     46struct dict_object * ta_sess_id = NULL;
     47struct dict_object * ta_origin_host = NULL;
     48struct dict_object * ta_origin_realm = NULL;
     49struct dict_object * ta_dest_host = NULL;
     50struct dict_object * ta_dest_realm = NULL;
     51struct dict_object * ta_res_code = NULL;
    5252
    53 int atst_dict_init(void)
     53int ta_dict_init(void)
    5454{
    5555        TRACE_DEBUG(FULL, "Initializing the dictionary for test");
    … …  
    5858        {
    5959                struct dict_vendor_data data;
    60                 data.vendor_id = atst_conf->vendor_id;
     60                data.vendor_id = ta_conf->vendor_id;
    6161                data.vendor_name = "app_test vendor";
    62                 CHECK_FCT(fd_dict_new( fd_g_config->cnf_dict, DICT_VENDOR, &data, NULL, &atst_vendor));
     62                CHECK_FCT(fd_dict_new( fd_g_config->cnf_dict, DICT_VENDOR, &data, NULL, &ta_vendor));
    6363        }
    6464       
    … …  
    6666        {
    6767                struct dict_application_data data;
    68                 data.application_id = atst_conf->appli_id;
     68                data.application_id = ta_conf->appli_id;
    6969                data.application_name = "app_test application";
    70                 CHECK_FCT(fd_dict_new( fd_g_config->cnf_dict, DICT_APPLICATION, &data, atst_vendor, &atst_appli));
     70                CHECK_FCT(fd_dict_new( fd_g_config->cnf_dict, DICT_APPLICATION, &data, ta_vendor, &ta_appli));
    7171        }
    7272       
    … …  
    7474        {
    7575                struct dict_cmd_data data;
    76                 data.cmd_code = atst_conf->cmd_id;
     76                data.cmd_code = ta_conf->cmd_id;
    7777                data.cmd_name = "Test-Request";
    7878                data.cmd_flag_mask = CMD_FLAG_PROXIABLE | CMD_FLAG_REQUEST;
    7979                data.cmd_flag_val  = CMD_FLAG_PROXIABLE | CMD_FLAG_REQUEST;
    80                 CHECK_FCT(fd_dict_new( fd_g_config->cnf_dict, DICT_COMMAND, &data, atst_appli, &atst_cmd_r));
     80                CHECK_FCT(fd_dict_new( fd_g_config->cnf_dict, DICT_COMMAND, &data, ta_appli, &ta_cmd_r));
    8181                data.cmd_name = "Test-Answer";
    8282                data.cmd_flag_val  = CMD_FLAG_PROXIABLE;
    83                 CHECK_FCT(fd_dict_new( fd_g_config->cnf_dict, DICT_COMMAND, &data, atst_appli, &atst_cmd_a));
     83                CHECK_FCT(fd_dict_new( fd_g_config->cnf_dict, DICT_COMMAND, &data, ta_appli, &ta_cmd_a));
    8484        }
    8585       
    … …  
    8787        {
    8888                struct dict_avp_data data;
    89                 data.avp_code = atst_conf->avp_id;
    90                 data.avp_vendor = atst_conf->vendor_id;
     89                data.avp_code = ta_conf->avp_id;
     90                data.avp_vendor = ta_conf->vendor_id;
    9191                data.avp_name = "Test-AVP";
    9292                data.avp_flag_mask = AVP_FLAG_VENDOR;
    9393                data.avp_flag_val = AVP_FLAG_VENDOR;
    9494                data.avp_basetype = AVP_TYPE_INTEGER32;
    95                 CHECK_FCT(fd_dict_new( fd_g_config->cnf_dict, DICT_AVP, &data, NULL, &atst_avp));
     95                CHECK_FCT(fd_dict_new( fd_g_config->cnf_dict, DICT_AVP, &data, NULL, &ta_avp));
    9696        }
    9797       
    9898        /* Now resolve some other useful AVPs */
    99         CHECK_FCT( fd_dict_search( fd_g_config->cnf_dict, DICT_AVP, AVP_BY_NAME, "Session-Id", &atst_sess_id, ENOENT) );
    100         CHECK_FCT( fd_dict_search( fd_g_config->cnf_dict, DICT_AVP, AVP_BY_NAME, "Origin-Host", &atst_origin_host, ENOENT) );
    101         CHECK_FCT( fd_dict_search( fd_g_config->cnf_dict, DICT_AVP, AVP_BY_NAME, "Origin-Realm", &atst_origin_realm, ENOENT) );
    102         CHECK_FCT( fd_dict_search( fd_g_config->cnf_dict, DICT_AVP, AVP_BY_NAME, "Destination-Host", &atst_dest_host, ENOENT) );
    103         CHECK_FCT( fd_dict_search( fd_g_config->cnf_dict, DICT_AVP, AVP_BY_NAME, "Destination-Realm", &atst_dest_realm, ENOENT) );
    104         CHECK_FCT( fd_dict_search( fd_g_config->cnf_dict, DICT_AVP, AVP_BY_NAME, "Result-Code", &atst_res_code, ENOENT) );
     99        CHECK_FCT( fd_dict_search( fd_g_config->cnf_dict, DICT_AVP, AVP_BY_NAME, "Session-Id", &ta_sess_id, ENOENT) );
     100        CHECK_FCT( fd_dict_search( fd_g_config->cnf_dict, DICT_AVP, AVP_BY_NAME, "Origin-Host", &ta_origin_host, ENOENT) );
     101        CHECK_FCT( fd_dict_search( fd_g_config->cnf_dict, DICT_AVP, AVP_BY_NAME, "Origin-Realm", &ta_origin_realm, ENOENT) );
     102        CHECK_FCT( fd_dict_search( fd_g_config->cnf_dict, DICT_AVP, AVP_BY_NAME, "Destination-Host", &ta_dest_host, ENOENT) );
     103        CHECK_FCT( fd_dict_search( fd_g_config->cnf_dict, DICT_AVP, AVP_BY_NAME, "Destination-Realm", &ta_dest_realm, ENOENT) );
     104        CHECK_FCT( fd_dict_search( fd_g_config->cnf_dict, DICT_AVP, AVP_BY_NAME, "Result-Code", &ta_res_code, ENOENT) );
    105105       
    106106        /* Create the rules for Test-Request and Test-Answer */
    … …  
    111111               
    112112                /* Session-Id is in first position */
    113                 data.rule_avp = atst_sess_id;
     113                data.rule_avp = ta_sess_id;
    114114                data.rule_position = RULE_FIXED_HEAD;
    115115                data.rule_order = 1;
    116                 CHECK_FCT(fd_dict_new( fd_g_config->cnf_dict, DICT_RULE, &data, atst_cmd_r, NULL));
    117                 CHECK_FCT(fd_dict_new( fd_g_config->cnf_dict, DICT_RULE, &data, atst_cmd_a, NULL));
     116                CHECK_FCT(fd_dict_new( fd_g_config->cnf_dict, DICT_RULE, &data, ta_cmd_r, NULL));
     117                CHECK_FCT(fd_dict_new( fd_g_config->cnf_dict, DICT_RULE, &data, ta_cmd_a, NULL));
    118118               
    119119                data.rule_position = RULE_REQUIRED;
    120120                /* Test-AVP is mandatory */
    121                 data.rule_avp = atst_avp;
    122                 CHECK_FCT(fd_dict_new( fd_g_config->cnf_dict, DICT_RULE, &data, atst_cmd_r, NULL));
    123                 CHECK_FCT(fd_dict_new( fd_g_config->cnf_dict, DICT_RULE, &data, atst_cmd_a, NULL));
     121                data.rule_avp = ta_avp;
     122                CHECK_FCT(fd_dict_new( fd_g_config->cnf_dict, DICT_RULE, &data, ta_cmd_r, NULL));
     123                CHECK_FCT(fd_dict_new( fd_g_config->cnf_dict, DICT_RULE, &data, ta_cmd_a, NULL));
    124124               
    125125                /* idem for Origin Host and Realm */
    126                 data.rule_avp = atst_origin_host;
    127                 CHECK_FCT(fd_dict_new( fd_g_config->cnf_dict, DICT_RULE, &data, atst_cmd_r, NULL));
    128                 CHECK_FCT(fd_dict_new( fd_g_config->cnf_dict, DICT_RULE, &data, atst_cmd_a, NULL));
     126                data.rule_avp = ta_origin_host;
     127                CHECK_FCT(fd_dict_new( fd_g_config->cnf_dict, DICT_RULE, &data, ta_cmd_r, NULL));
     128                CHECK_FCT(fd_dict_new( fd_g_config->cnf_dict, DICT_RULE, &data, ta_cmd_a, NULL));
    129129               
    130                 data.rule_avp = atst_origin_realm;
    131                 CHECK_FCT(fd_dict_new( fd_g_config->cnf_dict, DICT_RULE, &data, atst_cmd_r, NULL));
    132                 CHECK_FCT(fd_dict_new( fd_g_config->cnf_dict, DICT_RULE, &data, atst_cmd_a, NULL));
     130                data.rule_avp = ta_origin_realm;
     131                CHECK_FCT(fd_dict_new( fd_g_config->cnf_dict, DICT_RULE, &data, ta_cmd_r, NULL));
     132                CHECK_FCT(fd_dict_new( fd_g_config->cnf_dict, DICT_RULE, &data, ta_cmd_a, NULL));
    133133               
    134134                /* And Result-Code is mandatory for answers only */
    135                 data.rule_avp = atst_res_code;
    136                 CHECK_FCT(fd_dict_new( fd_g_config->cnf_dict, DICT_RULE, &data, atst_cmd_a, NULL));
     135                data.rule_avp = ta_res_code;
     136                CHECK_FCT(fd_dict_new( fd_g_config->cnf_dict, DICT_RULE, &data, ta_cmd_a, NULL));
    137137               
    138138                /* And Destination-Realm for requests only */
    139                 data.rule_avp = atst_dest_realm;
    140                 CHECK_FCT(fd_dict_new( fd_g_config->cnf_dict, DICT_RULE, &data, atst_cmd_r, NULL));
     139                data.rule_avp = ta_dest_realm;
     140                CHECK_FCT(fd_dict_new( fd_g_config->cnf_dict, DICT_RULE, &data, ta_cmd_r, NULL));
    141141               
    142142                /* And Destination-Host optional for requests only */
    143143                data.rule_position = RULE_OPTIONAL;
    144144                data.rule_min = 0;
    145                 data.rule_avp = atst_dest_host;
    146                 CHECK_FCT(fd_dict_new( fd_g_config->cnf_dict, DICT_RULE, &data, atst_cmd_r, NULL));
     145                data.rule_avp = ta_dest_host;
     146                CHECK_FCT(fd_dict_new( fd_g_config->cnf_dict, DICT_RULE, &data, ta_cmd_r, NULL));
    147147               
    148148        }
Note: See TracChangeset for help on using the changeset viewer.