Skip to content

Commit

Permalink
rename datagramConn & streamConn to be private
Browse files Browse the repository at this point in the history
  • Loading branch information
ainghazal committed Jan 10, 2024
1 parent cde4679 commit ff24563
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 12 deletions.
10 changes: 5 additions & 5 deletions internal/networkio/datagram.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ import (
"net"
)

// DatagramConn wraps a datagram socket and implements OpenVPN framing.
type DatagramConn struct {
// datagramConn wraps a datagram socket and implements OpenVPN framing.
type datagramConn struct {
net.Conn
}

var _ FramingConn = &DatagramConn{}
var _ FramingConn = &datagramConn{}

// ReadRawPacket implements FramingConn
func (c *DatagramConn) ReadRawPacket() ([]byte, error) {
func (c *datagramConn) ReadRawPacket() ([]byte, error) {
buffer := make([]byte, math.MaxUint16) // maximum UDP datagram size
count, err := c.Read(buffer)
if err != nil {
Expand All @@ -24,7 +24,7 @@ func (c *DatagramConn) ReadRawPacket() ([]byte, error) {
}

// WriteRawPacket implements FramingConn
func (c *DatagramConn) WriteRawPacket(pkt []byte) error {
func (c *datagramConn) WriteRawPacket(pkt []byte) error {
if len(pkt) > math.MaxUint16 {
return ErrPacketTooLarge
}
Expand Down
4 changes: 2 additions & 2 deletions internal/networkio/dialer.go
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ func (d *Dialer) DialContext(ctx context.Context, network, address string) (Fram
// wrap the conn and return
switch conn.LocalAddr().Network() {
case "udp", "udp4", "udp6":
return &DatagramConn{conn}, nil
return &datagramConn{conn}, nil
default:
return &StreamConn{conn}, nil
return &streamConn{conn}, nil
}
}
10 changes: 5 additions & 5 deletions internal/networkio/stream.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@ import (
"net"
)

// StreamConn wraps a stream socket and implements OpenVPN framing.
type StreamConn struct {
// streamConn wraps a stream socket and implements OpenVPN framing.
type streamConn struct {
net.Conn
}

var _ FramingConn = &StreamConn{}
var _ FramingConn = &streamConn{}

// ReadRawPacket implements FramingConn
func (c *StreamConn) ReadRawPacket() ([]byte, error) {
func (c *streamConn) ReadRawPacket() ([]byte, error) {
lenbuf := make([]byte, 2)
if _, err := io.ReadFull(c.Conn, lenbuf); err != nil {
return nil, err
Expand All @@ -33,7 +33,7 @@ func (c *StreamConn) ReadRawPacket() ([]byte, error) {
var ErrPacketTooLarge = errors.New("openvpn: packet too large")

// WriteRawPacket implements FramingConn
func (c *StreamConn) WriteRawPacket(pkt []byte) error {
func (c *streamConn) WriteRawPacket(pkt []byte) error {
if len(pkt) > math.MaxUint16 {
return ErrPacketTooLarge
}
Expand Down

0 comments on commit ff24563

Please sign in to comment.