Changeset 506

Timestamp:

07/22/08 16:48:46 (4 months ago)

Author:

bellmich

Message:

- fixed several compiler warnings
- removed unnecessary include in nokia_6230 test

Files:

• trunk/libsyncml/parser/sml_xml_assm.c (modified) (3 diffs)
• trunk/libsyncml/transports/obex_server.c (modified) (1 diff)
• trunk/tests/check_devinf.c (modified) (1 diff)
• trunk/tests/check_ds.c (modified) (1 diff)
• trunk/tests/check_manager.c (modified) (1 diff)
• trunk/tests/check_san.c (modified) (1 diff)
• trunk/tests/check_session.c (modified) (2 diffs)
• trunk/tests/mobiles/nokia_6230.c (modified) (1 diff)
• trunk/tests/mobiles/obex_mobile_ds_server.c (modified) (1 diff)

trunk/libsyncml/parser/sml_xml_assm.c

@@ -133 +133 @@
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-{
-        smlTrace(TRACE_ENTRY, "%s(%p)", __func__, assm);
@@ -604 +164 @@
-}
-
-
+static 
-{
-        smlTrace(TRACE_ENTRY, "%s(%p)", __func__, assm);
@@ -629 +189 @@
-                goto error;
-
+        smlTrace(TRACE_EXIT, "%s", __func__);
+        return TRUE;
+
+error:
+        smlTrace(TRACE_EXIT_ERROR, "%s: %s", __func__, smlErrorPrint(error));
+        return FALSE;
+}
+
+SmlBool smlLocationAssemble(SmlLocation *location, SmlXmlAssembler *assm, const char *name, SmlError **error)
+{
+        smlTrace(TRACE_ENTRY, "%s(%p, %p, %s, %p)", __func__, location, assm, name, error);
+        smlAssert(assm);
+        smlAssert(location);
+        
+        if (name) {
+                if (!_smlXmlAssemblerStartNode(assm, name, error))
+                        goto error;
+        }
+        
+        if (!location->locURI) {
+                smlErrorSet(error, SML_ERROR_GENERIC, "No locURI set");
+                goto error;
+        }
+        
+        if (!_smlXmlAssemblerAddString(assm, SML_ELEMENT_LOCURI, location->locURI, error))
+                goto error;
+        
+        if (location->locName) {
+                if (!_smlXmlAssemblerAddString(assm, SML_ELEMENT_LOCNAME, location->locName, error))
+                        goto error;
+        }
+        
+        if (name) {
+                if (!_smlXmlAssemblerEndNode(assm, error))
+                        goto error;
+        }
+        
+        smlTrace(TRACE_EXIT, "%s", __func__);
+        return TRUE;
+
+error:
+        smlTrace(TRACE_EXIT_ERROR, "%s: %s", __func__, smlErrorPrint(error));
+        return FALSE;
+}
+
+
+
+SmlBool smlAnchorAssemble(SmlAnchor *anchor, SmlXmlAssembler *assm, SmlError **error)
+{
+        smlTrace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, anchor, assm, error);
+        smlAssert(assm);
+        smlAssert(anchor);
+
+        /* Start the anchor and switch to syncml:metinf namespace.
+         * It is not possible to remove the namespace from Last and
+         * Next because otherwise the Status commands could be longer
+         * then the Alert commands. If this would happen then the
+         * Status commands alone could be longer than MaxMsgSize.
+         *
+         * It is not sure how a mobile would react in this situation.
+         */
+        if (!_smlXmlAssemblerStartNodeNS(assm, SML_ELEMENT_ANCHOR, SML_NAMESPACE_METINF, error))
+                goto error;
+        
+        if (!anchor->next) {
+                smlErrorSet(error, SML_ERROR_GENERIC, "No next set");
+                goto error;
+        }
+        
+        /* SyncML Meta-Information DTD 1.1, Page 6, 5.1 Anchor - Content Model: (Last?, Next)
+           Last is optional, don't write a empty Last node.
+         */ 
+        if (anchor->last) {
+                if (!_smlXmlAssemblerAddStringNS(assm, SML_ELEMENT_LAST, SML_NAMESPACE_METINF, anchor->last, error))
+                        goto error;
+                
+        }
+        
+        if (!_smlXmlAssemblerAddStringNS(assm, SML_ELEMENT_NEXT, SML_NAMESPACE_METINF, anchor->next, error))
+                goto error;
+        
+        if (!_smlXmlAssemblerEndNode(assm, error))
+                goto error;
+        
+        smlTrace(TRACE_EXIT, "%s", __func__);
+        return TRUE;
+
+error:
+        smlTrace(TRACE_EXIT_ERROR, "%s: %s", __func__, smlErrorPrint(error));
+        return FALSE;
+}
+
+SmlBool smlItemAssemble(SmlItem *item, SmlXmlAssembler *assm, SmlError **error)
+{
+        smlTrace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, item, assm, error);
+        smlAssert(assm);
+        smlAssert(item);
+        
+        if (assm->moreDataSet) {
+                smlErrorSet(error, SML_ERROR_GENERIC, "Trying to start a new item while last item had more data");
+                goto error;
+        }
+
+        /* Begin of Item */
+        if (!_smlXmlAssemblerStartNode(assm, SML_ELEMENT_ITEM, error))
+                goto error;
+
+        /* Target */
+        if (smlItemGetTarget(item)) {
+                if (!smlLocationAssemble(smlItemGetTarget(item), assm, SML_ELEMENT_TARGET, error))
+                        goto error;
+        }
+
+        /* Source */
+        if (smlItemGetSource(item)) {
+                if (!smlLocationAssemble(smlItemGetSource(item), assm, SML_ELEMENT_SOURCE, error))
+                        goto error;
+        }
+
+        /* SourceParent */
+
+        /* TargetParent */
+
+        /* Data */
+        if (smlItemHasData(item)) {
+                if (item->disabled) {
+                        if (!_smlXmlAssemblerAddData(assm, SML_ELEMENT_DATA, "", 0, item->raw, error))
+                                goto error;
+                } else {
+                        char *data = NULL;
+                        unsigned int size = 0;
+                        if (!smlItemGetData(item, &data, &size, error))
+                                goto error;
+                        
+                        if (!_smlXmlAssemblerAddData(assm, SML_ELEMENT_DATA, data, size, item->raw, error))
+                                goto error;
+                }
+        }
+
+        /* MoreData */
+        if (item->moreData) {
+                if (!_smlXmlAssemblerAddString(assm, SML_ELEMENT_MOREDATA, "", error))
+                        goto error;
+                
+                assm->moreDataSet = TRUE;
+        }
+
+        /* End of Item */
+        if (!_smlXmlAssemblerEndNode(assm, error))
+                goto error;
+        
+        smlTrace(TRACE_EXIT, "%s", __func__);
+        return TRUE;
+
+error:
+        smlTrace(TRACE_EXIT_ERROR, "%s: %s", __func__, smlErrorPrint(error));
+        return FALSE;
+}
+
+SmlBool smlCredAssemble(SmlCred *cred, SmlXmlAssembler *assm, SmlError **error)
+{
+        smlTrace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, cred, assm, error);
+        smlAssert(assm);
+        smlAssert(cred);
+                
+        if (!_smlXmlAssemblerStartNode(assm, SML_ELEMENT_CRED, error))
+                goto error;
+        
+        //Meta
+        if (!_smlXmlAssemblerStartNode(assm, SML_ELEMENT_META, error))
+                goto error;
+        
+        switch (cred->format) {
+                case SML_FORMAT_TYPE_BASE64:
+                        if (!_smlXmlAssemblerAddStringNS(assm, SML_ELEMENT_FORMAT, SML_NAMESPACE_METINF, SML_BASE64, error))
+                                goto error;
+                        break;
+                default:
+                        smlErrorSet(error, SML_ERROR_GENERIC, "SyncML credential: Unknown format %d.", cred->format);
+                        goto error;
+        }
+        
+        switch (cred->type) {
+                case SML_AUTH_TYPE_BASIC:
+                        if (!_smlXmlAssemblerAddStringNS(assm, SML_ELEMENT_TYPE, SML_NAMESPACE_METINF, SML_AUTH_BASIC, error))
+                                goto error;
+                        break;
+                case SML_AUTH_TYPE_MD5:
+                        if (!_smlXmlAssemblerAddStringNS(assm, SML_ELEMENT_TYPE, SML_NAMESPACE_METINF, SML_AUTH_MD5, error))
+                                goto error;
+                        break;
+                default:
+                        smlErrorSet(error, SML_ERROR_GENERIC, "Unknown format");
+                        goto error;
+        }
+        
+        //META
+        if (!_smlXmlAssemblerEndNode(assm, error))
+                goto error;
+        
+        if (!_smlXmlAssemblerAddData(assm, SML_ELEMENT_DATA, cred->data, strlen(cred->data), TRUE, error))
+                goto error;
+        
+        if (!_smlXmlAssemblerEndNode(assm, error))
+                goto error;
+        
+        smlTrace(TRACE_EXIT, "%s", __func__);
+        return TRUE;
+
+error:
+        smlTrace(TRACE_EXIT_ERROR, "%s: %s", __func__, smlErrorPrint(error));
+        return FALSE;
+}
+
+SmlBool smlAccessAssemble(SmlXmlAssembler *assm, SmlCommand *change, SmlError **error)
+{
+        smlTrace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, assm, change, error);
+        smlAssert(change);
+        smlAssert(assm);
+        
+        if (!change->private.access.item) {
+                smlErrorSet(error, SML_ERROR_GENERIC, "Missing item");
+                goto error;
+        }
+        
+        if (!change->private.access.item->contenttype) {
+                smlErrorSet(error, SML_ERROR_GENERIC, "Missing contenttype");
+                goto error;
+        }
+        
+        //Meta
+        if (!_smlXmlAssemblerStartNode(assm, SML_ELEMENT_META, error))
+                goto error;
+        
+        if (!_smlXmlAssemblerAddStringNS(assm, SML_ELEMENT_TYPE, SML_NAMESPACE_METINF, change->private.access.item->contenttype, error))
+                goto error;
+        
+        //META
+        if (!_smlXmlAssemblerEndNode(assm, error))
+                goto error;
+        
+        if (!smlItemAssemble(change->private.access.item, assm, error))
+                goto error;
+        
+        smlTrace(TRACE_EXIT, "%s", __func__);
+        return TRUE;
+
+error:
+        smlTrace(TRACE_EXIT_ERROR, "%s: %s", __func__, smlErrorPrint(error));
+        return FALSE;
+}
+
+SmlBool smlChangeAssemble(SmlXmlAssembler *assm, SmlCommand *change, SmlError **error)
+{
+        smlTrace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, assm, change, error);
+        smlAssert(change);
+        smlAssert(assm);
+        
+        if (!change->private.change.items ||
+            !g_list_length(change->private.change.items)) {
+                smlErrorSet(error, SML_ERROR_GENERIC, "Missing items");
+                goto error;
+        }
+
+        /* libsyncml only supports one item per change command */
+        smlAssert(g_list_length(change->private.change.items) == 1);
+        SmlItem *item = g_list_nth_data(change->private.change.items, 0);
+
+        if (!item) {
+                smlErrorSet(error, SML_ERROR_GENERIC, "One item of the item list is NULL.");
+                goto error;
+        }
+        if (!item->contenttype) {
+                smlErrorSet(error, SML_ERROR_GENERIC, "Missing contenttype");
+                goto error;
+        }
+        
+        //Meta
+        if (!_smlXmlAssemblerStartNode(assm, SML_ELEMENT_META, error))
+                goto error;
+        
+        if (!_smlXmlAssemblerAddStringNS(assm, SML_ELEMENT_TYPE, SML_NAMESPACE_METINF, item->contenttype, error))
+                goto error;
+        
+        /* We will add the max obj size node, if USE_LARGEOBJECTS is true or not set at all.
+         * And the remote side must have set a maxobjsize if we are a server */
+        const char *opt = smlAssemblerGetOption(assm->assembler, "USE_LARGEOBJECTS");
+        SmlBool supportsLargeObjects = (opt && !atoi(opt)) ? FALSE : TRUE;
+        
+        smlTrace(TRACE_INTERNAL, "Large object: use %i, server %i, requestedSize %i", supportsLargeObjects, assm->session->sessionType == SML_SESSION_TYPE_SERVER ? 1 : 0, smlAssemblerGetRemoteMaxObjSize(assm->assembler));
+        
+        if (assm->session->sessionType == SML_SESSION_TYPE_SERVER) {
+                if (smlAssemblerGetRemoteMaxObjSize(assm->assembler) == -1)
+                        supportsLargeObjects = FALSE;
+        }
+        
+        if (supportsLargeObjects && change->size) {
+                if (!_smlXmlAssemblerAddIDNS(assm, SML_ELEMENT_SIZE, SML_NAMESPACE_METINF, change->size, error))
+                        goto error;
+        }
+
+        //META
+        if (!_smlXmlAssemblerEndNode(assm, error))
+                goto error;
+
+        //Item(s)
+        opt = smlAssemblerGetOption(assm->assembler, "ONLY_REPLACE");
+        if (opt && atoi(opt) && change->type == SML_COMMAND_TYPE_ADD) {
+                if (item->target)
+                        smlLocationUnref(item->target);
+                item->target = item->source;
+                item->source = NULL;
+        }
+        
+        if (!smlItemAssemble(item, assm, error))
+                goto error;
+        
+        smlTrace(TRACE_EXIT, "%s", __func__);
+        return TRUE;
+
+error:
+        smlTrace(TRACE_EXIT_ERROR, "%s: %s", __func__, smlErrorPrint(error));
+        return FALSE;
+}
+
+SmlBool smlSyncAssemble(SmlXmlAssembler *assm, SmlCommand *cmd, SmlError **error)
+{
+        smlTrace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, assm, cmd, error);
+        smlAssert(cmd);
+        smlAssert(assm);
+        
+        if (!cmd->target) {
+                smlErrorSet(error, SML_ERROR_GENERIC, "No target set");
+                goto error;
+        }
+        
+        /* The specification OMA DS Protocol v1.2 allows to add
+         * MaxObjsize to Alert or Sync commands but all examples show
+         * it only in Alert commands. Therefore libsyncml adds it to
+         * Alert commands only.
+         */
+
+        if (!smlLocationAssemble(cmd->target, assm, SML_ELEMENT_TARGET, error))
+                goto error;
+        
+        if (!cmd->source) {
+                smlErrorSet(error, SML_ERROR_GENERIC, "No source set");
+                goto error;
+        }
+        
+        if (!smlLocationAssemble(cmd->source, assm, SML_ELEMENT_SOURCE, error))
+                goto error;
+
+        if (_smlAssembleUseMaxObjSize(assm))
+        {
+                if (!_smlXmlAssemblerStartNode(assm, SML_ELEMENT_META, error))
+                        goto error;
+
+                if (!_smlAssembleMaxObjSize(assm, error))
+                        goto error;
+
+                if (!_smlXmlAssemblerEndNode(assm, error))
+                        goto error;
+        }
+
+        const char *opt = smlAssemblerGetOption(assm->assembler, "USE_NUMBEROFCHANGES");
+        SmlBool supportsNumberOfChanges = (opt && !atoi(opt)) ? FALSE : TRUE;
+        if (supportsNumberOfChanges && assm->session->version != SML_VERSION_10) {
+                if (!_smlXmlAssemblerAddID(assm, SML_ELEMENT_NUMBEROFCHANGES, cmd->private.sync.numChanged, error))
+                        goto error;
+        }
+        
+        smlTrace(TRACE_EXIT, "%s", __func__);
+        return TRUE;
+
+error:
+        smlTrace(TRACE_EXIT_ERROR, "%s: %s", __func__, smlErrorPrint(error));
+        return FALSE;
+}
+
+SmlBool smlMapItemAssemble(SmlXmlAssembler *assm, SmlMapItem *item, SmlError **error)
+{
+        smlTrace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, assm, item, error);
+        smlAssert(assm);
+        smlAssert(item);
+                
+        if (!_smlXmlAssemblerStartNode(assm, SML_ELEMENT_MAPITEM, error))
+                goto error;
+        
+        if (item->source) {
+                if (!smlLocationAssemble(item->source, assm, SML_ELEMENT_SOURCE, error))
+                        goto error;
+        }
+        
+        if (item->target) {
+                if (!smlLocationAssemble(item->target, assm, SML_ELEMENT_TARGET, error))
+                        goto error;
+        }
+        
+        //MapItem
+        if (!_smlXmlAssemblerEndNode(assm, error))
+                goto error;
+        
+        smlTrace(TRACE_EXIT, "%s", __func__);
+        return TRUE;
+
+error:
+        smlTrace(TRACE_EXIT_ERROR, "%s: %s", __func__, smlErrorPrint(error));
+        return FALSE;
+}
+
+SmlBool smlMapAssemble(SmlXmlAssembler *assm, SmlCommand *cmd, SmlError **error)
+{
+        smlTrace(TRACE_ENTRY, "%s(%p, %p, %p, %p)", __func__, assm, cmd, error);
+        smlAssert(cmd);
+        smlAssert(assm);
+        
+        if (!cmd->target) {
+                smlErrorSet(error, SML_ERROR_GENERIC, "No target set");
+                goto error;
+        }
+        
+        if (!smlLocationAssemble(cmd->target, assm, SML_ELEMENT_TARGET, error))
+                goto error;
+        
+        if (!cmd->source) {
+                smlErrorSet(error, SML_ERROR_GENERIC, "No source set");
+                goto error;
+        }
+        
+        if (!smlLocationAssemble(cmd->source, assm, SML_ELEMENT_SOURCE, error))
+                goto error;
+                
+        GList *m = NULL;
+        for (m = cmd->private.map.items; m; m = m->next) {
+                SmlMapItem *item = m->data;
+                if (!smlMapItemAssemble(assm, item, error))
+                        goto error;
+        }
+        
-        smlTrace(TRACE_EXIT, "%s", __func__);
-        return TRUE;

trunk/libsyncml/transports/obex_server.c

@@ -651 +651 @@
-        smlAssert(data || error);
-        smlAssert(userdata);
-
+// Unused: 
-        SmlLinkObexServerEnv *linkenv = link;
-        SmlError *local_error = NULL;

trunk/tests/check_devinf.c

@@ -51 +51 @@
-                        break;
-                case SML_MANAGER_CONNECT_DONE:
+                case SML_MANAGER_SESSION_ESTABLISHED:
-                case SML_MANAGER_DISCONNECT_DONE:
-                        /* FIXME: Why is it an error if the transport layer signals correctly? */

trunk/tests/check_ds.c

@@ -452 +452 @@
-                                        smlDsSessionRecvSync(session, command, corr->dsession);
-                                        break;
+                                default:
+                                        fail("Unexpected command");
+                                        break;
-                        }
-                        break;

trunk/tests/check_manager.c

@@ -95 +95 @@
-                        break;
-                case SML_MANAGER_CONNECT_DONE:
+                case SML_MANAGER_SESSION_ESTABLISHED:
-                case SML_MANAGER_DISCONNECT_DONE:
-                        /* FIXME: Why is it an error if the transport layer signals correctly? */

trunk/tests/check_san.c

@@ -48 +48 @@
-}
-
-*
+
-{
-        smlManagerFree(manager);