libp2p/go-openssl
1
0
Fork 0
mirror of https://github.com/libp2p/go-openssl.git synced 2025-01-14 02:30:08 +08:00
Code Issues Projects Releases Wiki Activity

Merge pull request #26 from oleg-jukovec/openssl-dialtimeout-call

Browse Source 
Add openssl.DialTimeout(network, addr, timeout, ctx, flags) call
This commit is contained in:
Marco Munizaga 2022-06-03 16:05:13 -07:00 committed by GitHub
commit e25825bbd7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
net.go
View File

@ -17,6 +17,7 @@ package openssl
import ( import (
"errors" "errors"
"net" "net"
"time"
) )
type listener struct { type listener struct {
@ -80,6 +81,18 @@ func Dial(network, addr string, ctx *Ctx, flags DialFlags) (*Conn, error) {
return DialSession(network, addr, ctx, flags, nil) return DialSession(network, addr, ctx, flags, nil)
} }
// DialTimeout acts like Dial but takes a timeout for network dial.
//
// The timeout includes only network dial. It does not include OpenSSL calls.
//
// See func Dial for a description of the network, addr, ctx and flags
// parameters.
func DialTimeout(network, addr string, timeout time.Duration, ctx *Ctx,
flags DialFlags) (*Conn, error) {
d := net.Dialer {Timeout: timeout}
return dialSession(d, network, addr, ctx, flags, nil)
}
// DialSession will connect to network/address and then wrap the corresponding // DialSession will connect to network/address and then wrap the corresponding
// underlying connection with an OpenSSL client connection using context ctx. // underlying connection with an OpenSSL client connection using context ctx.
// If flags includes InsecureSkipHostVerification, the server certificate's // If flags includes InsecureSkipHostVerification, the server certificate's
@ -95,7 +108,12 @@ func Dial(network, addr string, ctx *Ctx, flags DialFlags) (*Conn, error) {
// can be retrieved from the GetSession method on the Conn. // can be retrieved from the GetSession method on the Conn.
func DialSession(network, addr string, ctx *Ctx, flags DialFlags, func DialSession(network, addr string, ctx *Ctx, flags DialFlags,
session []byte) (*Conn, error) { session []byte) (*Conn, error) {
var d net.Dialer
return dialSession(d, network, addr, ctx, flags, session);
}
func dialSession(d net.Dialer, network, addr string, ctx *Ctx, flags DialFlags,
session []byte) (*Conn, error) {
host, _, err := net.SplitHostPort(addr) host, _, err := net.SplitHostPort(addr)
if err != nil { if err != nil {
return nil, err return nil, err
@ -108,7 +126,8 @@ func DialSession(network, addr string, ctx *Ctx, flags DialFlags,
} }
// TODO: use operating system default certificate chain? // TODO: use operating system default certificate chain?
} }
c, err := net.Dial(network, addr)
c, err := d.Dial(network, addr)
if err != nil { if err != nil {
return nil, err return nil, err
} }