cont fix long session names

Author: lathoub

src/AppleMIDI_Parser.h

@@ -78,27 +78,31 @@ class AppleMIDIParser
 
 #ifdef KEEP_SESSION_NAME
             uint16_t bi = 0;
-            while ((i < buffer.size()) && (buffer[i] != 0x00))
+            while (i < buffer.size())
             {
                 if (bi < DefaultSettings::MaxSessionNameLen)
-                    invitation.sessionName[bi++] = buffer[i];
-                i++;
+                    invitation.sessionName[bi++] = buffer[i++];
+                else
+                    i++;
             }
             invitation.sessionName[bi++] = '\0';
 #else
-            while ((i < buffer.size()) && (buffer[i] != 0x00))
+            while (i < buffer.size())
                 i++;
 #endif
             parserReturn parserReturn = parserReturn::Processed;
 
-            if (i > minimumLen && i == buffer.size() && buffer[i] != 0x00)
-                parserReturn = parserReturn::SessionNameVeryLong;
+            if (i > minimumLen)
+                if (i == buffer.size() && buffer[i] != 0x00)
+                    parserReturn = parserReturn::SessionNameVeryLong;
 
             while (i--)
                 buffer.pop_front(); // consume all the bytes that made up this message
 
 			session->ReceivedInvitation(invitation, portType);
 
+            int yy = buffer.size();
+
             return parserReturn;
 		}
 		else if (0 == memcmp(command, amEndSession, sizeof(amEndSession)))
@@ -266,31 +270,30 @@ class AppleMIDIParser
 
 #ifdef KEEP_SESSION_NAME
             uint16_t bi = 0;
-            while ((i < buffer.size()) && (buffer[i] != 0x00))
+            while (i < buffer.size())
             {
                 if (bi < DefaultSettings::MaxSessionNameLen)
-                    invitationAccepted.sessionName[bi++] = buffer[i];
-                i++;
+                    invitationAccepted.sessionName[bi++] = buffer[i++];
+                else
+                    i++;
             }
             invitationAccepted.sessionName[bi++] = '\0';
 #else
-            while ((i < buffer.size()) && (buffer[i] != 0x00))
+            while (i < buffer.size())
                 i++;
 #endif
-            //// session name is optional.
-            //// If i > minimum size (16), then a sessionName was provided and must include 0x00
-            //if (i > minimumLen)
-            //    if (i == buffer.size() || buffer[i++] != 0x00)
-            //        return parserReturn::NotEnoughData;
 
             parserReturn parserReturn = parserReturn::Processed;
 
-            if (i > minimumLen && i == buffer.size() && buffer[i] != 0x00)
-                parserReturn = parserReturn::SessionNameVeryLong;
+            if (i > minimumLen)
+                if (i == buffer.size() && buffer[i] != 0x00)
+                    parserReturn = parserReturn::SessionNameVeryLong;
 
             while (i--)
                 buffer.pop_front(); // consume all the bytes that made up this message
 
+            int yy = buffer.size();
+
             session->ReceivedInvitationAccepted(invitationAccepted, portType);
 
             return parserReturn;

test/Ethernet.h

@@ -41,7 +41,7 @@ class EthernetUDP
                 0x6f, 0x72, 0x74, 0x20, 0x28, 0x36, 0x34, 0x37, 0x38, 0x3a, 0x30, 0x29, 0x00           
             };
 
-            write(notOKSessionName, sizeof(notOKSessionName));
+            write(okSessionName, sizeof(okSessionName));
 
         }
 
@@ -360,8 +360,6 @@ class EthernetUDP
 
     int read()
     {
-        int uu = _buffer.size();
-
         if (_buffer.size() == 0)
             return -1;