Skip to content

connecttimeout flag #1

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

Open
ksacry wants to merge 2 commits into
base: master
Choose a base branch
from
Open

connecttimeout flag #1

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f0f9627
Creating a connecttimeout that allows specifying a connection timeout…
ksacry Feb 15, 2019
5467eb2
restoring ability to accept net.TCPAddr in Connect
ksacry Feb 15, 2019
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
23 changes: 13 additions & 10 deletions rtltcp.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import (
"flag"
"fmt"
"log"
"time"
"net"

"github.com/bemasher/rtltcp/si"
Expand All @@ -15,7 +16,7 @@ var dongleMagic = [...]byte{'R', 'T', 'L', '0'}

// Contains dongle information and an embedded tcp connection to the spectrum server
type SDR struct {
*net.TCPConn
net.Conn
Flags Flags
Info DongleInfo
}
Expand All @@ -25,19 +26,19 @@ type SDR struct {
// for closing this connection. If addr is nil, use "127.0.0.1:1234" or
// command line flag value.
func (sdr *SDR) Connect(addr *net.TCPAddr) (err error) {
// using local var here so that something can be passed in an used other
// than what is set in sdr.Flags.ServerAddr in case that is required
var conn_addr string
if addr == nil {
if sdr.Flags.ServerAddr == "" {
sdr.Flags.ServerAddr = "127.0.0.1:1234"
}

// Parse and resolve rtl_tcp server address.
addr, err = net.ResolveTCPAddr("tcp", sdr.Flags.ServerAddr)
if err != nil {
return
}
conn_addr = sdr.Flags.ServerAddr
} else {
conn_addr = fmt.Sprintf("%s:%d", addr.IP, addr.Port)
}

sdr.TCPConn, err = net.DialTCP("tcp", nil, addr)
sdr.Conn, err = net.DialTimeout("tcp", conn_addr, sdr.Flags.ConnectTimeout)
if err != nil {
err = fmt.Errorf("Error connecting to spectrum server: %s", err)
return
Expand All @@ -50,7 +51,7 @@ func (sdr *SDR) Connect(addr *net.TCPAddr) (err error) {
}
}()

err = binary.Read(sdr.TCPConn, binary.BigEndian, &sdr.Info)
err = binary.Read(sdr.Conn, binary.BigEndian, &sdr.Info)
if err != nil {
err = fmt.Errorf("Error getting dongle information: %s", err)
return
Expand All @@ -77,6 +78,7 @@ type Flags struct {
RtlXtalFreq uint
TunerXtalFreq uint
GainByIndex uint
ConnectTimeout time.Duration
}

// Registers command line flags for rtltcp commands.
Expand All @@ -96,6 +98,7 @@ func (sdr *SDR) RegisterFlags() {
flag.UintVar(&sdr.Flags.RtlXtalFreq, "rtlxtalfreq", 0, "set rtl xtal frequency")
flag.UintVar(&sdr.Flags.TunerXtalFreq, "tunerxtalfreq", 0, "set tuner xtal frequency")
flag.UintVar(&sdr.Flags.GainByIndex, "gainbyindex", 0, "set gain by index")
flag.DurationVar(&sdr.Flags.ConnectTimeout, "connecttimeout", 0, "set a Duration as a connection timeout 0 for infinite")
}

// Parses flags and executes commands associated with each flag. Should only
Expand Down Expand Up @@ -184,7 +187,7 @@ func (t Tuner) String() string {
}

func (sdr SDR) execute(cmd command) (err error) {
return binary.Write(sdr.TCPConn, binary.BigEndian, cmd)
return binary.Write(sdr.Conn, binary.BigEndian, cmd)
}

type command struct {
Expand Down