denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

finetuning of phase1 matching metrics

Browse Source
This commit is contained in:
Andreas Steffen
2007-08-14 19:15:01 +00:00
parent 929b9e367a
commit bb70071b26
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pluto/connections.c
+4 -4
View File
@@ -3268,7 +3268,7 @@ find_host_connection(const ip_address *me, u_int16_t my_port
* less important than the disadvantages, so after FreeS/WAN 1.9, we * less important than the disadvantages, so after FreeS/WAN 1.9, we
* don't do this. * don't do this.
*/ */
#define PRIO_NO_MATCH_FOUND 4096 #define PRIO_NO_MATCH_FOUND 2048
struct connection * struct connection *
refine_host_connection(const struct state *st, const struct id *peer_id refine_host_connection(const struct state *st, const struct id *peer_id
@@ -3352,20 +3352,20 @@ refine_host_connection(const struct state *st, const struct id *peer_id
, d->spd.this.ca, &our_pathlen); , d->spd.this.ca, &our_pathlen);
bool match = matching_id && matching_auth && matching_trust; bool match = matching_id && matching_auth && matching_trust;
int prio = (MAX_WILDCARDS + 1) * matching_trust + wildcards; int prio = (MAX_WILDCARDS + 1) * !matching_trust + wildcards;
prio = (MAX_CA_PATH_LEN + 1) * prio + peer_pathlen; prio = (MAX_CA_PATH_LEN + 1) * prio + peer_pathlen;
prio = (MAX_CA_PATH_LEN + 1) * prio + our_pathlen; prio = (MAX_CA_PATH_LEN + 1) * prio + our_pathlen;
DBG(DBG_CONTROLMORE, DBG(DBG_CONTROLMORE,
DBG_log("%s: %s match (id: %s, auth: %s, trust: %s, request: %s, prio: %d)" DBG_log("%s: %s match (id: %s, auth: %s, trust: %s, request: %s, prio: %4d)"
, d->name , d->name
, match ? "full":" no" , match ? "full":" no"
, match_name[matching_id] , match_name[matching_id]
, match_name[matching_auth] , match_name[matching_auth]
, match_name[matching_trust] , match_name[matching_trust]
, match_name[matching_request] , match_name[matching_request]
, prio) , match ? prio:PRIO_NO_MATCH_FOUND)
) )
/* do we have a match? */ /* do we have a match? */