enum: Allow specifying the name used when none of the flags are set

diff --git a/src/libcharon/sa/child_sa.c b/src/libcharon/sa/child_sa.c
index 9b06ebc3c345123d04d92be2e5c2c0aada8ce2d7..f876831382b363e4cfa693b7db969ea245b06068 100644 (file)
--- a/src/libcharon/sa/child_sa.c
+++ b/src/libcharon/sa/child_sa.c
@@ -42,6 +42,7 @@ ENUM(child_sa_state_names, CHILD_CREATED, CHILD_DESTROYING,
 );
 
 ENUM_FLAGS(child_sa_outbound_state_names, CHILD_OUTBOUND_REGISTERED, CHILD_OUTBOUND_POLICIES,
+       "NONE",
        "REGISTERED",
        "SA",
        "POLICIES",

diff --git a/src/libstrongswan/tests/suites/test_enum.c b/src/libstrongswan/tests/suites/test_enum.c
index 06b2c3ff3c8c9aabd49f0f71b8c9dc76087109fd..613043e6deea0b8937a16a99fb00920ffd547e04 100644 (file)
--- a/src/libstrongswan/tests/suites/test_enum.c
+++ b/src/libstrongswan/tests/suites/test_enum.c
@@ -70,15 +70,15 @@ enum {
 } test_enum_flags;
 
 ENUM_FLAGS(test_enum_flags_names, FLAG1, FLAG5,
-       "FLAG1", "FLAG2", "FLAG3", "FLAG4", "FLAG5");
+       "(unset)", "FLAG1", "FLAG2", "FLAG3", "FLAG4", "FLAG5");
 
 ENUM_FLAGS(test_enum_flags_incomplete_names, FLAG3, FLAG4,
-       "FLAG3", "FLAG4");
+       "(unset)", "FLAG3", "FLAG4");
 
 ENUM_FLAGS(test_enum_flags_null_names, FLAG1, FLAG4,
-       "FLAG1", NULL, "FLAG3", NULL);
+       "(unset)", "FLAG1", NULL, "FLAG3", NULL);
 
-ENUM_FLAGS(test_enum_flags_overflow_names, FLAG1, FLAG12,
+ENUM_FLAGS(test_enum_flags_overflow_names, FLAG1, FLAG12, "(unset)",
        "OVERFLOWFLAGLONGNAME1",  "OVERFLOWFLAGLONGNAME2",  "OVERFLOWFLAGLONGNAME3",
        "OVERFLOWFLAGLONGNAME4",  "OVERFLOWFLAGLONGNAME5",  "OVERFLOWFLAGLONGNAME6",
        "OVERFLOWFLAGLONGNAME7",  "OVERFLOWFLAGLONGNAME8",  "OVERFLOWFLAGLONGNAME9",

diff --git a/src/libstrongswan/utils/enum.c b/src/libstrongswan/utils/enum.c
index 25182f93dd3d60ff42e7d6772385f907a71686e8..e62c75f913b2c8e50716e844eab1f8cd8852e363 100644 (file)
--- a/src/libstrongswan/utils/enum.c
+++ b/src/libstrongswan/utils/enum.c
@@ -66,16 +66,17 @@ bool enum_from_name_as_int(enum_name_t *e, const char *name, int *val)
 /**
  * Get the position of a flag name using offset calculation
  */
-static int find_flag_pos(u_int val, u_int first)
+static int find_flag_pos(u_int first, u_int val)
 {
        int offset = 0;
 
-       while (val != 0x01)
+       while (first != 0x01)
        {
-               val = val >> 1;
+               first = first >> 1;
                offset++;
        }
-       return first - offset;
+       /* skip the first name as that's used if no flag is set */
+       return 1 + val - offset;
 }
 
 /**
@@ -95,7 +96,7 @@ char *enum_flags_to_string(enum_name_t *e, u_int val, char *buf, size_t len)
                return buf;
        }
 
-       if (snprintf(buf, len, "(unset)") >= len)
+       if (snprintf(buf, len, e->names[0]) >= len)
        {
                return NULL;
        }

diff --git a/src/libstrongswan/utils/enum.h b/src/libstrongswan/utils/enum.h
index 72dea495a049152df70b8ea44654e6f283a08a27..1e723a220e4519f77d1138adcfa6f6e61ee88a3a 100644 (file)
--- a/src/libstrongswan/utils/enum.h
+++ b/src/libstrongswan/utils/enum.h
@@ -130,13 +130,14 @@ struct enum_name_t {
  * @param name name of the enum_name list
  * @param first        enum value of the first enum string
  * @param last enum value of the last enum string
+ * @param unset        name used if no flags are set
  * @param ...  a list of strings
  */
-#define ENUM_FLAGS(name, first, last, ...) \
+#define ENUM_FLAGS(name, first, last, unset, ...) \
        static enum_name_t name##last = {first, last + \
                BUILD_ASSERT((__builtin_ffs(last)-__builtin_ffs(first)+1) == \
                        countof(((char*[]){__VA_ARGS__}))), \
-               ENUM_FLAG_MAGIC, { __VA_ARGS__ }}; ENUM_END(name, last)
+               ENUM_FLAG_MAGIC, { unset, __VA_ARGS__ }}; ENUM_END(name, last)
 
 /**
  * Convert a enum value to its string representation.