Actually, do 0.32.28 instead
This commit is contained in:
parent
edc20572c7
commit
04f851eeb6
9 changed files with 30 additions and 7 deletions
2
vendor/github.com/eyedeekay/goSam/Makefile
generated
vendored
2
vendor/github.com/eyedeekay/goSam/Makefile
generated
vendored
|
@ -1,6 +1,6 @@
|
|||
|
||||
USER_GH=eyedeekay
|
||||
VERSION=0.32.27
|
||||
VERSION=0.32.28
|
||||
packagename=gosam
|
||||
|
||||
echo: fmt
|
||||
|
|
1
vendor/github.com/eyedeekay/goSam/README.md
generated
vendored
1
vendor/github.com/eyedeekay/goSam/README.md
generated
vendored
|
@ -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
|
||||
|
|
6
vendor/github.com/eyedeekay/goSam/dial.go
generated
vendored
6
vendor/github.com/eyedeekay/goSam/dial.go
generated
vendored
|
@ -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
|
||||
}
|
||||
|
|
1
vendor/github.com/eyedeekay/goSam/go.sum
generated
vendored
1
vendor/github.com/eyedeekay/goSam/go.sum
generated
vendored
|
@ -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=
|
||||
|
|
12
vendor/github.com/eyedeekay/goSam/options.go
generated
vendored
12
vendor/github.com/eyedeekay/goSam/options.go
generated
vendored
|
@ -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 ""
|
||||
}
|
||||
|
|
9
vendor/github.com/eyedeekay/goSam/replyParser.go
generated
vendored
9
vendor/github.com/eyedeekay/goSam/replyParser.go
generated
vendored
|
@ -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 {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue