Changeset 170

Timestamp:

05/24/06 16:46:47 (2 years ago)

Author:

abauer

Message:

Merged the dev branch into the 6230 branch

svn merge -r 159:169 dev-branch/ 6230-branch/

Files:

• branches/6230-branch/devices.txt (added)
• branches/6230-branch/libsyncml/objects/sml_auth.c (modified) (4 diffs)
• branches/6230-branch/libsyncml/objects/sml_devinf_obj.c (modified) (6 diffs)
• branches/6230-branch/libsyncml/objects/sml_devinf_obj.h (modified) (1 diff)
• branches/6230-branch/libsyncml/objects/sml_devinf_obj_internals.h (modified) (1 diff)
• branches/6230-branch/libsyncml/objects/sml_ds_server.c (modified) (9 diffs)
• branches/6230-branch/libsyncml/objects/sml_ds_server.h (modified) (3 diffs)
• branches/6230-branch/libsyncml/objects/sml_ds_server_internals.h (modified) (1 diff)
• branches/6230-branch/libsyncml/parser/sml_wbxml.c (modified) (2 diffs)
• branches/6230-branch/libsyncml/parser/sml_xml_assm.c (modified) (30 diffs)
• branches/6230-branch/libsyncml/parser/sml_xml_parse.c (modified) (15 diffs)
• branches/6230-branch/libsyncml/parser/sml_xml_parse.h (modified) (1 diff)
• branches/6230-branch/libsyncml/sml_command.c (modified) (15 diffs)
• branches/6230-branch/libsyncml/sml_command.h (modified) (2 diffs)
• branches/6230-branch/libsyncml/sml_command_internals.h (modified) (5 diffs)
• branches/6230-branch/libsyncml/sml_defines.h (modified) (3 diffs)
• branches/6230-branch/libsyncml/sml_devinf.c (modified) (7 diffs)
• branches/6230-branch/libsyncml/sml_devinf.h (modified) (2 diffs)
• branches/6230-branch/libsyncml/sml_devinf_internals.h (modified) (1 diff)
• branches/6230-branch/libsyncml/sml_elements.c (modified) (2 diffs)
• branches/6230-branch/libsyncml/sml_elements.h (modified) (1 diff)
• branches/6230-branch/libsyncml/sml_elements_internals.h (modified) (1 diff)
• branches/6230-branch/libsyncml/sml_manager.c (modified) (5 diffs)
• branches/6230-branch/libsyncml/sml_manager.h (modified) (1 diff)
• branches/6230-branch/libsyncml/sml_notification.c (modified) (6 diffs)
• branches/6230-branch/libsyncml/sml_notification.h (modified) (2 diffs)
• branches/6230-branch/libsyncml/sml_notification_internals.h (modified) (1 diff)
• branches/6230-branch/libsyncml/sml_parse.c (modified) (4 diffs)
• branches/6230-branch/libsyncml/sml_parse.h (modified) (1 diff)
• branches/6230-branch/libsyncml/sml_session.c (modified) (27 diffs)
• branches/6230-branch/libsyncml/sml_session.h (modified) (2 diffs)
• branches/6230-branch/libsyncml/sml_session_internals.h (modified) (2 diffs)
• branches/6230-branch/libsyncml/sml_support.c (modified) (1 diff)
• branches/6230-branch/libsyncml/transports/obex_client.c (modified) (2 diffs)
• branches/6230-branch/tests/check_devinf.c (modified) (2 diffs)
• branches/6230-branch/tests/check_ds.c (modified) (31 diffs)
• branches/6230-branch/tests/check_manager.c (modified) (2 diffs)
• branches/6230-branch/tests/check_obex.c (modified) (4 diffs)
• branches/6230-branch/tests/check_san.c (modified) (5 diffs)
• branches/6230-branch/tests/check_session.c (modified) (43 diffs)
• branches/6230-branch/tests/check_sync.c (modified) (11 diffs)
• branches/6230-branch/tests/check_wbxml_assembler.c (modified) (21 diffs)
• branches/6230-branch/tests/check_xml_assembler.c (modified) (23 diffs)
• branches/6230-branch/tests/check_xml_parser.c (modified) (2 diffs)
• branches/6230-branch/tests/valgrind.supp (modified) (1 diff)
• branches/6230-branch/tools/syncml-http-server.c (modified) (17 diffs)
• branches/6230-branch/tools/syncml-obex-client.c (modified) (21 diffs)

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

@@ -60 +60 @@
-                smlTrace(TRACE_INTERNAL, "Auth is required");
-                auth->state = SML_ERROR_AUTH_REQUIRED;
+                
+                smlErrorSet(&error, SML_ERROR_AUTH_REQUIRED, "Auth required but not given");
+                smlSessionDispatchEvent(session, SML_SESSION_EVENT_ERROR, NULL, NULL, NULL, error);
+                smlErrorDeref(&error);
-        } else if ((!cred && auth->enabled && auth->state == SML_AUTH_ACCEPTED) || \
-                (cred && !auth->enabled)) {
@@ -86 +90 @@
-                                        auth->state = SML_ERROR_AUTH_REJECTED;
-                                }
+                                
+                                if (auth->state == SML_ERROR_AUTH_REJECTED) {
+                                        smlErrorSet(&error, SML_ERROR_AUTH_REJECTED, "Auth rejected for username %s", arr[0]);
+                                        smlSessionDispatchEvent(session, SML_SESSION_EVENT_ERROR, NULL, NULL, NULL, error);
+                                        smlErrorDeref(&error);
+                                }
+                                
-                                g_strfreev(arr);
-        
@@ -97 +108 @@
-        }
-        
-
+
+
-                session->end = TRUE;
+        }
-        
-        reply = smlAuthHeaderReply(session, auth->state, &error);
@@ -115 +128 @@
-
-error:
-SetError(session, &
+DispatchEvent(session, SML_SESSION_EVENT_ERROR, NULL, NULL, NULL, 
-        smlTrace(TRACE_EXIT_ERROR, "%s: %s", __func__, smlErrorPrint(&error));
-        smlErrorDeref(&error);

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

@@ -36 +36 @@
-/*@{*/
-
+static void _get_devinf_reply(SmlSession *session, SmlStatus *status, void *userdata)
+{
+        smlTrace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, session, status, userdata);
+        SmlError *error = NULL;
+        SmlDevInfAgent *agent = userdata;
+        
+        if (smlStatusIsResult(status)) {
+                SmlCommand *result = smlStatusGetResult(status);
+                printf("result: %p\n", result);
+                
+                agent->recvDevInf = smlDevInfFromResult(result, &error);
+                if (!agent->recvDevInf)
+                        goto error;
+                
+                SmlStatus *reply = smlCommandNewReply(result, SML_NO_ERROR, &error);
+                if (!reply)
+                        goto error;
+        
+                if (!smlSessionSendReply(session, reply, &error)) {
+                        smlStatusUnref(reply);
+                        goto error;
+                }
+                
+                smlStatusUnref(reply);
+        }
+        
+        smlTrace(TRACE_EXIT, "%s", __func__);
+        return;
+
+error:
+        smlSessionDispatchEvent(session, SML_SESSION_EVENT_ERROR, NULL, NULL, NULL, error);
+        smlTrace(TRACE_EXIT_ERROR, "%s: %s", __func__, smlErrorPrint(&error));
+        smlErrorDeref(&error);
+}
+
-static void _devinf_reply(SmlSession *session, SmlStatus *status, void *userdata)
-{
@@ -57 +92 @@
-{
-        smlTrace(TRACE_ENTRY, "%s(%p, %p, %p, %p)", __func__, agent, session, get, error);
-Status
+Command
-        SmlCommand *cmd = NULL;
-        
@@ -70 +105 @@
-                                goto error;
-                        
-Result(session, result
-Status
+Command(session, result, NULL
+Command
-                                goto error;
-                        }
-                        
-Status
+Command
-                        
-                        SmlStatus *reply = smlCommandNewReply(get, SML_NO_ERROR, error);
@@ -134 +169 @@
-        SmlDevInfAgent *agent = userdata;
-        SmlError *error = NULL;
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-        if (!reply)
-                goto error;
@@ -205 +246 @@
-
-/* Get the devinf that was sent in the session. Returns FALSE if no devinf was received yet. */
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-}
-
@@ -257 +274 @@
-        smlTrace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, agent, session, error);
-        smlAssert(agent);
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        smlTrace(TRACE_EXIT, "%s", __func__);
-        return TRUE;
-        
-/*
-
-*/
+
+
+
-}
-

branches/6230-branch/libsyncml/objects/sml_devinf_obj.h

@@ -26 +26 @@
-SmlDevInfAgent *smlDevInfAgentNew(SmlDevInf *devinf, SmlError **error);
-void smlDevInfAgentFree(SmlDevInfAgent *agent);
-, SmlError **error
+
-SmlBool smlDevInfAgentRegister(SmlDevInfAgent *agent, SmlManager *manager, SmlError **error);
-SmlBool smlDevInfAgentSendDevInf(SmlDevInfAgent *agent, SmlSession *session, SmlError **error);

branches/6230-branch/libsyncml/objects/sml_devinf_obj_internals.h

@@ -26 +26 @@
-        SmlBool devinfSent;
-        
-Command
+DevInf
-};
-

branches/6230-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/6230-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/6230-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/6230-branch/libsyncml/parser/sml_wbxml.c

@@ -79 +79 @@
-        
-        smlTrace(TRACE_INTERNAL, "Wbxml input: %s", smlPrintBinary(data, size));
+        smlLog("received-%i.wbxml", data, size);
-        
-        char *buffer = NULL;
@@ -136 +137 @@
-        
-        smlTrace(TRACE_INTERNAL, "Wbxml assembled: %s", smlPrintHex(*data, *size));
+        smlLog("sent-%i.wbxml", *data, *size);
-        
-        smlTrace(TRACE_EXIT, "%s", __func__);

branches/6230-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");
@@ -197 +198 @@
-}
-
-Bool raw, unsigned int complete_size, Sml
-
-i, %i, %p)", __func__, item, assm, raw, complete_size
+
+
+p)", __func__, item, assm
-        smlAssert(assm);
-        smlAssert(item);
@@ -221 +222 @@
-        }
-        
-        //Meta
-        /*if (complete_size) {
-                if (!_smlXmlAssemblerStartNode(assm, SML_ELEMENT_META, error))
-                        goto error;
-                        
-                if (!_smlXmlAssemblerAddIDNS(assm, NULL, SML_ELEMENT_SIZE, SML_NAMESPACE_METINF, complete_size, error))
-                        goto error;
-        
-                //META
-                if (!_smlXmlAssemblerEndNode(assm, error))
-                        goto error;
-        }*/
-        
-        if (smlItemHasData(item)) {
-                if (item->disabled) {
-
+item->
-                                goto error;
-                } else {
@@ -244 +232 @@
-                                goto error;
-                        
-
+item->
-                                goto error;
-                }
@@ -339 +327 @@
-                goto error;
-        
-
-
-
-
-
+
-                goto error;
-        
@@ -350 +334 @@
-                goto error;
-        
-FALSE, 0, 
+
-                goto error;
-        
@@ -381 +365 @@
-                goto error;
-        
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-                if (!_smlXmlAssemblerAddIDNS(assm, SML_ELEMENT_SIZE, SML_NAMESPACE_METINF, change->size, error))
-                        goto error;
@@ -397 +379 @@
-                goto error;
-        
-const char *
+
-        if (opt && atoi(opt) && change->type == SML_COMMAND_TYPE_ADD) {
-                change->private.change.item->target = change->private.change.item->source;
@@ -403 +385 @@
-        }
-        
-FALSE, change->size, 
+
-                goto error;
-        
@@ -416 +398 @@
-SmlBool smlSyncAssemble(SmlXmlAssembler *assm, SmlCommand *cmd, SmlError **error)
-{
-, %p
+
-        smlAssert(cmd);
-        smlAssert(assm);
@@ -425 +407 @@
-        }
-        
-
+
+
+
-                if (!_smlXmlAssemblerStartNode(assm, SML_ELEMENT_META, error))
-                        goto error;
@@ -435 +419 @@
-                if (!_smlXmlAssemblerEndNode(assm, error))
-                        goto error;
-*/
+
-        
-        if (!smlLocationAssemble(cmd->target, assm, SML_ELEMENT_TARGET, error))
@@ -448 +432 @@
-                goto error;
-        
-
+
+
+
-                if (!_smlXmlAssemblerAddID(assm, SML_ELEMENT_NUMBEROFCHANGES, cmd->private.sync.numChanged, error))
-                        goto error;
-*/
+
-        
-        smlTrace(TRACE_EXIT, "%s", __func__);
@@ -566 +552 @@
-        }
-        
- != 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;
-                
@@ -585 +567 @@
-        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 smlResultsAssemble(SmlXmlAssembler *assm, SmlCommand *cmd, SmlError **error)
+{
+        smlTrace(TRACE_ENTRY, "%s(%p, %p, %p, %p)", __func__, assm, cmd, error);
+        smlAssert(cmd);
+        smlAssert(assm);
+        
+        if (!_smlXmlAssemblerAddID(assm, SML_ELEMENT_MSGREF, cmd->private.results.status->msgRef, error))
+                goto error;
+                
+        if (!_smlXmlAssemblerAddID(assm, SML_ELEMENT_CMDREF, cmd->private.results.status->cmdRef, error))
+                goto error;
+                
+        if (!_smlXmlAssemblerStartNode(assm, SML_ELEMENT_META, error))
+                goto error;
+                
+        if (!_smlXmlAssemblerAddStringNS(assm, SML_ELEMENT_TYPE, SML_NAMESPACE_METINF, cmd->private.results.status->item->contenttype, error))
+                goto error;
+        
+        //META
+        if (!_smlXmlAssemblerEndNode(assm, error))
+                goto error;
+        
+        if (!smlItemAssemble(cmd->private.results.status->item, assm, error))
+                goto error;
+        
+        if (cmd->private.results.status->sourceRef) {
+                if (!_smlXmlAssemblerAddString(assm, SML_ELEMENT_SOURCEREF, cmd->private.results.status->sourceRef->locURI, error))
+                        goto error;
+        }
+        
+        if (cmd->private.results.status->targetRef) {
+                if (!_smlXmlAssemblerAddString(assm, SML_ELEMENT_TARGETREF, cmd->private.results.status->targetRef->locURI, error))
+                        goto error;
+        }
-        
-        smlTrace(TRACE_EXIT, "%s", __func__);
@@ -680 +705 @@
-                goto error_free_writer;
-        
-
+
+
+
-                if (!_smlXmlAssemblerStartNode(assm, SML_ELEMENT_META, error))
-                        goto error_free_writer;
@@ -689 +716 @@
-                }
-                
-if (
+/*if (supportsLargeObjects && 
-                        if (!_smlXmlAssemblerAddIDNS(assm, SML_ELEMENT_MAXOBJSIZE, SML_NAMESPACE_METINF, session->incomingMaxObjSize, error))
-                                goto error_free_writer;
-
+*/
-                
-                //META
@@ -798 +825 @@
-                        break;
-                case SML_COMMAND_TYPE_PUT:
+                case SML_COMMAND_TYPE_GET:
-                        if (!smlAccessAssemble(assm, cmd, error))
-                                goto error_free_writer;
@@ -805 +833 @@
-                                goto error_free_writer;
-                        break;
+                case SML_COMMAND_TYPE_RESULTS:
+                        if (!smlResultsAssemble(assm, cmd, error))
+                                goto error_free_writer;
-                default:
-                        smlErrorSet(error, SML_ERROR_GENERIC, "Unknown command type");
@@ -1002 +1033 @@
-        }
-        
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-        }
-        
@@ -1046 +1070 @@
-        }
-        
-
-
-
-
-
-
-
+
+
-        
-        if (!_smlXmlAssemblerAddID(assm, SML_ELEMENT_CMDID, res->cmdID, error))
@@ -1063 +1082 @@
-                goto error;
-        
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-        
-        switch (status->type) {
@@ -1127 +1144 @@
-                        }
-                        break;
-                case SML_COMMAND_TYPE_RESULTS:
-                        if (!_smlXmlAssemblerStartNode(assm, SML_ELEMENT_META, error))
-                                goto error;
-                        
-                        const char *contenttype = smlContentTypeToString(status->item->contenttype, error);
-                        if (!contenttype)
-                                goto error;
-                                
-                        if (!_smlXmlAssemblerAddStringNS(assm, SML_ELEMENT_TYPE, SML_NAMESPACE_METINF, contenttype, error))
-                                goto error;
-                        
-                        //META
-                        if (!_smlXmlAssemblerEndNode(assm, error))
-                                goto error;
-                        
-                        if (!smlItemAssemble(status->item, assm, TRUE, 0, error))
-                                goto error;
-                        break;
-                default:
-                ;
@@ -1159 +1158 @@
-        }
-        
-type != SML_COMMAND_TYPE_RESULTS && status->
+
-                if (!_smlXmlAssemblerAddString(assm, SML_ELEMENT_DATA, status->data, error))
-                        goto error;
@@ -1334 +1333 @@
-                                /* Add the corresponding command opener */
-                                
-
+cmd->cmdType == SML_COMMAND_TYPE_ADD && 
-                                        cmdname = SML_ELEMENT_REPLACE;
-                                else {
@@ -1456 +1455 @@
-                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;
@@ -1548 +1551 @@
-SmlBool smlXmlAssemblerRun(SmlXmlAssembler *assm, char **data, unsigned int *size, SmlBool *end, SmlBool final, unsigned int maxsize, SmlError **error)
-{
-
+
+
+
+
-}
-
@@ -1584 +1590 @@
-SmlBool smlXmlAssemblerNextCmdRef(SmlXmlAssembler *assm, unsigned int *cmdRef, unsigned int *msgRef)
-{
-        smlTrace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, assm, cmdRef, msgRef);
-        smlAssert(assm);
-        smlAssert(cmdRef);
@@ -1596 +1601 @@
-                        *cmdRef = status->cmdRef;
-                        *msgRef = status->msgRef;
-                        
-                        smlTrace(TRACE_EXIT, "%s: Found one", __func__);
-                        return TRUE;
-                }
-        }
-        
-        smlTrace(TRACE_EXIT, "%s: None found", __func__);
-        return FALSE;
-}