Changeset 120

Timestamp:

04/12/06 16:18:50 (3 years ago)

Author:

abauer

Message:

Finished most parts of large object handling

Added test cases for large object handling

Fixed several bugs

Added bug workarounds for certain phones

Files:

• branches/development-branch/libsyncml/objects/sml_auth.c (modified) (2 diffs)
• branches/development-branch/libsyncml/objects/sml_devinf_obj.c (modified) (1 diff)
• branches/development-branch/libsyncml/objects/sml_ds_server.c (modified) (2 diffs)
• branches/development-branch/libsyncml/parser/sml_wbxml.c (modified) (1 diff)
• branches/development-branch/libsyncml/parser/sml_xml_assm.c (modified) (15 diffs)
• branches/development-branch/libsyncml/parser/sml_xml_assm_internals.h (modified) (1 diff)
• branches/development-branch/libsyncml/parser/sml_xml_parse.c (modified) (34 diffs)
• branches/development-branch/libsyncml/parser/sml_xml_parse_internals.h (modified) (1 diff)
• branches/development-branch/libsyncml/sml_command.c (modified) (10 diffs)
• branches/development-branch/libsyncml/sml_command.h (modified) (1 diff)
• branches/development-branch/libsyncml/sml_command_internals.h (modified) (1 diff)
• branches/development-branch/libsyncml/sml_defines.h (modified) (1 diff)
• branches/development-branch/libsyncml/sml_devinf.c (modified) (2 diffs)
• branches/development-branch/libsyncml/sml_elements.c (modified) (1 diff)
• branches/development-branch/libsyncml/sml_elements.h (modified) (1 diff)
• branches/development-branch/libsyncml/sml_elements_internals.h (modified) (2 diffs)
• branches/development-branch/libsyncml/sml_error.h (modified) (1 diff)
• branches/development-branch/libsyncml/sml_manager.c (modified) (6 diffs)
• branches/development-branch/libsyncml/sml_manager_internals.h (modified) (1 diff)
• branches/development-branch/libsyncml/sml_parse.c (modified) (4 diffs)
• branches/development-branch/libsyncml/sml_parse.h (modified) (3 diffs)
• branches/development-branch/libsyncml/sml_session.c (modified) (20 diffs)
• branches/development-branch/libsyncml/sml_session.h (modified) (1 diff)
• branches/development-branch/libsyncml/sml_session_internals.h (modified) (2 diffs)
• branches/development-branch/libsyncml/sml_support.c (modified) (3 diffs)
• branches/development-branch/libsyncml/sml_support.h (modified) (1 diff)
• branches/development-branch/tests (modified) (1 prop)
• branches/development-branch/tests/Makefile.am (modified) (2 diffs)
• branches/development-branch/tests/check_session.c (modified) (8 diffs)
• branches/development-branch/tests/check_sync.c (modified) (9 diffs)
• branches/development-branch/tests/check_xml_assembler.c (modified) (2 diffs)
• branches/development-branch/tests/check_xml_parser.c (modified) (2 diffs)
• branches/development-branch/tests/valgrind.supp (modified) (1 diff)
• branches/development-branch/tools/syncml-obex-client.c (modified) (7 diffs)

branches/development-branch/libsyncml/objects/sml_auth.c

@@ -76 +76 @@
-                                
-                                char **arr = g_strsplit(buffer, ":", 2);
+                                g_free(buffer);
-                                
-                                smlTrace(TRACE_INTERNAL, "Username \"%s\", Password \"%s\"", arr[0], arr[1]);
@@ -103 +104 @@
-                goto error;
-        
-
-
+
+
+
+
+
+
-        
-        smlTrace(TRACE_EXIT, "%s", __func__);

branches/development-branch/libsyncml/objects/sml_devinf_obj.c

@@ -211 +211 @@
-        
-        if (agent->recvDevInf) {
-
+
+
+
+
+
+
-                if (!devinf)
-                        goto error;

branches/development-branch/libsyncml/objects/sml_ds_server.c

@@ -323 +323 @@
-                goto error;
-        
+        if (!smlManagerObjectRegister(server->manager, SML_COMMAND_TYPE_SYNC, session, server->location, NULL, smlDsSessionRecvSync, smlDsSessionRecvChange, dsession, error))
+                goto error_free_dsession;
+        
+        if (!smlManagerObjectRegister(server->manager, SML_COMMAND_TYPE_MAP, session, server->location, NULL, smlDsSessionRecvMap, NULL, dsession, error))
+                goto error_free_dsession;
+        
+        if (!smlManagerObjectRegister(server->manager, SML_COMMAND_TYPE_ALERT, session, server->location, NULL, smlDsSessionRecvAlert, NULL, dsession, error))
+                goto error_free_dsession;
+        
-        if (!smlDsSessionSendAlert(dsession, type, last, next, callback, userdata, error))
-
+d
-        
-        smlTrace(TRACE_EXIT, "%s", __func__);
-        return dsession;
-
-
+d
-        g_free(dsession);
-error:
@@ -504 +513 @@
-                                 * uid (if we are a client for example). If it is not given we use the
-                                 * source uri. This has then to be translated by the sync engine of course */
-
+
+
+
+
+
+
+
-                                        goto error;
-                                                

branches/development-branch/libsyncml/parser/sml_wbxml.c

@@ -81 +81 @@
-        
-        char *buffer = NULL;
-
+
+
-                goto error;
-        unsigned int buffer_size = strlen(buffer);

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

@@ -81 +81 @@
-}
-
-SmlBool _smlXmlAssemblerAddData(SmlXmlAssembler *assm, const char *name, const char *valu
+static SmlBool _smlXmlAssemblerAddData(SmlXmlAssembler *assm, const char *name, const char *value, unsigned int siz
-{
-        int rc = 0;
@@ -88 +88 @@
-        
-        if (raw)
-(assm->writer, (xmlChar *)valu
+Len(assm->writer, (xmlChar *)value, siz
-        else
-CDATA(assm->writer
+FormatCDATA(assm->writer, "%*s", size
-        if (rc < 0) {
-                smlErrorSet(error, SML_ERROR_GENERIC, "Unable to add data");
@@ -102 +102 @@
-}
-
-
+static 
-{
-        int rc = xmlTextWriterWriteFormatElement(assm->writer, (xmlChar *)name, "%i", id);
@@ -112 +112 @@
-}
-
+static SmlBool _smlXmlAssemblerAddIDNS(SmlXmlAssembler *assm, const char *prefix, const char *name, const char *uri, unsigned int id, SmlError **error)
+{
+        int rc = xmlTextWriterWriteFormatElementNS(assm->writer, (xmlChar *)prefix, (xmlChar *)name, (xmlChar *)uri, "%i", id);
+        if (rc < 0) {
+                smlErrorSet(error, SML_ERROR_GENERIC, "Unable to add id");
+                return FALSE;
+        }
+        return TRUE;
+}
+
-SmlBool smlLocationAssemble(SmlLocation *location, SmlXmlAssembler *assm, const char *name, SmlError **error)
-{
@@ -184 +194 @@
-}
-
-
-
-p)", __func__, item, assm, raw
+unsigned int complete_size, 
+
+i, %p)", __func__, item, assm, raw, complete_size
-        smlAssert(assm);
-        smlAssert(item);
-
+
+
+
+
+
+
-        if (!_smlXmlAssemblerStartNode(assm, SML_ELEMENT_ITEM, error))
-                goto error;
-        
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-        
@@ -257 +302 @@
-                goto error;
-        
-
+strlen(cred->data), 
-                goto error;
-        
@@ -302 +347 @@
-                goto error;
-        
-
+0, 
-                goto error;
-        
@@ -340 +385 @@
-                goto error;
-        
+        /*if (change->size) {
+                if (!_smlXmlAssemblerAddID(assm, SML_ELEMENT_SIZE, change->size, error))
+                        goto error;
+        }*/
+
-        //META
-        if (!_smlXmlAssemblerEndNode(assm, error))
@@ -350 +400 @@
-        }
-        
-
+change->size, 
-                goto error;
-        
@@ -371 +421 @@
-                goto error;
-        }
+        
+        
+        if (!_smlXmlAssemblerStartNode(assm, SML_ELEMENT_META, error))
+                goto error;
+        
+        if (!_smlXmlAssemblerAddIDNS(assm, NULL, SML_ELEMENT_MAXOBJSIZE, SML_NAMESPACE_METINF, 786432, error))
+                goto error;
+        
+        //META
+        if (!_smlXmlAssemblerEndNode(assm, error))
+                goto error;
-        
-        if (!smlLocationAssemble(cmd->target, assm, SML_ELEMENT_TARGET, error))
@@ -834 +895 @@
-                goto error;
-        }
-
+
+
+
-        xmlBufferFree(cmd->buffer);
-        g_free(cmd);
@@ -1010 +1073 @@
-        switch (status->type) {
-                case SML_COMMAND_TYPE_ALERT:
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-                                
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                        break;
-                case SML_COMMAND_TYPE_HEADER:
@@ -1076 +1141 @@
-                                goto error;
-                        
-
+0, 
-                                goto error;
-                        break;
@@ -1206 +1271 @@
-        flush_list(assm->commands);
-        assm->commands = NULL;
+        
+        assm->moreDataSet = FALSE;
-        
-        smlTrace(TRACE_EXIT, "%s: %i", __func__, newid);
@@ -1526 +1593 @@
-}
-
-, SmlError **error
-
-, %p)", __func__, assm, cmdRef, msgRef, error
+
+
+)", __func__, assm, cmdRef, msgRef
-        smlAssert(assm);
-        smlAssert(cmdRef);

branches/development-branch/libsyncml/parser/sml_xml_assm_internals.h

@@ -69 +69 @@
-        unsigned int reserved_statuses;
-        unsigned int added_statuses;
+        
+        SmlBool moreDataSet;
-};
-

branches/development-branch/libsyncml/parser/sml_xml_parse.c

@@ -29 +29 @@
-#include "sml_xml_parse_internals.h"
-
+#define BUFFER_SIZE 500
+
-/**
- * @defgroup Parser SyncML XML Parser
@@ -37 +39 @@
-/*@{*/
-
-
+static 
-{
-        SmlBool ret = FALSE;
-        do {
-xmlTextReaderRead(parser->reader) == 1
+(xmlTextReaderRead(parser->reader) == 1)
-        } while (ret && (xmlTextReaderNodeType(parser->reader) == XML_READER_TYPE_DOCUMENT_TYPE || \
-                xmlTextReaderNodeType(parser->reader) == XML_READER_TYPE_WHITESPACE || \
@@ -49 +51 @@
-}
-
-
+static 
-{
-        if (!_smlXmlParserStep(parser)) {
@@ -91 +93 @@
-}
-
-
+static 
-{
-        smlAssert(parser);
@@ -115 +117 @@
-}
-
-
+static 
-{
-        smlAssert(parser);
@@ -150 +152 @@
-}
-
-
+static 
-{
-        smlAssert(parser);
@@ -161 +163 @@
-        }
-        
-
+
+
-        if (!buffer) {
-                smlErrorSet(error, SML_ERROR_GENERIC, "Unable to create new buffer");
@@ -221 +224 @@
-        *string = (char *)xmlBufferContent(buffer);
-        if (size)
-
-
-
+
-        
-        //Hack to avoid memory copy
@@ -313 +314 @@
-
-
-
+static 
-{
-        smlTrace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, location, parser, error);
@@ -375 +376 @@
-}
-
-
+static 
-{
-        smlTrace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, anchor, parser, error);
@@ -433 +434 @@
-}
-
-SmlBool _smlCommandMetaParse(SmlXmlParser *parser, char **format, char **type, SmlAnchor **anchor
-
-)", __func__, parser, format, type, anchor
+static SmlBool _smlCommandMetaParse(SmlXmlParser *parser, char **format, char **type, SmlAnchor **anchor, unsigned int *size
+
+, %p)", __func__, parser, format, type, anchor, size
-        smlAssert(parser);
-                
@@ -461 +462 @@
-                        if (!_smlXmlParserGetString(parser, format, SML_ELEMENT_FORMAT, error))
-                                goto error;
+                } else if (size && !strcmp((char *)xmlTextReaderConstName(parser->reader), SML_ELEMENT_SIZE)) {
+                        if (!_smlXmlParserGetID(parser, size, SML_ELEMENT_SIZE, error))
+                                goto error;
-                } else {
-                        smlErrorSet(error, SML_ERROR_GENERIC, "wrong initial node: %s", xmlTextReaderConstName(parser->reader));
@@ -481 +485 @@
-}
-
-
+static 
-{
-        smlTrace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, parser, maxobjsize, error);
@@ -519 +523 @@
-}
-
-
+static 
-{
-        smlTrace(TRACE_ENTRY, "%s(%p, %p, %i, %p)", __func__, parser, cmd, type, error);
-        smlAssert(parser);
-        
-
+
+
+
+
+
+
-        if (!item)
-                goto error;
-        
+        if (!_smlXmlParserStep(parser)) {
+                smlErrorSet(error, SML_ERROR_GENERIC, "Missing nodes");
+                goto error_free_item;
+        }
+        
-        while (1) {
-                if (!_smlXmlParserStep(parser)) {
-                        smlErrorSet(error, SML_ERROR_GENERIC, "Missing nodes");
-                        goto error_free_item;
-                }
-                
-                if (!strcmp((char *)xmlTextReaderConstName(parser->reader), SML_ELEMENT_ITEM) && \
-                xmlTextReaderNodeType(parser->reader) == XML_NODE_CLOSE) {
@@ -543 +552 @@
-                
-                if (!strcmp((char *)xmlTextReaderConstName(parser->reader), SML_ELEMENT_SOURCE)) {
-
+
+
-                                goto error_free_item;
+                        
+                        smlItemSetSource(item, source);
+                        smlLocationUnref(source);
-                } else if (!strcmp((char *)xmlTextReaderConstName(parser->reader), SML_ELEMENT_TARGET)) {
-
+
+
-                                goto error_free_item;
+                        
+                        smlItemSetTarget(item, target);
+                        smlLocationUnref(target);
-                } else if (!strcmp((char *)xmlTextReaderConstName(parser->reader), SML_ELEMENT_META)) {
-                        switch (type) {
-                                case SML_COMMAND_TYPE_ALERT:
-
+
+
+
+
+
+
-                                                goto error_free_item;
-                                        break;
@@ -566 +588 @@
-                                        }
-                                        
-
+
+
-                                                goto error_free_item;
+                                        
+                                        item->anchor = anchor;
-                                        
-                                        if (!_smlXmlParserStep(parser)) {
@@ -574 +599 @@
-                                        }
-                                        break;
-
-
+
+
+
+
-                                                goto error_free_item;
+                                        
+                                        if (!smlItemAddData(item, data, size, error)) {
+                                                g_free(data);
+                                                goto error_free_item;
+                                        }
+                                        
+                                        g_free(data);
-                        }
+                } else if (!strcmp((char *)xmlTextReaderConstName(parser->reader), SML_ELEMENT_MOREDATA)) {
+                        if (parser->version == SML_VERSION_10) {
+                                smlErrorSet(error, SML_ERROR_GENERIC, "SyncML 1.0 does not allow MoreData");
+                                goto error_free_item;
+                        }
+                        
+                        item->moreData = TRUE;
+                        parser->gotMoreData = TRUE;
+                        if (!_smlXmlParserStep(parser)) {
+                                smlErrorSet(error, SML_ERROR_GENERIC, "Missing nodes2");
+                                goto error_free_item;
+                        }
+                        
+                        if (!strcmp((char *)xmlTextReaderConstName(parser->reader), SML_ELEMENT_MOREDATA) && \
+                                xmlTextReaderNodeType(parser->reader) == XML_NODE_CLOSE) {
+                                if (!_smlXmlParserStep(parser)) {
+                                        smlErrorSet(error, SML_ERROR_GENERIC, "Missing nodes3");
+                                        goto error_free_item;
+                                }
+                        }
+                        continue;
-                } else {
-                        smlErrorSet(error, SML_ERROR_GENERIC, "wrong initial node %s", xmlTextReaderConstName(parser->reader));
-                        goto error_free_item;
-                }
+                
+                if (!_smlXmlParserStep(parser)) {
+                        smlErrorSet(error, SML_ERROR_GENERIC, "Missing nodes");
+                        goto error_free_item;
+                }
-        }
-        
@@ -588 +648 @@
-
-error_free_item:
-Free
+Unref
-error:
-        smlTrace(TRACE_EXIT_ERROR, "%s: %s", __func__, smlErrorPrint(error));
@@ -594 +654 @@
-}
-
-
+static 
-{
-        smlTrace(TRACE_ENTRY, "%s(%p, %p)", __func__, parser, error);
@@ -620 +680 @@
-                
-                if (!strcmp((char *)xmlTextReaderConstName(parser->reader), SML_ELEMENT_META)) {
-
+NULL, 
-                                goto error_free_cred;
-                } else if (!strcmp((char *)xmlTextReaderConstName(parser->reader), SML_ELEMENT_DATA)) {
@@ -677 +737 @@
-        smlAssert(name);
-        char *contenttype = NULL;
-        SmlItem *item = NULL;
-        
-        *cmd = smlCommandNew(type, error);
@@ -702 +761 @@
-                                goto error_free_cmd;
-                } else if (!strcmp((char *)xmlTextReaderConstName(parser->reader), SML_ELEMENT_ITEM)) {
-item = _smlItemParse(parser, *cmd, SML_COMMAND_TYPE_SYNC
-
+(*cmd)->private.change.item = _smlItemParse(parser, *cmd, type
+(*cmd)->private.change.
-                                goto error_free_cmd;
-                } else if (!strcmp((char *)xmlTextReaderConstName(parser->reader), SML_ELEMENT_META)) {
-
+&(*cmd)->size, 
-                                goto error_free_cmd;
-                } else {
@@ -719 +778 @@
-        }
-        
-
+(*cmd)->private.change.
-                smlErrorSet(error, SML_ERROR_GENERIC, "No item set");
-                goto error_free_cmd;
@@ -725 +784 @@
-        
-        if (contenttype) {
-
-
-
-
-
-
+
+
+
+
+
+
+
-        
-        switch (type) {
@@ -747 +807 @@
-        }
-        
-
-
+(*cmd)->private.change.
+(*cmd)->private.change.
-                if (!(*cmd)->source)
-                        goto error_free_cmd;
-        }
-        
-
-
+(*cmd)->private.change.
+(*cmd)->private.change.
-                if (!(*cmd)->target)
-                        goto error_free_cmd;
@@ -776 +836 @@
-        if (contenttype)
-                g_free(contenttype);
-
-
+
-        smlTrace(TRACE_EXIT_ERROR, "%s: %s", __func__, smlErrorPrint(error));
-        return FALSE;
@@ -868 +927 @@
-                        item->source = NULL;
-                        
-Free
+Unref
-                } else if (!strcmp((char *)xmlTextReaderConstName(parser->reader), SML_ELEMENT_DATA)) {
-                        if (!_smlXmlParserGetID(parser, &((*cmd)->private.alert.type), SML_ELEMENT_DATA, error))
@@ -964 +1023 @@
-}
-
-
+static 
-{
-        smlTrace(TRACE_ENTRY, "%s(%p, %p)", __func__, parser, error);
@@ -1116 +1175 @@
-                } else if (!strcmp((char *)xmlTextReaderConstName(parser->reader), SML_ELEMENT_META)) {
-                        char *format = NULL;
-
+NULL, 
-                                goto error_free_cmd;
-                        g_free(format);
@@ -1244 +1303 @@
-        if (strcmp((char *)xmlTextReaderConstName(parser->reader), SML_ELEMENT_SYNCBODY) || \
-                xmlTextReaderNodeType(parser->reader) != XML_NODE_CLOSE) {
-s
+
-                goto error;
-        }
@@ -1290 +1349 @@
-                goto error;
-        }
+        
+        parser->version = SML_VERSION_UNKNOWN;
-        
-        *header = smlTryMalloc0(sizeof(SmlHeader), error);
@@ -1312 +1373 @@
-                        if (!_smlSyncHeaderParseDTD(&((*header)->version), parser, error))
-                                goto error_free_header;
+                        parser->version = (*header)->version;
-                } else if (!strcmp((char *)xmlTextReaderConstName(parser->reader), SML_ELEMENT_VERPROTO)) {
-                        if (!_smlSyncHeaderParseProto(&((*header)->protocol), parser, error))
@@ -1508 +1570 @@
-        if (item && (*status)->type != SML_COMMAND_TYPE_ALERT) {
-                smlErrorSet(error, SML_ERROR_GENERIC, "Got wrong item");
-Free
+Unref
-                goto error_free_status;
-        }
@@ -1515 +1577 @@
-                (*status)->anchor = item->anchor;
-                item->anchor = NULL;
-Free
+Unref