Fix merge commit c195c7a0d50cd80656fc3cabc692a0464dd0cb2d

diff --git a/filter/f-inst.c b/filter/f-inst.c
index 2a6ef6cf86f6b7034790284860384bbd9cfea2fd..6a0cdfdebf58d9c1b34088bba3e5c853baddbe13 100644 (file)
--- a/filter/f-inst.c
+++ b/filter/f-inst.c
@@ -923,7 +923,7 @@
 
       case T_STRING:
        a = ea_set_attr(&fs->rte->attrs,
-           EA_LITERAL_STORE_ADATA(da, 0, &v1.val.s, strlen(v1.val.s) + 1));
+           EA_LITERAL_STORE_ADATA(da, 0, v1.val.s, strlen(v1.val.s) + 1));
        break;
 
       default:

diff --git a/lib/type.h b/lib/type.h
index e07c98ec04ab62815aa1a717a4372d69c980dd5a..2edaa2e4e179ca82e18f6d4e1633b6e642a89616 100644 (file)
--- a/lib/type.h
+++ b/lib/type.h
@@ -72,10 +72,11 @@ enum btype {
   T_CLIST = 0x0a,              /* Set of u32's (e.g., a community list) */
   T_ECLIST = 0x0e,             /* Set of pairs of u32's - ext. community list */
   T_LCLIST = 0x08,             /* Set of triplets of u32's - large community list */
+  T_STRING = 0x10,
 
-  T_ENUM_BGP_ORIGIN = 0x11,    /* BGP Origin enum */
-  T_ENUM_RA_PREFERENCE = 0x13, /* RA Preference enum */
-  T_ENUM_FLOWSPEC_VALID = 0x15,        /* Flowspec validation result */
+  T_ENUM_BGP_ORIGIN = 0x13,    /* BGP Origin enum */
+  T_ENUM_RA_PREFERENCE = 0x15, /* RA Preference enum */
+  T_ENUM_FLOWSPEC_VALID = 0x17,        /* Flowspec validation result */
 
 #define EAF_TYPE__MAX 0x1f
 #define EAF_EMBEDDED 0x01              /* Data stored in eattr.u.data (part of type spec) */
@@ -86,7 +87,7 @@ enum btype {
   T_PAIR = 0xa4,  /*   Notice that pair is stored as integer: first << 16 | second */
 
 /* Put enumerational types in 0x20..0x3f range */
-  T_ENUM_LO = 0x10,
+  T_ENUM_LO = 0x12,
   T_ENUM_HI = 0x3f,
 
   T_ENUM_RTS = 0x31,
@@ -103,7 +104,6 @@ enum btype {
 
 /* Bigger ones */
   T_NET = 0xb0,
-  T_STRING = 0xb4,
   T_PATH_MASK = 0xb8,  /* mask for BGP path */
   T_EC = 0xbc,         /* Extended community value, u64 */
   T_LC = 0xc0,         /* Large community value, lcomm */