- fixed some problems in server side file directory service

src/goose/goose_publisher.c

@@ -376,11 +376,6 @@ GoosePublisher_publish(GoosePublisher self, LinkedList dataSet)
     if (DEBUG_GOOSE_PUBLISHER)
         printf("GOOSE_PUBLISHER: send GOOSE message\n");
 
-	struct timeval tv;
-
-	gettimeofday(&tv,NULL/*&tz*/);
-	printf("GOOSE SEND: %ld %ld\n",tv.tv_sec, tv.tv_usec);
-
     Ethernet_sendPacket(self->ethernetSocket, self->buffer, self->payloadStart + payloadLength);
 
     return 0;

src/goose/goose_receiver.c

@@ -612,13 +612,6 @@ exit_with_fault:
 static void
 parseGooseMessage(GooseReceiver self, int numbytes)
 {
-	struct timeval tv;
-
-	gettimeofday(&tv,NULL/*&tz*/);
-
-	printf("RCVD GOOSE: %ld %ld\n",tv.tv_sec, tv.tv_usec);
-
-
     int bufPos;
     bool subscriberFound = false;
     uint8_t* buffer = self->buffer;

src/iec61850/client/ied_connection.c

@@ -88,6 +88,9 @@ iedConnection_mapMmsErrorToIedError(MmsError mmsError)
     case MMS_ERROR_CONNECTION_REJECTED:
         return IED_ERROR_CONNECTION_REJECTED;
 
+    case MMS_ERROR_ACCESS_OBJECT_VALUE_INVALID:
+    	return IED_ERROR_OBJECT_VALUE_INVALID;
+
     default:
         return IED_ERROR_UNKNOWN;
     }

src/mms/iso_client/iso_client_connection.c

@@ -106,8 +106,6 @@ connectionHandlingThread(IsoClientConnection self)
 
         TpktState packetState;
 
-        printf("P1\n");
-
         while ((packetState = CotpConnection_readToTpktBuffer(self->cotpConnection)) == TPKT_WAITING)
         {
             Thread_sleep(1);
@@ -118,9 +116,6 @@ connectionHandlingThread(IsoClientConnection self)
             }
         }
 
-        printf("P2\n");
-
-
         if (packetState == TPKT_ERROR)
             break;
 
@@ -151,44 +146,27 @@ connectionHandlingThread(IsoClientConnection self)
             break;
         }
 
-        printf("P3\n");
-
-
         self->callback(ISO_IND_DATA, self->callbackParameter,
                 &(self->presentation->nextPayload));
 
-        printf("P4\n");
-
-
         /* wait for user to release the buffer */
         Semaphore_wait(self->receiveBufferMutex);
 
-
-        printf("P5\n");
-
         CotpConnection_resetPayload(self->cotpConnection);
     }
 
-    printf("I1\n");
+    self->callback(ISO_IND_CLOSED, self->callbackParameter, NULL);;
-
-    self->callback(ISO_IND_CLOSED, self->callbackParameter, NULL);
-
-    printf("I2\n");
 
     self->state = STATE_IDLE;
 
     Socket_destroy(self->socket);
 
-    printf("I3\n");
-
     if (DEBUG_ISO_CLIENT)
         printf("ISO_CLIENT_CONNECTION: exit connection %p\n", self);
 
     /* release buffer to enable reuse of client connection */
     Semaphore_post(self->receiveBufferMutex);
 
-    printf("I4\n");
-
     self->handlingThreadRunning = false;
 }
 
@@ -449,16 +427,12 @@ IsoClientConnection_close(IsoClientConnection self)
     if (DEBUG_ISO_CLIENT)
         printf("ISO_CLIENT: IsoClientConnection_close\n");
 
-    printf("B1\n");
-
     if (self->handlingThreadRunning) {
         self->stopHandlingThread = true;
         while (self->handlingThreadRunning)
             Thread_sleep(1);
     }
 
-    printf("B2\n");
-
     self->state = STATE_IDLE;
 }
 

src/mms/iso_mms/client/mms_client_identify.c

@@ -98,6 +98,9 @@ mmsClient_parseIdentifyResponse(MmsConnection self)
         case 0x83: /* list of abstract syntaxes */
             bufPos += length;
             break;
+        default: /* ignore unknown tags */
+        	bufPos += length;
+        	break;
         }
     }
 

src/mms/iso_mms/server/mms_association_service.c

@@ -221,6 +221,9 @@ parseInitiateRequestPdu(MmsServerConnection self, uint8_t* buffer, int bufPos, i
         case 0xa4: /* mms-init-request-detail */
             /* we ignore this */
             break;
+
+        default:
+        	break; /* Ignore unknown tags */
         }
 
         bufPos += length;

src/mms/iso_mms/server/mms_file_service.c

@@ -450,8 +450,10 @@ addFileEntriesToResponse(uint8_t* buffer, int bufPos, int maxBufSize, char* dire
         while (fileName != NULL) {
         	directoryName[directoryNameLength] = 0;
 
-        	if (directoryNameLength > 0)
+        	if (directoryNameLength > 0) {
-        		strcat(directoryName, "/");
+        		if (directoryName[directoryNameLength - 1] != '/')
+        			strcat(directoryName, "/");
+        	}
 
         	strcat(directoryName, fileName);
 
@@ -506,6 +508,8 @@ addFileEntriesToResponse(uint8_t* buffer, int bufPos, int maxBufSize, char* dire
 
         FileSystem_closeDirectory(directory);
     }
+    else
+    	bufPos = -1;
 
     directoryName[directoryNameLength] = 0;