diff options
| author | Martin Willi <martin@strongswan.org> | 2006-04-10 08:07:38 +0000 |
|---|---|---|
| committer | Martin Willi <martin@strongswan.org> | 2006-04-10 08:07:38 +0000 |
| commit | 5113680f95e522c677cdd37072cfffbdca06831e (patch) | |
| tree | 973ac57accbc66b042e5307942c6cbbbf4f19579 /Source/testing/policy_test.c | |
| parent | 6862128151fb78f63685a8da5575783c426d64a7 (diff) | |
| download | strongswan-5113680f95e522c677cdd37072cfffbdca06831e.tar.bz2 strongswan-5113680f95e522c677cdd37072cfffbdca06831e.tar.xz | |
- split up in libstrong, charon, stroke, testing done
- new leak detective with malloc hook in library
- useable, but needs improvements
- logger_manager has now a single instance per library
- allows use of loggers from any linking prog
- a LOT of other things
Diffstat (limited to 'Source/testing/policy_test.c')
| -rw-r--r-- | Source/testing/policy_test.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/Source/testing/policy_test.c b/Source/testing/policy_test.c index d511f4ae4..0b09877e0 100644 --- a/Source/testing/policy_test.c +++ b/Source/testing/policy_test.c @@ -25,7 +25,6 @@ #include <daemon.h> #include <config/policy.h> #include <config/traffic_selector.h> -#include <utils/allocator.h> #include <utils/logger.h> #include <encoding/payloads/ts_payload.h> @@ -44,7 +43,7 @@ void test_policy(protected_tester_t *tester) logger_t *logger; identification_t *alice, *bob; - logger = charon->logger_manager->get_logger(charon->logger_manager, TESTER); + logger = logger_manager->get_logger(logger_manager, TESTER); logger->disable_level(logger, FULL); alice = identification_create_from_string(ID_IPV4_ADDR, "152.96.193.131"); @@ -173,7 +172,7 @@ void test_policy(protected_tester_t *tester) // ts_result[0]->destroy(ts_result[0]); // ts_result[0]->destroy(ts_result[1]); // ts_result[0]->destroy(ts_result[2]); -// allocator_free(ts_result); +// free(ts_result); // // count = policy->select_my_traffic_selectors(policy, &ts_request[0], 4, &ts_result); // tester->assert_true(tester, (count == 3), "ts select count"); @@ -186,7 +185,7 @@ void test_policy(protected_tester_t *tester) // ts_result[0]->destroy(ts_result[0]); // ts_result[0]->destroy(ts_result[1]); // ts_result[0]->destroy(ts_result[2]); -// allocator_free(ts_result); +// free(ts_result); // // /* get them again out of the payload */ // count = ts_payload->get_traffic_selectors(ts_payload, &ts_result); @@ -219,10 +218,10 @@ void test_policy(protected_tester_t *tester) // tester->assert_true(tester, fp_res == fp_ref, "from port"); // tester->assert_true(tester, tp_res == tp_ref, "to port"); // -// allocator_free(fa_res.ptr); -// allocator_free(fa_ref.ptr); -// allocator_free(ta_res.ptr); -// allocator_free(ta_ref.ptr); +// free(fa_res.ptr); +// free(fa_ref.ptr); +// free(ta_res.ptr); +// free(ta_ref.ptr); // } // // @@ -230,7 +229,7 @@ void test_policy(protected_tester_t *tester) // ts_result[0]->destroy(ts_result[0]); // ts_result[0]->destroy(ts_result[1]); // ts_result[0]->destroy(ts_result[2]); -// allocator_free(ts_result); +// free(ts_result); // // ts_policy[0]->destroy(ts_policy[0]); // ts_policy[1]->destroy(ts_policy[1]); |