Skip to content

Commit

Permalink
fix multipart request; gofmt libopenflow
Browse files Browse the repository at this point in the history
  • Loading branch information
@shaleman
shaleman committed May 25, 2016
1 parent 94f338a commit c0fd55c
Show file tree
Hide file tree
Showing 18 changed files with 3,441 additions and 3,445 deletions.
260 changes: 130 additions & 130 deletions common/header.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,20 @@ package common
// Package common defines OpenFlow message types that are version independent.

import (
"encoding/binary"
"errors"
"encoding/binary"
"errors"

"github.com/shaleman/libOpenflow/util"
"github.com/shaleman/libOpenflow/util"
)

var messageXid uint32 = 1

func NewHeaderGenerator(ver int) func() Header {
return func() Header {
messageXid += 1
p := Header{uint8(ver), 0, 8, messageXid}
return p
}
return func() Header {
messageXid += 1
p := Header{uint8(ver), 0, 8, messageXid}
return p
}
}

// The version specifies the OpenFlow protocol version being
Expand All @@ -28,141 +28,141 @@ func NewHeaderGenerator(ver int) func() Header {
// indicates the total length of the message, so no additional
// framing is used to distinguish one frame from the next.
type Header struct {
Version uint8
Type uint8
Length uint16
Xid uint32
Version uint8
Type uint8
Length uint16
Xid uint32
}

func (h *Header) Header() *Header {
return h
return h
}

func (h *Header) Len() (n uint16) {
return 8
return 8
}

func (h *Header) MarshalBinary() (data []byte, err error) {
data = make([]byte, 8)
data[0] = h.Version
data[1] = h.Type
binary.BigEndian.PutUint16(data[2:4], h.Length)
binary.BigEndian.PutUint32(data[4:8], h.Xid)
return
data = make([]byte, 8)
data[0] = h.Version
data[1] = h.Type
binary.BigEndian.PutUint16(data[2:4], h.Length)
binary.BigEndian.PutUint32(data[4:8], h.Xid)
return
}

func (h *Header) UnmarshalBinary(data []byte) error {
if len(data) < 4 {
return errors.New("The []byte is too short to unmarshel a full HelloElemHeader.")
}
h.Version = data[0]
h.Type = data[1]
h.Length = binary.BigEndian.Uint16(data[2:4])
h.Xid = binary.BigEndian.Uint32(data[4:8])
return nil
if len(data) < 4 {
return errors.New("The []byte is too short to unmarshel a full HelloElemHeader.")
}
h.Version = data[0]
h.Type = data[1]
h.Length = binary.BigEndian.Uint16(data[2:4])
h.Xid = binary.BigEndian.Uint32(data[4:8])
return nil
}

const (
reserved = iota
HelloElemType_VersionBitmap
)
reserved = iota
HelloElemType_VersionBitmap
)

type HelloElem interface {
Header() *HelloElemHeader
util.Message
Header() *HelloElemHeader
util.Message
}

type HelloElemHeader struct {
Type uint16
Length uint16
Type uint16
Length uint16
}

func NewHelloElemHeader() *HelloElemHeader {
h := new(HelloElemHeader)
h.Type = HelloElemType_VersionBitmap
h.Length = 4
return h
h := new(HelloElemHeader)
h.Type = HelloElemType_VersionBitmap
h.Length = 4
return h
}

func (h *HelloElemHeader) Header() *HelloElemHeader {
return h
return h
}

func (h *HelloElemHeader) Len() (n uint16) {
return 4
return 4
}

func (h *HelloElemHeader) MarshalBinary() (data []byte, err error) {
data = make([]byte, 4)
binary.BigEndian.PutUint16(data[:2], h.Type)
binary.BigEndian.PutUint16(data[2:4], h.Length)
return
data = make([]byte, 4)
binary.BigEndian.PutUint16(data[:2], h.Type)
binary.BigEndian.PutUint16(data[2:4], h.Length)
return
}

func (h *HelloElemHeader) UnmarshalBinary(data []byte) error {
if len(data) < 4 {
return errors.New("The []byte is too short to unmarshal a full HelloElemHeader.")
}
h.Type = binary.BigEndian.Uint16(data[:2])
h.Length = binary.BigEndian.Uint16(data[2:4])
return nil
if len(data) < 4 {
return errors.New("The []byte is too short to unmarshal a full HelloElemHeader.")
}
h.Type = binary.BigEndian.Uint16(data[:2])
h.Length = binary.BigEndian.Uint16(data[2:4])
return nil
}

type HelloElemVersionBitmap struct {
HelloElemHeader
Bitmaps []uint32
HelloElemHeader
Bitmaps []uint32
}

func NewHelloElemVersionBitmap() *HelloElemVersionBitmap {
h := new(HelloElemVersionBitmap)
h.HelloElemHeader = *NewHelloElemHeader()
h.Bitmaps = make([]uint32, 0)
// 10010 meaning openflow 1.0 & 1.3 support
h.Bitmaps = append(h.Bitmaps, uint32(1<<4) | uint32(1<<1))
h.Length = h.Length + uint16(len(h.Bitmaps) * 4)
return h
h := new(HelloElemVersionBitmap)
h.HelloElemHeader = *NewHelloElemHeader()
h.Bitmaps = make([]uint32, 0)
// 10010 meaning openflow 1.0 & 1.3 support
h.Bitmaps = append(h.Bitmaps, uint32(1<<4)|uint32(1<<1))
h.Length = h.Length + uint16(len(h.Bitmaps)*4)
return h
}

func (h *HelloElemVersionBitmap) Header() *HelloElemHeader {
return &h.HelloElemHeader
return &h.HelloElemHeader
}

func (h *HelloElemVersionBitmap) Len() (n uint16) {
n = h.HelloElemHeader.Len()
n += uint16(len(h.Bitmaps) * 4)
return
n = h.HelloElemHeader.Len()
n += uint16(len(h.Bitmaps) * 4)
return
}

func (h *HelloElemVersionBitmap) MarshalBinary() (data []byte, err error) {
data = make([]byte, int(h.Len()))
bytes := make([]byte, 0)
next := 0
data = make([]byte, int(h.Len()))
bytes := make([]byte, 0)
next := 0

bytes, err = h.HelloElemHeader.MarshalBinary()
copy(data[next:], bytes)
next += len(bytes)
bytes, err = h.HelloElemHeader.MarshalBinary()
copy(data[next:], bytes)
next += len(bytes)

for _, m := range h.Bitmaps {
binary.BigEndian.PutUint32(data[next:], m)
next += 4
}
return
for _, m := range h.Bitmaps {
binary.BigEndian.PutUint32(data[next:], m)
next += 4
}
return
}

func (h *HelloElemVersionBitmap) UnmarshalBinary(data []byte) error {
length := len(data)
read := 0
if err := h.HelloElemHeader.UnmarshalBinary(data[:4]); err != nil {
return err
}
read += int(h.HelloElemHeader.Len())
length := len(data)
read := 0
if err := h.HelloElemHeader.UnmarshalBinary(data[:4]); err != nil {
return err
}
read += int(h.HelloElemHeader.Len())

h.Bitmaps = make([]uint32, 0)
for read < length {
h.Bitmaps = append(h.Bitmaps, binary.BigEndian.Uint32(data[read:read+4]))
read += 4
}
return nil
h.Bitmaps = make([]uint32, 0)
for read < length {
h.Bitmaps = append(h.Bitmaps, binary.BigEndian.Uint32(data[read:read+4]))
read += 4
}
return nil
}

// The OFPT_HELLO message consists of an OpenFlow header plus a set of variable
Expand All @@ -178,62 +178,62 @@ func (h *HelloElemVersionBitmap) UnmarshalBinary(data []byte) error {
// inform the initial handshake of the connection. Implementations must ignore
// (skip) all elements of a Hello message that they do not support.
type Hello struct {
Header
Elements []HelloElem
Header
Elements []HelloElem
}

func NewHello(ver int) (h *Hello, err error) {
h = new(Hello)
h.Header = NewHeaderGenerator(ver)()
h.Elements = make([]HelloElem, 0)
h.Elements = append(h.Elements, NewHelloElemVersionBitmap())
h = new(Hello)
h.Header = NewHeaderGenerator(ver)()
h.Elements = make([]HelloElem, 0)
h.Elements = append(h.Elements, NewHelloElemVersionBitmap())

return
return
}

func (h *Hello) Len() (n uint16) {
n = h.Header.Len()
for _, e := range h.Elements {
n += e.Len()
}
return
n = h.Header.Len()
for _, e := range h.Elements {
n += e.Len()
}
return
}

func (h *Hello) MarshalBinary() (data []byte, err error) {
data = make([]byte, int(h.Len()))
bytes := make([]byte, 0)
next := 0
data = make([]byte, int(h.Len()))
bytes := make([]byte, 0)
next := 0

h.Header.Length = h.Len()
bytes, err = h.Header.MarshalBinary()
copy(data[next:], bytes)
next += len(bytes)
h.Header.Length = h.Len()
bytes, err = h.Header.MarshalBinary()
copy(data[next:], bytes)
next += len(bytes)

for _, e := range h.Elements {
bytes, err = e.MarshalBinary()
copy(data[next:], bytes)
next += len(bytes)
}
return
for _, e := range h.Elements {
bytes, err = e.MarshalBinary()
copy(data[next:], bytes)
next += len(bytes)
}
return
}

func (h *Hello) UnmarshalBinary(data []byte) error {
next := 0
err := h.Header.UnmarshalBinary(data[next:])
next += int(h.Header.Len())

h.Elements = make([]HelloElem, 0)
for next < len(data) {
e := NewHelloElemHeader()
e.UnmarshalBinary(data[next:])

switch e.Type {
case HelloElemType_VersionBitmap:
v := NewHelloElemVersionBitmap()
err = v.UnmarshalBinary(data[next:])
next += int(v.Len())
h.Elements = append(h.Elements, v)
}
}
return err
next := 0
err := h.Header.UnmarshalBinary(data[next:])
next += int(h.Header.Len())

h.Elements = make([]HelloElem, 0)
for next < len(data) {
e := NewHelloElemHeader()
e.UnmarshalBinary(data[next:])

switch e.Type {
case HelloElemType_VersionBitmap:
v := NewHelloElemVersionBitmap()
err = v.UnmarshalBinary(data[next:])
next += int(v.Len())
h.Elements = append(h.Elements, v)
}
}
return err
}
1 change: 1 addition & 0 deletions libOpenflow.go
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
package libOpenflow

// This library implements the openflow1.3 encap/decap.
// Please use packages in common and openflow13 subdirectories
Loading

0 comments on commit c0fd55c

Please sign in to comment.