api: fix inconsistent behaviour when adding l2fib filter entry (VPP-147)

[vpp.git] / vppapigen / node.h

diff --git a/vppapigen/node.h b/vppapigen/node.h
index 1f5a153..297d603 100644 (file)
--- a/vppapigen/node.h
+++ b/vppapigen/node.h
@@ -52,7 +52,6 @@ enum node_subclass {  /* WARNING: indices must match the vft... */
     NODE_TYPEONLY,
     NODE_MANUAL_PRINT,
     NODE_MANUAL_ENDIAN,
-    NODE_MANUAL_JAVA,
     NODE_DONT_TRACE,
 };
 
@@ -61,9 +60,8 @@ enum passid {
     UNION_DEF_PASS,
     ENDIANFUN_PASS,
     PRINTFUN_PASS,
-    JAVA_METHOD_PASS,
-    JAVA_JNI_PASS,
     PYTHON_PASS,
+    JSON_PASS,
 };
 
 extern void *make_node (enum node_subclass type);
@@ -73,16 +71,17 @@ typedef struct node_ {
     struct node_ *peer;
     struct node_ *deeper;
     int flags;
-    void *data[2];
+    void *data[4];
 } node_t;
 
 /* To shut up gcc-4.2.x warnings */
 #define CDATA0 ((char *)(this->data[0]))
 #define IDATA1 ((int)(uword)(this->data[1]))
+#define CDATA2 ((char *)(this->data[2]))
+#define CDATA3 ((char *)(this->data[3]))
 
 #define NODE_FLAG_MANUAL_PRINT (1<<0)
 #define NODE_FLAG_MANUAL_ENDIAN (1<<1)
-#define NODE_FLAG_MANUAL_JAVA (1<<2)
 #define NODE_FLAG_TYPEONLY (1<<3)
 #define NODE_FLAG_DONT_TRACE (1<<4)
 
@@ -90,11 +89,6 @@ typedef struct node_vft_ {
     void (*print)(struct node_ *);
     void (*generate)(struct node_ *, enum passid id, FILE *ofp);
     char *endian_converter;
-    void (*java_method_function)(struct node_ *, enum passid id, FILE *ofp);
-    void (*java_jni_parameter)(struct node_ *, enum passid id, FILE *ofp);
-    void (*java_jni_setup)(struct node_ *, enum passid id, FILE *ofp);
-    void (*java_jni_code)(struct node_ *, enum passid id, FILE *ofp);
-    void (*java_jni_teardown)(struct node_ *, enum passid id, FILE *ofp);
 } node_vft_t;    
 
 #endif /* _node_h */