diff options
| author | Andreas Steffen <andreas.steffen@strongswan.org> | 2006-12-19 22:51:48 +0000 |
|---|---|---|
| committer | Andreas Steffen <andreas.steffen@strongswan.org> | 2006-12-19 22:51:48 +0000 |
| commit | 86ae0969b4e2e884764f811bc28118a99e14a694 (patch) | |
| tree | 8c3caa062668eed032da9c30014ed413ef60bc2a /src/pluto/constants.h | |
| parent | 0c409f097c4db02cdf4c614398aadb154b54d332 (diff) | |
| download | strongswan-86ae0969b4e2e884764f811bc28118a99e14a694.tar.bz2 strongswan-86ae0969b4e2e884764f811bc28118a99e14a694.tar.xz | |
added XAUTH server and client support
Diffstat (limited to 'src/pluto/constants.h')
| -rw-r--r-- | src/pluto/constants.h | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/src/pluto/constants.h b/src/pluto/constants.h index 9ff74a469..1295b29cf 100644 --- a/src/pluto/constants.h +++ b/src/pluto/constants.h @@ -508,10 +508,12 @@ enum state_kind { /* XAUTH states */ - STATE_XAUTH_R0, /* responder states (server) */ - STATE_XAUTH_R1, + STATE_XAUTH_R1, /* responder states (server) */ + STATE_XAUTH_R2, + STATE_XAUTH_R3, - STATE_XAUTH_I1, /* initiator states (client) */ + STATE_XAUTH_I0, /* initiator states (client) */ + STATE_XAUTH_I1, STATE_XAUTH_I2, /* Mode Config states */ @@ -531,18 +533,26 @@ enum state_kind { #define PHASE1_INITIATOR_STATES (LELEM(STATE_MAIN_I1) | LELEM(STATE_MAIN_I2) \ | LELEM(STATE_MAIN_I3) | LELEM(STATE_MAIN_I4)) -#define ISAKMP_SA_ESTABLISHED_STATES (LELEM(STATE_MAIN_R3) | LELEM(STATE_MAIN_I4) \ +#define ISAKMP_SA_ESTABLISHED_STATES ( \ + LELEM(STATE_MAIN_R3) | LELEM(STATE_MAIN_I4) \ + | LELEM(STATE_XAUTH_R1) | LELEM(STATE_XAUTH_R2) | LELEM(STATE_XAUTH_R3) \ + | LELEM(STATE_XAUTH_I1) | LELEM(STATE_XAUTH_I2) \ | LELEM(STATE_MODE_CFG_R1) | LELEM(STATE_MODE_CFG_R2) \ | LELEM(STATE_MODE_CFG_I2) | LELEM(STATE_MODE_CFG_I3)) #define IS_PHASE1(s) ((STATE_MAIN_R0 <= (s) && (s) <= STATE_MAIN_I4) \ + || (STATE_XAUTH_R1 <= (s) && (s) <= STATE_XAUTH_I2) \ || (STATE_MODE_CFG_R0 <= (s) && (s) <= STATE_MODE_CFG_I3)) #define IS_QUICK(s) (STATE_QUICK_R0 <= (s) && (s) <= STATE_QUICK_R2) #define IS_ISAKMP_ENCRYPTED(s) (STATE_MAIN_I2 <= (s)) #define IS_ISAKMP_SA_ESTABLISHED(s) ( \ - (s) == STATE_MAIN_R3 \ + (s) == STATE_MAIN_R3 \ || (s) == STATE_MAIN_I4 \ - || (s) == STATE_MODE_CFG_R0 \ + || (s) == STATE_XAUTH_R1 \ + || (s) == STATE_XAUTH_R2 \ + || (s) == STATE_XAUTH_R3 \ + || (s) == STATE_XAUTH_I1 \ + || (s) == STATE_XAUTH_I2 \ || (s) == STATE_MODE_CFG_R1 \ || (s) == STATE_MODE_CFG_R2 \ || (s) == STATE_MODE_CFG_I2 \ |