sashakoshka/go-gemini
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

client: Inline result type

Browse Source
This commit is contained in:
Adnan Maolood 2021-02-21 00:20:42 -05:00
parent 7668345daa
commit 0c8c945eba
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
client.go
View File

@ -125,9 +125,15 @@ func (c *Client) Do(ctx context.Context, req *Request) (*Response, error) {
ServerName: host, ServerName: host,
}) })
type result struct {
resp *Response
err error
}
res := make(chan result, 1) res := make(chan result, 1)
go func() { go func() {
res <- c.do(conn, req) resp, err := c.do(conn, req)
res <- result{resp, err}
}() }()
select { select {
@ -139,21 +145,16 @@ func (c *Client) Do(ctx context.Context, req *Request) (*Response, error) {
} }
} }
type result struct { func (c *Client) do(conn net.Conn, req *Request) (*Response, error) {
resp *Response
err error
}
func (c *Client) do(conn net.Conn, req *Request) result {
// Write the request // Write the request
if err := req.Write(conn); err != nil { if err := req.Write(conn); err != nil {
return result{nil, err} return nil, err
} }
// Read the response // Read the response
resp, err := ReadResponse(conn) resp, err := ReadResponse(conn)
if err != nil { if err != nil {
return result{nil, err} return nil, err
} }
// Store TLS connection state // Store TLS connection state
@ -162,7 +163,7 @@ func (c *Client) do(conn net.Conn, req *Request) result {
resp.TLS = &state resp.TLS = &state
} }
return result{resp, nil} return resp, nil
} }
func (c *Client) dialContext(ctx context.Context, network, addr string) (net.Conn, error) { func (c *Client) dialContext(ctx context.Context, network, addr string) (net.Conn, error) {