增加iec61850 server相关接口

Author: wendy512

client.go

@@ -12,11 +12,12 @@ type Client struct {
 	connected *atomic.Bool
 }
 
+// Settings 连接配置
 type Settings struct {
 	Host           string
 	Port           int
-	ConnectTimeout uint
-	RequestTimeout uint
+	ConnectTimeout uint // 连接超时配置，单位：毫秒
+	RequestTimeout uint // 请求超时配置，单位：毫秒
 }
 
 func NewSettings() *Settings {
@@ -28,6 +29,7 @@ func NewSettings() *Settings {
 	}
 }
 
+// NewClient 创建客户端实例
 func NewClient(settings *Settings) (*Client, error) {
 	conn, clientErr := connect(settings)
 	if err := GetIedClientError(clientErr); err != nil {
@@ -43,6 +45,7 @@ func NewClient(settings *Settings) (*Client, error) {
 	return connection, nil
 }
 
+// Write 写单个属性值，不支持Structure
 func (c *Client) Write(objectRef string, fc FC, value interface{}) error {
 	mmsType, err := c.GetVariableSpecType(objectRef, fc)
 	if err != nil {
@@ -143,7 +146,7 @@ func (c *Client) ReadString(objectRef string, fc FC) (string, error) {
 	return C.GoString(value), nil
 }
 
-// Read 读取数据
+// Read 读取属性数据
 func (c *Client) Read(objectRef string, fc FC) (interface{}, error) {
 	var clientError C.IedClientError
 	cObjectRef := C.CString(objectRef)
@@ -159,6 +162,7 @@ func (c *Client) Read(objectRef string, fc FC) (interface{}, error) {
 	return c.toGoValue(mmsValue, mmsType), nil
 }
 
+// ReadDataSet 读取DataSet
 func (c *Client) ReadDataSet(objectRef string) ([]*MmsValue, error) {
 	cObjectRef := C.CString(objectRef)
 	defer C.free(unsafe.Pointer(cObjectRef))
@@ -254,7 +258,7 @@ func (c *Client) toGoValue(mmsValue *C.MmsValue, mmsType MmsType) interface{} {
 		size := uint16(C.MmsValue_getOctetStringSize(mmsValue))
 		bytes := make([]byte, size)
 		for i := 0; i < int(size); i++ {
-			bytes[i] = uint8(C.getOctetStringOctet(mmsValue, C.int(i)))
+			bytes[i] = uint8(C.MmsValue_getOctetStringOctet(mmsValue, C.int(i)))
 		}
 		value = bytes
 	case BinaryTime:
@@ -284,6 +288,15 @@ func (c *Client) toGoStructure(mmsValue *C.MmsValue, mmsType MmsType) []*MmsValu
 	}
 }
 
+func (c *Client) getSubElementValue(sgcbVal *C.MmsValue, sgcbVarSpec *C.MmsVariableSpecification, name string) interface{} {
+	mmsPath := C.CString(name)
+	defer C.free(unsafe.Pointer(mmsPath))
+	mmsValue := C.MmsValue_getSubElement(sgcbVal, sgcbVarSpec, mmsPath)
+	defer C.MmsValue_delete(mmsValue)
+	return c.toGoValue(mmsValue, MmsType(C.MmsValue_getType(mmsValue)))
+}
+
+// connect 建立连接
 func connect(settings *Settings) (C.IedConnection, C.IedClientError) {
 	conn := C.IedConnection_create()
 	C.IedConnection_setConnectTimeout(conn, C.uint(settings.ConnectTimeout))
@@ -292,7 +305,6 @@ func connect(settings *Settings) (C.IedConnection, C.IedClientError) {
 	// 释放内存
 	defer C.free(unsafe.Pointer(host))
 	var err C.IedClientError
-	// 建立连接
 	C.IedConnection_connect(conn, &err, host, C.int(settings.Port))
 	return conn, err
 }

client_control.go

@@ -4,30 +4,27 @@ package iec61850
 import "C"
 import "unsafe"
 
-type commandTerminationHandler func(parameter unsafe.Pointer, control C.ControlObjectClient)
-
-// DirectControl 直接控制
-func (c *Client) DirectControl(objectRef string, value bool) error {
-	return c.control(objectRef, value, false, true, false, nil)
+// ControlForDirectWithNormalSecurity 控制模式 1[direct-with-normal-security]
+func (c *Client) ControlForDirectWithNormalSecurity(objectRef string, value bool) error {
+	return c.control(objectRef, value, false, true, false)
 }
 
-// DirectControlSelect 直接控制之前select
-func (c *Client) DirectControlSelect(objectRef string, value bool) error {
-	return c.control(objectRef, value, true, false, false, nil)
+// ControlForSboWithNormalSecurity 控制模式 2[sbo-with-normal-security]
+func (c *Client) ControlForSboWithNormalSecurity(objectRef string, value bool) error {
+	return c.control(objectRef, value, true, false, false)
 }
 
-// DirectControlWithEnhancedSecurity 增强安全直接控制
-func (c *Client) DirectControlWithEnhancedSecurity(objectRef string, value bool) error {
-	return c.control(objectRef, value, false, false, true, func(void unsafe.Pointer, control C.ControlObjectClient) {})
+// ControlForDirectWithEnhancedSecurity 控制模式 3[direct-with-enhanced-security]
+func (c *Client) ControlForDirectWithEnhancedSecurity(objectRef string, value bool) error {
+	return c.control(objectRef, value, false, false, true)
 }
 
-// DirectControlSelectWithEnhancedSecurity 增强安全直接控制之前select
-func (c *Client) DirectControlSelectWithEnhancedSecurity(objectRef string, value bool) error {
-	return c.control(objectRef, value, true, false, true, nil)
+// ControlForSboWithEnhancedSecurity 控制模式 4[sbo-with-enhanced-security]
+func (c *Client) ControlForSboWithEnhancedSecurity(objectRef string, value bool) error {
+	return c.control(objectRef, value, true, false, true)
 }
 
-// control for FC=CO
-func (c *Client) control(objectRef string, value, _select, direct, enhanced bool, handler commandTerminationHandler) error {
+func (c *Client) control(objectRef string, value, _select, direct, enhanced bool) error {
 	cObjectRef := C.CString(objectRef)
 	defer C.free(unsafe.Pointer(cObjectRef))
 
@@ -44,7 +41,7 @@ func (c *Client) control(objectRef string, value, _select, direct, enhanced bool
 
 	// Direct control with enhanced security
 	if enhanced {
-		C.ControlObjectClient_setCommandTerminationHandler(control, C.CommandTerminationHandler(handler), nil)
+		C.ControlObjectClient_setCommandTerminationHandler(control, nil, nil)
 	}
 	ctlVal := C.MmsValue_newBoolean(C.bool(value))
 	defer C.MmsValue_delete(ctlVal)
@@ -58,9 +55,7 @@ func (c *Client) control(objectRef string, value, _select, direct, enhanced bool
 	if direct {
 		C.ControlObjectClient_setOrigin(control, nil, 3)
 	}
-	if bool(C.ControlObjectClient_operate(control, ctlVal, 0)) {
-		return nil
-	} else {
-		return ControlObjectFail
-	}
+
+	C.ControlObjectClient_operate(control, ctlVal, 0)
+	return nil
 }

client_sg.go

@@ -3,14 +3,15 @@ package iec61850
 // #include <iec61850_client.h>
 import "C"
 import (
+	"fmt"
 	"github.com/spf13/cast"
 	"unsafe"
 )
 
 const (
-	ActDA  = "/LLN0.SGCB.ActSG"
-	EditDA = "/LLN0.SGCB.EditSG"
-	CnfDA  = "/LLN0.SGCB.CnfEdit"
+	ActDA  = "%s/%s.SGCB.ActSG"
+	EditDA = "%s/%s.SGCB.EditSG"
+	CnfDA  = "%s/%s.SGCB.CnfEdit"
 )
 
 type SettingGroup struct {
@@ -20,14 +21,15 @@ type SettingGroup struct {
 	CnfEdit bool
 }
 
-func (c *Client) WriteSG(ld, objectRef string, fc FC, actSG int, value interface{}) error {
+// WriteSG 写入SettingGroup
+func (c *Client) WriteSG(ld, ln, objectRef string, fc FC, actSG int, value interface{}) error {
 	// Set active setting group
-	if err := c.Write(ld+ActDA, SP, actSG); err != nil {
+	if err := c.Write(fmt.Sprintf(ActDA, ld, ln), SP, actSG); err != nil {
 		return err
 	}
 
 	// Set edit setting group
-	if err := c.Write(ld+EditDA, SP, actSG); err != nil {
+	if err := c.Write(fmt.Sprintf(EditDA, ld, ln), SP, actSG); err != nil {
 		return err
 	}
 
@@ -37,15 +39,16 @@ func (c *Client) WriteSG(ld, objectRef string, fc FC, actSG int, value interface
 	}
 
 	// Confirm new setting group values
-	if err := c.Write(ld+CnfDA, SP, true); err != nil {
+	if err := c.Write(fmt.Sprintf(CnfDA, ld, ln), SP, true); err != nil {
 		return err
 	}
 	return nil
 }
 
-func (c *Client) GetSG(ld string) (*SettingGroup, error) {
+// GetSG 获取SettingGroup
+func (c *Client) GetSG(objectRef string) (*SettingGroup, error) {
 	var clientError C.IedClientError
-	cObjectRef := C.CString(ld + "/LLN0.SGCB")
+	cObjectRef := C.CString(objectRef)
 	defer C.free(unsafe.Pointer(cObjectRef))
 
 	// 获取类型
@@ -62,10 +65,10 @@ func (c *Client) GetSG(ld string) (*SettingGroup, error) {
 	}
 	defer C.MmsValue_delete(sgcbVal)
 
-	numOfSGValue := c.getSGSubElementValue(sgcbVal, sgcbVarSpec, "NumOfSG")
-	actSGValue := c.getSGSubElementValue(sgcbVal, sgcbVarSpec, "ActSG")
-	editSGValue := c.getSGSubElementValue(sgcbVal, sgcbVarSpec, "EditSG")
-	cnfEditValue := c.getSGSubElementValue(sgcbVal, sgcbVarSpec, "CnfEdit")
+	numOfSGValue := c.getSubElementValue(sgcbVal, sgcbVarSpec, "NumOfSG")
+	actSGValue := c.getSubElementValue(sgcbVal, sgcbVarSpec, "ActSG")
+	editSGValue := c.getSubElementValue(sgcbVal, sgcbVarSpec, "EditSG")
+	cnfEditValue := c.getSubElementValue(sgcbVal, sgcbVarSpec, "CnfEdit")
 
 	sg := &SettingGroup{
 		NumOfSG: cast.ToInt(numOfSGValue),
@@ -75,11 +78,3 @@ func (c *Client) GetSG(ld string) (*SettingGroup, error) {
 	}
 	return sg, nil
 }
-
-func (c *Client) getSGSubElementValue(sgcbVal *C.MmsValue, sgcbVarSpec *C.MmsVariableSpecification, name string) interface{} {
-	mmsPath := C.CString(name)
-	defer C.free(unsafe.Pointer(mmsPath))
-	mmsValue := C.MmsValue_getSubElement(sgcbVal, sgcbVarSpec, mmsPath)
-	defer C.MmsValue_delete(mmsValue)
-	return c.toGoValue(mmsValue, MmsType(C.MmsValue_getType(mmsValue)))
-}

config.go

@@ -16,5 +16,6 @@ import (
 
 	_ "github.com/wendy512/iec61850/libiec61850/lib/linux64"
 	_ "github.com/wendy512/iec61850/libiec61850/lib/linux_armv7l"
+	_ "github.com/wendy512/iec61850/libiec61850/lib/linux_armv8"
 	_ "github.com/wendy512/iec61850/libiec61850/lib/win64"
 )

config_armv8.go

@@ -0,0 +1,7 @@
+//go:build linux && arm64
+
+package iec61850
+
+// #cgo CFLAGS: -I./libiec61850/inc/hal/inc -I./libiec61850/inc/common/inc -I./libiec61850/inc/goose -I./libiec61850/inc/iec61850/inc -I./libiec61850/inc/iec61850/inc_private -I./libiec61850/inc/logging -I./libiec61850/inc/mms/inc -I./libiec61850/inc/mms/inc_private -I./libiec61850/inc/mms/iso_mms/asn1c
+// #cgo LDFLAGS: -static-libgcc -static-libstdc++ -L./libiec61850/lib/linux_armv8 -liec61850 -lhal
+import "C"

libiec61850/lib/linux64/libiec61850.a

@@ -0,0 +1 @@
+package linux_armv8