Changeset 138

Timestamp:

04/21/06 00:01:54 (3 years ago)

Author:

abauer

Message:

Fix a problem when using DELETE commands

Fix a problem when the statuses to commands
are larger then the commands itself

Files:

• branches/6620-branch/libsyncml/parser/sml_xml_assm.c (modified) (1 diff)
• branches/6620-branch/libsyncml/sml_elements.c (modified) (2 diffs)
• branches/6620-branch/libsyncml/sml_parse.c (modified) (4 diffs)
• branches/6620-branch/libsyncml/sml_parse.h (modified) (1 diff)
• branches/6620-branch/libsyncml/sml_session.c (modified) (2 diffs)

branches/6620-branch/libsyncml/parser/sml_xml_assm.c

@@ -1462 +1462 @@
-                        
-                buffersize += xmlBufferLength(status->buffer) - 1;
-
-
+//
+//
-                xmlTextWriterWriteRawLen(assm->writer, xmlBufferContent(status->buffer), xmlBufferLength(status->buffer) - 1);
-        }

branches/6620-branch/libsyncml/sml_elements.c

@@ -316 +316 @@
-}
-
+/* If data is NULL, this call is the same if smlItemNew */
-SmlItem *smlItemNewForData(const char *data, unsigned int size, SmlError **error)
-{
@@ -323 +324 @@
-        if (!item)
-                goto error;
-
-
-
+
+
+
+
+
-        
-        smlTrace(TRACE_EXIT, "%s: %p", __func__, item);

branches/6620-branch/libsyncml/sml_parse.c

@@ -721 +721 @@
- * @param assm The assembler
- * @param status The command to add
+ * @param force If set to TRUE, libsyncml will ignore if the outgoing limit has been reached
- * @param error A pointer to an error struct
- * @returns SML_ASSEMBLER_RESULT_OK if the status was added ok, SML_ASSEMBLER_RESULT_MISMATCH
@@ -726 +727 @@
- * 
- */
-(SmlAssembler *assm, SmlStatus *status
-
-p)", __func__, assm, status
+Full(SmlAssembler *assm, SmlStatus *status, SmlBool force
+
+i, %p)", __func__, assm, status, force
-        smlAssert(assm);
-        smlAssert(status);
@@ -738 +739 @@
-                goto error;
-        
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-                                goto error;
-                        
-
-
+
+
+
+
+
+
+
+
-                }
-        }
@@ -766 +768 @@
-        smlTrace(TRACE_EXIT_ERROR, "%s: %s", __func__, smlErrorPrint(error));
-        return SML_ASSEMBLER_RESULT_ERROR;
+}
+
+SmlAssemblerResult smlAssemblerAddStatus(SmlAssembler *assm, SmlStatus *status, SmlError **error)
+{
+        return smlAssemblerAddStatusFull(assm, status, FALSE, error);
-}
-

branches/6620-branch/libsyncml/sml_parse.h

@@ -101 +101 @@
-SmlBool smlAssemblerRun(SmlAssembler *assm, char **data, unsigned int *size, SmlBool *end, SmlBool final, SmlError **error);
-SmlAssemblerResult smlAssemblerAddStatus(SmlAssembler *assm, SmlStatus *status, SmlError **error);
+SmlAssemblerResult smlAssemblerAddStatusFull(SmlAssembler *assm, SmlStatus *status, SmlBool force, SmlError **error);
-SmlAssemblerResult smlAssemblerReserveStatus(SmlAssembler *assm, unsigned int cmdRef, unsigned int msgRef, unsigned int cmdID, SmlError **error);
-SmlBool smlAssemblerAddHeader(SmlAssembler *assm, SmlSession *session, SmlError **error);

branches/6620-branch/libsyncml/sml_session.c

@@ -543 +543 @@
-                        }
-                        
+                        /* We ignore if the added status violates the size limitation if
+                         * a incoming buffer for a large object is open. the problem is that
+                         * the status for the chunk has to go into the next message AND the status
+                         * MUST be in the same order as the original commands. so the only solution is
+                         * to send all statuses and ignore the size. */
+                        
-                        /* Now we can try to add the status to the assembler */
-(session->assembler, status
+Full(session->assembler, status, session->incomingBuffer ? TRUE : FALSE
-                                case SML_ASSEMBLER_RESULT_OK:
-                                        /* We successfully added the status */
@@ -925 +931 @@
-        if (final) {
-                if (session->pendingReplies) {
-
+
+
-                        _smlSessionFreePendingReplies(session);
-                        goto error;