added XAUTH client states

diff --git a/src/pluto/constants.c b/src/pluto/constants.c
index f2810b8a1e1d0b8e49036df9e298d9389c87a035..53de6f66922e58e7e103a92cc7667e8ad4b5ddea 100644 (file)
--- a/src/pluto/constants.c
+++ b/src/pluto/constants.c
@@ -185,6 +185,8 @@ static const char *const state_name[] = {
 
        "STATE_XAUTH_R0",
        "STATE_XAUTH_R1",
+       "STATE_XAUTH_I1",
+       "STATE_XAUTH_I2",
 
        "STATE_MODE_CFG_R0",
        "STATE_MODE_CFG_R1",
@@ -222,6 +224,8 @@ const char *const state_story[] = {
 
        "sent XAUTH request, expecting reply",   /* STATE_XAUTH_R0 */
        "sent XAUTH status, expecting ack",      /* STATE_XAUTH_R1 */
+       "received XAUTH request, sent reply",    /* STATE_XAUTH_I1 */
+       "received XAUTH status, sent ack",       /* STATE_XAUTH_I2 */
 
        "sent ModeCfg reply",                    /* STATE_MODE_CFG_R0 */
        "sent ModeCfg reply",                    /* STATE_MODE_CFG_R1 */

diff --git a/src/pluto/constants.h b/src/pluto/constants.h
index bbacd2f508edcee7ebc62bb1d80565eceedfb976..080953c8c58df4435a258d5a9e01664a52fb33af 100644 (file)
--- a/src/pluto/constants.h
+++ b/src/pluto/constants.h
@@ -508,8 +508,11 @@ enum state_kind {
 
     /* XAUTH states */
 
-    STATE_XAUTH_R0,              /* server state: sent request, awaiting reply */
-    STATE_XAUTH_R1,              /* server state: sent success/fail, awaiting reply */
+    STATE_XAUTH_R0,              /* responder states (server) */
+    STATE_XAUTH_R1,
+
+    STATE_XAUTH_I1,              /* initiator states (client) */
+    STATE_XAUTH_I2,
 
     /* Mode Config states */