X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fsflow.h;h=c6cde7f23b4d676bbcc5d7af1aa21fe670a5a4ac;hb=HEAD;hp=397ae2dae75f9cc4c379632c2c7eb1780c8ea890;hpb=a4af00400a835eb87569ba40e21874c05e872c0f;p=sliver-openvswitch.git

diff --git a/lib/sflow.h b/lib/sflow.h
index 397ae2dae..c6cde7f23 100644
--- a/lib/sflow.h
+++ b/lib/sflow.h
@@ -1,9 +1,24 @@
-/* Copyright (c) 2002-2009 InMon Corp. Licensed under the terms of the InMon sFlow licence: */
-/* http://www.inmon.com/technology/sflowlicense.txt */
+/* Copyright (c) 2002-2009 InMon Corp. Licensed under the terms of either the
+ *   Sun Industry Standards Source License 1.1, that is available at:
+ *    http://host-sflow.sourceforge.net/sissl.html
+ * or the InMon sFlow License, that is available at:
+ *    http://www.inmon.com/technology/sflowlicense.txt
+ */
 
 #ifndef SFLOW_H
 #define SFLOW_H 1
 
+#ifdef _WIN32
+#include "windefs.h"
+#endif
+
+typedef enum {
+    SFL_DSCLASS_IFINDEX = 0,
+    SFL_DSCLASS_VLAN = 1,
+    SFL_DSCLASS_PHYSICAL_ENTITY = 2,
+    SFL_DSCLASS_LOGICAL_ENTITY = 3
+} SFL_DSCLASS;
+
 enum SFLAddress_type {
     SFLADDRESSTYPE_IP_V4 = 1,
     SFLADDRESSTYPE_IP_V6 = 2
@@ -64,7 +79,7 @@ typedef struct _SFLSampled_header {
 /* decoded ethernet header */
 
 typedef struct _SFLSampled_ethernet {
-    u_int32_t eth_len;       /* The length of the MAC packet excluding 
+    u_int32_t eth_len;       /* The length of the MAC packet excluding
 				lower layer encapsulations */
     u_int8_t src_mac[8];    /* 6 bytes + 2 pad */
     u_int8_t dst_mac[8];
@@ -123,7 +138,7 @@ enum SFLExtended_as_path_segment_type {
     SFLEXTENDED_AS_SET = 1,      /* Unordered set of ASs */
     SFLEXTENDED_AS_SEQUENCE = 2  /* Ordered sequence of ASs */
 };
-  
+
 typedef struct _SFLExtended_as_path_segment {
     u_int32_t type;   /* enum SFLExtended_as_path_segment_type */
     u_int32_t length; /* number of AS numbers in set/sequence */
@@ -184,7 +199,7 @@ typedef struct _SFLLabelStack {
 } SFLLabelStack;
 
 typedef struct _SFLExtended_mpls {
-    SFLAddress nextHop;        /* Address of the next hop */ 
+    SFLAddress nextHop;        /* Address of the next hop */
     SFLLabelStack in_stack;
     SFLLabelStack out_stack;
 } SFLExtended_mpls;
@@ -192,7 +207,7 @@ typedef struct _SFLExtended_mpls {
 /* Extended NAT data
    Packet header records report addresses as seen at the sFlowDataSource.
    The extended_nat structure reports on translated source and/or destination
-   addesses for this packet. If an address was not translated it should 
+   addesses for this packet. If an address was not translated it should
    be equal to that reported for the header. */
 
 typedef struct _SFLExtended_nat {
@@ -231,29 +246,29 @@ typedef struct _SFLExtended_mpls_LDP_FEC {
     u_int32_t mplsFecAddrPrefixLength;
 } SFLExtended_mpls_LDP_FEC;
 
-/* Extended VLAN tunnel information 
-   Record outer VLAN encapsulations that have 
-   been stripped. extended_vlantunnel information 
-   should only be reported if all the following conditions are satisfied: 
-   1. The packet has nested vlan tags, AND 
-   2. The reporting device is VLAN aware, AND 
-   3. One or more VLAN tags have been stripped, either 
-   because they represent proprietary encapsulations, or 
-   because switch hardware automatically strips the outer VLAN 
-   encapsulation. 
-   Reporting extended_vlantunnel information is not a substitute for 
-   reporting extended_switch information. extended_switch data must 
-   always be reported to describe the ingress/egress VLAN information 
-   for the packet. The extended_vlantunnel information only applies to 
-   nested VLAN tags, and then only when one or more tags has been 
-   stripped. */ 
+/* Extended VLAN tunnel information
+   Record outer VLAN encapsulations that have
+   been stripped. extended_vlantunnel information
+   should only be reported if all the following conditions are satisfied:
+   1. The packet has nested vlan tags, AND
+   2. The reporting device is VLAN aware, AND
+   3. One or more VLAN tags have been stripped, either
+   because they represent proprietary encapsulations, or
+   because switch hardware automatically strips the outer VLAN
+   encapsulation.
+   Reporting extended_vlantunnel information is not a substitute for
+   reporting extended_switch information. extended_switch data must
+   always be reported to describe the ingress/egress VLAN information
+   for the packet. The extended_vlantunnel information only applies to
+   nested VLAN tags, and then only when one or more tags has been
+   stripped. */
 
 typedef SFLLabelStack SFLVlanStack;
-typedef struct _SFLExtended_vlan_tunnel { 
-    SFLVlanStack stack;  /* List of stripped 802.1Q TPID/TCI layers. Each 
-			    TPID,TCI pair is represented as a single 32 bit 
-			    integer. Layers listed from outermost to 
-			    innermost. */ 
+typedef struct _SFLExtended_vlan_tunnel {
+    SFLVlanStack stack;  /* List of stripped 802.1Q TPID/TCI layers. Each
+			    TPID,TCI pair is represented as a single 32 bit
+			    integer. Layers listed from outermost to
+			    innermost. */
 } SFLExtended_vlan_tunnel;
 
 enum SFLFlow_type_tag {
@@ -308,7 +323,7 @@ enum SFL_sample_tag {
     SFLFLOW_SAMPLE_EXPANDED = 3,     /* enterprise = 0 : format = 3 */
     SFLCOUNTERS_SAMPLE_EXPANDED = 4  /* enterprise = 0 : format = 4 */
 };
-  
+
 /* Format of a single flow sample */
 
 typedef struct _SFLFlow_sample {