interim commit go fmt stuff
Change-Id: I617a7d771b50c2b7999eabbbebbabef4e68d8713
diff --git a/vendor/github.com/skydive-project/goloxi/LICENSE b/vendor/github.com/donNewtonAlpha/goloxi/LICENSE
similarity index 100%
rename from vendor/github.com/skydive-project/goloxi/LICENSE
rename to vendor/github.com/donNewtonAlpha/goloxi/LICENSE
diff --git a/vendor/github.com/skydive-project/goloxi/README.md b/vendor/github.com/donNewtonAlpha/goloxi/README.md
similarity index 100%
rename from vendor/github.com/skydive-project/goloxi/README.md
rename to vendor/github.com/donNewtonAlpha/goloxi/README.md
diff --git a/vendor/github.com/skydive-project/goloxi/decoder.go b/vendor/github.com/donNewtonAlpha/goloxi/decoder.go
similarity index 100%
rename from vendor/github.com/skydive-project/goloxi/decoder.go
rename to vendor/github.com/donNewtonAlpha/goloxi/decoder.go
diff --git a/vendor/github.com/skydive-project/goloxi/encoder.go b/vendor/github.com/donNewtonAlpha/goloxi/encoder.go
similarity index 100%
rename from vendor/github.com/skydive-project/goloxi/encoder.go
rename to vendor/github.com/donNewtonAlpha/goloxi/encoder.go
diff --git a/vendor/github.com/skydive-project/goloxi/globals.go b/vendor/github.com/donNewtonAlpha/goloxi/globals.go
similarity index 100%
rename from vendor/github.com/skydive-project/goloxi/globals.go
rename to vendor/github.com/donNewtonAlpha/goloxi/globals.go
diff --git a/vendor/github.com/skydive-project/goloxi/of13/action.go b/vendor/github.com/donNewtonAlpha/goloxi/of13/action.go
similarity index 99%
rename from vendor/github.com/skydive-project/goloxi/of13/action.go
rename to vendor/github.com/donNewtonAlpha/goloxi/of13/action.go
index 4e271b2..a68d78f 100644
--- a/vendor/github.com/skydive-project/goloxi/of13/action.go
+++ b/vendor/github.com/donNewtonAlpha/goloxi/of13/action.go
@@ -16,7 +16,7 @@
"fmt"
"net"
- "github.com/skydive-project/goloxi"
+ "github.com/donNewtonAlpha/goloxi"
)
type Action struct {
diff --git a/vendor/github.com/skydive-project/goloxi/of13/action_id.go b/vendor/github.com/donNewtonAlpha/goloxi/of13/action_id.go
similarity index 99%
rename from vendor/github.com/skydive-project/goloxi/of13/action_id.go
rename to vendor/github.com/donNewtonAlpha/goloxi/of13/action_id.go
index 68cb38a..e99e42b 100644
--- a/vendor/github.com/skydive-project/goloxi/of13/action_id.go
+++ b/vendor/github.com/donNewtonAlpha/goloxi/of13/action_id.go
@@ -13,7 +13,7 @@
"encoding/binary"
"fmt"
- "github.com/skydive-project/goloxi"
+ "github.com/donNewtonAlpha/goloxi"
)
type ActionId struct {
diff --git a/vendor/github.com/skydive-project/goloxi/of13/common.go b/vendor/github.com/donNewtonAlpha/goloxi/of13/common.go
similarity index 99%
rename from vendor/github.com/skydive-project/goloxi/of13/common.go
rename to vendor/github.com/donNewtonAlpha/goloxi/of13/common.go
index 3ac2db7..978d369 100644
--- a/vendor/github.com/skydive-project/goloxi/of13/common.go
+++ b/vendor/github.com/donNewtonAlpha/goloxi/of13/common.go
@@ -15,7 +15,7 @@
"fmt"
"net"
- "github.com/skydive-project/goloxi"
+ "github.com/donNewtonAlpha/goloxi"
)
type OxmId struct {
@@ -1459,7 +1459,7 @@
}
}
- binary.BigEndian.PutUint16(encoder.Bytes()[0:2], uint16(len(encoder.Bytes())))
+ binary.BigEndian.PutUint16(encoder.Bytes()[2:4], uint16(len(encoder.Bytes())))
return nil
}
@@ -1595,7 +1595,7 @@
encoder.PutUint32(uint32(self.MaxEntries))
encoder.Write(bytes.Repeat([]byte{0}, 4))
- binary.BigEndian.PutUint16(encoder.Bytes()[0:2], uint16(len(encoder.Bytes())))
+ binary.BigEndian.PutUint16(encoder.Bytes()[2:4], uint16(len(encoder.Bytes())))
return nil
}
@@ -1695,7 +1695,7 @@
}
}
- binary.BigEndian.PutUint16(encoder.Bytes()[0:2], uint16(len(encoder.Bytes())))
+ binary.BigEndian.PutUint16(encoder.Bytes()[2:4], uint16(len(encoder.Bytes())))
return nil
}
@@ -1801,7 +1801,7 @@
}
}
- binary.BigEndian.PutUint16(encoder.Bytes()[0:2], uint16(len(encoder.Bytes())))
+ binary.BigEndian.PutUint16(encoder.Bytes()[2:4], uint16(len(encoder.Bytes())))
return nil
}
@@ -2206,7 +2206,7 @@
}
}
- binary.BigEndian.PutUint16(encoder.Bytes()[0:2], uint16(len(encoder.Bytes())))
+ binary.BigEndian.PutUint16(encoder.Bytes()[2:4], uint16(len(encoder.Bytes())))
return nil
}
@@ -10905,7 +10905,7 @@
}
}
- binary.BigEndian.PutUint16(encoder.Bytes()[0:2], uint16(len(encoder.Bytes())))
+ binary.BigEndian.PutUint16(encoder.Bytes()[2:4], uint16(len(encoder.Bytes())))
return nil
}
@@ -11323,7 +11323,7 @@
}
}
- binary.BigEndian.PutUint16(encoder.Bytes()[0:2], uint16(len(encoder.Bytes())))
+ binary.BigEndian.PutUint16(encoder.Bytes()[2:4], uint16(len(encoder.Bytes())))
return nil
}
@@ -11427,7 +11427,7 @@
}
}
- binary.BigEndian.PutUint16(encoder.Bytes()[0:2], uint16(len(encoder.Bytes())))
+ binary.BigEndian.PutUint16(encoder.Bytes()[2:4], uint16(len(encoder.Bytes())))
return nil
}
@@ -12378,7 +12378,7 @@
}
}
- binary.BigEndian.PutUint16(encoder.Bytes()[0:2], uint16(len(encoder.Bytes())))
+ binary.BigEndian.PutUint16(encoder.Bytes()[2:4], uint16(len(encoder.Bytes())))
return nil
}
@@ -12486,7 +12486,7 @@
}
}
- binary.BigEndian.PutUint16(encoder.Bytes()[0:2], uint16(len(encoder.Bytes())))
+ binary.BigEndian.PutUint16(encoder.Bytes()[2:4], uint16(len(encoder.Bytes())))
return nil
}
@@ -12625,7 +12625,7 @@
}
}
- binary.BigEndian.PutUint16(encoder.Bytes()[0:2], uint16(len(encoder.Bytes())))
+ binary.BigEndian.PutUint16(encoder.Bytes()[2:4], uint16(len(encoder.Bytes())))
return nil
}
@@ -14135,7 +14135,7 @@
}
}
- binary.BigEndian.PutUint16(encoder.Bytes()[0:2], uint16(len(encoder.Bytes())))
+ binary.BigEndian.PutUint16(encoder.Bytes()[2:4], uint16(len(encoder.Bytes())))
return nil
}
@@ -14633,7 +14633,7 @@
}
}
- binary.BigEndian.PutUint16(encoder.Bytes()[0:2], uint16(len(encoder.Bytes())))
+ binary.BigEndian.PutUint16(encoder.Bytes()[2:4], uint16(len(encoder.Bytes())))
return nil
}
@@ -14868,7 +14868,7 @@
}
}
- binary.BigEndian.PutUint16(encoder.Bytes()[0:2], uint16(len(encoder.Bytes())))
+ binary.BigEndian.PutUint16(encoder.Bytes()[2:4], uint16(len(encoder.Bytes())))
return nil
}
@@ -15032,7 +15032,7 @@
}
}
- binary.BigEndian.PutUint16(encoder.Bytes()[0:2], uint16(len(encoder.Bytes())))
+ binary.BigEndian.PutUint16(encoder.Bytes()[2:4], uint16(len(encoder.Bytes())))
return nil
}
@@ -15196,7 +15196,7 @@
}
}
- binary.BigEndian.PutUint16(encoder.Bytes()[0:2], uint16(len(encoder.Bytes())))
+ binary.BigEndian.PutUint16(encoder.Bytes()[2:4], uint16(len(encoder.Bytes())))
return nil
}
@@ -32604,7 +32604,7 @@
}
}
- binary.BigEndian.PutUint16(encoder.Bytes()[0:2], uint16(len(encoder.Bytes())))
+ binary.BigEndian.PutUint16(encoder.Bytes()[2:4], uint16(len(encoder.Bytes())))
return nil
}
diff --git a/vendor/github.com/skydive-project/goloxi/of13/const.go b/vendor/github.com/donNewtonAlpha/goloxi/of13/const.go
similarity index 100%
rename from vendor/github.com/skydive-project/goloxi/of13/const.go
rename to vendor/github.com/donNewtonAlpha/goloxi/of13/const.go
diff --git a/vendor/github.com/skydive-project/goloxi/of13/instruction.go b/vendor/github.com/donNewtonAlpha/goloxi/of13/instruction.go
similarity index 99%
rename from vendor/github.com/skydive-project/goloxi/of13/instruction.go
rename to vendor/github.com/donNewtonAlpha/goloxi/of13/instruction.go
index 53a2eca..5b52376 100644
--- a/vendor/github.com/skydive-project/goloxi/of13/instruction.go
+++ b/vendor/github.com/donNewtonAlpha/goloxi/of13/instruction.go
@@ -14,7 +14,7 @@
"encoding/binary"
"fmt"
- "github.com/skydive-project/goloxi"
+ "github.com/donNewtonAlpha/goloxi"
)
type Instruction struct {
diff --git a/vendor/github.com/skydive-project/goloxi/of13/message.go b/vendor/github.com/donNewtonAlpha/goloxi/of13/message.go
similarity index 99%
rename from vendor/github.com/skydive-project/goloxi/of13/message.go
rename to vendor/github.com/donNewtonAlpha/goloxi/of13/message.go
index 2b9ba0e..3df8162 100644
--- a/vendor/github.com/skydive-project/goloxi/of13/message.go
+++ b/vendor/github.com/donNewtonAlpha/goloxi/of13/message.go
@@ -15,7 +15,7 @@
"fmt"
"net"
- "github.com/skydive-project/goloxi"
+ "github.com/donNewtonAlpha/goloxi"
)
type Header struct {
@@ -9626,6 +9626,7 @@
for i := 0; i < int(_packetout.ActionsLen); i++ {
item, err := DecodeAction(decoder)
+ i += int(item.GetLen())
if err != nil {
return nil, err
}
diff --git a/vendor/github.com/skydive-project/goloxi/of13/oxm.go b/vendor/github.com/donNewtonAlpha/goloxi/of13/oxm.go
similarity index 99%
rename from vendor/github.com/skydive-project/goloxi/of13/oxm.go
rename to vendor/github.com/donNewtonAlpha/goloxi/of13/oxm.go
index be8bb7d..90d07c5 100644
--- a/vendor/github.com/skydive-project/goloxi/of13/oxm.go
+++ b/vendor/github.com/donNewtonAlpha/goloxi/of13/oxm.go
@@ -13,7 +13,7 @@
"fmt"
"net"
- "github.com/skydive-project/goloxi"
+ "github.com/donNewtonAlpha/goloxi"
)
type Oxm struct {
diff --git a/vendor/github.com/skydive-project/goloxi/of13/types.go b/vendor/github.com/donNewtonAlpha/goloxi/of13/types.go
similarity index 98%
rename from vendor/github.com/skydive-project/goloxi/of13/types.go
rename to vendor/github.com/donNewtonAlpha/goloxi/of13/types.go
index f6f2e7e..527f463 100644
--- a/vendor/github.com/skydive-project/goloxi/of13/types.go
+++ b/vendor/github.com/donNewtonAlpha/goloxi/of13/types.go
@@ -5,7 +5,7 @@
"fmt"
"net"
- "github.com/skydive-project/goloxi"
+ "github.com/donNewtonAlpha/goloxi"
)
// TODO: set real types