Merge pull request #21 from Paashaas/master

added client connect, client close connection, reservation URCB, get number of open connections

Author: wendy512

client_rcb.go

@@ -30,6 +30,7 @@ type OptFlds struct {
 type ClientReportControlBlock struct {
 	Ena     bool    // 使能
 	IntgPd  int     // 周期上送时间
+	Resv    bool    // Reservation for URCB
 	TrgOps  TrgOps  // 触发条件
 	OptFlds OptFlds // 报告选项
 }
@@ -45,6 +46,7 @@ func (c *Client) GetRCBValues(objectReference string) (*ClientReportControlBlock
 	return &ClientReportControlBlock{
 		Ena:     c.getRCBEnable(rcb),
 		IntgPd:  int(c.getRCBIntgPd(rcb)),
+		Resv:    c.getRCBResv(rcb),
 		TrgOps:  c.getTrgOps(rcb),
 		OptFlds: c.getOptFlds(rcb),
 	}, nil
@@ -60,6 +62,11 @@ func (c *Client) getRCBIntgPd(rcb C.ClientReportControlBlock) uint32 {
 	return uint32(intgPd)
 }
 
+func (c *Client) getRCBResv(rcb C.ClientReportControlBlock) bool {
+	resv := C.ClientReportControlBlock_getResv(rcb)
+	return bool(resv)
+}
+
 func (c *Client) getOptFlds(rcb C.ClientReportControlBlock) OptFlds {
 	optFlds := C.ClientReportControlBlock_getOptFlds(rcb)
 	g := int(optFlds)
@@ -140,11 +147,18 @@ func (c *Client) SetRCBValues(objectReference string, settings ClientReportContr
 		optFlds = optFlds | C.RPT_OPT_CONF_REV
 	}
 
-	C.ClientReportControlBlock_setTrgOps(rcb, trgOps)                      // 触发条件
-	C.ClientReportControlBlock_setRptEna(rcb, C.bool(settings.Ena))        // 报告使能
+	C.ClientReportControlBlock_setTrgOps(rcb, trgOps)               // 触发条件
+	C.ClientReportControlBlock_setRptEna(rcb, C.bool(settings.Ena)) // 报告使能
+	C.ClientReportControlBlock_setResv(rcb, C.bool(settings.Resv))
 	C.ClientReportControlBlock_setIntgPd(rcb, C.uint32_t(settings.IntgPd)) // 周期上送时间
 	C.ClientReportControlBlock_setOptFlds(rcb, optFlds)
-	C.IedConnection_setRCBValues(c.conn, &clientError, rcb, C.RCB_ELEMENT_RPT_ENA|C.RCB_ELEMENT_TRG_OPS|C.RCB_ELEMENT_INTG_PD, true)
+
+	if bool(C.ClientReportControlBlock_isBuffered(rcb)) {
+		C.IedConnection_setRCBValues(c.conn, &clientError, rcb, C.RCB_ELEMENT_RPT_ENA|C.RCB_ELEMENT_TRG_OPS|C.RCB_ELEMENT_INTG_PD, true)
+	} else {
+		C.IedConnection_setRCBValues(c.conn, &clientError, rcb, C.RCB_ELEMENT_RESV|C.RCB_ELEMENT_RPT_ENA|C.RCB_ELEMENT_TRG_OPS|C.RCB_ELEMENT_INTG_PD, true)
+	}
+
 	if err := GetIedClientError(clientError); err != nil {
 		return err
 	}

server.go

@@ -130,6 +130,11 @@ func (is *IedServer) GetUTCTimeAttributeValue(node *ModelNode) int64 {
 	return int64(timestamp)
 }
 
+// GetNumberOfOpenConnections reads the amount of connections with the server
+func (is *IedServer) GetNumberOfOpenConnections() int {
+	return int(C.IedServer_getNumberOfOpenConnections(is.server))
+}
+
 // SetServerIdentity updates the server identity of the IedServer
 func (is *IedServer) SetServerIdentity(vendor string, model string, version string) {
 	cVendor := C.CString(vendor)