Changeset 166

Timestamp:

05/21/06 13:14:08 (3 years ago)

Author:

abauer

Message:

Fixed some bugs in the unit tests

Added support for text based mimetypes

Files:

• branches/dev-branch/libsyncml/objects/sml_ds_server.c (modified) (9 diffs)
• branches/dev-branch/libsyncml/objects/sml_ds_server.h (modified) (3 diffs)
• branches/dev-branch/libsyncml/objects/sml_ds_server_internals.h (modified) (1 diff)
• branches/dev-branch/libsyncml/parser/sml_xml_assm.c (modified) (7 diffs)
• branches/dev-branch/libsyncml/parser/sml_xml_parse.c (modified) (5 diffs)
• branches/dev-branch/libsyncml/sml_command.c (modified) (14 diffs)
• branches/dev-branch/libsyncml/sml_command.h (modified) (1 diff)
• branches/dev-branch/libsyncml/sml_command_internals.h (modified) (2 diffs)
• branches/dev-branch/libsyncml/sml_defines.h (modified) (2 diffs)
• branches/dev-branch/libsyncml/sml_devinf.c (modified) (3 diffs)
• branches/dev-branch/libsyncml/sml_elements.c (modified) (1 diff)
• branches/dev-branch/libsyncml/sml_elements_internals.h (modified) (1 diff)
• branches/dev-branch/libsyncml/sml_notification.c (modified) (6 diffs)
• branches/dev-branch/libsyncml/sml_notification.h (modified) (2 diffs)
• branches/dev-branch/libsyncml/sml_notification_internals.h (modified) (1 diff)
• branches/dev-branch/libsyncml/sml_session.c (modified) (8 diffs)
• branches/dev-branch/tests/check_ds.c (modified) (31 diffs)
• branches/dev-branch/tests/check_manager.c (modified) (1 diff)
• branches/dev-branch/tests/check_san.c (modified) (5 diffs)
• branches/dev-branch/tests/check_session.c (modified) (43 diffs)
• branches/dev-branch/tests/check_sync.c (modified) (8 diffs)
• branches/dev-branch/tests/check_wbxml_assembler.c (modified) (21 diffs)
• branches/dev-branch/tests/check_xml_assembler.c (modified) (23 diffs)
• branches/dev-branch/tests/check_xml_parser.c (modified) (2 diffs)
• branches/dev-branch/tests/valgrind.supp (modified) (1 diff)
• branches/dev-branch/tools/syncml-http-server.c (modified) (13 diffs)
• branches/dev-branch/tools/syncml-obex-client.c (modified) (16 diffs)

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

@@ -171 +171 @@
-/*@{*/
-
-SmlContentType 
-
-i
+const char *
+
+s
-        smlAssert(location);
-        
@@ -183 +183 @@
-        smlLocationRef(location);
-
-type
+g_strdup(type)
-        server->servertype = SML_DS_SERVER;
-        
@@ -194 +194 @@
-}
-
-SmlContentType 
-
-i
+const char *
+
+s
-        smlAssert(location);
-        smlAssert(target);
@@ -210 +210 @@
-        smlLocationRef(target);
-
-type
+g_strdup(type)
-        server->servertype = SML_DS_CLIENT;
-        
@@ -231 +231 @@
-        if (server->target)
-                smlLocationUnref(server->target);
+        
+        if (server->contenttype)
+                g_free(server->contenttype);
-        
-        g_free(server);
@@ -265 +268 @@
-}
-
-SmlContentType 
+const char *
-{
-        smlAssert(server);
@@ -756 +759 @@
-        smlAssert(dsession);
-        
-SML_CONTENT_TYPE_UNKNOWN
+NULL
-        if (!alert)
-                goto error;
@@ -858 +861 @@
-
-//Send a change to the remote side
-SmlContentType 
-
-i
+const char *
+
+s
-        smlAssert(dsession);
-        
@@ -1010 +1013 @@
-}
-
-SmlContentType 
+const char *
-{
-        smlAssert(dsession);

branches/dev-branch/libsyncml/objects/sml_ds_server.h

@@ -34 +34 @@
-typedef SmlBool (* SmlDsSessionAlertCb) (SmlDsSession *dsession, SmlAlertType type, const char *last, const char *next, void *userdata);
-typedef void (* SmlDsSessionSyncCb) (SmlDsSession *dsession, unsigned int numchanges, void *userdata);
-SmlContentType 
+const char *
-typedef void (* SmlDsSessionWriteCb) (SmlDsSession *dsession, SmlStatus *status, const char *newuid, void *userdata);
-
-SmlContentType 
-SmlContentType 
+const char *
+const char *
-void smlDsServerFree(SmlDsServer *server);
-SmlBool smlDsServerRegister(SmlDsServer *server, SmlManager *manager, SmlError **error);
@@ -45 +45 @@
-void smlDsServerSetConnectCallback(SmlDsServer *server, SmlDsSessionConnectCb callback, void *userdata);
-const char *smlDsServerGetLocation(SmlDsServer *server);
-SmlContentType 
+const char *
-SmlDsSession *smlDsServerSendAlert(SmlDsServer *server, SmlSession *session, SmlAlertType type, const char *last, const char *next, SmlStatusReplyCb callback, void *userdata, SmlError **error);
-
@@ -57 +57 @@
-void smlDsSessionGetSync(SmlDsSession *dsession, SmlDsSessionSyncCb chgCallback, void *userdata);
-SmlBool smlDsSessionSendSync(SmlDsSession *dsession, unsigned int num_changes, SmlStatusReplyCb callback, void *userdata, SmlError **error);
-SmlContentType 
+const char *
-SmlBool smlDsSessionCloseSync(SmlDsSession *dsession, SmlError **error);
-SmlBool smlDsSessionQueueMap(SmlDsSession *dsession, const char *uid, const char *newuid, SmlError **error);
-SmlBool smlDsSessionCloseMap(SmlDsSession *dsession, SmlStatusReplyCb callback, void *userdata, SmlError **error);
-const char *smlDsSessionGetLocation(SmlDsSession *dsession);
-SmlContentType 
+const char *
-SmlDsServer *smlDsSessionGetServer(SmlDsSession *dsession);
-

branches/dev-branch/libsyncml/objects/sml_ds_server_internals.h

@@ -81 +81 @@
-        /** The target if the ds server is in client mode */
-        SmlLocation *target;
-SmlContentType 
+char *
-        SmlDsServerType servertype;
-        SmlManager *manager;

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

@@ -91 +91 @@
-        else
-                rc = xmlTextWriterWriteFormatCDATA(assm->writer, "%*s", size, (xmlChar *)value);
+                
-        if (rc < 0) {
-                smlErrorSet(error, SML_ERROR_GENERIC, "Unable to add data");
@@ -339 +340 @@
-                goto error;
-        
-
-
-
-
-
+
-                goto error;
-        
@@ -381 +378 @@
-                goto error;
-        
-
-
-
-
-
+
-                goto error;
-        
@@ -416 +409 @@
-SmlBool smlSyncAssemble(SmlXmlAssembler *assm, SmlCommand *cmd, SmlError **error)
-{
-, %p
+
-        smlAssert(cmd);
-        smlAssert(assm);
@@ -566 +559 @@
-        }
-        
- != SML_CONTENT_TYPE_UNKNOWN
+
-                if (!_smlXmlAssemblerStartNode(assm, SML_ELEMENT_META, error))
-                        goto error;
-                
-                const char *contenttype = smlContentTypeToString(cmd->private.alert.contentType, error);
-                if (!contenttype)
-                        goto error;
-                        
-ontentt
+md->private.alert.contentT
-                        goto error;
-                
@@ -608 +597 @@
-        if (!_smlXmlAssemblerStartNode(assm, SML_ELEMENT_META, error))
-                goto error;
-
-
-
-
-
-
+
+
-                goto error;
-        
@@ -1475 +1460 @@
-                SmlXmlAssemblerStatus *status = b->data;
-                if (!status->buffer) {
+                        if (status->cmdRef == 0 && check) {
+                                smlErrorSet(error, SML_ERROR_GENERIC, "Reserved status 0 has not been added");
+                                goto error_free_writer;
+                        }
-                        smlTrace(TRACE_INTERNAL, "Reserved status %i is missing", status->cmdRef);
-                        missingstatus = TRUE;

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

@@ -593 +593 @@
-                                        /* Some phones send the type information for the devinf put
-                                         * not in the put itself but in the item */
-
-
-
+
-                                                goto error_free_item;
-
-
-
-
-
-
+
+
+
-                                        break;
-                                default:
@@ -811 +806 @@
-        }
-        
-
-
-
-
-
-
+
+
+
-        if ((*cmd)->size)
-                (*cmd)->private.change.item->size = (*cmd)->size;
@@ -852 +844 @@
-                goto error_free_cmd;
-        }
-        
-        if (contenttype)
-                g_free(contenttype);
-        
-        smlTrace(TRACE_EXIT, "%s: %p", __func__, *cmd);
@@ -1218 +1207 @@
-        /* We only use the content type of the put command if the item itself did not have
-         * a content type set */
-
-
-
-
-
+
+
-        
-        if (contenttype)
@@ -1335 +1321 @@
-        /* We only use the content type of the put command if the item itself did not have
-         * a content type set */
-(*cmd)->private.results.status->item->contenttype == SML_CONTENT_TYPE_UNKNOWN
+!(*cmd)->private.results.status->item->contenttype
-                if (!contenttype) {
-Pu
+Resul
-                        goto error_free_cmd;
-                }
-                
-
-
-
+
-        }
-        

branches/dev-branch/libsyncml/sml_command.c

@@ -34 +34 @@
- */
-/*@{*/
-
-
-SmlContentType smlContentTypeFromString(const char *name, SmlError **error)
-{
-        if (!name)
-                return SML_CONTENT_TYPE_UNKNOWN;
-        
-        if (!strcmp(name, SML_ELEMENT_TEXT_VCARD))
-                return SML_CONTENT_TYPE_VCARD;
-        else if (!strcmp(name, SML_ELEMENT_TEXT_VCAL))
-                return SML_CONTENT_TYPE_VCAL;
-        else if (!strcmp(name, SML_ELEMENT_DEVINF_XML))
-                return SML_CONTENT_TYPE_DEVINF_XML;
-        else if (!strcmp(name, SML_ELEMENT_TEXT_PLAIN))
-                return SML_CONTENT_TYPE_PLAIN;
-                
-        smlErrorSet(error, SML_ERROR_GENERIC, "Unknown content type \"%s\"", name);
-        return SML_CONTENT_TYPE_UNKNOWN;
-}
-
-const char *smlContentTypeToString(SmlContentType type, SmlError **error)
-{
-        switch (type) {
-                case SML_CONTENT_TYPE_VCARD:
-                        return SML_ELEMENT_TEXT_VCARD;
-                case SML_CONTENT_TYPE_VCAL:
-                        return SML_ELEMENT_TEXT_VCAL;
-                case SML_CONTENT_TYPE_DEVINF_XML:
-                        return SML_ELEMENT_DEVINF_XML;
-                case SML_CONTENT_TYPE_PLAIN:
-                        return SML_ELEMENT_TEXT_PLAIN;
-                default:
-                        ;
-        }
-                
-        smlErrorSet(error, SML_ERROR_GENERIC, "Unknown content type \"%i\"", type);
-        return NULL;
-}
-
-SmlCommandType smlCommandTypeFromString(const char *name, SmlError **error)
@@ -286 +248 @@
-}
-
-SmlContentType 
-
-i
+const char *
+
+s
-        smlAssert(cmd);
-        
@@ -303 +265 @@
-                goto error_free_cmd;
-        
-contenttype
+g_strdup(contenttype)
-        result->private.results.status->item->source = smlLocationClone(source, error);
-        
@@ -385 +347 @@
-                if (cmd->source)
-                        smlLocationUnref(cmd->source);
-       
+
-                g_free(cmd);
-        }
@@ -392 +354 @@
-}
-
-SmlContentType 
-
-i
+const char *
+
+s
-        SmlCommand *cmd = NULL;
-        
@@ -426 +388 @@
-                cmd->private.change.item->source = loc;
-        
-contenttype
+g_strdup(contenttype)
-        
-        smlTrace(TRACE_EXIT, "%s: %p", __func__, cmd);
@@ -445 +407 @@
- * @param partial_size The size of this part.
- */
-SmlContentType 
-
-i
+const char *
+
+s
-        SmlCommand *cmd = NULL;
-        
@@ -481 +443 @@
-        
-        cmd->private.change.item->moreData = TRUE;
-contenttype
+g_strdup(contenttype)
-        
-        smlTrace(TRACE_EXIT, "%s: %p", __func__, cmd);
@@ -495 +457 @@
-}
-
-SmlContentType 
-
-i
+const char *
+
+s
-        
-        SmlCommand *cmd = smlCommandNew(SML_COMMAND_TYPE_ALERT, error);
@@ -519 +481 @@
-        }
-        cmd->private.alert.type = type;
-contenttype
+g_strdup(contenttype)
-        
-        smlTrace(TRACE_EXIT, "%s: %p", __func__, cmd);
@@ -552 +514 @@
-}
-
-SmlContentType 
-
-i
+const char *
+
+s
-        
-        SmlCommand *cmd = smlCommandNew(SML_COMMAND_TYPE_PUT, error);
@@ -576 +538 @@
-        }
-        
-contenttype
+g_strdup(contenttype)
-        
-        smlTrace(TRACE_EXIT, "%s: %p", __func__, cmd);
@@ -588 +550 @@
-}
-
-SmlContentType 
-
-i
+const char *
+
+s
-        smlAssert(target);
-        
@@ -605 +567 @@
-        smlItemSetTarget(cmd->private.access.item, cmd->target);
-        
-contenttype
+g_strdup(contenttype)
-        
-        smlTrace(TRACE_EXIT, "%s: %p", __func__, cmd);

branches/dev-branch/libsyncml/sml_command.h

@@ -35 +35 @@
-void smlCommandUnref(SmlCommand *cmd);
-
-SmlContentType 
+const char *
-SmlCommand *smlCommandNewSync(SmlLocation *target, SmlLocation *source, unsigned int num_changes, SmlError **error);
-SmlContentType 
-SmlContentType 
-SmlContentType 
-SmlContentType 
-SmlContentType 
+const char *
+const char *
+const char *
+const char *
+const char *
-
-SmlCommand *smlCommandNewMap(SmlLocation *target, SmlLocation *source, SmlError **error);

branches/dev-branch/libsyncml/sml_command_internals.h

@@ -25 +25 @@
-        SmlAlertType type;
-        SmlAnchor *anchor;
-SmlContentType 
+char *
-} SmlCommandAlertPrivate;
-
@@ -99 +99 @@
-const char *smlCommandTypeToString(SmlCommandType type, SmlError **error);
-
-SmlContentType smlContentTypeFromString(const char *name, SmlError **error);
-const char *smlContentTypeToString(SmlContentType type, SmlError **error);
-
-#endif //_SML_COMMAND_INTERNALS_H_

branches/dev-branch/libsyncml/sml_defines.h

@@ -161 +161 @@
-#define SML_ELEMENT_TEXT_VCAL "text/x-vcalendar"
-#define SML_ELEMENT_TEXT_PLAIN "text/plain"
+#define SML_ELEMENT_TEXT_MESSAGE "text/x-vMessage"
-
-#define SML_ELEMENT_DEVINF_XML "application/vnd.syncml-devinf+xml"
@@ -261 +262 @@
-
-typedef enum {
-        SML_CONTENT_TYPE_UNKNOWN = 0,
-        SML_CONTENT_TYPE_VCARD = 1,
-        SML_CONTENT_TYPE_VCAL = 2,
-        SML_CONTENT_TYPE_VTODO = 3,
-        SML_CONTENT_TYPE_PLAIN= 4,
-        SML_CONTENT_TYPE_DEVINF_XML = 5
-} SmlContentType;
-
-typedef enum {
-        SML_AUTH_TYPE_UNKNOWN = 0,
-        SML_AUTH_TYPE_BASIC = 1,

branches/dev-branch/libsyncml/sml_devinf.c

@@ -532 +532 @@
-                goto error_free_data;
-        
-CONTENT_TYPE
+ELEMENT
-        if (!result) {
-                smlLocationUnref(source);
@@ -564 +564 @@
-                goto error;
-                
-CONTENT_TYPE
+ELEMENT
-        if (!cmd)
-                goto error_free_source;
@@ -605 +605 @@
-                goto error;
-                
-CONTENT_TYPE
+ELEMENT
-        if (!cmd)
-                goto error_free_target;

branches/dev-branch/libsyncml/sml_elements.c

@@ -370 +370 @@
-                        xmlBufferFree(item->buffer);
-                
+                if (item->contenttype)
+                        g_free(item->contenttype);
+                
-                g_free(item);
-                item = NULL;

branches/dev-branch/libsyncml/sml_elements_internals.h

@@ -46 +46 @@
-        unsigned int size;
-        
-SmlContentType 
+char *
-        SmlBool moreData;
-        

branches/dev-branch/libsyncml/sml_notification.c

@@ -91 +91 @@
-}
-
-SmlContentType 
+const char *
-{
-        smlTrace(TRACE_ENTRY, "%s(%p)", __func__, error);
@@ -101 +101 @@
-
-        alert->type = type;
-contenttype
+g_strdup(contenttype)
-        alert->serverURI = g_strdup(serverURI);
-
@@ -119 +119 @@
-        smlAssert(alert);
-        
+        g_free(alert->contenttype);
-        g_free(alert->serverURI);
-        g_free(alert);
@@ -215 +216 @@
-                switch (contenttype) {
-                        case 0x07:
-SML_CONTENT_TYPE_VCARD
+g_strdup(SML_ELEMENT_TEXT_VCARD)
-                                break;
-                        default:
@@ -407 +408 @@
-                
-                /* The contenttype */
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-                }
-                
@@ -544 +539 @@
-}
-
-SmlContentType 
+const char *
-{
-        smlAssert(alert);

branches/dev-branch/libsyncml/sml_notification.h

@@ -47 +47 @@
-SmlBool smlNotificationSend(SmlNotification *san, SmlTransport *tsp, SmlError **error);
-
-SmlContentType 
+const char *
-void smlNotificationFreeAlert(SmlSanAlert *alert);
-
@@ -59 +59 @@
-
-SmlAlertType smlSanAlertGetType(SmlSanAlert *alert);
-SmlContentType 
+const char *
-const char *smlSanAlertGetServerURI(SmlSanAlert *alert);
-

branches/dev-branch/libsyncml/sml_notification_internals.h

@@ -34 +34 @@
-struct SmlSanAlert {
-        SmlAlertType type;
-SmlContentType 
+char *
-        char *serverURI;
-};

branches/dev-branch/libsyncml/sml_session.c

@@ -212 +212 @@
-                        smlLocationRef(frag_cmd->private.change.item->source);
-                
-orig_cmd->private.change.item->contenttype
+g_strdup(orig_cmd->private.change.item->contenttype)
-                
-                if (start == 0)
@@ -226 +226 @@
-                if (!orig_cmd->private.change.item)
-                        goto error;
-orig_item->contenttype
+g_strdup(orig_item->contenttype)
-                
-                orig_cmd->private.change.item->target = orig_item->target;
@@ -347 +347 @@
-                case SML_ASSEMBLER_RESULT_OK:
-                        /* We successfully added the command */
+                        cmd->pushedBack = FALSE;
-                        break;
-                case SML_ASSEMBLER_RESULT_MISMATCH:
@@ -501 +502 @@
-                        }
-                        break;
-                /*case SML_SESSION_RESULT:
-                        if (!status->pendingReply) {
-                                pending = smlTryMalloc0(sizeof(SmlPendingStatus), &error);
-                                if (!pending)
-                                        goto error;
-                                
-                                pending->callback = sesscmd->callback;
-                                pending->userdata = sesscmd->callbackUserdata;
-                                pending->cmdID = session->lastCommandID;
-                                pending->msgID = session->lastMessageID;
-                                
-                                status->pendingReply = pending;
-                                session->pendingReplies = g_list_append(session->pendingReplies, pending);
-                                
-                                smlTrace(TRACE_INTERNAL, "Appending pending result status with cmdID %i and msgID %i", status->pendingReply->cmdID, status->pendingReply->msgID);
-                        }
-                        status->cmdID = session->lastCommandID;
-                        
-                        session->lastCommandID++;
-                        
-                        switch (smlAssemblerAddStatus(session->assembler, status, &error)) {
-                                case SML_ASSEMBLER_RESULT_OK:
-                                        break;
-                                case SML_ASSEMBLER_RESULT_MISMATCH:
-                                        if (!_smlSessionFlushInternal(session, FALSE, &error)) {
-                                                session->lastCommandID--;
-                                                goto error;
-                                        }
-                                        
-                                        smlQueuePushHead(session->command_queue, message);
-                                        return;
-                                        break;
-                                case SML_ASSEMBLER_RESULT_ERROR:
-                                        goto error;
-                        }
-                        break;*/
-                case SML_SESSION_STATUS:;
-                        unsigned int cmdRef, msgRef = 0;
@@ -623 +588 @@
-SmlBool smlSessionDispatchStatus(SmlSession *session, SmlStatus *status, SmlError **error)
-{
-, %p
+
-        smlAssert(status);
-        
@@ -910 +875 @@
-        session->waiting = FALSE;
-        
+        /* We have to wait at this point until no status are pending anymore
+         * if we have a incoming buffer. if there is a incoming buffer for large objs open,
+         * the other side expects to see the status for the open buffer of course. so we have to
+         * wait here for all open statuses, since they have to be added in the correct order and
+         * the status for the open buffer is obviously last */
-        if (session->incomingBuffer || session->noPendingReplies) {
-                while (1) {
@@ -920 +890 @@
-                        int i = 0;
-                        unsigned int num = smlQueueLengthPrio(session->command_queue);
-                        smlTrace(TRACE_INTERNAL, "Now dispatching %i statuses2", num);
-                        while (!session->waiting && smlQueueCheckPrio(session->command_queue) && i < num) {
-                                smlSessionDispatch(session);
@@ -964 +933 @@
-                if (smlAssemblerIsEmpty(session->assembler)) {
-                        /* The assembler is empty so we need to add an alert */
-SML_CONTENT_TYPE_UNKNOWN
+NULL
-                        if (!alert)
-                                goto error_free_cmd;