Artifacts from floodlight/loxigen@5be7ba1...fcffa3c (Branch master)

Loxigen Head commit floodlight/loxigen@fcffa3c
commit fcffa3c608749dcc4b80e583421ca2784e0e6eac
Merge: 5be7ba1 3138ad2
Author: abat <abat@bigswitch.com>
Date:   Fri Aug 12 16:10:43 2016 -0700

    Merge into master from pull request #511:
    ipv6 src/dst tlvs (floodlight/loxigen#511)

commit 3138ad2a3a60764109dfc5c9ccf9753591c9b2ce
Author: harshsin <harshmeet.singh@bigswitch.com>
Date:   Thu Aug 11 11:20:40 2016 -0700

    ipv6 src/dst tlvs

loci/inc/loci/loci_classes.h

@@ -903,8 +903,12 @@ void of_bsn_tlv_ipv4_src_wire_object_id_get(of_object_t *obj, of_object_id_t *id
 void of_bsn_tlv_ipv4_src_push_wire_types(of_object_t *obj);
 void of_bsn_tlv_ipv6_wire_object_id_get(of_object_t *obj, of_object_id_t *id);
 void of_bsn_tlv_ipv6_push_wire_types(of_object_t *obj);
+void of_bsn_tlv_ipv6_dst_wire_object_id_get(of_object_t *obj, of_object_id_t *id);
+void of_bsn_tlv_ipv6_dst_push_wire_types(of_object_t *obj);
 void of_bsn_tlv_ipv6_prefix_wire_object_id_get(of_object_t *obj, of_object_id_t *id);
 void of_bsn_tlv_ipv6_prefix_push_wire_types(of_object_t *obj);
+void of_bsn_tlv_ipv6_src_wire_object_id_get(of_object_t *obj, of_object_id_t *id);
+void of_bsn_tlv_ipv6_src_push_wire_types(of_object_t *obj);
 void of_bsn_tlv_known_multicast_rate_wire_object_id_get(of_object_t *obj, of_object_id_t *id);
 void of_bsn_tlv_known_multicast_rate_push_wire_types(of_object_t *obj);
 void of_bsn_tlv_l2_multicast_lookup_wire_object_id_get(of_object_t *obj, of_object_id_t *id);
@@ -1758,7 +1762,9 @@ typedef of_object_t of_bsn_tlv_ipv4_dst_t;
 typedef of_object_t of_bsn_tlv_ipv4_netmask_t;
 typedef of_object_t of_bsn_tlv_ipv4_src_t;
 typedef of_object_t of_bsn_tlv_ipv6_t;
+typedef of_object_t of_bsn_tlv_ipv6_dst_t;
 typedef of_object_t of_bsn_tlv_ipv6_prefix_t;
+typedef of_object_t of_bsn_tlv_ipv6_src_t;
 typedef of_object_t of_bsn_tlv_known_multicast_rate_t;
 typedef of_object_t of_bsn_tlv_l2_multicast_lookup_t;
 typedef of_object_t of_bsn_tlv_loopback_port_t;
@@ -3945,11 +3951,21 @@ extern of_object_t *
 extern void of_bsn_tlv_ipv6_init(
     of_object_t *obj, of_version_t version, int bytes, int clean_wire);
 
+extern of_object_t *
+    of_bsn_tlv_ipv6_dst_new(of_version_t version);
+extern void of_bsn_tlv_ipv6_dst_init(
+    of_object_t *obj, of_version_t version, int bytes, int clean_wire);
+
 extern of_object_t *
     of_bsn_tlv_ipv6_prefix_new(of_version_t version);
 extern void of_bsn_tlv_ipv6_prefix_init(
     of_object_t *obj, of_version_t version, int bytes, int clean_wire);
 
+extern of_object_t *
+    of_bsn_tlv_ipv6_src_new(of_version_t version);
+extern void of_bsn_tlv_ipv6_src_init(
+    of_object_t *obj, of_version_t version, int bytes, int clean_wire);
+
 extern of_object_t *
     of_bsn_tlv_known_multicast_rate_new(of_version_t version);
 extern void of_bsn_tlv_known_multicast_rate_init(
@@ -9839,6 +9855,17 @@ of_bsn_tlv_ipv6_delete(of_object_t *obj) {
     of_object_delete(obj);
 }
 
+/**
+ * Delete an object of type of_bsn_tlv_ipv6_dst_t
+ * @param obj An instance of type of_bsn_tlv_ipv6_dst_t
+ *
+ * \ingroup of_bsn_tlv_ipv6_dst
+ */
+static inline void
+of_bsn_tlv_ipv6_dst_delete(of_object_t *obj) {
+    of_object_delete(obj);
+}
+
 /**
  * Delete an object of type of_bsn_tlv_ipv6_prefix_t
  * @param obj An instance of type of_bsn_tlv_ipv6_prefix_t
@@ -9850,6 +9877,17 @@ of_bsn_tlv_ipv6_prefix_delete(of_object_t *obj) {
     of_object_delete(obj);
 }
 
+/**
+ * Delete an object of type of_bsn_tlv_ipv6_src_t
+ * @param obj An instance of type of_bsn_tlv_ipv6_src_t
+ *
+ * \ingroup of_bsn_tlv_ipv6_src
+ */
+static inline void
+of_bsn_tlv_ipv6_src_delete(of_object_t *obj) {
+    of_object_delete(obj);
+}
+
 /**
  * Delete an object of type of_bsn_tlv_known_multicast_rate_t
  * @param obj An instance of type of_bsn_tlv_known_multicast_rate_t
@@ -22415,6 +22453,15 @@ extern void of_bsn_tlv_ipv6_value_get(
     of_bsn_tlv_ipv6_t *obj,
     of_ipv6_t *value);
 
+/* Unified accessor functions for of_bsn_tlv_ipv6_dst */
+
+extern void of_bsn_tlv_ipv6_dst_value_set(
+    of_bsn_tlv_ipv6_dst_t *obj,
+    of_ipv6_t value);
+extern void of_bsn_tlv_ipv6_dst_value_get(
+    of_bsn_tlv_ipv6_dst_t *obj,
+    of_ipv6_t *value);
+
 /* Unified accessor functions for of_bsn_tlv_ipv6_prefix */
 
 extern void of_bsn_tlv_ipv6_prefix_value_set(
@@ -22431,6 +22478,15 @@ extern void of_bsn_tlv_ipv6_prefix_prefix_length_get(
     of_bsn_tlv_ipv6_prefix_t *obj,
     uint8_t *prefix_length);
 
+/* Unified accessor functions for of_bsn_tlv_ipv6_src */
+
+extern void of_bsn_tlv_ipv6_src_value_set(
+    of_bsn_tlv_ipv6_src_t *obj,
+    of_ipv6_t value);
+extern void of_bsn_tlv_ipv6_src_value_get(
+    of_bsn_tlv_ipv6_src_t *obj,
+    of_ipv6_t *value);
+
 /* Unified accessor functions for of_bsn_tlv_known_multicast_rate */
 
 extern void of_bsn_tlv_known_multicast_rate_value_set(

loci/inc/loci/loci_doc.h

@@ -6954,6 +6954,17 @@ typedef struct of_bsn_tlv_ipv4_src_s of_bsn_tlv_ipv4_src_t;
  */
 typedef struct of_bsn_tlv_ipv6_s of_bsn_tlv_ipv6_t;
 
+/**
+ * Structure for of_bsn_tlv_ipv6_dst object.  Get/set
+ * accessors available in all versions unless noted otherwise
+ *
+ * @param value_get/set ( OF_1_3 OF_1_4).
+ *   Accessors for value, a variable of type of_ipv6.  Functions
+ *   are of type of_bsn_tlv_ipv6_dst_of_ipv6_get_f and _set_f.
+ *
+ */
+typedef struct of_bsn_tlv_ipv6_dst_s of_bsn_tlv_ipv6_dst_t;
+
 /**
  * Structure for of_bsn_tlv_ipv6_prefix object.  Get/set
  * accessors available in all versions unless noted otherwise
@@ -6969,6 +6980,17 @@ typedef struct of_bsn_tlv_ipv6_s of_bsn_tlv_ipv6_t;
  */
 typedef struct of_bsn_tlv_ipv6_prefix_s of_bsn_tlv_ipv6_prefix_t;
 
+/**
+ * Structure for of_bsn_tlv_ipv6_src object.  Get/set
+ * accessors available in all versions unless noted otherwise
+ *
+ * @param value_get/set ( OF_1_3 OF_1_4).
+ *   Accessors for value, a variable of type of_ipv6.  Functions
+ *   are of type of_bsn_tlv_ipv6_src_of_ipv6_get_f and _set_f.
+ *
+ */
+typedef struct of_bsn_tlv_ipv6_src_s of_bsn_tlv_ipv6_src_t;
+
 /**
  * Structure for of_bsn_tlv_known_multicast_rate object.  Get/set
  * accessors available in all versions unless noted otherwise

loci/inc/loci/loci_obj_dump.h

@@ -776,7 +776,9 @@ int of_bsn_tlv_ipv4_dst_OF_VERSION_1_3_dump(loci_writer_f writer, void* cookie,
 int of_bsn_tlv_ipv4_netmask_OF_VERSION_1_3_dump(loci_writer_f writer, void* cookie, of_object_t *obj);
 int of_bsn_tlv_ipv4_src_OF_VERSION_1_3_dump(loci_writer_f writer, void* cookie, of_object_t *obj);
 int of_bsn_tlv_ipv6_OF_VERSION_1_3_dump(loci_writer_f writer, void* cookie, of_object_t *obj);
+int of_bsn_tlv_ipv6_dst_OF_VERSION_1_3_dump(loci_writer_f writer, void* cookie, of_object_t *obj);
 int of_bsn_tlv_ipv6_prefix_OF_VERSION_1_3_dump(loci_writer_f writer, void* cookie, of_object_t *obj);
+int of_bsn_tlv_ipv6_src_OF_VERSION_1_3_dump(loci_writer_f writer, void* cookie, of_object_t *obj);
 int of_bsn_tlv_known_multicast_rate_OF_VERSION_1_3_dump(loci_writer_f writer, void* cookie, of_object_t *obj);
 int of_bsn_tlv_l2_multicast_lookup_OF_VERSION_1_3_dump(loci_writer_f writer, void* cookie, of_object_t *obj);
 int of_bsn_tlv_loopback_port_OF_VERSION_1_3_dump(loci_writer_f writer, void* cookie, of_object_t *obj);
@@ -1366,7 +1368,9 @@ int of_bsn_tlv_ipv4_dst_OF_VERSION_1_4_dump(loci_writer_f writer, void* cookie,
 int of_bsn_tlv_ipv4_netmask_OF_VERSION_1_4_dump(loci_writer_f writer, void* cookie, of_object_t *obj);
 int of_bsn_tlv_ipv4_src_OF_VERSION_1_4_dump(loci_writer_f writer, void* cookie, of_object_t *obj);
 int of_bsn_tlv_ipv6_OF_VERSION_1_4_dump(loci_writer_f writer, void* cookie, of_object_t *obj);
+int of_bsn_tlv_ipv6_dst_OF_VERSION_1_4_dump(loci_writer_f writer, void* cookie, of_object_t *obj);
 int of_bsn_tlv_ipv6_prefix_OF_VERSION_1_4_dump(loci_writer_f writer, void* cookie, of_object_t *obj);
+int of_bsn_tlv_ipv6_src_OF_VERSION_1_4_dump(loci_writer_f writer, void* cookie, of_object_t *obj);
 int of_bsn_tlv_known_multicast_rate_OF_VERSION_1_4_dump(loci_writer_f writer, void* cookie, of_object_t *obj);
 int of_bsn_tlv_l2_multicast_lookup_OF_VERSION_1_4_dump(loci_writer_f writer, void* cookie, of_object_t *obj);
 int of_bsn_tlv_loopback_port_OF_VERSION_1_4_dump(loci_writer_f writer, void* cookie, of_object_t *obj);

loci/inc/loci/loci_obj_show.h

@@ -776,7 +776,9 @@ int of_bsn_tlv_ipv4_dst_OF_VERSION_1_3_show(loci_writer_f writer, void* cookie,
 int of_bsn_tlv_ipv4_netmask_OF_VERSION_1_3_show(loci_writer_f writer, void* cookie, of_object_t *obj);
 int of_bsn_tlv_ipv4_src_OF_VERSION_1_3_show(loci_writer_f writer, void* cookie, of_object_t *obj);
 int of_bsn_tlv_ipv6_OF_VERSION_1_3_show(loci_writer_f writer, void* cookie, of_object_t *obj);
+int of_bsn_tlv_ipv6_dst_OF_VERSION_1_3_show(loci_writer_f writer, void* cookie, of_object_t *obj);
 int of_bsn_tlv_ipv6_prefix_OF_VERSION_1_3_show(loci_writer_f writer, void* cookie, of_object_t *obj);
+int of_bsn_tlv_ipv6_src_OF_VERSION_1_3_show(loci_writer_f writer, void* cookie, of_object_t *obj);
 int of_bsn_tlv_known_multicast_rate_OF_VERSION_1_3_show(loci_writer_f writer, void* cookie, of_object_t *obj);
 int of_bsn_tlv_l2_multicast_lookup_OF_VERSION_1_3_show(loci_writer_f writer, void* cookie, of_object_t *obj);
 int of_bsn_tlv_loopback_port_OF_VERSION_1_3_show(loci_writer_f writer, void* cookie, of_object_t *obj);
@@ -1366,7 +1368,9 @@ int of_bsn_tlv_ipv4_dst_OF_VERSION_1_4_show(loci_writer_f writer, void* cookie,
 int of_bsn_tlv_ipv4_netmask_OF_VERSION_1_4_show(loci_writer_f writer, void* cookie, of_object_t *obj);
 int of_bsn_tlv_ipv4_src_OF_VERSION_1_4_show(loci_writer_f writer, void* cookie, of_object_t *obj);
 int of_bsn_tlv_ipv6_OF_VERSION_1_4_show(loci_writer_f writer, void* cookie, of_object_t *obj);
+int of_bsn_tlv_ipv6_dst_OF_VERSION_1_4_show(loci_writer_f writer, void* cookie, of_object_t *obj);
 int of_bsn_tlv_ipv6_prefix_OF_VERSION_1_4_show(loci_writer_f writer, void* cookie, of_object_t *obj);
+int of_bsn_tlv_ipv6_src_OF_VERSION_1_4_show(loci_writer_f writer, void* cookie, of_object_t *obj);
 int of_bsn_tlv_known_multicast_rate_OF_VERSION_1_4_show(loci_writer_f writer, void* cookie, of_object_t *obj);
 int of_bsn_tlv_l2_multicast_lookup_OF_VERSION_1_4_show(loci_writer_f writer, void* cookie, of_object_t *obj);
 int of_bsn_tlv_loopback_port_OF_VERSION_1_4_show(loci_writer_f writer, void* cookie, of_object_t *obj);

loci/src/class12.c

@@ -6614,6 +6614,12 @@ of_bsn_tlv_wire_object_id_get(of_object_t *obj, of_object_id_t *id)
         case 0x7d:
             *id = OF_BSN_TLV_ICMPV6_CHKSUM;
             break;
+        case 0x7e:
+            *id = OF_BSN_TLV_IPV6_SRC;
+            break;
+        case 0x7f:
+            *id = OF_BSN_TLV_IPV6_DST;
+            break;
         default:
             *id = OF_BSN_TLV;
             break;
@@ -6998,6 +7004,12 @@ of_bsn_tlv_wire_object_id_get(of_object_t *obj, of_object_id_t *id)
         case 0x7d:
             *id = OF_BSN_TLV_ICMPV6_CHKSUM;
             break;
+        case 0x7e:
+            *id = OF_BSN_TLV_IPV6_SRC;
+            break;
+        case 0x7f:
+            *id = OF_BSN_TLV_IPV6_DST;
+            break;
         default:
             *id = OF_BSN_TLV;
             break;