Changeset 1113:eb4ce68b6e5c in freeDiameter for tests
- Timestamp:
- May 13, 2013, 8:17:13 PM (11 years ago)
- Branch:
- default
- Phase:
- public
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
tests/testdisp.c
r1088 r1113 106 106 struct dict_object * avp1, * avp2; /* avp2 is enumerated; they are both unsigned32 types */ 107 107 struct dict_object * enu1, * enu2; 108 struct msg * msg = NULL ;108 struct msg * msg = NULL, *error; 109 109 enum disp_action action; 110 110 struct disp_hdl * hdl[NB_CB]; 111 111 struct disp_when when; 112 char * ec ;112 char * ec, *em; 113 113 114 114 /* First, initialize the daemon modules */ … … 156 156 msg = new_msg( 0, cmd1, avp1, NULL, 0 ); 157 157 memset(cbcalled, 0, sizeof(cbcalled)); 158 CHECK( 0, fd_msg_dispatch ( &msg, sess, &action, &ec ) );158 CHECK( 0, fd_msg_dispatch ( &msg, sess, &action, &ec, &em, &error ) ); 159 159 CHECK( 1, cbcalled[0] ); 160 160 CHECK( DISP_ACT_CONT, action ); … … 180 180 memset(cbcalled, 0, sizeof(cbcalled)); 181 181 msg = new_msg( 0, cmd1, avp1, NULL, 0 ); 182 CHECK( 0, fd_msg_dispatch ( &msg, sess, &action, &ec ) );182 CHECK( 0, fd_msg_dispatch ( &msg, sess, &action, &ec, &em, &error ) ); 183 183 CHECK( 1, cbcalled[0] ); 184 184 CHECK( 0, cbcalled[1] ); … … 191 191 memset(cbcalled, 0, sizeof(cbcalled)); 192 192 msg = new_msg( 1, cmd1, avp1, NULL, 0 ); 193 CHECK( 0, fd_msg_dispatch ( &msg, sess, &action, &ec ) );193 CHECK( 0, fd_msg_dispatch ( &msg, sess, &action, &ec, &em, &error ) ); 194 194 CHECK( 1, cbcalled[0] ); 195 195 CHECK( 1, cbcalled[1] ); … … 202 202 memset(cbcalled, 0, sizeof(cbcalled)); 203 203 msg = new_msg( 2, cmd1, avp1, NULL, 0 ); 204 CHECK( 0, fd_msg_dispatch ( &msg, sess, &action, &ec ) );204 CHECK( 0, fd_msg_dispatch ( &msg, sess, &action, &ec, &em, &error ) ); 205 205 CHECK( 1, cbcalled[0] ); 206 206 CHECK( 0, cbcalled[1] ); … … 236 236 memset(cbcalled, 0, sizeof(cbcalled)); 237 237 msg = new_msg( 0, cmd1, avp1, NULL, 0 ); 238 CHECK( 0, fd_msg_dispatch ( &msg, sess, &action, &ec ) );238 CHECK( 0, fd_msg_dispatch ( &msg, sess, &action, &ec, &em, &error ) ); 239 239 CHECK( 1, cbcalled[0] ); 240 240 CHECK( 1, cbcalled[1] ); … … 246 246 memset(cbcalled, 0, sizeof(cbcalled)); 247 247 msg = new_msg( 2, cmd1, avp1, NULL, 0 ); 248 CHECK( 0, fd_msg_dispatch ( &msg, sess, &action, &ec ) );248 CHECK( 0, fd_msg_dispatch ( &msg, sess, &action, &ec, &em, &error ) ); 249 249 CHECK( 1, cbcalled[0] ); 250 250 CHECK( 1, cbcalled[1] ); … … 256 256 memset(cbcalled, 0, sizeof(cbcalled)); 257 257 msg = new_msg( 2, cmd2, avp1, NULL, 0 ); 258 CHECK( 0, fd_msg_dispatch ( &msg, sess, &action, &ec ) );258 CHECK( 0, fd_msg_dispatch ( &msg, sess, &action, &ec, &em, &error ) ); 259 259 CHECK( 1, cbcalled[0] ); 260 260 CHECK( 0, cbcalled[1] ); … … 266 266 memset(cbcalled, 0, sizeof(cbcalled)); 267 267 msg = new_msg( 1, cmd2, NULL, avp2, 0 ); 268 CHECK( 0, fd_msg_dispatch ( &msg, sess, &action, &ec ) );268 CHECK( 0, fd_msg_dispatch ( &msg, sess, &action, &ec, &em, &error ) ); 269 269 CHECK( 1, cbcalled[0] ); 270 270 CHECK( 0, cbcalled[1] ); … … 316 316 memset(cbcalled, 0, sizeof(cbcalled)); 317 317 msg = new_msg( 0, cmd1, NULL, NULL, 0 ); 318 CHECK( 0, fd_msg_dispatch ( &msg, sess, &action, &ec ) );318 CHECK( 0, fd_msg_dispatch ( &msg, sess, &action, &ec, &em, &error ) ); 319 319 CHECK( 1, cbcalled[0] ); 320 320 CHECK( 0, cbcalled[1] ); … … 328 328 memset(cbcalled, 0, sizeof(cbcalled)); 329 329 msg = new_msg( 0, cmd1, avp1, NULL, 0 ); 330 CHECK( 0, fd_msg_dispatch ( &msg, sess, &action, &ec ) );330 CHECK( 0, fd_msg_dispatch ( &msg, sess, &action, &ec, &em, &error ) ); 331 331 CHECK( 1, cbcalled[0] ); 332 332 CHECK( 1, cbcalled[1] ); … … 340 340 memset(cbcalled, 0, sizeof(cbcalled)); 341 341 msg = new_msg( 1, cmd2, avp1, NULL, 0 ); 342 CHECK( 0, fd_msg_dispatch ( &msg, sess, &action, &ec ) );342 CHECK( 0, fd_msg_dispatch ( &msg, sess, &action, &ec, &em, &error ) ); 343 343 CHECK( 1, cbcalled[0] ); 344 344 CHECK( 1, cbcalled[1] ); … … 352 352 memset(cbcalled, 0, sizeof(cbcalled)); 353 353 msg = new_msg( 1, cmd1, avp1, NULL, 0 ); 354 CHECK( 0, fd_msg_dispatch ( &msg, sess, &action, &ec ) );354 CHECK( 0, fd_msg_dispatch ( &msg, sess, &action, &ec, &em, &error ) ); 355 355 CHECK( 1, cbcalled[0] ); 356 356 CHECK( 1, cbcalled[1] ); … … 364 364 memset(cbcalled, 0, sizeof(cbcalled)); 365 365 msg = new_msg( 1, cmd1, avp1, avp2, 0 ); 366 CHECK( 0, fd_msg_dispatch ( &msg, sess, &action, &ec ) );366 CHECK( 0, fd_msg_dispatch ( &msg, sess, &action, &ec, &em, &error ) ); 367 367 CHECK( 1, cbcalled[0] ); 368 368 CHECK( 1, cbcalled[1] ); … … 377 377 memset(cbcalled, 0, sizeof(cbcalled)); 378 378 msg = new_msg( 1, cmd1, NULL, avp2, 1 ); 379 CHECK( 0, fd_msg_dispatch ( &msg, sess, &action, &ec ) );379 CHECK( 0, fd_msg_dispatch ( &msg, sess, &action, &ec, &em, &error ) ); 380 380 CHECK( 1, cbcalled[0] ); 381 381 CHECK( 0, cbcalled[1] ); … … 390 390 memset(cbcalled, 0, sizeof(cbcalled)); 391 391 msg = new_msg( 1, cmd1, NULL, avp2, 2 ); 392 CHECK( 0, fd_msg_dispatch ( &msg, sess, &action, &ec ) );392 CHECK( 0, fd_msg_dispatch ( &msg, sess, &action, &ec, &em, &error ) ); 393 393 CHECK( 1, cbcalled[0] ); 394 394 CHECK( 0, cbcalled[1] ); … … 437 437 memset(cbcalled, 0, sizeof(cbcalled)); 438 438 msg = new_msg( 0, cmd1, avp1, NULL, 0 ); 439 CHECK( 0, fd_msg_dispatch ( &msg, sess, &action, &ec ) );439 CHECK( 0, fd_msg_dispatch ( &msg, sess, &action, &ec, &em, &error ) ); 440 440 CHECK( 1, cbcalled[0] ); 441 441 CHECK( 0, cbcalled[1] ); … … 447 447 memset(cbcalled, 0, sizeof(cbcalled)); 448 448 msg = new_msg( 1, cmd2, avp1, avp2, 0 ); 449 CHECK( 0, fd_msg_dispatch ( &msg, sess, &action, &ec ) );449 CHECK( 0, fd_msg_dispatch ( &msg, sess, &action, &ec, &em, &error ) ); 450 450 CHECK( 1, cbcalled[0] ); 451 451 CHECK( 0, cbcalled[1] ); … … 457 457 memset(cbcalled, 0, sizeof(cbcalled)); 458 458 msg = new_msg( 1, cmd2, avp1, avp2, 1 ); 459 CHECK( 0, fd_msg_dispatch ( &msg, sess, &action, &ec ) );459 CHECK( 0, fd_msg_dispatch ( &msg, sess, &action, &ec, &em, &error ) ); 460 460 CHECK( 1, cbcalled[0] ); 461 461 CHECK( 1, cbcalled[1] ); … … 467 467 memset(cbcalled, 0, sizeof(cbcalled)); 468 468 msg = new_msg( 1, cmd2, avp1, avp2, 2 ); 469 CHECK( 0, fd_msg_dispatch ( &msg, sess, &action, &ec ) );469 CHECK( 0, fd_msg_dispatch ( &msg, sess, &action, &ec, &em, &error ) ); 470 470 CHECK( 1, cbcalled[0] ); 471 471 CHECK( 0, cbcalled[1] ); … … 477 477 memset(cbcalled, 0, sizeof(cbcalled)); 478 478 msg = new_msg( 1, cmd1, avp1, avp2, 1 ); 479 CHECK( 0, fd_msg_dispatch ( &msg, sess, &action, &ec ) );479 CHECK( 0, fd_msg_dispatch ( &msg, sess, &action, &ec, &em, &error ) ); 480 480 CHECK( 1, cbcalled[0] ); 481 481 CHECK( 1, cbcalled[1] ); … … 495 495 CHECK( 0, fd_msg_avp_add ( msg, MSG_BRW_LAST_CHILD, avp ) ); 496 496 } 497 CHECK( 0, fd_msg_dispatch ( &msg, sess, &action, &ec ) );497 CHECK( 0, fd_msg_dispatch ( &msg, sess, &action, &ec, &em, &error ) ); 498 498 CHECK( 1, cbcalled[0] ); 499 499 CHECK( 1, cbcalled[1] ); … … 519 519 memset(cbcalled, 0, sizeof(cbcalled)); 520 520 msg = new_msg( 1, cmd1, avp1, avp2, 1 ); 521 CHECK( 0, fd_msg_dispatch ( &msg, sess, &action, &ec ) );521 CHECK( 0, fd_msg_dispatch ( &msg, sess, &action, &ec, &em, &error ) ); 522 522 CHECK( 1, cbcalled[0] ); 523 523 CHECK( 1, cbcalled[1] ); … … 526 526 CHECK( 0, cbcalled[3] ); 527 527 CHECK( 0, msg ? 1 : 0); 528 CHECK( 1, ec ? 1 : 0); 529 CHECK( 0, fd_msg_free( error ) ); 528 530 529 531 CHECK( 0, fd_disp_unregister( &hdl[0], NULL ) ); … … 541 543 memset(cbcalled, 0, sizeof(cbcalled)); 542 544 msg = new_msg( 1, cmd1, avp1, avp2, 1 ); 543 CHECK( 0, fd_msg_dispatch ( &msg, sess, &action, &ec ) );545 CHECK( 0, fd_msg_dispatch ( &msg, sess, &action, &ec, &em, &error ) ); 544 546 CHECK( 1, cbcalled[0] ); 545 547 CHECK( 1, cbcalled[1] ); … … 548 550 CHECK( 0, cbcalled[3] ); 549 551 CHECK( NULL, msg ); 552 CHECK( NULL, ec ); 550 553 551 554 CHECK( 0, fd_disp_unregister( &hdl[0], NULL ) ); … … 563 566 memset(cbcalled, 0, sizeof(cbcalled)); 564 567 msg = new_msg( 1, cmd1, avp1, avp2, 1 ); 565 CHECK( 0, fd_msg_dispatch ( &msg, sess, &action, &ec ) );568 CHECK( 0, fd_msg_dispatch ( &msg, sess, &action, &ec, &em, &error ) ); 566 569 CHECK( 1, cbcalled[0] ); 567 570 CHECK( 1, cbcalled[1] ); … … 594 597 memset(cbcalled, 0, sizeof(cbcalled)); 595 598 msg = new_msg( 2, cmd2, avp1, avp2, 2 ); 596 CHECK( 0, fd_msg_dispatch ( &msg, sess, &action, &ec ) );599 CHECK( 0, fd_msg_dispatch ( &msg, sess, &action, &ec, &em, &error ) ); 597 600 CHECK( 1, cbcalled[0] ); 598 601 CHECK( 1, cbcalled[1] ); … … 606 609 memset(cbcalled, 0, sizeof(cbcalled)); 607 610 msg = new_msg( 2, cmd2, avp1, avp2, 2 ); 608 CHECK( 0, fd_msg_dispatch ( &msg, sess, &action, &ec ) );611 CHECK( 0, fd_msg_dispatch ( &msg, sess, &action, &ec, &em, &error ) ); 609 612 CHECK( 1, cbcalled[0] ); 610 613 CHECK( 0, cbcalled[1] ); … … 619 622 memset(cbcalled, 0, sizeof(cbcalled)); 620 623 msg = new_msg( 2, cmd2, avp1, avp2, 2 ); 621 CHECK( 0, fd_msg_dispatch ( &msg, sess, &action, &ec ) );624 CHECK( 0, fd_msg_dispatch ( &msg, sess, &action, &ec, &em, &error ) ); 622 625 CHECK( 1, cbcalled[0] ); 623 626 CHECK( 1, cbcalled[1] ); … … 632 635 memset(cbcalled, 0, sizeof(cbcalled)); 633 636 msg = new_msg( 2, cmd2, avp1, avp2, 2 ); 634 CHECK( 0, fd_msg_dispatch ( &msg, sess, &action, &ec ) );637 CHECK( 0, fd_msg_dispatch ( &msg, sess, &action, &ec, &em, &error ) ); 635 638 CHECK( 1, cbcalled[0] ); 636 639 CHECK( 1, cbcalled[1] ); … … 645 648 memset(cbcalled, 0, sizeof(cbcalled)); 646 649 msg = new_msg( 2, cmd2, avp1, avp2, 2 ); 647 CHECK( 0, fd_msg_dispatch ( &msg, sess, &action, &ec ) );650 CHECK( 0, fd_msg_dispatch ( &msg, sess, &action, &ec, &em, &error ) ); 648 651 CHECK( 1, cbcalled[0] ); 649 652 CHECK( 1, cbcalled[1] ); … … 658 661 memset(cbcalled, 0, sizeof(cbcalled)); 659 662 msg = new_msg( 2, cmd2, avp1, avp2, 2 ); 660 CHECK( 0, fd_msg_dispatch ( &msg, sess, &action, &ec ) );663 CHECK( 0, fd_msg_dispatch ( &msg, sess, &action, &ec, &em, &error ) ); 661 664 CHECK( 1, cbcalled[0] ); 662 665 CHECK( 1, cbcalled[1] ); … … 711 714 msg = new_msg( 0, cmd1, avp1, NULL, 0 ); 712 715 memset(cbcalled, 0, sizeof(cbcalled)); 713 CHECK( 0, fd_msg_dispatch ( &msg, sess, &action, &ec ) );716 CHECK( 0, fd_msg_dispatch ( &msg, sess, &action, &ec, &em, &error ) ); 714 717 CHECK( 1, cbcalled[0] ); 715 718 CHECK( DISP_ACT_CONT, action );
Note: See TracChangeset
for help on using the changeset viewer.