Skip to content

Commit 0803336

Browse files
committed
remove deadline from SendPacket method
1 parent 07d59cd commit 0803336

File tree

2 files changed

+6
-10
lines changed

2 files changed

+6
-10
lines changed

p2p/net/simconn/router.go

+4-8
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ type PerfectRouter struct {
2020
}
2121

2222
// SendPacket implements Router.
23-
func (r *PerfectRouter) SendPacket(deadline time.Time, p Packet) error {
23+
func (r *PerfectRouter) SendPacket(p Packet) error {
2424
r.mu.Lock()
2525
defer r.mu.Unlock()
2626
conn, ok := r.nodes[p.To]
@@ -61,12 +61,8 @@ type FixedLatencyRouter struct {
6161
latency time.Duration
6262
}
6363

64-
func (r *FixedLatencyRouter) SendPacket(deadline time.Time, p Packet) error {
65-
if !deadline.IsZero() && time.Now().After(deadline) {
66-
return ErrDeadlineExceeded
67-
}
68-
69-
return r.PerfectRouter.SendPacket(deadline, p)
64+
func (r *FixedLatencyRouter) SendPacket(p Packet) error {
65+
return r.PerfectRouter.SendPacket(p)
7066
}
7167

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

127-
func (r *SimpleFirewallRouter) SendPacket(deadline time.Time, p Packet) error {
123+
func (r *SimpleFirewallRouter) SendPacket(p Packet) error {
128124
r.mu.Lock()
129125
defer r.mu.Unlock()
130126
toNode, exists := r.nodes[p.To.String()]

p2p/net/simconn/simconn.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
var ErrDeadlineExceeded = errors.New("deadline exceeded")
1313

1414
type Router interface {
15-
SendPacket(deadline time.Time, p Packet) error
15+
SendPacket(p Packet) error
1616
}
1717

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

164164
func (c *SimConn) UnicastAddr() net.Addr {

0 commit comments

Comments
 (0)