diff options
| author | Martin Willi <martin@strongswan.org> | 2007-03-08 14:40:15 +0000 |
|---|---|---|
| committer | Martin Willi <martin@strongswan.org> | 2007-03-08 14:40:15 +0000 |
| commit | 0cde6c412b30de164b9c0370bfdba1a001ce71c6 (patch) | |
| tree | f6a1702e6a92200b63bd36a7f6fe71b9877adf1c | |
| parent | 9b8b3e5f5c89ae745040914331a7b0d2fb0d9b52 (diff) | |
| download | strongswan-0cde6c412b30de164b9c0370bfdba1a001ce71c6.tar.bz2 strongswan-0cde6c412b30de164b9c0370bfdba1a001ce71c6.tar.xz | |
added more debugging output for policy lookup
returning a (dummy) policy even when TS does not match, so we can properly send a TS_UNACCEPTABLE
| -rw-r--r-- | src/charon/config/policies/local_policy_store.c | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/src/charon/config/policies/local_policy_store.c b/src/charon/config/policies/local_policy_store.c index 54c01630b..dd22b43a0 100644 --- a/src/charon/config/policies/local_policy_store.c +++ b/src/charon/config/policies/local_policy_store.c @@ -96,7 +96,8 @@ static policy_t *get_policy(private_local_policy_store_t *this, { typedef enum { PRIO_UNDEFINED = 0x00, - PRIO_ID_ANY = 0x01, + PRIO_TS_MISMATCH = 0x01, + PRIO_ID_ANY = 0x02, PRIO_ID_MATCH = PRIO_ID_ANY + MAX_WILDCARDS, } prio_t; @@ -105,8 +106,21 @@ static policy_t *get_policy(private_local_policy_store_t *this, iterator_t *iterator; policy_t *candidate; policy_t *found = NULL; + traffic_selector_t *ts; - DBG2(DBG_CFG, "searching policy for ID pair '%D'...'%D'", my_id, other_id); + DBG1(DBG_CFG, "searching policy for '%D'...'%D'", my_id, other_id); + iterator = my_ts->create_iterator(my_ts, TRUE); + while (iterator->iterate(iterator, (void**)&ts)) + { + DBG1(DBG_CFG, " local TS: %R", ts); + } + iterator->destroy(iterator); + iterator = other_ts->create_iterator(other_ts, TRUE); + while (iterator->iterate(iterator, (void**)&ts)) + { + DBG1(DBG_CFG, " remote TS: %R", ts); + } + iterator->destroy(iterator); pthread_mutex_lock(&(this->mutex)); iterator = this->policies->create_iterator(this->policies, TRUE); @@ -139,7 +153,7 @@ static policy_t *get_policy(private_local_policy_store_t *this, { DBG2(DBG_CFG, "candidate '%s' inacceptable due traffic " "selector mismatch", candidate->get_name(candidate)); - continue; + prio = PRIO_TS_MISMATCH; } DBG2(DBG_CFG, "candidate policy '%s': '%D'...'%D' (prio=%d)", |