opensource/kubo
1
0
Fork 0
mirror of https://github.com/ipfs/kubo.git synced 2025-06-29 17:36:38 +08:00
Code Issues Projects Releases Wiki Activity

Service: remove RequestID from SendMessage

Browse Source
This commit is contained in:
Juan Batiz-Benet
2014-09-15 17:36:03 -07:00
committed by Brian Tiger Chow
parent cb230b69a2
commit c7148cd83c
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
bitswap/transmission/service_wrapper.go
View File

@ -58,8 +58,7 @@ func (wrapper *senderWrapper) SendMessage(
if err != nil { if err != nil {
return err return err
} }
req, err := netservice.NewRequest(p.ID) return wrapper.serviceDelegate.SendMessage(ctx, nmsg)
return wrapper.serviceDelegate.SendMessage(ctx, nmsg, req.ID)
} }
func (wrapper *senderWrapper) SendRequest(ctx context.Context, func (wrapper *senderWrapper) SendRequest(ctx context.Context,

13
net/service/service.go
View File

@ -69,8 +69,8 @@ func (s *Service) GetPipe() *msg.Pipe {
return s.Pipe return s.Pipe
} }
// SendMessage sends a message out // sendMessage sends a message out (actual leg work. SendMessage is to export w/o rid)
func (s *Service) SendMessage(ctx context.Context, m msg.NetMessage, rid RequestID) error { func (s *Service) sendMessage(ctx context.Context, m msg.NetMessage, rid RequestID) error {
// serialize ServiceMessage wrapper // serialize ServiceMessage wrapper
data, err := wrapData(m.Data(), rid) data, err := wrapData(m.Data(), rid)
@ -89,6 +89,11 @@ func (s *Service) SendMessage(ctx context.Context, m msg.NetMessage, rid Request
return nil return nil
} }
// SendMessage sends a message out
func (s *Service) SendMessage(ctx context.Context, m msg.NetMessage) error {
return s.sendMessage(ctx, m, nil)
}
// SendRequest sends a request message out and awaits a response. // SendRequest sends a request message out and awaits a response.
func (s *Service) SendRequest(ctx context.Context, m msg.NetMessage) (msg.NetMessage, error) { func (s *Service) SendRequest(ctx context.Context, m msg.NetMessage) (msg.NetMessage, error) {
@ -118,7 +123,7 @@ func (s *Service) SendRequest(ctx context.Context, m msg.NetMessage) (msg.NetMes
} }
// Send message // Send message
s.SendMessage(ctx, m, r.ID) s.sendMessage(ctx, m, r.ID)
// wait for response // wait for response
m = nil m = nil
@ -170,7 +175,7 @@ func (s *Service) handleIncomingMessage(ctx context.Context, m msg.NetMessage) {
// if handler gave us a response, send it back out! // if handler gave us a response, send it back out!
if r1 != nil { if r1 != nil {
err := s.SendMessage(ctx, r1, rid.Response()) err := s.sendMessage(ctx, r1, rid.Response())
if err != nil { if err != nil {
u.PErr("error sending response message: %v\n", err) u.PErr("error sending response message: %v\n", err)
} }