ims-volte-vowifi
/
strongswan
9
0
Fork 0
Code Pull Requests Releases Activity

define state_story for STATE_UNDEFINED

This commit is contained in:
Andreas Steffen 2010-10-16 16:15:10 +02:00
parent b3cabd1f03
commit 4b7d1262d9
4 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/pluto/constants.c
View File

@ -131,6 +131,8 @@ const char *const debug_bit_names[] = {
/* State of exchanges */
static const char *const state_name[] = {
"STATE_UNDEFINED",
"STATE_MAIN_R0",
"STATE_MAIN_I1",
"STATE_MAIN_R1",
@ -170,11 +172,12 @@ static const char *const state_name[] = {
};
enum_names state_names =
{ STATE_MAIN_R0, STATE_IKE_ROOF-1, state_name, NULL };
{ STATE_UNDEFINED, STATE_IKE_ROOF-1, state_name, NULL };
/* story for state */
const char *const state_story[] = {
"undefined state after error", /* STATE_UNDEFINED */
"expecting MI1", /* STATE_MAIN_R0 */
"sent MI1, expecting MR1", /* STATE_MAIN_I1 */
"sent MR1, expecting MI2", /* STATE_MAIN_R1 */

5
src/pluto/constants.h
View File

@ -368,11 +368,6 @@ extern const char *const state_story[];
enum state_kind {
STATE_UNDEFINED, /* 0 -- most likely accident */
/* Opportunism states: see "Opportunistic Encryption" 2.2 */
OPPO_ACQUIRE, /* got an ACQUIRE message for this pair */
OPPO_GW_DISCOVERED, /* got TXT specifying gateway */
/* IKE states */
STATE_MAIN_R0,

2
src/pluto/demux.c
View File

@ -2308,7 +2308,7 @@ complete_state_transition(struct msg_digest **mdp, stf_status result)
/* tell whack and log of progress */
{
const char *story = state_story[st->st_state - STATE_MAIN_R0];
const char *story = state_story[st->st_state];
enum rc_type w = RC_NEW_STATE + st->st_state;
char sadetails[128];

2
src/pluto/state.c
View File

@ -734,7 +734,7 @@ void fmt_state(bool all, struct state *st, time_t n, char *state_buf,
, st->st_serialno
, c->name, inst
, enum_name(&state_names, st->st_state)
, state_story[st->st_state - STATE_MAIN_R0]
, state_story[st->st_state]
, timer_event_names, st->st_event->ev_type
, delta
, np1, np2, eo, dpd);