Merge branch 'main' into bounceback

sonic-net · Nov 14, 2024 · 0b6f995 · 0b6f995
2 parents 7ab672f + 0726ca7
commit 0b6f995
Show file tree

Hide file tree

Showing 66 changed files with 2,261 additions and 1,042 deletions.
diff --git a/.wordlist.txt b/.wordlist.txt
diff --git a/dash-pipeline/SAI/SAI b/dash-pipeline/SAI/SAI
diff --git a/dash-pipeline/SAI/debian/Makefile b/dash-pipeline/SAI/debian/Makefile
@@ -21,6 +21,7 @@ libsai_$(VERSION)_amd64.deb: ../lib/libsai.so
 	mkdir -p -m 755 libsai_$(VERSION)_amd64/usr/lib/x86_64-linux-gnu/
 	find -type d |xargs chmod go-w
 	install -vCD ../lib/libsai.so libsai_$(VERSION)_amd64/usr/lib/x86_64-linux-gnu/libsai.so
+	install -vCD ../SAI/meta/libsaimetadata.so libsai_$(VERSION)_amd64/usr/lib/x86_64-linux-gnu/libdashsaimetadata.so
 	cd libsai_$(VERSION)_amd64 && find usr -type f | xargs md5sum > DEBIAN/md5sums
 	dpkg-deb --build --root-owner-group libsai_$(VERSION)_amd64
 

diff --git a/dash-pipeline/SAI/specs/dash_acl.yaml b/dash-pipeline/SAI/specs/dash_acl.yaml
@@ -27,11 +27,11 @@ sai_apis:
   p4_meta: !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4Meta
     tables:
     - !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4MetaTable
-      id: 50200087
+      id: 37949057
       actions:
         default: !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4MetaAction
           name: default
-          id: 25655048
+          id: 21989040
           attr_param_id: {}
 - !!python/object:utils.sai_spec.sai_api.SaiApi
   name: dash_acl_rule
@@ -194,116 +194,116 @@ sai_apis:
   p4_meta: !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4Meta
     tables:
     - !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4MetaTable
-      id: 41950136
+      id: 43936368
       actions:
         SAI_DASH_ACL_RULE_ACTION_PERMIT: !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4MetaAction
           name: SAI_DASH_ACL_RULE_ACTION_PERMIT
-          id: 32161567
+          id: 24892843
           attr_param_id: {}
         SAI_DASH_ACL_RULE_ACTION_PERMIT_AND_CONTINUE: !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4MetaAction
           name: SAI_DASH_ACL_RULE_ACTION_PERMIT_AND_CONTINUE
-          id: 20706700
+          id: 26577723
           attr_param_id: {}
         SAI_DASH_ACL_RULE_ACTION_DENY: !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4MetaAction
           name: SAI_DASH_ACL_RULE_ACTION_DENY
-          id: 28146588
+          id: 31332881
           attr_param_id: {}
         SAI_DASH_ACL_RULE_ACTION_DENY_AND_CONTINUE: !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4MetaAction
           name: SAI_DASH_ACL_RULE_ACTION_DENY_AND_CONTINUE
-          id: 31424218
+          id: 24146215
           attr_param_id: {}
     - !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4MetaTable
-      id: 43016664
+      id: 48549629
       actions:
         SAI_DASH_ACL_RULE_ACTION_PERMIT: !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4MetaAction
           name: SAI_DASH_ACL_RULE_ACTION_PERMIT
-          id: 32161567
+          id: 24892843
           attr_param_id: {}
         SAI_DASH_ACL_RULE_ACTION_PERMIT_AND_CONTINUE: !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4MetaAction
           name: SAI_DASH_ACL_RULE_ACTION_PERMIT_AND_CONTINUE
-          id: 20706700
+          id: 26577723
           attr_param_id: {}
         SAI_DASH_ACL_RULE_ACTION_DENY: !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4MetaAction
           name: SAI_DASH_ACL_RULE_ACTION_DENY
-          id: 28146588
+          id: 31332881
           attr_param_id: {}
         SAI_DASH_ACL_RULE_ACTION_DENY_AND_CONTINUE: !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4MetaAction
           name: SAI_DASH_ACL_RULE_ACTION_DENY_AND_CONTINUE
-          id: 31424218
+          id: 24146215
           attr_param_id: {}
     - !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4MetaTable
-      id: 49695908
+      id: 40869404
       actions:
         SAI_DASH_ACL_RULE_ACTION_PERMIT: !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4MetaAction
           name: SAI_DASH_ACL_RULE_ACTION_PERMIT
-          id: 32161567
+          id: 24892843
           attr_param_id: {}
         SAI_DASH_ACL_RULE_ACTION_PERMIT_AND_CONTINUE: !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4MetaAction
           name: SAI_DASH_ACL_RULE_ACTION_PERMIT_AND_CONTINUE
-          id: 20706700
+          id: 26577723
           attr_param_id: {}
         SAI_DASH_ACL_RULE_ACTION_DENY: !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4MetaAction
           name: SAI_DASH_ACL_RULE_ACTION_DENY
-          id: 28146588
+          id: 31332881
           attr_param_id: {}
         SAI_DASH_ACL_RULE_ACTION_DENY_AND_CONTINUE: !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4MetaAction
           name: SAI_DASH_ACL_RULE_ACTION_DENY_AND_CONTINUE
-          id: 31424218
+          id: 24146215
           attr_param_id: {}
     - !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4MetaTable
-      id: 49209582
+      id: 49672642
       actions:
         SAI_DASH_ACL_RULE_ACTION_PERMIT: !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4MetaAction
           name: SAI_DASH_ACL_RULE_ACTION_PERMIT
-          id: 18858683
+          id: 22622424
           attr_param_id: {}
         SAI_DASH_ACL_RULE_ACTION_PERMIT_AND_CONTINUE: !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4MetaAction
           name: SAI_DASH_ACL_RULE_ACTION_PERMIT_AND_CONTINUE
-          id: 24263137
+          id: 27458076
           attr_param_id: {}
         SAI_DASH_ACL_RULE_ACTION_DENY: !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4MetaAction
           name: SAI_DASH_ACL_RULE_ACTION_DENY
-          id: 29962337
+          id: 27228779
           attr_param_id: {}
         SAI_DASH_ACL_RULE_ACTION_DENY_AND_CONTINUE: !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4MetaAction
           name: SAI_DASH_ACL_RULE_ACTION_DENY_AND_CONTINUE
-          id: 26077229
+          id: 29275145
           attr_param_id: {}
     - !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4MetaTable
-      id: 36478314
+      id: 37932124
       actions:
         SAI_DASH_ACL_RULE_ACTION_PERMIT: !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4MetaAction
           name: SAI_DASH_ACL_RULE_ACTION_PERMIT
-          id: 18858683
+          id: 22622424
           attr_param_id: {}
         SAI_DASH_ACL_RULE_ACTION_PERMIT_AND_CONTINUE: !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4MetaAction
           name: SAI_DASH_ACL_RULE_ACTION_PERMIT_AND_CONTINUE
-          id: 24263137
+          id: 27458076
           attr_param_id: {}
         SAI_DASH_ACL_RULE_ACTION_DENY: !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4MetaAction
           name: SAI_DASH_ACL_RULE_ACTION_DENY
-          id: 29962337
+          id: 27228779
           attr_param_id: {}
         SAI_DASH_ACL_RULE_ACTION_DENY_AND_CONTINUE: !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4MetaAction
           name: SAI_DASH_ACL_RULE_ACTION_DENY_AND_CONTINUE
-          id: 26077229
+          id: 29275145
           attr_param_id: {}
     - !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4MetaTable
-      id: 39012793
+      id: 46113118
       actions:
         SAI_DASH_ACL_RULE_ACTION_PERMIT: !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4MetaAction
           name: SAI_DASH_ACL_RULE_ACTION_PERMIT
-          id: 18858683
+          id: 22622424
           attr_param_id: {}
         SAI_DASH_ACL_RULE_ACTION_PERMIT_AND_CONTINUE: !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4MetaAction
           name: SAI_DASH_ACL_RULE_ACTION_PERMIT_AND_CONTINUE
-          id: 24263137
+          id: 27458076
           attr_param_id: {}
         SAI_DASH_ACL_RULE_ACTION_DENY: !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4MetaAction
           name: SAI_DASH_ACL_RULE_ACTION_DENY
-          id: 29962337
+          id: 27228779
           attr_param_id: {}
         SAI_DASH_ACL_RULE_ACTION_DENY_AND_CONTINUE: !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4MetaAction
           name: SAI_DASH_ACL_RULE_ACTION_DENY_AND_CONTINUE
-          id: 26077229
+          id: 29275145
           attr_param_id: {}
diff --git a/dash-pipeline/SAI/specs/dash_appliance.yaml b/dash-pipeline/SAI/specs/dash_appliance.yaml
@@ -17,7 +17,7 @@ sai_apis:
     attr_value_field: u8
     default: '0'
     isresourcetype: false
-    flags: CREATE_AND_SET
+    flags: CREATE_ONLY
     object_name: null
     allow_null: false
     valid_only: null
@@ -27,9 +27,9 @@ sai_apis:
   p4_meta: !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4Meta
     tables:
     - !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4MetaTable
-      id: 41082190
+      id: 45177948
       actions:
         default: !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4MetaAction
           name: default
-          id: 29775410
+          id: 17143042
           attr_param_id: {}
diff --git a/dash-pipeline/SAI/specs/dash_direction_lookup.yaml b/dash-pipeline/SAI/specs/dash_direction_lookup.yaml
@@ -64,10 +64,10 @@ sai_apis:
   p4_meta: !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4Meta
     tables:
     - !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4MetaTable
-      id: 44703784
+      id: 49875338
       actions:
         SAI_DIRECTION_LOOKUP_ENTRY_ACTION_SET_OUTBOUND_DIRECTION: !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4MetaAction
           name: SAI_DIRECTION_LOOKUP_ENTRY_ACTION_SET_OUTBOUND_DIRECTION
-          id: 17408972
+          id: 32588257
           attr_param_id:
             SAI_DIRECTION_LOOKUP_ENTRY_ATTR_DASH_ENI_MAC_OVERRIDE_TYPE: 1
diff --git a/dash-pipeline/SAI/specs/dash_eni.yaml b/dash-pipeline/SAI/specs/dash_eni.yaml
@@ -64,11 +64,11 @@ sai_apis:
   p4_meta: !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4Meta
     tables:
     - !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4MetaTable
-      id: 36648123
+      id: 39883185
       actions:
         SAI_ENI_ETHER_ADDRESS_MAP_ENTRY_ACTION_SET_ENI: !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4MetaAction
           name: SAI_ENI_ETHER_ADDRESS_MAP_ENTRY_ACTION_SET_ENI
-          id: 24618133
+          id: 19019152
           attr_param_id:
             SAI_ENI_ETHER_ADDRESS_MAP_ENTRY_ATTR_ENI_ID: 1
 - !!python/object:utils.sai_spec.sai_api.SaiApi
@@ -1642,9 +1642,9 @@ sai_apis:
   p4_meta: !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4Meta
     tables:
     - !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4MetaTable
-      id: 45859274
+      id: 38483381
       actions:
         default: !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4MetaAction
           name: default
-          id: 27167550
+          id: 30359009
           attr_param_id: {}
diff --git a/dash-pipeline/SAI/specs/dash_flow.yaml b/dash-pipeline/SAI/specs/dash_flow.yaml
@@ -311,9 +311,9 @@ sai_apis:
   - !!python/object:utils.sai_spec.sai_attribute.SaiAttribute
     name: SAI_FLOW_ENTRY_ATTR_UNDERLAY0_SIP
     description: Action parameter underlay0 sip
-    type: sai_uint32_t
-    attr_value_field: u32
-    default: '0'
+    type: sai_ip_address_t
+    attr_value_field: ipaddr
+    default: 0.0.0.0
     isresourcetype: false
     flags: CREATE_AND_SET
     object_name: null
@@ -324,9 +324,9 @@ sai_apis:
   - !!python/object:utils.sai_spec.sai_attribute.SaiAttribute
     name: SAI_FLOW_ENTRY_ATTR_UNDERLAY0_DIP
     description: Action parameter underlay0 dip
-    type: sai_uint32_t
-    attr_value_field: u32
-    default: '0'
+    type: sai_ip_address_t
+    attr_value_field: ipaddr
+    default: 0.0.0.0
     isresourcetype: false
     flags: CREATE_AND_SET
     object_name: null
@@ -363,9 +363,9 @@ sai_apis:
   - !!python/object:utils.sai_spec.sai_attribute.SaiAttribute
     name: SAI_FLOW_ENTRY_ATTR_UNDERLAY1_SIP
     description: Action parameter underlay1 sip
-    type: sai_uint32_t
-    attr_value_field: u32
-    default: '0'
+    type: sai_ip_address_t
+    attr_value_field: ipaddr
+    default: 0.0.0.0
     isresourcetype: false
     flags: CREATE_AND_SET
     object_name: null
@@ -376,9 +376,9 @@ sai_apis:
   - !!python/object:utils.sai_spec.sai_attribute.SaiAttribute
     name: SAI_FLOW_ENTRY_ATTR_UNDERLAY1_DIP
     description: Action parameter underlay1 dip
-    type: sai_uint32_t
-    attr_value_field: u32
-    default: '0'
+    type: sai_ip_address_t
+    attr_value_field: ipaddr
+    default: 0.0.0.0
     isresourcetype: false
     flags: CREATE_AND_SET
     object_name: null
@@ -529,6 +529,45 @@ sai_apis:
     valid_only: null
     is_vlan: false
     deprecated: false
+  - !!python/object:utils.sai_spec.sai_attribute.SaiAttribute
+    name: SAI_FLOW_ENTRY_ATTR_DASH_FLOW_SYNC_STATE
+    description: Action parameter DASH flow sync state
+    type: sai_dash_flow_sync_state_t
+    attr_value_field: s32
+    default: SAI_DASH_FLOW_SYNC_STATE_FLOW_MISS
+    isresourcetype: false
+    flags: CREATE_AND_SET
+    object_name: null
+    allow_null: false
+    valid_only: null
+    is_vlan: false
+    deprecated: false
+  - !!python/object:utils.sai_spec.sai_attribute.SaiAttribute
+    name: SAI_FLOW_ENTRY_ATTR_UNDERLAY0_SMAC
+    description: Action parameter underlay0 source MAC
+    type: sai_mac_t
+    attr_value_field: mac
+    default: vendor
+    isresourcetype: false
+    flags: CREATE_AND_SET
+    object_name: null
+    allow_null: false
+    valid_only: null
+    is_vlan: false
+    deprecated: false
+  - !!python/object:utils.sai_spec.sai_attribute.SaiAttribute
+    name: SAI_FLOW_ENTRY_ATTR_UNDERLAY0_DMAC
+    description: Action parameter underlay0 destination MAC
+    type: sai_mac_t
+    attr_value_field: mac
+    default: vendor
+    isresourcetype: false
+    flags: CREATE_AND_SET
+    object_name: null
+    allow_null: false
+    valid_only: null
+    is_vlan: false
+    deprecated: false
   stats: []
   p4_meta: !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4Meta
     tables:
@@ -544,30 +583,33 @@ sai_apis:
             SAI_FLOW_ENTRY_ATTR_DASH_FLOW_ACTION: 3
             SAI_FLOW_ENTRY_ATTR_METER_CLASS: 4
             SAI_FLOW_ENTRY_ATTR_IS_UNIDIRECTIONAL_FLOW: 5
-            SAI_FLOW_ENTRY_ATTR_REVERSE_FLOW_ENI_MAC: 6
-            SAI_FLOW_ENTRY_ATTR_REVERSE_FLOW_VNET_ID: 7
-            SAI_FLOW_ENTRY_ATTR_REVERSE_FLOW_IP_PROTO: 8
-            SAI_FLOW_ENTRY_ATTR_REVERSE_FLOW_SRC_IP: 9
-            SAI_FLOW_ENTRY_ATTR_REVERSE_FLOW_DST_IP: 10
-            SAI_FLOW_ENTRY_ATTR_REVERSE_FLOW_SRC_PORT: 11
-            SAI_FLOW_ENTRY_ATTR_REVERSE_FLOW_DST_PORT: 12
-            SAI_FLOW_ENTRY_ATTR_UNDERLAY0_VNET_ID: 13
-            SAI_FLOW_ENTRY_ATTR_UNDERLAY0_SIP: 14
-            SAI_FLOW_ENTRY_ATTR_UNDERLAY0_DIP: 15
-            SAI_FLOW_ENTRY_ATTR_UNDERLAY0_DASH_ENCAPSULATION: 16
-            SAI_FLOW_ENTRY_ATTR_UNDERLAY1_VNET_ID: 17
-            SAI_FLOW_ENTRY_ATTR_UNDERLAY1_SIP: 18
-            SAI_FLOW_ENTRY_ATTR_UNDERLAY1_DIP: 19
-            SAI_FLOW_ENTRY_ATTR_UNDERLAY1_SMAC: 20
-            SAI_FLOW_ENTRY_ATTR_UNDERLAY1_DMAC: 21
-            SAI_FLOW_ENTRY_ATTR_UNDERLAY1_DASH_ENCAPSULATION: 22
-            SAI_FLOW_ENTRY_ATTR_DST_MAC: 23
-            SAI_FLOW_ENTRY_ATTR_SIP: 24
-            SAI_FLOW_ENTRY_ATTR_DIP: 25
-            SAI_FLOW_ENTRY_ATTR_SIP_MASK: 26
-            SAI_FLOW_ENTRY_ATTR_DIP_MASK: 27
-            SAI_FLOW_ENTRY_ATTR_VENDOR_METADATA: 28
-            SAI_FLOW_ENTRY_ATTR_FLOW_DATA_PB: 29
+            SAI_FLOW_ENTRY_ATTR_DASH_FLOW_SYNC_STATE: 6
+            SAI_FLOW_ENTRY_ATTR_REVERSE_FLOW_ENI_MAC: 7
+            SAI_FLOW_ENTRY_ATTR_REVERSE_FLOW_VNET_ID: 8
+            SAI_FLOW_ENTRY_ATTR_REVERSE_FLOW_IP_PROTO: 9
+            SAI_FLOW_ENTRY_ATTR_REVERSE_FLOW_SRC_IP: 10
+            SAI_FLOW_ENTRY_ATTR_REVERSE_FLOW_DST_IP: 11
+            SAI_FLOW_ENTRY_ATTR_REVERSE_FLOW_SRC_PORT: 12
+            SAI_FLOW_ENTRY_ATTR_REVERSE_FLOW_DST_PORT: 13
+            SAI_FLOW_ENTRY_ATTR_UNDERLAY0_VNET_ID: 15
+            SAI_FLOW_ENTRY_ATTR_UNDERLAY0_SIP: 16
+            SAI_FLOW_ENTRY_ATTR_UNDERLAY0_DIP: 17
+            SAI_FLOW_ENTRY_ATTR_UNDERLAY0_SMAC: 18
+            SAI_FLOW_ENTRY_ATTR_UNDERLAY0_DMAC: 19
+            SAI_FLOW_ENTRY_ATTR_UNDERLAY0_DASH_ENCAPSULATION: 20
+            SAI_FLOW_ENTRY_ATTR_UNDERLAY1_VNET_ID: 21
+            SAI_FLOW_ENTRY_ATTR_UNDERLAY1_SIP: 22
+            SAI_FLOW_ENTRY_ATTR_UNDERLAY1_DIP: 23
+            SAI_FLOW_ENTRY_ATTR_UNDERLAY1_SMAC: 24
+            SAI_FLOW_ENTRY_ATTR_UNDERLAY1_DMAC: 25
+            SAI_FLOW_ENTRY_ATTR_UNDERLAY1_DASH_ENCAPSULATION: 26
+            SAI_FLOW_ENTRY_ATTR_DST_MAC: 27
+            SAI_FLOW_ENTRY_ATTR_SIP: 28
+            SAI_FLOW_ENTRY_ATTR_DIP: 29
+            SAI_FLOW_ENTRY_ATTR_SIP_MASK: 30
+            SAI_FLOW_ENTRY_ATTR_DIP_MASK: 31
+            SAI_FLOW_ENTRY_ATTR_VENDOR_METADATA: 33
+            SAI_FLOW_ENTRY_ATTR_FLOW_DATA_PB: 34
 - !!python/object:utils.sai_spec.sai_api.SaiApi
   name: flow_entry_bulk_get_session_filter
   description: flow entry bulk get session filter
+1,484 −0		doc/SAI-Counter-enhancement-hld.md
+160 −0		doc/SAI-Proposal-HW-FRR.md
+9 −0		experimental/saiexperimentaldashdirectionlookup.h
+18 −0		experimental/saiexperimentaldasheni.h
+27 −0		experimental/saiexperimentaldashflow.h
+217 −8		experimental/saiexperimentaldashtunnel.h
+57 −1		experimental/saitypesextensions.h
+22 −0		inc/saibfd.h
+44 −0		inc/saibridge.h
+46 −0		inc/saibuffer.h
+42 −0		inc/saicounter.h
+7 −0		inc/saihostif.h
+22 −0		inc/saiicmpecho.h
+44 −0		inc/saiipsec.h
+55 −0		inc/saimacsec.h
+3 −0		inc/sainexthopgroup.h
+2 −0		inc/saiobject.h
+22 −0		inc/saipolicer.h
+30 −1		inc/saiport.h
+31 −8		inc/saiqueue.h
+22 −0		inc/sairouterinterface.h
+22 −0		inc/saisrv6.h
+22 −0		inc/saiswitch.h
+22 −0		inc/saitunnel.h
+22 −0		inc/saitwamp.h
+16 −0		inc/saitypes.h
+1 −1		inc/saiversion.h
+22 −0		inc/saivlan.h
+1 −0		meta/aspell.en.pws
+2 −1		meta/gensairpc.pl
+7 −0		meta/saisanitycheck.c