|
|
|
@ -15,18 +15,14 @@ See the License for the specific language governing permissions and
|
|
|
|
|
limitations under the License.
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
// Package seriallink provides a handler for the serial connection of the signer machine.
|
|
|
|
|
// Package serial provides a handler for the serial connection of the signer machine.
|
|
|
|
|
package serial
|
|
|
|
|
|
|
|
|
|
import (
|
|
|
|
|
"bytes"
|
|
|
|
|
"context"
|
|
|
|
|
"fmt"
|
|
|
|
|
"io"
|
|
|
|
|
"sync"
|
|
|
|
|
"time"
|
|
|
|
|
|
|
|
|
|
"github.com/justincpresley/go-cobs"
|
|
|
|
|
"github.com/sirupsen/logrus"
|
|
|
|
|
"github.com/tarm/serial"
|
|
|
|
|
|
|
|
|
@ -68,11 +64,13 @@ func (p protocolState) String() string {
|
|
|
|
|
type Handler struct {
|
|
|
|
|
protocolHandler protocol.Handler
|
|
|
|
|
protocolState protocolState
|
|
|
|
|
framer protocol.Framer
|
|
|
|
|
config *serial.Config
|
|
|
|
|
port *serial.Port
|
|
|
|
|
logger *logrus.Logger
|
|
|
|
|
lock sync.Mutex
|
|
|
|
|
framesIn chan []byte
|
|
|
|
|
framesOut chan []byte
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
func (h *Handler) setupConnection() error {
|
|
|
|
@ -95,14 +93,18 @@ func (h *Handler) Close() error {
|
|
|
|
|
return nil
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
var cobsConfig = cobs.Config{SpecialByte: protocol.CobsDelimiter, Delimiter: true, EndingSave: true}
|
|
|
|
|
|
|
|
|
|
func (h *Handler) Run(ctx context.Context) error {
|
|
|
|
|
h.protocolState = cmdAnnounce
|
|
|
|
|
errors := make(chan error)
|
|
|
|
|
|
|
|
|
|
go func() {
|
|
|
|
|
err := h.readFrames()
|
|
|
|
|
err := h.framer.ReadFrames(h.port, h.framesIn)
|
|
|
|
|
|
|
|
|
|
errors <- err
|
|
|
|
|
}()
|
|
|
|
|
|
|
|
|
|
go func() {
|
|
|
|
|
err := h.framer.WriteFrames(h.port, h.framesOut)
|
|
|
|
|
|
|
|
|
|
errors <- err
|
|
|
|
|
}()
|
|
|
|
@ -127,79 +129,6 @@ func (h *Handler) Run(ctx context.Context) error {
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
func (h *Handler) readFrames() error {
|
|
|
|
|
const (
|
|
|
|
|
readInterval = 50 * time.Millisecond
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
var frame []byte
|
|
|
|
|
|
|
|
|
|
buffer := &bytes.Buffer{}
|
|
|
|
|
|
|
|
|
|
delimiter := []byte{cobsConfig.SpecialByte}
|
|
|
|
|
|
|
|
|
|
for {
|
|
|
|
|
readBytes, err := h.readFromPort()
|
|
|
|
|
if err != nil {
|
|
|
|
|
close(h.framesIn)
|
|
|
|
|
|
|
|
|
|
return err
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if len(readBytes) == 0 {
|
|
|
|
|
time.Sleep(readInterval)
|
|
|
|
|
|
|
|
|
|
continue
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
h.logger.Tracef("read %d bytes", len(readBytes))
|
|
|
|
|
|
|
|
|
|
buffer.Write(readBytes)
|
|
|
|
|
|
|
|
|
|
h.logger.Tracef("read buffer is now %d bytes long", buffer.Len())
|
|
|
|
|
|
|
|
|
|
rest := buffer.Bytes()
|
|
|
|
|
|
|
|
|
|
if !bytes.Contains(rest, delimiter) {
|
|
|
|
|
continue
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
for bytes.Contains(rest, delimiter) {
|
|
|
|
|
parts := bytes.SplitAfterN(rest, delimiter, 2)
|
|
|
|
|
frame, rest = parts[0], parts[1]
|
|
|
|
|
|
|
|
|
|
h.logger.Tracef("frame of length %d", len(frame))
|
|
|
|
|
|
|
|
|
|
if len(frame) == 0 {
|
|
|
|
|
continue
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if err := cobs.Verify(frame, cobsConfig); err != nil {
|
|
|
|
|
close(h.framesIn)
|
|
|
|
|
|
|
|
|
|
return fmt.Errorf("could not verify COBS frame: %w", err)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
decoded := cobs.Decode(frame, cobsConfig)
|
|
|
|
|
|
|
|
|
|
h.logger.Tracef("frame decoded to length %d", len(decoded))
|
|
|
|
|
|
|
|
|
|
h.framesIn <- decoded
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
buffer.Truncate(0)
|
|
|
|
|
buffer.Write(rest)
|
|
|
|
|
|
|
|
|
|
h.logger.Tracef("read buffer is now %d bytes long", buffer.Len())
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
func (h *Handler) writeFrame(frame []byte) error {
|
|
|
|
|
encoded := cobs.Encode(frame, cobsConfig)
|
|
|
|
|
|
|
|
|
|
return h.writeToPort(encoded)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
func (h *Handler) nextState() error {
|
|
|
|
|
next, ok := validTransitions[h.protocolState]
|
|
|
|
|
if !ok {
|
|
|
|
@ -241,36 +170,11 @@ func (h *Handler) handleProtocolState() error {
|
|
|
|
|
return nil
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
func (h *Handler) writeToPort(data []byte) error {
|
|
|
|
|
reader := bytes.NewReader(data)
|
|
|
|
|
|
|
|
|
|
n, err := io.Copy(h.port, reader)
|
|
|
|
|
if err != nil {
|
|
|
|
|
return fmt.Errorf("could not write data: %w", err)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
h.logger.Tracef("wrote %d bytes", n)
|
|
|
|
|
|
|
|
|
|
return nil
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
func (h *Handler) readFromPort() ([]byte, error) {
|
|
|
|
|
const bufferSize = 1024
|
|
|
|
|
|
|
|
|
|
buf := make([]byte, bufferSize)
|
|
|
|
|
|
|
|
|
|
count, err := h.port.Read(buf)
|
|
|
|
|
if err != nil {
|
|
|
|
|
return nil, fmt.Errorf("could not read from serial port: %w", err)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return buf[:count], nil
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
func (h *Handler) handleCmdAnnounce() error {
|
|
|
|
|
h.logger.Trace("waiting for command announce")
|
|
|
|
|
|
|
|
|
|
frame := <-h.framesIn
|
|
|
|
|
|
|
|
|
|
if frame == nil {
|
|
|
|
|
return nil
|
|
|
|
|
}
|
|
|
|
@ -312,9 +216,7 @@ func (h *Handler) handleRespAnnounce() error {
|
|
|
|
|
return fmt.Errorf("could not get response announcement: %w", err)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if err := h.writeFrame(frame); err != nil {
|
|
|
|
|
return err
|
|
|
|
|
}
|
|
|
|
|
h.framesOut <- frame
|
|
|
|
|
|
|
|
|
|
if err := h.nextState(); err != nil {
|
|
|
|
|
return err
|
|
|
|
@ -329,9 +231,7 @@ func (h *Handler) handleRespData() error {
|
|
|
|
|
return fmt.Errorf("could not get response data: %w", err)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if err := h.writeFrame(frame); err != nil {
|
|
|
|
|
return err
|
|
|
|
|
}
|
|
|
|
|
h.framesOut <- frame
|
|
|
|
|
|
|
|
|
|
if err := h.nextState(); err != nil {
|
|
|
|
|
return err
|
|
|
|
@ -345,6 +245,8 @@ func New(cfg *config.Serial, logger *logrus.Logger, protocolHandler protocol.Han
|
|
|
|
|
protocolHandler: protocolHandler,
|
|
|
|
|
logger: logger,
|
|
|
|
|
framesIn: make(chan []byte),
|
|
|
|
|
framesOut: make(chan []byte),
|
|
|
|
|
framer: protocol.NewCOBSFramer(logger),
|
|
|
|
|
}
|
|
|
|
|
h.config = &serial.Config{Name: cfg.Device, Baud: cfg.Baud, ReadTimeout: cfg.Timeout}
|
|
|
|
|
|
|
|
|
|