mirror of
https://github.com/jwetzell/showbridge-go.git
synced 2026-04-27 05:15:47 +00:00
Merge pull request #51 from jwetzell/fix/no-default-framing-method
don't default framing method
This commit is contained in:
@@ -43,20 +43,19 @@ func init() {
|
|||||||
return nil, errors.New("serial.client port must be a string")
|
return nil, errors.New("serial.client port must be a string")
|
||||||
}
|
}
|
||||||
|
|
||||||
framingMethod := "RAW"
|
framingMethod, ok := params["framing"]
|
||||||
|
|
||||||
framingMethodRaw, ok := params["framing"]
|
if !ok {
|
||||||
|
return nil, errors.New("serial.client requires a framing parameter")
|
||||||
if ok {
|
|
||||||
framingMethodString, ok := framingMethodRaw.(string)
|
|
||||||
|
|
||||||
if !ok {
|
|
||||||
return nil, errors.New("serial.client framing method must be a string")
|
|
||||||
}
|
|
||||||
framingMethod = framingMethodString
|
|
||||||
}
|
}
|
||||||
|
|
||||||
framer := framer.GetFramer(framingMethod)
|
framingMethodString, ok := framingMethod.(string)
|
||||||
|
|
||||||
|
if !ok {
|
||||||
|
return nil, errors.New("serial.client framing method must be a string")
|
||||||
|
}
|
||||||
|
|
||||||
|
framer := framer.GetFramer(framingMethodString)
|
||||||
|
|
||||||
if framer == nil {
|
if framer == nil {
|
||||||
return nil, fmt.Errorf("serial.client unknown framing method: %s", framingMethod)
|
return nil, fmt.Errorf("serial.client unknown framing method: %s", framingMethod)
|
||||||
|
|||||||
@@ -56,20 +56,19 @@ func init() {
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
framingMethod := "RAW"
|
framingMethod, ok := params["framing"]
|
||||||
|
|
||||||
framingMethodRaw, ok := params["framing"]
|
if !ok {
|
||||||
|
return nil, errors.New("net.tcp.client requires a framing parameter")
|
||||||
if ok {
|
|
||||||
framingMethodString, ok := framingMethodRaw.(string)
|
|
||||||
|
|
||||||
if !ok {
|
|
||||||
return nil, errors.New("net.tcp.client framing method must be a string")
|
|
||||||
}
|
|
||||||
framingMethod = framingMethodString
|
|
||||||
}
|
}
|
||||||
|
|
||||||
framer := framer.GetFramer(framingMethod)
|
framingMethodString, ok := framingMethod.(string)
|
||||||
|
|
||||||
|
if !ok {
|
||||||
|
return nil, errors.New("net.tcp.client framing method must be a string")
|
||||||
|
}
|
||||||
|
|
||||||
|
framer := framer.GetFramer(framingMethodString)
|
||||||
|
|
||||||
if framer == nil {
|
if framer == nil {
|
||||||
return nil, fmt.Errorf("net.tcp.client unknown framing method: %s", framingMethod)
|
return nil, fmt.Errorf("net.tcp.client unknown framing method: %s", framingMethod)
|
||||||
|
|||||||
@@ -45,20 +45,19 @@ func init() {
|
|||||||
return nil, errors.New("net.tcp.server port must be a number")
|
return nil, errors.New("net.tcp.server port must be a number")
|
||||||
}
|
}
|
||||||
|
|
||||||
framingMethod := "RAW"
|
framingMethod, ok := params["framing"]
|
||||||
|
|
||||||
framingMethodRaw, ok := params["framing"]
|
if !ok {
|
||||||
|
return nil, errors.New("net.tcp.server requires a framing parameter")
|
||||||
if ok {
|
|
||||||
framingMethodString, ok := framingMethodRaw.(string)
|
|
||||||
|
|
||||||
if !ok {
|
|
||||||
return nil, errors.New("net.tcp.server framing method must be a string")
|
|
||||||
}
|
|
||||||
framingMethod = framingMethodString
|
|
||||||
}
|
}
|
||||||
|
|
||||||
framer := framer.GetFramer(framingMethod)
|
framingMethodString, ok := framingMethod.(string)
|
||||||
|
|
||||||
|
if !ok {
|
||||||
|
return nil, errors.New("net.tcp.server framing method must be a string")
|
||||||
|
}
|
||||||
|
|
||||||
|
framer := framer.GetFramer(framingMethodString)
|
||||||
|
|
||||||
if framer == nil {
|
if framer == nil {
|
||||||
return nil, fmt.Errorf("net.tcp.server unknown framing method: %s", framingMethod)
|
return nil, fmt.Errorf("net.tcp.server unknown framing method: %s", framingMethod)
|
||||||
|
|||||||
Reference in New Issue
Block a user