Actually, do 0.32.28 instead

This commit is contained in:
idk 2020-11-12 22:53:16 -05:00
parent edc20572c7
commit 04f851eeb6
No known key found for this signature in database
GPG key ID: D75C03B39B5E14E1
9 changed files with 30 additions and 7 deletions

View file

@ -1,6 +1,6 @@
USER_GH=eyedeekay
VERSION=0.32.27
VERSION=0.32.28
packagename=gosam
echo: fmt

View file

@ -85,6 +85,7 @@ to produce an unsigned deb for personal use only. For packagers,
will produce a viable source package for use with Launchpad PPA's and other
similar systems.
### TODO
* Improve recovery on failed sockets

View file

@ -15,7 +15,11 @@ func (c *Client) DialContext(ctx context.Context, network, addr string) (net.Con
if conn, err := c.Dial(network, addr); err != nil {
errCh <- err
} else if ctx.Err() != nil {
conn.Close()
var err error
c, err = c.NewClient()
if err != nil {
conn.Close()
}
} else {
connCh <- conn
}

View file

@ -1,3 +1,4 @@
github.com/eyedeekay/ramp v0.0.0-20190429201811-305b382042ab h1:EfTRHxGSbiaEyxNzvKRBWVIDw3mD8xXGxj4gvwFzY7Q=
github.com/eyedeekay/ramp v0.0.0-20190429201811-305b382042ab/go.mod h1:h7mvUAMgZ/rtRDUOkvKTK+8LnDMeUhJSoa5EPdB51fc=
github.com/eyedeekay/sam3 v0.32.2 h1:xODDY5nBVg0oK7KaYk7ofkXFoHPsmI1umhSv1TZlS7s=
github.com/eyedeekay/sam3 v0.32.2/go.mod h1:Y3igFVzN4ybqkkpfUWULGhw7WRp8lieq0ORXbLBbcZM=

View file

@ -369,6 +369,12 @@ func SetSignatureType(s string) func(*Client) error {
//return the from port as a string.
func (c *Client) from() string {
if c.fromport == "FROM_PORT=0" {
return ""
}
if c.fromport == "0" {
return ""
}
if c.fromport == "" {
return ""
}
@ -377,6 +383,12 @@ func (c *Client) from() string {
//return the to port as a string.
func (c *Client) to() string {
if c.fromport == "TO_PORT=0" {
return ""
}
if c.fromport == "0" {
return ""
}
if c.toport == "" {
return ""
}

View file

@ -39,7 +39,6 @@ type Reply struct {
}
func parseReply(line string) (*Reply, error) {
fmt.Println("PARSER PARTS", line)
line = strings.TrimSpace(line)
parts := strings.Split(line, " ")
if len(parts) < 3 {
@ -54,9 +53,13 @@ func parseReply(line string) (*Reply, error) {
for _, v := range parts[2:] {
if strings.Contains(v, "FROM_PORT") {
r.From = v
if v != "FROM_PORT=0" {
r.From = v
}
} else if strings.Contains(v, "TO_PORT") {
r.To = v
if v != "TO_PORT=0" {
r.To = v
}
} else {
kvPair := strings.SplitN(v, "=", 2)
if kvPair != nil {

2
vendor/modules.txt vendored
View file

@ -81,7 +81,7 @@ github.com/davecgh/go-spew/spew
github.com/dsnet/compress/brotli
github.com/dsnet/compress/internal
github.com/dsnet/compress/internal/errors
# github.com/eyedeekay/goSam v0.32.27
# github.com/eyedeekay/goSam v0.32.28
## explicit
github.com/eyedeekay/goSam
# github.com/eyedeekay/sam3 v0.32.3