- fixed compilation problems with C++/VS

src/mms/iso_client/iso_client_connection.c

@@ -3,7 +3,7 @@
  *
  *  Client side representation of the ISO stack (COTP, session, presentation, ACSE)
  *
- *  Copyright 2013-2018 Michael Zillgith
+ *  Copyright 2013-2022 Michael Zillgith
  *
  *  This file is part of libIEC61850.
  *
@@ -201,7 +201,7 @@ sendConnectionRequestMessage(IsoClientConnection self)
     }
 
     int socketExtensionBufferSize = CONFIG_MMS_MAXIMUM_PDU_SIZE + 1000;
-    uint8_t* socketExtensionBuffer = GLOBAL_MALLOC(socketExtensionBufferSize);
+    uint8_t* socketExtensionBuffer = (uint8_t*)GLOBAL_MALLOC(socketExtensionBufferSize);
 
     /* COTP (ISO transport) handshake */
     CotpConnection_init(self->cotpConnection, self->socket, self->receiveBuffer, self->cotpReadBuffer, self->cotpWriteBuffer,

src/mms/iso_server/iso_connection.c

@@ -1,7 +1,7 @@
 /*
  *  iso_connection.c
  *
- *  Copyright 2013-2020 Michael Zillgith
+ *  Copyright 2013-2022 Michael Zillgith
  *
  *  This file is part of libIEC61850.
  *
@@ -534,7 +534,7 @@ IsoConnection_create(Socket socket, IsoServer isoServer, bool isSingleThread)
 
         self->cotpConnection = (CotpConnection*) GLOBAL_CALLOC(1, sizeof(CotpConnection));
         int socketExtensionBufferSize = CONFIG_MMS_MAXIMUM_PDU_SIZE + 1000;
-        uint8_t* socketExtensionBuffer = GLOBAL_MALLOC(socketExtensionBufferSize);
+        uint8_t* socketExtensionBuffer = (uint8_t*)GLOBAL_MALLOC(socketExtensionBufferSize);
         CotpConnection_init(self->cotpConnection, self->socket, &(self->rcvBuffer), &(self->cotpReadBuffer), &(self->cotpWriteBuffer),
                 socketExtensionBuffer, socketExtensionBufferSize);
 

third_party/winpcap/README

@@ -1,2 +1,6 @@
 For GOOSE support add winpcap source and headers here. Rerun cmake to configure the build system for GOOSE support.
 
+You can get the winpcap headers and libraries here: https://www.winpcap.org/install/bin/WpdPack_4_1_2.zip
+
+From this package copy the "Lib" and "Include" folders in this directory. On 64 bit systems you have to replace the lib files from the "Lib" folder by the files in "Lib\x64".
+