diff --git a/cmd/root.go b/cmd/root.go index e1fca62..d45e331 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -97,7 +97,6 @@ func init() { rootCmd.Flags().Uint16VarP(&clientConfig.TargetPort, "target-port", "p", 0, "target port") rootCmd.Flags().StringVarP(&clientConfig.Message, "message", "m", "defaultmessage", "message to send") rootCmd.Flags().UintVarP(&clientConfig.Timeout, "timeout", "t", 2000, "timeout in ms") - rootCmd.Flags().UintVarP(&clientConfig.ReadTimeout, "read-timeout", "", 1500, "response read timeout in ms (tcp only)") rootCmd.Flags().UintVarP(&clientConfig.Attempts, "attempts", "r", 1, "number of attempts, successful or not") rootCmd.Flags().UintVar(&clientConfig.Period, "period", 5000, "send a new message every ms") rootCmd.Flags().UintVar(&clientConfig.SuccThrPec, "success-threshold", 80, "percentage of successful attempts needed") diff --git a/pkg/config/config.go b/pkg/config/config.go index ca19a84..092f976 100644 --- a/pkg/config/config.go +++ b/pkg/config/config.go @@ -22,7 +22,6 @@ type Config struct { TargetPort uint16 Message string Timeout uint - ReadTimeout uint Attempts uint Period uint SuccThrPec uint diff --git a/pkg/conntester/conntester.go b/pkg/conntester/conntester.go index a1f4ab0..cb8f2f8 100644 --- a/pkg/conntester/conntester.go +++ b/pkg/conntester/conntester.go @@ -20,15 +20,14 @@ var ErrTestFailed = errors.New("test failed") // ConnTester performs connections against a certain destination type ConnTester struct { - protocol string - targetHost string - targetPort uint16 - message string - timeout uint - readTimeout uint - attempts uint - period uint - succThrPec uint + protocol string + targetHost string + targetPort uint16 + message string + timeout uint + attempts uint + period uint + succThrPec uint logger *log.Logger @@ -46,15 +45,14 @@ func New(config *config.Config, logger *log.Logger) (*ConnTester, error) { } ct := &ConnTester{ - protocol: config.Protocol, - targetHost: config.TargetHost, - targetPort: config.TargetPort, - message: config.Message, - timeout: config.Timeout, - readTimeout: config.ReadTimeout, - attempts: config.Attempts, - period: config.Period, - succThrPec: config.SuccThrPec, + protocol: config.Protocol, + targetHost: config.TargetHost, + targetPort: config.TargetPort, + message: config.Message, + timeout: config.Timeout, + attempts: config.Attempts, + period: config.Period, + succThrPec: config.SuccThrPec, } ct.logger = logger return ct, nil @@ -143,7 +141,6 @@ func (c *ConnTester) send(ctx context.Context, wg *sync.WaitGroup) { c.logger.Info("TCP FIN packet sent, writing side closed") } - conn.SetReadDeadline(time.Now().Add(time.Duration(c.readTimeout) * time.Millisecond)) _, err = io.Copy(io.Discard, conn) if err != nil && err != io.EOF { c.logger.Info(fmt.Sprintf("stopped discarding data from %s: %s", dstEndpoint, err))