Changeset 8:3e143f047f78 in freeDiameter for freeDiameter/tests/testmesg.c
- Timestamp:
- Sep 18, 2009, 6:54:07 PM (15 years ago)
- Branch:
- default
- Phase:
- public
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
freeDiameter/tests/testmesg.c
r2 r8 51 51 52 52 /* Now find the ACR dictionary object */ 53 CHECK( 0, fd_dict_search ( fd_g_ dict, DICT_COMMAND, CMD_BY_NAME, "Accounting-Request", &acr_model, ENOENT ) );53 CHECK( 0, fd_dict_search ( fd_g_config->g_dict, DICT_COMMAND, CMD_BY_NAME, "Accounting-Request", &acr_model, ENOENT ) ); 54 54 55 55 /* Create the instance, using the templates */ … … 71 71 72 72 /* Now find the ACR dictionary object */ 73 CHECK( 0, fd_dict_search ( fd_g_ dict, DICT_AVP, AVP_BY_NAME, "Proxy-Info", &pi_model, ENOENT ) );73 CHECK( 0, fd_dict_search ( fd_g_config->g_dict, DICT_AVP, AVP_BY_NAME, "Proxy-Info", &pi_model, ENOENT ) ); 74 74 75 75 /* Create the instance, using the templates */ … … 133 133 134 134 /* Now find the dictionary object */ 135 CHECK( 0, fd_dict_search ( fd_g_ dict, DICT_AVP, AVP_BY_NAME, "Route-Record", &rr_model, ENOENT ) );135 CHECK( 0, fd_dict_search ( fd_g_config->g_dict, DICT_AVP, AVP_BY_NAME, "Route-Record", &rr_model, ENOENT ) ); 136 136 137 137 /* Create the instance, using the templates */ … … 161 161 162 162 /* Now find the ACR dictionary object */ 163 CHECK( 0, fd_dict_search ( fd_g_ dict, DICT_COMMAND, CMD_BY_NAME, "Accounting-Request", &acr_model, ENOENT ) );163 CHECK( 0, fd_dict_search ( fd_g_config->g_dict, DICT_COMMAND, CMD_BY_NAME, "Accounting-Request", &acr_model, ENOENT ) ); 164 164 165 165 /* Create the instance, using the templates */ … … 173 173 { 174 174 struct dict_vendor_data vendor_data = { 73565, "Vendor test" }; 175 CHECK( 0, fd_dict_new ( fd_g_ dict, DICT_VENDOR, &vendor_data , NULL, &vendor ) );175 CHECK( 0, fd_dict_new ( fd_g_config->g_dict, DICT_VENDOR, &vendor_data , NULL, &vendor ) ); 176 176 } 177 177 178 178 { 179 179 struct dict_application_data app_data = { 73566, "Application test" }; 180 CHECK( 0, fd_dict_new ( fd_g_ dict, DICT_APPLICATION, &app_data , vendor, NULL ) );180 CHECK( 0, fd_dict_new ( fd_g_config->g_dict, DICT_APPLICATION, &app_data , vendor, NULL ) ); 181 181 } 182 182 183 183 { 184 184 struct dict_avp_data avp_data = { 73567, 0, "AVP Test - no vendor - f32", 0, 0, AVP_TYPE_FLOAT32 }; 185 CHECK( 0, fd_dict_new ( fd_g_ dict, DICT_AVP, &avp_data , NULL, NULL ) );185 CHECK( 0, fd_dict_new ( fd_g_config->g_dict, DICT_AVP, &avp_data , NULL, NULL ) ); 186 186 } 187 187 … … 190 190 struct dict_type_data type_data = { AVP_TYPE_INTEGER64, "Int64 test" }; 191 191 struct dict_avp_data avp_data = { 73568, 73565, "AVP Test - i64", AVP_FLAG_VENDOR, AVP_FLAG_VENDOR, AVP_TYPE_INTEGER64 }; 192 CHECK( 0, fd_dict_new ( fd_g_ dict, DICT_TYPE, &type_data , NULL, &type ) );193 CHECK( 0, fd_dict_new ( fd_g_ dict, DICT_AVP, &avp_data , type, NULL ) );192 CHECK( 0, fd_dict_new ( fd_g_config->g_dict, DICT_TYPE, &type_data , NULL, &type ) ); 193 CHECK( 0, fd_dict_new ( fd_g_config->g_dict, DICT_AVP, &avp_data , type, NULL ) ); 194 194 } 195 195 … … 202 202 struct dict_avp_data avp_data = { 73569, 73565, "AVP Test - enumi32", AVP_FLAG_VENDOR, AVP_FLAG_VENDOR, AVP_TYPE_INTEGER32 }; 203 203 204 CHECK( 0, fd_dict_new ( fd_g_ dict, DICT_TYPE, &type_data , NULL, &type ) );205 CHECK( 0, fd_dict_new ( fd_g_ dict, DICT_AVP, &avp_data , type, NULL ) );206 CHECK( 0, fd_dict_new ( fd_g_ dict, DICT_ENUMVAL, &val1 , type, NULL ) );207 CHECK( 0, fd_dict_new ( fd_g_ dict, DICT_ENUMVAL, &val2 , type, NULL ) );208 CHECK( 0, fd_dict_new ( fd_g_ dict, DICT_ENUMVAL, &val3 , type, NULL ) );204 CHECK( 0, fd_dict_new ( fd_g_config->g_dict, DICT_TYPE, &type_data , NULL, &type ) ); 205 CHECK( 0, fd_dict_new ( fd_g_config->g_dict, DICT_AVP, &avp_data , type, NULL ) ); 206 CHECK( 0, fd_dict_new ( fd_g_config->g_dict, DICT_ENUMVAL, &val1 , type, NULL ) ); 207 CHECK( 0, fd_dict_new ( fd_g_config->g_dict, DICT_ENUMVAL, &val2 , type, NULL ) ); 208 CHECK( 0, fd_dict_new ( fd_g_config->g_dict, DICT_ENUMVAL, &val3 , type, NULL ) ); 209 209 } 210 210 … … 213 213 struct dict_type_data type_data = { AVP_TYPE_OCTETSTRING, "OS test" }; 214 214 struct dict_avp_data avp_data = { 73570, 73565, "AVP Test - os", AVP_FLAG_VENDOR, AVP_FLAG_VENDOR, AVP_TYPE_OCTETSTRING }; 215 CHECK( 0, fd_dict_new ( fd_g_ dict, DICT_TYPE, &type_data , NULL, &type ) );216 CHECK( 0, fd_dict_new ( fd_g_ dict, DICT_AVP, &avp_data , type, NULL ) );215 CHECK( 0, fd_dict_new ( fd_g_config->g_dict, DICT_TYPE, &type_data , NULL, &type ) ); 216 CHECK( 0, fd_dict_new ( fd_g_config->g_dict, DICT_AVP, &avp_data , type, NULL ) ); 217 217 } 218 218 … … 225 225 struct dict_avp_data avp_data = { 73571, 73565, "AVP Test - enumos", AVP_FLAG_VENDOR, AVP_FLAG_VENDOR, AVP_TYPE_OCTETSTRING }; 226 226 227 CHECK( 0, fd_dict_new ( fd_g_ dict, DICT_TYPE, &type_data , NULL, &type ) );228 CHECK( 0, fd_dict_new ( fd_g_ dict, DICT_AVP, &avp_data , type, NULL ) );229 CHECK( 0, fd_dict_new ( fd_g_ dict, DICT_ENUMVAL, &val1 , type, NULL ) );230 CHECK( 0, fd_dict_new ( fd_g_ dict, DICT_ENUMVAL, &val2 , type, NULL ) );231 CHECK( 0, fd_dict_new ( fd_g_ dict, DICT_ENUMVAL, &val3 , type, NULL ) );227 CHECK( 0, fd_dict_new ( fd_g_config->g_dict, DICT_TYPE, &type_data , NULL, &type ) ); 228 CHECK( 0, fd_dict_new ( fd_g_config->g_dict, DICT_AVP, &avp_data , type, NULL ) ); 229 CHECK( 0, fd_dict_new ( fd_g_config->g_dict, DICT_ENUMVAL, &val1 , type, NULL ) ); 230 CHECK( 0, fd_dict_new ( fd_g_config->g_dict, DICT_ENUMVAL, &val2 , type, NULL ) ); 231 CHECK( 0, fd_dict_new ( fd_g_config->g_dict, DICT_ENUMVAL, &val3 , type, NULL ) ); 232 232 } 233 233 … … 236 236 struct dict_avp_data avp_data = { 73572, 73565, "AVP Test - grouped", AVP_FLAG_VENDOR, AVP_FLAG_VENDOR, AVP_TYPE_GROUPED }; 237 237 238 CHECK( 0, fd_dict_new ( fd_g_ dict, DICT_AVP, &avp_data , NULL, &gavp ) );238 CHECK( 0, fd_dict_new ( fd_g_config->g_dict, DICT_AVP, &avp_data , NULL, &gavp ) ); 239 239 240 240 /* Macro to search AVP and create a rule */ … … 243 243 struct dict_avp_request _req = { (_vendor), 0, (_avpname) }; \ 244 244 struct dict_rule_data _data; \ 245 CHECK( 0, fd_dict_search( fd_g_ dict, DICT_AVP, AVP_BY_NAME_AND_VENDOR, &_req, &_avp, ENOENT));\245 CHECK( 0, fd_dict_search( fd_g_config->g_dict, DICT_AVP, AVP_BY_NAME_AND_VENDOR, &_req, &_avp, ENOENT));\ 246 246 _data.rule_avp = _avp; \ 247 247 _data.rule_position = (_pos); \ … … 249 249 _data.rule_min = (_min); \ 250 250 _data.rule_max = (_max); \ 251 CHECK( 0, fd_dict_new ( fd_g_ dict, DICT_RULE, &_data , (_parent), NULL ) ); \251 CHECK( 0, fd_dict_new ( fd_g_config->g_dict, DICT_RULE, &_data , (_parent), NULL ) ); \ 252 252 } 253 253 … … 261 261 struct dict_cmd_data cmd_data = { 73573, "Test-Command-Request", CMD_FLAG_REQUEST, CMD_FLAG_REQUEST }; 262 262 263 CHECK( 0, fd_dict_search ( fd_g_ dict, DICT_APPLICATION, APPLICATION_BY_NAME, "Application test", &application, ENOENT ) );264 CHECK( 0, fd_dict_new ( fd_g_ dict, DICT_COMMAND, &cmd_data , application, &command ) );263 CHECK( 0, fd_dict_search ( fd_g_config->g_dict, DICT_APPLICATION, APPLICATION_BY_NAME, "Application test", &application, ENOENT ) ); 264 CHECK( 0, fd_dict_new ( fd_g_config->g_dict, DICT_COMMAND, &cmd_data , application, &command ) ); 265 265 ADD_RULE(command, 0, "AVP Test - no vendor - f32", RULE_FIXED_HEAD, -1, 1, 1); 266 266 ADD_RULE(command, 73565, "AVP Test - i64", RULE_REQUIRED, -1, -1, 0); … … 275 275 struct dict_avp_data avp_data = { 73574, 73565, "AVP Test - rules", AVP_FLAG_VENDOR, AVP_FLAG_VENDOR, AVP_TYPE_GROUPED }; 276 276 277 CHECK( 0, fd_dict_new ( fd_g_ dict, DICT_AVP, &avp_data , NULL, &gavp ) );277 CHECK( 0, fd_dict_new ( fd_g_config->g_dict, DICT_AVP, &avp_data , NULL, &gavp ) ); 278 278 279 279 ADD_RULE(gavp, 0, "AVP Test - no vendor - f32", RULE_FIXED_HEAD, 0, 1, 1); … … 303 303 union avp_value value; 304 304 305 CHECK( 0, fd_dict_search ( fd_g_ dict, DICT_COMMAND, CMD_BY_NAME, "Test-Command-Request", &cmd_model, ENOENT ) );305 CHECK( 0, fd_dict_search ( fd_g_config->g_dict, DICT_COMMAND, CMD_BY_NAME, "Test-Command-Request", &cmd_model, ENOENT ) ); 306 306 307 307 /* Check an error is trigged if the AVP has no value set */ 308 308 { 309 CHECK( 0, fd_dict_search ( fd_g_ dict, DICT_AVP, AVP_BY_NAME, "AVP Test - no vendor - f32", &avp_model, ENOENT ) );309 CHECK( 0, fd_dict_search ( fd_g_config->g_dict, DICT_AVP, AVP_BY_NAME, "AVP Test - no vendor - f32", &avp_model, ENOENT ) ); 310 310 311 311 CHECK( 0, fd_msg_new ( cmd_model, 0, &msg ) ); … … 329 329 struct dict_object * _avp = NULL; \ 330 330 struct dict_avp_request _req = { (_avpvendor), 0, (_avpname) }; \ 331 CHECK( 0, fd_dict_search( fd_g_ dict, DICT_AVP, AVP_BY_NAME_AND_VENDOR, &_req, &_avp, ENOENT));\331 CHECK( 0, fd_dict_search( fd_g_config->g_dict, DICT_AVP, AVP_BY_NAME_AND_VENDOR, &_req, &_avp, ENOENT));\ 332 332 CHECK( 0, fd_msg_avp_new ( _avp, 0, &_avpi ) ); \ 333 333 CHECK( 0, fd_msg_avp_add ( (_parent), (_position), _avpi ) ); \ … … 378 378 379 379 CHECK( 0, fd_msg_model ( avpi, &avp_model ) ); 380 CHECK( 0, fd_dict_search ( fd_g_ dict, DICT_TYPE, TYPE_OF_AVP, avp_model, &type_model, ENOENT ) );380 CHECK( 0, fd_dict_search ( fd_g_config->g_dict, DICT_TYPE, TYPE_OF_AVP, avp_model, &type_model, ENOENT ) ); 381 381 memset(&request, 0, sizeof(request)); 382 382 request.type_obj = type_model; 383 383 request.search.enum_name = "i32 const test (val 2)"; 384 CHECK( 0, fd_dict_search ( fd_g_ dict, DICT_ENUMVAL, ENUMVAL_BY_STRUCT, &request, &value_model, ENOENT ) );384 CHECK( 0, fd_dict_search ( fd_g_config->g_dict, DICT_ENUMVAL, ENUMVAL_BY_STRUCT, &request, &value_model, ENOENT ) ); 385 385 CHECK( 0, fd_dict_getval ( value_model, &request.search ) ); 386 386 CHECK( 0, fd_msg_avp_setvalue ( avpi, &request.search.enum_value ) ); … … 399 399 400 400 CHECK( 0, fd_msg_model ( avpi, &avp_model ) ); 401 CHECK( 0, fd_dict_search ( fd_g_ dict, DICT_TYPE, TYPE_OF_AVP, avp_model, &type_model, ENOENT ) );401 CHECK( 0, fd_dict_search ( fd_g_config->g_dict, DICT_TYPE, TYPE_OF_AVP, avp_model, &type_model, ENOENT ) ); 402 402 memset(&request, 0, sizeof(request)); 403 403 request.type_obj = type_model; 404 404 request.search.enum_name = "i32 const test (val -5)"; 405 CHECK( 0, fd_dict_search ( fd_g_ dict, DICT_ENUMVAL, ENUMVAL_BY_STRUCT, &request, &value_model, ENOENT ) );405 CHECK( 0, fd_dict_search ( fd_g_config->g_dict, DICT_ENUMVAL, ENUMVAL_BY_STRUCT, &request, &value_model, ENOENT ) ); 406 406 CHECK( 0, fd_dict_getval ( value_model, &request.search ) ); 407 407 CHECK( 0, fd_msg_avp_setvalue ( avpi, &request.search.enum_value ) ); … … 458 458 459 459 CHECK( 0, fd_msg_model ( avpi, &avp_model ) ); 460 CHECK( 0, fd_dict_search ( fd_g_ dict, DICT_TYPE, TYPE_OF_AVP, avp_model, &type_model, ENOENT ) );460 CHECK( 0, fd_dict_search ( fd_g_config->g_dict, DICT_TYPE, TYPE_OF_AVP, avp_model, &type_model, ENOENT ) ); 461 461 memset(&request, 0, sizeof(request)); 462 462 request.type_obj = type_model; 463 463 request.search.enum_name = "os const test (waaad)"; 464 CHECK( 0, fd_dict_search ( fd_g_ dict, DICT_ENUMVAL, ENUMVAL_BY_STRUCT, &request, &value_model, ENOENT ) );464 CHECK( 0, fd_dict_search ( fd_g_config->g_dict, DICT_ENUMVAL, ENUMVAL_BY_STRUCT, &request, &value_model, ENOENT ) ); 465 465 CHECK( 0, fd_dict_getval ( value_model, &request.search ) ); 466 466 CHECK( 0, fd_msg_avp_setvalue ( avpi, &request.search.enum_value ) ); … … 483 483 484 484 CHECK( 0, fd_msg_model ( avpi, &avp_model ) ); 485 CHECK( 0, fd_dict_search ( fd_g_ dict, DICT_TYPE, TYPE_OF_AVP, avp_model, &type_model, ENOENT ) );485 CHECK( 0, fd_dict_search ( fd_g_config->g_dict, DICT_TYPE, TYPE_OF_AVP, avp_model, &type_model, ENOENT ) ); 486 486 memset(&request, 0, sizeof(request)); 487 487 request.type_obj = type_model; 488 488 request.search.enum_name = "os const test (waa)"; 489 CHECK( 0, fd_dict_search ( fd_g_ dict, DICT_ENUMVAL, ENUMVAL_BY_STRUCT, &request, &value_model, ENOENT ) );489 CHECK( 0, fd_dict_search ( fd_g_config->g_dict, DICT_ENUMVAL, ENUMVAL_BY_STRUCT, &request, &value_model, ENOENT ) ); 490 490 CHECK( 0, fd_dict_getval ( value_model, &request.search ) ); 491 491 CHECK( 0, fd_msg_avp_setvalue ( avpi, &request.search.enum_value ) ); … … 654 654 655 655 /* Now find the ACR dictionary object */ 656 CHECK( 0, fd_dict_search ( fd_g_ dict, DICT_AVP, AVP_BY_NAME, "AVP Test - no vendor - f32", &avp_model, ENOENT ) );656 CHECK( 0, fd_dict_search ( fd_g_config->g_dict, DICT_AVP, AVP_BY_NAME, "AVP Test - no vendor - f32", &avp_model, ENOENT ) ); 657 657 658 658 CPYBUF(); … … 680 680 buf_cpy[5] = 0x11; 681 681 CHECK( 0, fd_msg_parse_buffer( &buf_cpy, 344, &msg) ); 682 CHECK( ENOTSUP, fd_msg_parse_dict( msg, fd_g_ dict ) );682 CHECK( ENOTSUP, fd_msg_parse_dict( msg, fd_g_config->g_dict ) ); 683 683 684 684 /* reset */ … … 695 695 /* Check that we cannot support this message now */ 696 696 CHECK( 0, fd_msg_parse_buffer( &buf_cpy, 344, &msg) ); 697 CHECK( ENOTSUP, fd_msg_parse_dict( msg, fd_g_ dict ) );697 CHECK( ENOTSUP, fd_msg_parse_dict( msg, fd_g_config->g_dict ) ); 698 698 699 699 /* reset */ … … 709 709 /* Check that we can support this message now */ 710 710 CHECK( 0, fd_msg_parse_buffer( &buf_cpy, 344, &msg) ); 711 CHECK( 0, fd_msg_parse_dict( msg, fd_g_ dict ) );711 CHECK( 0, fd_msg_parse_dict( msg, fd_g_config->g_dict ) ); 712 712 713 713 #if 0 … … 720 720 721 721 CHECK( 0, fd_msg_parse_buffer( &buf, 344, &msg) ); 722 CHECK( 0, fd_msg_parse_dict( msg, fd_g_ dict ) );722 CHECK( 0, fd_msg_parse_dict( msg, fd_g_config->g_dict ) ); 723 723 #if 0 724 724 fd_msg_dump_walk(0, msg); … … 730 730 struct dict_object * rule; 731 731 732 CHECK( 0, fd_msg_parse_rules( msg, fd_g_ dict, &rule ) );732 CHECK( 0, fd_msg_parse_rules( msg, fd_g_config->g_dict, &rule ) ); 733 733 734 734 /* Use the "AVP Test - rules" AVP to test the rules */ … … 749 749 750 750 /* Check the message is still conform */ 751 CHECK( 0, fd_msg_parse_rules( msg, fd_g_ dict, &rule ) );751 CHECK( 0, fd_msg_parse_rules( msg, fd_g_config->g_dict, &rule ) ); 752 752 753 753 /* The first avp is optional in fixed position, so remove it and check the message is still OK */ 754 754 CHECK( 0, fd_msg_browse ( tavp, MSG_BRW_FIRST_CHILD, &childavp, NULL) ); 755 755 CHECK( 0, fd_msg_free ( childavp ) ); 756 CHECK( 0, fd_msg_parse_rules( msg, fd_g_ dict, &rule ) );756 CHECK( 0, fd_msg_parse_rules( msg, fd_g_config->g_dict, &rule ) ); 757 757 ADD_AVP( tavp, MSG_BRW_FIRST_CHILD, childavp, 0, "AVP Test - no vendor - f32" ); 758 758 … … 761 761 #define CHECK_CONFLICT( _msg, _ruleavp, _avpvendor ) { \ 762 762 struct dict_object * _rule; \ 763 CHECK( EBADMSG, fd_msg_parse_rules( _msg, fd_g_ dict, &_rule ) ); \763 CHECK( EBADMSG, fd_msg_parse_rules( _msg, fd_g_config->g_dict, &_rule ) ); \ 764 764 if ((_ruleavp) == NULL) { \ 765 765 CHECK( NULL, _rule); \ … … 768 768 struct dict_object * _avp; \ 769 769 struct dict_avp_request _req = { (_avpvendor), 0, (_ruleavp) }; \ 770 CHECK( 0, fd_dict_search( fd_g_ dict, DICT_AVP, AVP_BY_NAME_AND_VENDOR, &_req, &_avp, ENOENT)); \770 CHECK( 0, fd_dict_search( fd_g_config->g_dict, DICT_AVP, AVP_BY_NAME_AND_VENDOR, &_req, &_avp, ENOENT)); \ 771 771 CHECK( 0, fd_dict_getval( _rule, &_ruledata ) ); \ 772 772 CHECK( _avp, _ruledata.rule_avp ); \ … … 824 824 825 825 /* The message is still conform */ 826 CHECK( 0, fd_msg_parse_rules( msg, fd_g_ dict, &rule ) );826 CHECK( 0, fd_msg_parse_rules( msg, fd_g_config->g_dict, &rule ) ); 827 827 828 828 /* Now break the rule */ … … 865 865 866 866 /* Find the CER dictionary object */ 867 CHECK( 0, fd_dict_search ( fd_g_ dict, DICT_COMMAND, CMD_BY_NAME, "Capabilities-Exchange-Request", &cer_model, ENOENT ) );867 CHECK( 0, fd_dict_search ( fd_g_config->g_dict, DICT_COMMAND, CMD_BY_NAME, "Capabilities-Exchange-Request", &cer_model, ENOENT ) ); 868 868 869 869 /* Now find the Host-IP-Address dictionary object */ 870 CHECK( 0, fd_dict_search ( fd_g_ dict, DICT_AVP, AVP_BY_NAME, "Host-IP-Address", &hia_model, ENOENT ) );870 CHECK( 0, fd_dict_search ( fd_g_config->g_dict, DICT_AVP, AVP_BY_NAME, "Host-IP-Address", &hia_model, ENOENT ) ); 871 871 872 872 /* Create the msg instance */ … … 945 945 /* Ok, now let's recreate the message */ 946 946 CHECK( 0, fd_msg_parse_buffer( &buf, 64, &cer) ); 947 CHECK( 0, fd_msg_parse_dict( cer, fd_g_ dict ) );947 CHECK( 0, fd_msg_parse_dict( cer, fd_g_config->g_dict ) ); 948 948 949 949 /* Get the pointers to the first and last AVP */ … … 972 972 { 973 973 struct dict_avp_data avp_data = { 91001, 0, "AVP Test 2 - os", 0, 0, AVP_TYPE_OCTETSTRING }; 974 CHECK( 0, fd_dict_new ( fd_g_ dict, DICT_AVP, &avp_data , NULL, NULL ) );974 CHECK( 0, fd_dict_new ( fd_g_config->g_dict, DICT_AVP, &avp_data , NULL, NULL ) ); 975 975 } 976 976 { 977 977 struct dict_avp_data avp_data = { 91002, 0, "AVP Test 2 - i32", 0, 0, AVP_TYPE_INTEGER32 }; 978 CHECK( 0, fd_dict_new ( fd_g_ dict, DICT_AVP, &avp_data , NULL, NULL ) );978 CHECK( 0, fd_dict_new ( fd_g_config->g_dict, DICT_AVP, &avp_data , NULL, NULL ) ); 979 979 } 980 980 { 981 981 struct dict_avp_data avp_data = { 91003, 0, "AVP Test 2 - i64", 0, 0, AVP_TYPE_INTEGER64 }; 982 CHECK( 0, fd_dict_new ( fd_g_ dict, DICT_AVP, &avp_data , NULL, NULL ) );982 CHECK( 0, fd_dict_new ( fd_g_config->g_dict, DICT_AVP, &avp_data , NULL, NULL ) ); 983 983 } 984 984 { 985 985 struct dict_avp_data avp_data = { 91004, 0, "AVP Test 2 - u32", 0, 0, AVP_TYPE_UNSIGNED32 }; 986 CHECK( 0, fd_dict_new ( fd_g_ dict, DICT_AVP, &avp_data , NULL, NULL ) );986 CHECK( 0, fd_dict_new ( fd_g_config->g_dict, DICT_AVP, &avp_data , NULL, NULL ) ); 987 987 } 988 988 { 989 989 struct dict_avp_data avp_data = { 91005, 0, "AVP Test 2 - u64", 0, 0, AVP_TYPE_UNSIGNED64 }; 990 CHECK( 0, fd_dict_new ( fd_g_ dict, DICT_AVP, &avp_data , NULL, NULL ) );990 CHECK( 0, fd_dict_new ( fd_g_config->g_dict, DICT_AVP, &avp_data , NULL, NULL ) ); 991 991 } 992 992 { 993 993 struct dict_avp_data avp_data = { 91006, 0, "AVP Test 2 - f32", 0, 0, AVP_TYPE_FLOAT32 }; 994 CHECK( 0, fd_dict_new ( fd_g_ dict, DICT_AVP, &avp_data , NULL, NULL ) );994 CHECK( 0, fd_dict_new ( fd_g_config->g_dict, DICT_AVP, &avp_data , NULL, NULL ) ); 995 995 } 996 996 { 997 997 struct dict_avp_data avp_data = { 91007, 0, "AVP Test 2 - f64", 0, 0, AVP_TYPE_FLOAT64 }; 998 CHECK( 0, fd_dict_new ( fd_g_ dict, DICT_AVP, &avp_data , NULL, NULL ) );998 CHECK( 0, fd_dict_new ( fd_g_config->g_dict, DICT_AVP, &avp_data , NULL, NULL ) ); 999 999 } 1000 1000 … … 1010 1010 struct msg_hdr * msgdata = NULL; 1011 1011 1012 CHECK( 0, fd_dict_search ( fd_g_ dict, DICT_COMMAND, CMD_BY_NAME, "Test-Command-Request", &cmd_model, ENOENT ) );1012 CHECK( 0, fd_dict_search ( fd_g_config->g_dict, DICT_COMMAND, CMD_BY_NAME, "Test-Command-Request", &cmd_model, ENOENT ) ); 1013 1013 1014 1014 /* Create a message */ … … 1175 1175 1176 1176 CHECK( 0, fd_msg_parse_buffer( &buf, 148, &msg) ); 1177 CHECK( 0, fd_msg_parse_dict( msg, fd_g_ dict ) );1177 CHECK( 0, fd_msg_parse_dict( msg, fd_g_config->g_dict ) ); 1178 1178 #if 0 1179 1179 fd_msg_dump_walk(0, msg);
Note: See TracChangeset
for help on using the changeset viewer.