1 files changed, 16 insertions, 15 deletions

diff --git a/src/gnunet/transport/endpoint.go b/src/gnunet/transport/endpoint.go
index d98776a..a2f54d7 100644
--- a/src/gnunet/transport/endpoint.go
+++ b/src/gnunet/transport/endpoint.go
@@ -39,7 +39,7 @@ var (
         ErrEndpExists           = errors.New("endpoint exists")
         ErrEndpNoAddress        = errors.New("no address for endpoint")
         ErrEndpNoConnection     = errors.New("no connection on endpoint")
-        ErrEndpMaybeSent        = errors.New("message may have been sent - cant know")
+        ErrEndpMaybeSent        = errors.New("message may have been sent - can't know")
         ErrEndpWriteShort       = errors.New("write too short")
 )
 
@@ -48,10 +48,10 @@ var (
 // remote endpoints for TCP and UDP traffic.
 type Endpoint interface {
         // Run the endpoint and send received messages to channel
-        Run(context.Context, chan *TransportMessage) error
+        Run(context.Context, chan *Message) error
 
         // Send message on endpoint
-        Send(context.Context, net.Addr, *TransportMessage) error
+        Send(context.Context, net.Addr, *Message) error
 
         // Address returns the listening address for the endpoint
         Address() net.Addr
@@ -84,16 +84,17 @@ func NewEndpoint(addr net.Addr) (ep Endpoint, err error) {
 
 // PacketEndpoint for packet-oriented network protocols
 type PaketEndpoint struct {
+        sync.Mutex
+
         id   int            // endpoint identifier
         netw string         // network identifier ("udp", "udp4", "udp6", ...)
         addr net.Addr       // endpoint address
         conn net.PacketConn // packet connection
         buf  []byte         // buffer for read/write operations
-        mtx  sync.Mutex     // mutex for send operations
 }
 
 // Run packet endpoint: send incoming messages to the handler.
-func (ep *PaketEndpoint) Run(ctx context.Context, hdlr chan *TransportMessage) (err error) {
+func (ep *PaketEndpoint) Run(ctx context.Context, hdlr chan *Message) (err error) {
         // create listener
         var lc net.ListenConfig
         xproto := ep.addr.Network()
@@ -144,7 +145,7 @@ func (ep *PaketEndpoint) Run(ctx context.Context, hdlr chan *TransportMessage) (
 }
 
 // Read a transport message from endpoint based on extended protocol
-func (ep *PaketEndpoint) read() (tm *TransportMessage, err error) {
+func (ep *PaketEndpoint) read() (tm *Message, err error) {
         // read next packet (assuming that it contains one complete message)
         var n int
         if n, _, err = ep.conn.ReadFrom(ep.buf); err != nil {
@@ -167,7 +168,7 @@ func (ep *PaketEndpoint) read() (tm *TransportMessage, err error) {
                 panic(ErrEndpProtocolUnknown)
         }
         // return transport message
-        return &TransportMessage{
+        return &Message{
                 Peer:  peer,
                 Msg:   msg,
                 Resp:  nil,
@@ -176,10 +177,10 @@ func (ep *PaketEndpoint) read() (tm *TransportMessage, err error) {
 }
 
 // Send message to address from endpoint
-func (ep *PaketEndpoint) Send(ctx context.Context, addr net.Addr, msg *TransportMessage) (err error) {
+func (ep *PaketEndpoint) Send(ctx context.Context, addr net.Addr, msg *Message) (err error) {
         // only one sender at a time
-        ep.mtx.Lock()
-        defer ep.mtx.Unlock()
+        ep.Lock()
+        defer ep.Unlock()
 
         // check for valid connection
         if ep.conn == nil {
@@ -284,7 +285,7 @@ type StreamEndpoint struct {
 }
 
 // Run packet endpoint: send incoming messages to the handler.
-func (ep *StreamEndpoint) Run(ctx context.Context, hdlr chan *TransportMessage) (err error) {
+func (ep *StreamEndpoint) Run(ctx context.Context, hdlr chan *Message) (err error) {
         // create listener
         var lc net.ListenConfig
         xproto := ep.addr.Network()
@@ -331,7 +332,7 @@ func (ep *StreamEndpoint) Run(ctx context.Context, hdlr chan *TransportMessage)
 }
 
 // Read a transport message from endpoint based on extended protocol
-func (ep *StreamEndpoint) read(ctx context.Context, conn net.Conn) (tm *TransportMessage, err error) {
+func (ep *StreamEndpoint) read(ctx context.Context, conn net.Conn) (tm *Message, err error) {
         // parse transport message based on extended protocol
         var (
                 peer *util.PeerID
@@ -341,7 +342,7 @@ func (ep *StreamEndpoint) read(ctx context.Context, conn net.Conn) (tm *Transpor
         case "ip+udp":
                 // parse peer id
                 peer = util.NewPeerID(nil)
-                if _, err = conn.Read(peer.Key); err != nil {
+                if _, err = conn.Read(peer.Data); err != nil {
                         return
                 }
                 // read next message from connection
@@ -352,14 +353,14 @@ func (ep *StreamEndpoint) read(ctx context.Context, conn net.Conn) (tm *Transpor
                 panic(ErrEndpProtocolUnknown)
         }
         // return transport message
-        return &TransportMessage{
+        return &Message{
                 Peer: peer,
                 Msg:  msg,
         }, nil
 }
 
 // Send message to address from endpoint
-func (ep *StreamEndpoint) Send(ctx context.Context, addr net.Addr, msg *TransportMessage) error {
+func (ep *StreamEndpoint) Send(ctx context.Context, addr net.Addr, msg *Message) error {
         return nil
 }