Changeset 383

Timestamp:

02/19/08 10:17:05 (9 months ago)

Author:

bellmich

Message:

fixed the sending of splitted packages/commands
(NEXT MESSAGE is received and after all status are managed
there are still commands in the command_queue)

Files:

• trunk/libsyncml/sml_session.c (modified) (2 diffs)

trunk/libsyncml/sml_session.c

@@ -1077 +1077 @@
-        }
-
+        /* A lot of checks are performed before the while loop is executed.
+         * This is necessary because this while loop is only present for one
+         * reason, a NEXT MESSAGE request from the remote peer if the original
+         * message data does not fit into one message (MaxMsgSize to small).
+         * The following stuff is checked:
+         *
+         *     - the session must be in normal mode
+         *         - not sending or waiting
+         *         - no changed message counters
+         *     - there must be a waiting command (not a waiting status!)
+         *
+         * Usually this happens if an image is too large and must be splitted
+         * (MaxMsgSize < MaxObjSize). Do not touch this stuff except that you
+         * really test it with an image which must be send and it is correctly
+         * splitted.
+         */
+        unsigned int receivedMsg = session->lastReceivedMessageID;
+        unsigned int lastMsg = session->lastMessageID;
+        while (!session->waiting && !session->sending &&
+               smlQueueCheck(session->command_queue) &&
+               smlQueueLength(session->command_queue) != smlQueueLengthPrio(session->command_queue) &&
+               receivedMsg == session->lastReceivedMessageID &&
+               lastMsg == session->lastMessageID)
+        {
+                /* If the session does not wait for the remote peer (session->waiting)
+                 * and there is a command in the queue
+                 * then the command is dispatched.
+                 * If the command is too large then the session is automatically
+                 * flushed. If all commands were dispatched then the queue check
+                 * fails and the normal mechanism for sending messages flushes
+                 * the session or do some other actions.
+                 */
+                smlQueueDispatch(session->command_queue);
+        }
+
-        smlTrace(TRACE_INTERNAL, "%s: Final %i, waiting %i, sending %i",
-                __func__, final, session->waiting, session->sending);
@@ -1176 +1211 @@
-                        if (!alert)
-                                goto error;
-
+
-                        if (_smlSessionStartCommandInternal(session, alert, NULL, NULL, NULL, TRUE, error) != SML_ASSEMBLER_RESULT_OK)
-                                goto error;
-                        if (!_smlSessionEndCommandInternal(session, NULL, error))
-                                goto error;
-
+
-                        smlCommandUnref(alert);
-                }