- slave: added IMasterConnection_getPeerAddress function

Author: mzillgith

lib60870-C/src/iec60870/cs101/cs101_master_connection.c

@@ -54,3 +54,11 @@ IMasterConnection_close(IMasterConnection self)
         self->close(self);
 }
 
+int
+IMasterConnection_getPeerAddress(IMasterConnection self, char* addrBuf, int addrBufSize)
+{
+    if (self->getPeerAddress)
+        return self->getPeerAddress(self, addrBuf, addrBufSize);
+    else
+        return 0;
+}

lib60870-C/src/iec60870/cs101/cs101_slave.c

@@ -332,6 +332,7 @@ CS101_Slave_create(SerialPort serialPort, LinkLayerParameters llParameters, CS10
         self->iMasterConnection.sendACT_TERM = sendACT_TERM;
         self->iMasterConnection.getApplicationLayerParameters = getApplicationLayerParameters;
         self->iMasterConnection.close = NULL;
+        self->iMasterConnection.getPeerAddress = NULL;
         self->iMasterConnection.object = self;
 
         CS101_Queue_initialize(&(self->userDataClass1Queue), CS101_MAX_QUEUE_SIZE);

lib60870-C/src/iec60870/cs104/cs104_slave.c

@@ -2578,6 +2578,28 @@ _IMasterConnection_close(IMasterConnection self)
     MasterConnection_close(con);
 }
 
+static int
+_IMasterConnection_getPeerAddress(IMasterConnection self, char* addrBuf, int addrBufSize)
+{
+    MasterConnection con = (MasterConnection) self->object;
+
+    char buf[50];
+
+    char* addrStr = Socket_getPeerAddressStatic(con->socket, buf);
+
+    if (addrStr == NULL)
+        return 0;
+
+    int len = strlen(buf);
+
+    if (len < addrBufSize) {
+        strcpy(addrBuf, buf);
+        return len;
+    }
+    else
+        return 0;
+}
+
 static CS101_AppLayerParameters
 _IMasterConnection_getApplicationLayerParameters(IMasterConnection self)
 {
@@ -2632,6 +2654,7 @@ MasterConnection_create(CS104_Slave slave, Socket socket, MessageQueue lowPrioQu
         self->iMasterConnection.sendACT_CON = _IMasterConnection_sendACT_CON;
         self->iMasterConnection.sendACT_TERM = _IMasterConnection_sendACT_TERM;
         self->iMasterConnection.close = _IMasterConnection_close;
+        self->iMasterConnection.getPeerAddress = _IMasterConnection_getPeerAddress;
 
         resetT3Timeout(self);
 

lib60870-C/src/inc/api/iec60870_slave.h

@@ -67,6 +67,7 @@ struct sIMasterConnection {
     void (*sendACT_CON) (IMasterConnection self, CS101_ASDU asdu, bool negative);
     void (*sendACT_TERM) (IMasterConnection self, CS101_ASDU asdu);
     void (*close) (IMasterConnection self);
+    int (*getPeerAddress) (IMasterConnection self, char* addrBuf, int addrBufSize);
     CS101_AppLayerParameters (*getApplicationLayerParameters) (IMasterConnection self);
     void* object;
 };
@@ -105,6 +106,17 @@ IMasterConnection_sendACT_CON(IMasterConnection self, CS101_ASDU asdu, bool nega
 void
 IMasterConnection_sendACT_TERM(IMasterConnection self, CS101_ASDU asdu);
 
+/**
+ * \brief Get the peer address of the master (only for CS 104)
+ *
+ * \param addrBuf buffer where to store the IP address as string
+ * \param addrBufSize the size of the buffer where to store the IP address
+ *
+ * \return the number of bytes written to the buffer, 0 if function not supported
+ */
+int
+IMasterConnection_getPeerAddress(IMasterConnection self, char* addrBuf, int addrBufSize);
+
 /**
  * \brief Close the master connection (only for CS 104)
  *