github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-29 13:38:00 +00:00
Code Issues Projects Releases Wiki Activity

proxy: add an initial length to the marshalled frames

Browse Source 
Since the header is variable length it's useful to write a length
field first, so the peer can read the rest of the packet as a block.

Signed-off-by: David Scott <dave.scott@docker.com>
This commit is contained in:
David Scott 2016-04-22 11:42:24 +01:00
parent 03ea441933
commit caeb0d53cc
1 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
alpine/packages/proxy/libproxy/udp_encapsulation.go
View File

@ -91,30 +91,40 @@ type udpDatagram struct {
}
func (u *udpDatagram) Marshal(conn net.Conn) error {
// marshal the variable length header to a temporary buffer
var header bytes.Buffer
var length uint16
length = uint16(len(*u.IP))
if err := binary.Write(conn, binary.LittleEndian, &length); err != nil {
if err := binary.Write(&header, binary.LittleEndian, &length); err != nil {
return err
}
if err := binary.Write(conn, binary.LittleEndian, &u.IP); err != nil {
if err := binary.Write(&header, binary.LittleEndian, &u.IP); err != nil {
return err
}
if err := binary.Write(conn, binary.LittleEndian, &u.Port); err != nil {
if err := binary.Write(&header, binary.LittleEndian, &u.Port); err != nil {
return err
}
length = uint16(len(u.Zone))
if err := binary.Write(conn, binary.LittleEndian, &length); err != nil {
if err := binary.Write(&header, binary.LittleEndian, &length); err != nil {
return err
}
if err := binary.Write(conn, binary.LittleEndian, &u.Zone); err != nil {
if err := binary.Write(&header, binary.LittleEndian, &u.Zone); err != nil {
return nil
}
length = uint16(len(u.payload))
if err := binary.Write(&header, binary.LittleEndian, &length); err != nil {
return nil
}
length = uint16(header.Len() + len(u.payload))
if err := binary.Write(conn, binary.LittleEndian, &length); err != nil {
return nil
}
_, err := io.Copy(conn, &header)
if err != nil {
return err
}
payload := bytes.NewBuffer(u.payload)
_, err := io.Copy(conn, payload)
_, err = io.Copy(conn, payload)
if err != nil {
return err
}
@ -123,6 +133,10 @@ func (u *udpDatagram) Marshal(conn net.Conn) error {
func (u *udpDatagram) Unmarshal(conn net.Conn) error {
var length uint16
// frame length
if err := binary.Read(conn, binary.LittleEndian, &length); err != nil {
return err
}
if err := binary.Read(conn, binary.LittleEndian, &length); err != nil {
return err
}