Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix ipv6 ping error #38

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix ipv6 ping error #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 12 additions & 6 deletions main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,17 @@ package main
import (
"context"
"fmt"
"github.com/cloverstd/tcping/ping"
"github.com/cloverstd/tcping/ping/http"
"github.com/cloverstd/tcping/ping/tcp"
"github.com/spf13/cobra"
"net"
"net/url"
"os"
"os/signal"
"strconv"
"syscall"

"github.com/cloverstd/tcping/ping"
"github.com/cloverstd/tcping/ping/http"
"github.com/cloverstd/tcping/ping/tcp"
"github.com/spf13/cobra"
)

var (
Expand Down Expand Up @@ -79,7 +80,8 @@ var rootCmd = cobra.Command{
cmd.Printf("%s is invalid port.\n", defaultPort)
return
}
url.Host = fmt.Sprintf("%s:%d", url.Hostname(), port)
url.Host = ping.GetUrlHost(url.Hostname(), port)


timeoutDuration, err := ping.ParseDuration(timeout)
if err != nil {
Expand Down Expand Up @@ -110,7 +112,11 @@ var rootCmd = cobra.Command{
PreferGo: true,
Dial: func(ctx context.Context, network, address string) (conn net.Conn, err error) {
for _, addr := range dnsServer {
if conn, err = net.Dial("udp", addr+":53"); err != nil {
ipAddr, err := ping.FormatIP(addr)
if err != nil {
ipAddr = addr
}
if conn, err = net.Dial("udp", ipAddr+":53"); err != nil {
continue
} else {
return conn, nil
Expand Down
6 changes: 3 additions & 3 deletions ping/tcp/tcp.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,17 +61,17 @@ func (p *Ping) Ping(ctx context.Context) *ping.Stats {
tlsErr error
)
if p.tls {
tlsConn, err = tls.DialWithDialer(p.dialer, "tcp", fmt.Sprintf("%s:%d", p.host, p.port), &tls.Config{
tlsConn, err = tls.DialWithDialer(p.dialer, "tcp", ping.GetUrlHost(p.host, p.port), &tls.Config{
InsecureSkipVerify: true,
})
if err == nil {
conn = tlsConn.NetConn()
} else {
tlsErr = err
conn, err = p.dialer.DialContext(ctx, "tcp", fmt.Sprintf("%s:%d", p.host, p.port))
conn, err = p.dialer.DialContext(ctx, "tcp", ping.GetUrlHost(p.host, p.port))
}
} else {
conn, err = p.dialer.DialContext(ctx, "tcp", fmt.Sprintf("%s:%d", p.host, p.port))
conn, err = p.dialer.DialContext(ctx, "tcp", ping.GetUrlHost(p.host, p.port))
}
stats.Duration = time.Since(start)
if err != nil {
Expand Down
19 changes: 19 additions & 0 deletions ping/utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ func FormatIP(IP string) (string, error) {
return "", fmt.Errorf("error IP format")
}


// ParseDuration parse the t as time.Duration, it will parse t as mills when missing unit.
func ParseDuration(t string) (time.Duration, error) {
if timeout, err := strconv.ParseInt(t, 10, 64); err == nil {
Expand All @@ -38,8 +39,26 @@ func ParseDuration(t string) (time.Duration, error) {
return time.ParseDuration(t)
}

func GetUrlHost(host string, port int) string {
if port <= 0 {
return host
}
if ipAddr, err := FormatIP(host); err == nil {
return fmt.Sprintf("%s:%d", ipAddr, port)
}

return fmt.Sprintf("%s:%d", host, port)

}

// ParseAddress will try to parse addr as url.URL.
func ParseAddress(addr string) (*url.URL, error) {
if ipAddr, err := FormatIP(addr); err == nil {
return &url.URL{
Scheme: "tcp",
Host: ipAddr,
}, nil
}
if strings.Contains(addr, "://") {
// it maybe with scheme, try url.Parse
return url.Parse(addr)
Expand Down