- fixed problem: GI without activated GI trigger option

src/hal/socket/linux/socket_linux.c

@@ -316,7 +316,7 @@ Socket_connect(Socket self, const char* address, int port)
 
     activateTcpNoDelay(self);
 
-#if CONFIG_ACTIVATE_TCP_KEEPALIVE == 1
+#if (CONFIG_ACTIVATE_TCP_KEEPALIVE == 1)
     activateKeepAlive(self->fd);
 #endif
 

src/iec61850/server/mms_mapping/reporting.c

@@ -1315,8 +1315,10 @@ Reporting_RCBWriteAccessHandler(MmsMapping* self, ReportControl* rc, char* eleme
     if (strcmp(elementName, "GI") == 0) {
         if ((rc->enabled) && (rc->clientConnection == connection)) {
 
-            if (MmsValue_getBoolean(value))
+            if (MmsValue_getBoolean(value)) {
-                rc->gi = true;
+                if (rc->triggerOps & TRG_OPT_GI)
+                    rc->gi = true;
+            }
 
             retVal = DATA_ACCESS_ERROR_SUCCESS;
             goto exit_function;