Skip to content

Commit

Permalink
remove deadline from SendPacket method
Browse files Browse the repository at this point in the history
  • Loading branch information
MarcoPolo committed Feb 25, 2025
1 parent a0d03f4 commit e0a57d7
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 10 deletions.
12 changes: 4 additions & 8 deletions p2p/net/simconn/router.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ type PerfectRouter struct {
}

// SendPacket implements Router.
func (r *PerfectRouter) SendPacket(deadline time.Time, p Packet) error {
func (r *PerfectRouter) SendPacket(p Packet) error {
r.mu.Lock()
defer r.mu.Unlock()
conn, ok := r.nodes[p.To]
Expand Down Expand Up @@ -61,12 +61,8 @@ type FixedLatencyRouter struct {
latency time.Duration
}

func (r *FixedLatencyRouter) SendPacket(deadline time.Time, p Packet) error {
if !deadline.IsZero() && time.Now().After(deadline) {
return ErrDeadlineExceeded
}

return r.PerfectRouter.SendPacket(deadline, p)
func (r *FixedLatencyRouter) SendPacket(p Packet) error {
return r.PerfectRouter.SendPacket(p)
}

func (r *FixedLatencyRouter) AddNode(addr net.Addr, conn PacketReciever) {
Expand Down Expand Up @@ -124,7 +120,7 @@ func (r *SimpleFirewallRouter) String() string {
return fmt.Sprintf("%v", nodes)
}

func (r *SimpleFirewallRouter) SendPacket(deadline time.Time, p Packet) error {
func (r *SimpleFirewallRouter) SendPacket(p Packet) error {
r.mu.Lock()
defer r.mu.Unlock()
toNode, exists := r.nodes[p.To.String()]
Expand Down
4 changes: 2 additions & 2 deletions p2p/net/simconn/simconn.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
var ErrDeadlineExceeded = errors.New("deadline exceeded")

type Router interface {
SendPacket(deadline time.Time, p Packet) error
SendPacket(p Packet) error
}

type Packet struct {
Expand Down Expand Up @@ -158,7 +158,7 @@ func (c *SimConn) WriteTo(p []byte, addr net.Addr) (n int, err error) {
To: addr,
buf: slices.Clone(p),
}
return len(p), c.router.SendPacket(deadline, pkt)
return len(p), c.router.SendPacket(pkt)
}

func (c *SimConn) UnicastAddr() net.Addr {
Expand Down

0 comments on commit e0a57d7

Please sign in to comment.