mirror of
https://github.com/jwetzell/showbridge-go.git
synced 2026-04-27 13:25:40 +00:00
Merge pull request #11 from jwetzell/feat/raw-framing-default
use RAW framer if no framer specified
This commit is contained in:
@@ -42,18 +42,20 @@ func init() {
|
|||||||
return nil, fmt.Errorf("misc.serial.client port must be a string")
|
return nil, fmt.Errorf("misc.serial.client port must be a string")
|
||||||
}
|
}
|
||||||
|
|
||||||
framingMethod, ok := params["framing"]
|
framingMethod := "RAW"
|
||||||
if !ok {
|
|
||||||
return nil, fmt.Errorf("misc.serial.client requires a framing method")
|
|
||||||
}
|
|
||||||
|
|
||||||
framingMethodString, ok := framingMethod.(string)
|
framingMethodRaw, ok := params["framing"]
|
||||||
|
|
||||||
|
if ok {
|
||||||
|
framingMethodString, ok := framingMethodRaw.(string)
|
||||||
|
|
||||||
if !ok {
|
if !ok {
|
||||||
return nil, fmt.Errorf("misc.serial.client framing method must be a string")
|
return nil, fmt.Errorf("misc.serial.client framing method must be a string")
|
||||||
}
|
}
|
||||||
|
framingMethod = framingMethodString
|
||||||
|
}
|
||||||
|
|
||||||
framer, err := framer.GetFramer(framingMethodString)
|
framer, err := framer.GetFramer(framingMethod)
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
|
|||||||
@@ -54,18 +54,20 @@ func init() {
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
framingMethod, ok := params["framing"]
|
framingMethod := "RAW"
|
||||||
if !ok {
|
|
||||||
return nil, fmt.Errorf("net.tcp.client requires a framing method")
|
|
||||||
}
|
|
||||||
|
|
||||||
framingMethodString, ok := framingMethod.(string)
|
framingMethodRaw, ok := params["framing"]
|
||||||
|
|
||||||
|
if ok {
|
||||||
|
framingMethodString, ok := framingMethodRaw.(string)
|
||||||
|
|
||||||
if !ok {
|
if !ok {
|
||||||
return nil, fmt.Errorf("net.tcp.client framing method must be a string")
|
return nil, fmt.Errorf("misc.serial.client framing method must be a string")
|
||||||
|
}
|
||||||
|
framingMethod = framingMethodString
|
||||||
}
|
}
|
||||||
|
|
||||||
framer, err := framer.GetFramer(framingMethodString)
|
framer, err := framer.GetFramer(framingMethod)
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
|
|||||||
@@ -44,18 +44,20 @@ func init() {
|
|||||||
return nil, fmt.Errorf("net.tcp.server port must be a number")
|
return nil, fmt.Errorf("net.tcp.server port must be a number")
|
||||||
}
|
}
|
||||||
|
|
||||||
framingMethod, ok := params["framing"]
|
framingMethod := "RAW"
|
||||||
if !ok {
|
|
||||||
return nil, fmt.Errorf("net.tcp.server requires a framing method")
|
|
||||||
}
|
|
||||||
|
|
||||||
framingMethodString, ok := framingMethod.(string)
|
framingMethodRaw, ok := params["framing"]
|
||||||
|
|
||||||
|
if ok {
|
||||||
|
framingMethodString, ok := framingMethodRaw.(string)
|
||||||
|
|
||||||
if !ok {
|
if !ok {
|
||||||
return nil, fmt.Errorf("net.tcp.server framing method must be a string")
|
return nil, fmt.Errorf("misc.serial.client framing method must be a string")
|
||||||
|
}
|
||||||
|
framingMethod = framingMethodString
|
||||||
}
|
}
|
||||||
|
|
||||||
framer, err := framer.GetFramer(framingMethodString)
|
framer, err := framer.GetFramer(framingMethod)
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
|
|||||||
Reference in New Issue
Block a user