Changeset 87

Timestamp:

02/25/06 18:05:05 (3 years ago)

Author:

abauer

Message:

Made further improvments to the obex tool to allow more
flexibility.

Files:

• branches/libsyncml-threaded/libsyncml/Makefile.am (modified) (1 diff)
• branches/libsyncml-threaded/libsyncml/objects/Makefile.am (modified) (2 diffs)
• branches/libsyncml-threaded/libsyncml/objects/sml_ds_server.c (modified) (18 diffs)
• branches/libsyncml-threaded/libsyncml/objects/sml_ds_server.h (modified) (3 diffs)
• branches/libsyncml-threaded/libsyncml/objects/sml_ds_server_internals.h (modified) (4 diffs)
• branches/libsyncml-threaded/libsyncml/parser/sml_xml_assm.c (modified) (4 diffs)
• branches/libsyncml-threaded/libsyncml/parser/sml_xml_assm_internals.h (modified) (1 diff)
• branches/libsyncml-threaded/libsyncml/sml_defines.h (modified) (1 diff)
• branches/libsyncml-threaded/libsyncml/sml_devinf.c (modified) (3 diffs)
• branches/libsyncml-threaded/libsyncml/sml_devinf.h (modified) (2 diffs)
• branches/libsyncml-threaded/libsyncml/sml_devinf_internals.h (modified) (1 diff)
• branches/libsyncml-threaded/libsyncml/sml_manager.c (modified) (1 diff)
• branches/libsyncml-threaded/libsyncml/sml_manager.h (modified) (1 diff)
• branches/libsyncml-threaded/libsyncml/sml_notification.c (modified) (8 diffs)
• branches/libsyncml-threaded/libsyncml/sml_notification.h (modified) (2 diffs)
• branches/libsyncml-threaded/libsyncml/sml_notification_internals.h (modified) (1 diff)
• branches/libsyncml-threaded/libsyncml/sml_parse.c (modified) (1 diff)
• branches/libsyncml-threaded/libsyncml/sml_parse.h (modified) (3 diffs)
• branches/libsyncml-threaded/libsyncml/sml_queue.c (modified) (1 diff)
• branches/libsyncml-threaded/libsyncml/sml_session.c (modified) (3 diffs)
• branches/libsyncml-threaded/libsyncml/sml_support.c (modified) (2 diffs)
• branches/libsyncml-threaded/libsyncml/syncml.h (modified) (1 diff)
• branches/libsyncml-threaded/tests/check_ds.c (modified) (55 diffs)
• branches/libsyncml-threaded/tests/check_san.c (modified) (5 diffs)
• branches/libsyncml-threaded/tools/syncml-http-server.c (modified) (2 diffs)
• branches/libsyncml-threaded/tools/syncml-obex-client.c (modified) (13 diffs)

branches/libsyncml-threaded/libsyncml/Makefile.am

@@ -64 +64 @@
-        parser/libsyncml-wbxml.la \
-        objects/libauth.la \
+        objects/libdevinf.la \
-        objects/libdsserver.la 

branches/libsyncml-threaded/libsyncml/objects/Makefile.am

@@ -9 +9 @@
-libsyncmlinclude_HEADERS = \
-        sml_auth.h \
-
+
+
-        
-EXTRA_DIST = \
-        sml_auth_internals.h \
-
+
+
-        
-
+evinf.la libd
-
-libauth_la_SOURCES = sml_auth.c
@@ -22 +24 @@
-libdsserver_la_SOURCES = sml_ds_server.c
-libdsserver_la_LDFLAGS = @PACKAGE_LIBS@
+
+libdevinf_la_SOURCES = sml_devinf_obj.c
+libdevinf_la_LDFLAGS = @PACKAGE_LIBS@

branches/libsyncml-threaded/libsyncml/objects/sml_ds_server.c

@@ -51 +51 @@
-        SmlDsSession *dsession = userdata;
-        
-        switch (smlStatusGetClass(status)) {
-                case SML_ERRORCLASS_SUCCESS:
-                        dsession->state = SML_DS_STATE_SENT_ALERT;
-                        break;
-                default:
-                        dsession->state = SML_DS_STATE_ERROR;
-                        break;
-        }
-        
-        if (dsession->sentAlertCallback)
-                dsession->sentAlertCallback(session, status, dsession->sentAlertCallbackUserdata);
@@ -69 +60 @@
-}
-
-static void _devinf_reply(SmlSession *session, SmlStatus *status, void *userdata)
-{
-        smlTrace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, session, status, userdata);
-        
-        smlTrace(TRACE_EXIT, "%s", __func__);
-}
-
-static void _sync_reply(SmlSession *session, SmlStatus *status, void *userdata)
-{
@@ -81 +65 @@
-        SmlDsSession *dsession = userdata;
-        
-        switch (smlStatusGetClass(status)) {
-                case SML_ERRORCLASS_SUCCESS:
-                        dsession->state = SML_DS_STATE_SENT_CHANGES;
-                        break;
-                default:
-                        dsession->state = SML_DS_STATE_ERROR;
-                        break;
-        }
-        
-        if (dsession->sentSyncCallback)
-                dsession->sentSyncCallback(session, status, dsession->sentSyncCallbackUserdata);
@@ -108 +83 @@
-        dsession->location = smlLocationClone(cmd->target, NULL);
-        dsession->target = smlLocationClone(cmd->source, NULL);
-        
-        smlTrace(TRACE_EXIT, "%s", __func__);
-}
-
-void smlDsSessionRecvDevinf(SmlSession *session, SmlCommand *cmd, void *userdata)
-{
-        smlTrace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, session, cmd, userdata);
-        SmlDsSession *dsession = userdata;
-        
-        dsession->recvDevInf = cmd;
-        
-        smlTrace(TRACE_EXIT, "%s", __func__);
@@ -268 +233 @@
-}
-
-static SmlBool _send_devinf(SmlDsSession *dsession, SmlCommand *get, SmlError **error)
-{
-        smlTrace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, dsession, get, error);
-        SmlLocation *loc = NULL;
-        
-        if (!dsession->sent_devinf) {
-                if (get) {
-                        SmlStatus *result = smlDevInfNewResult(get, get->target, dsession->server->ownDevInf, error);
-                        if (!result)
-                                goto error;
-                        
-                        if (!smlSessionSendResult(dsession->session, result, _devinf_reply, dsession, error))
-                                goto error;
-                } else {
-                        loc = smlLocationNew("./devinf11", NULL, error);
-                        if (!loc)
-                                goto error;
-                                
-                        SmlCommand *cmd = smlDevInfNewPut(loc, dsession->server->ownDevInf, error);
-                        if (!cmd)
-                                goto error_free_loc;
-                        
-                        smlLocationFree(loc);
-                        
-                        if (!smlSessionSendCommand(dsession->session, cmd, NULL, _devinf_reply, dsession, error))
-                                goto error;
-                }
-                dsession->sent_devinf= TRUE;
-        } else
-                smlTrace(TRACE_INTERNAL, "Already sent the devinf!");
-        
-        smlTrace(TRACE_EXIT, "%s", __func__);
-        return TRUE;
-        
-error_free_loc:
-        smlLocationFree(loc);
-error:
-        smlTrace(TRACE_EXIT_ERROR, "%s: %s", __func__, smlErrorPrint(error));
-        return FALSE;
-}
-        
-static void _request_devinf(SmlSession *session, SmlCommand *cmd, void *userdata)
-{
-        smlTrace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, session, cmd, userdata);
-        SmlDsSession *dsession = userdata;
-        SmlError *error = NULL;
-        
-        SmlStatus *reply = smlCommandNewReply(cmd, SML_NO_ERROR, &error);
-        if (!reply)
-                goto error;
-        
-        if (!smlSessionSendReply(session, reply, &error))
-                goto error;
-        
-        if (!_send_devinf(dsession, userdata, &error))
-                goto error;
-        
-        smlTrace(TRACE_EXIT, "%s", __func__);
-        return;
-
-error:
-        smlTrace(TRACE_EXIT_ERROR, "%s: %s", __func__, smlErrorPrint(&error));
-}
-
-SmlDsSession *smlDsServerRecvAlert(SmlDsServer *server, SmlSession *session, SmlCommand *cmd)
-{
@@ -500 +401 @@
-}
-
-Bool send_devinf, Sml
-
-i, %p)", __func__, server, session, type, last, next, send_devinf
+
+
+p)", __func__, server, session, type, last, next
-        smlAssert(server);
-        smlAssert(session);
-        
-        
-        SmlDsSession *dsession = smlDsSessionNew(server, session, error);
@@ -515 +415 @@
-                goto error_free_session;
-        
-send_devinf, 
+
-                goto error_free_target;
-        
-        dsession->state = SML_DS_STATE_SENT_ALERT;
-        
-        smlTrace(TRACE_EXIT, "%s", __func__);
@@ -532 +430 @@
-}
-
-void smlDsServerSetDevinf(SmlDsServer *server, SmlDevInf *devinf)
-{
-        smlTrace(TRACE_ENTRY, "%s(%p, %p)", __func__, server, devinf);
-        smlAssert(server);
-        
-        server->ownDevInf = devinf;
-        
-        smlTrace(TRACE_EXIT, "%s", __func__);
-}
-
-SmlDsSession *smlDsSessionNew(SmlDsServer *server, SmlSession *session, SmlError **error)
-{
@@ -552 +440 @@
-
-        dsession->server = server;
-        dsession->state = SML_DS_STATE_IDLE;
-        dsession->session = session;
-        dsession->lock = g_mutex_new();
@@ -596 +483 @@
-                        
-                dsession->alertCommand = NULL;
-                
-                dsession->state = SML_DS_STATE_RECV_ALERT;
-
-                smlTrace(TRACE_EXIT, "%s", __func__);
-        } else if (dsession->recvDevInf && dsession->recvDevinfCallback) {
-                smlTrace(TRACE_ENTRY, "%s(%p): Dispatching devinf", __func__, dsession);
-                
-                SmlDevInf *devinf = smlDevInfParse(dsession->recvDevInf->private.access.item->data, dsession->recvDevInf->private.access.item->size, &error);
-                if (!devinf)
-                        goto error;
-                        
-                dsession->recvDevinfCallback(dsession, devinf, dsession->recvDevinfCallbackUserdata);
-                dsession->recvDevinfCallback = NULL;
-                
-                SmlStatus *reply = smlCommandNewReply(dsession->recvDevInf, SML_NO_ERROR, &error);
-                if (!reply)
-                        goto error;
-        
-                if (!smlSessionSendReply(dsession->session, reply, &error))
-                        goto error;
-                
-                dsession->recvDevInf = NULL;
-                
-                smlTrace(TRACE_EXIT, "%s", __func__);   
-        } else if (dsession->recvSync && dsession->recvSyncCallback) {
-
+: Dispatching sync
-                
-                dsession->recvSyncCallback(dsession, ((SmlCommand *)(dsession->recvSync->data))->private.sync.numChanged, dsession->changesCallbackUserdata);
@@ -640 +505 @@
-                dsession->syncReply = SML_NO_ERROR;
-                
-                dsession->state = SML_DS_STATE_RECV_CHANGES;
-                
-                g_list_free(dsession->recvSync);
-                dsession->recvSync = NULL;
@@ -647 +510 @@
-                smlTrace(TRACE_EXIT, "%s", __func__);
-        } else if (dsession->recvChanges && dsession->changesCallback) {
-
+: Dispatching changes
-                
-                g_mutex_lock(dsession->lock);
@@ -655 +518 @@
-                        if (cmd) {
-                                SmlItem *item = cmd->private.change.item;
-
+ || (!item->source && !item->target)
-                                        smlErrorSet(&error, SML_ERROR_GENERIC, "No item");
-                                        goto error_unlock;
-                                }
-                                
-
-
-
+
+
+
+
+
-                                                
+                                if (cmd->private.change.type == SML_CHANGE_ADD)
-                                        reply = smlCommandNewReply(cmd, SML_ALERT_SLOW_SYNC, &error);
-
-
-
-
+
-                                        reply = smlCommandNewReply(cmd, SML_NO_ERROR, &error);
-                                }
-                                
-                                if (!reply)
@@ -700 +562 @@
-{
-        if ((dsession->alertCommand && dsession->recvAlertCallback) || \
-                (dsession->recvDevInf && dsession->recvDevinfCallback) || \
-                (dsession->recvSync && dsession->recvSyncCallback) || \
-                (dsession->recvChanges && dsession->changesCallback))
@@ -745 +606 @@
- * @returns TRUE if the call was successful, FALSE otherwise
- */
-Bool send_devinf, Sml
-
-i, %p)", __func__, dsession, type, last, next, send_devinf
+
+
+p)", __func__, dsession, type, last, next
-        smlAssert(dsession);
-        
@@ -760 +621 @@
-                goto error;
-        
-        if (send_devinf) {
-                smlAssert(dsession->server->ownDevInf);
-                
-                if (!_send_devinf(dsession, NULL, error))
-                        goto error;
-                        
-        }
-        
-        dsession->state = SML_DS_STATE_SENT_ALERT;
-        
-        smlTrace(TRACE_EXIT, "%s", __func__);
-        return TRUE;
@@ -776 +627 @@
-        smlTrace(TRACE_EXIT_ERROR, "%s: %s", __func__, smlErrorPrint(error));
-        return FALSE;
-}
-
-void smlDsSessionGetDevinf(SmlDsSession *dsession, SmlDsSessionDevinfCb callback, void *userdata)
-{
-        smlTrace(TRACE_ENTRY, "%s(%p, %p, %p, %p)", __func__, dsession, callback, userdata);
-        smlAssert(dsession);
-        smlAssert(callback);
-        
-        dsession->recvDevinfCallback = callback;
-        dsession->recvDevinfCallbackUserdata = userdata;
-        
-        smlDsSessionDispatch(dsession);
-        
-        smlTrace(TRACE_EXIT, "%s", __func__);
-}
-
@@ -1030 +867 @@
-                goto error_free_dsession;
-        
-        SmlLocation *devinf = smlLocationNew("./devinf11", NULL, &error);
-        if (!devinf)
-                goto error_free_dsession;
-        
-        if (!smlManagerObjectRegister(server->manager, SML_COMMAND_TYPE_PUT, NULL, devinf, smlDsSessionRecvDevinf, NULL, dsession, &error)) {
-                smlLocationFree(devinf);
-                goto error_free_dsession;
-        }
-        
-        if (!smlManagerObjectRegister(server->manager, SML_COMMAND_TYPE_GET, devinf, NULL, _request_devinf, NULL, dsession, &error)) {
-                smlLocationFree(devinf);
-                goto error_free_dsession;
-        }
-        
-        smlLocationFree(devinf);
-        
-        smlTrace(TRACE_EXIT, "%s", __func__);
-        return;

branches/libsyncml-threaded/libsyncml/objects/sml_ds_server.h

@@ -33 +33 @@
-typedef void (* SmlDsSessionConnectCb) (SmlDsSession *dsession, void *userdata);
-typedef SmlBool (* SmlDsSessionAlertCb) (SmlDsSession *dsession, SmlAlertType type, const char *last, const char *next, void *userdata);
-typedef void (* SmlDsSessionDevinfCb) (SmlDsSession *dsession, SmlDevInf *devinf, void *userdata);
-typedef void (* SmlDsSessionSyncCb) (SmlDsSession *dsession, unsigned int numchanges, void *userdata);
-typedef SmlBool (* SmlDsSessionChangesCb) (SmlDsSession *dsession, SmlChangeType type, const char *uid, char *data, unsigned int size, SmlContentType contenttype, void *userdata, SmlError **error);
@@ -47 +46 @@
-const char *smlDsServerGetLocation(SmlDsServer *server);
-SmlContentType smlDsServerGetContentType(SmlDsServer *server);
-
-
+
-
-void smlDsSessionDispatch(SmlDsSession *dsession);
-SmlBool smlDsSessionCheck(SmlDsSession *dsession);
-void smlDsSessionGetAlert(SmlDsSession *dsession, SmlDsSessionAlertCb callback, void *userdata);
-Bool send_devinf, Sml
+
-void smlDsSessionGetChanges(SmlDsSession *dsession, SmlDsSessionChangesCb chgCallback, void *userdata);
-void smlDsSessionGetSync(SmlDsSession *dsession, SmlDsSessionSyncCb chgCallback, void *userdata);
@@ -62 +60 @@
-SmlBool smlDsSessionCloseMap(SmlDsSession *dsession, SmlStatusReplyCb callback, void *userdata, SmlError **error);
-const char *smlDsSessionGetLocation(SmlDsSession *dsession);
-void smlDsSessionGetDevinf(SmlDsSession *dsession, SmlDsSessionDevinfCb callback, void *userdata);
-
-#endif //_SML_DS_SERVER_H_

branches/libsyncml-threaded/libsyncml/objects/sml_ds_server_internals.h

@@ -22 +22 @@
-#define _SML_DS_SERVER_INTERNALS_H_
-
-typedef enum {
-        SML_DS_STATE_IDLE,
-        SML_DS_STATE_SENT_ALERT,
-        SML_DS_STATE_RECV_ALERT,
-        SML_DS_STATE_SENT_CHANGES,
-        SML_DS_STATE_RECV_CHANGES,
-        SML_DS_STATE_SENT_MAP,
-        SML_DS_STATE_RECV_MAP,
-        SML_DS_STATE_ERROR
-} SmlDsSessionState;
-
-struct SmlDsSession {
-        SmlDsServer *server;
@@ -40 +29 @@
-        SmlLocation *location;
-        
-        /** Defines the state that the ds server is currently in */
-        SmlDsSessionState state;
-        
-        /** Callback that will receive the alert once it is received */
-        SmlDsSessionAlertCb recvAlertCallback;
@@ -48 +34 @@
-        SmlCommand *alertCommand;
-        
-        SmlDsSessionDevinfCb recvDevinfCallback;
-        void *recvDevinfCallbackUserdata;
-        SmlCommand *recvDevInf;
-        
-        /** Callback that will receive the reply to the alert */
-        SmlStatusReplyCb sentAlertCallback;
-        void *sentAlertCallbackUserdata;
-        SmlBool sent_devinf;
-        
-        /** Callback that will receive the sync command */
@@ -94 +75 @@
-        SmlDsSessionConnectCb connectCallback;
-        void *connectCallbackUserdata;
-        
-        SmlDevInf *ownDevInf;
-};
-
-void smlDsSessionRecvAlert(SmlSession *session, SmlCommand *cmd, void *userdata);
-void smlDsSessionRecvDevinf(SmlSession *session, SmlCommand *cmd, void *userdata);
-void smlDsSessionRecvSync(SmlSession *session, SmlCommand *cmd, void *userdata);
-void smlDsSessionRecvChange(SmlSession *session, SmlCommand *cmd, void *userdata);

branches/libsyncml-threaded/libsyncml/parser/sml_xml_assm.c

@@ -1080 +1080 @@
-}
-
+SmlBool smlXmlAssemblerReserveResult(SmlXmlAssembler *assm, unsigned int cmdRef, unsigned int msgRef, unsigned int cmdID, SmlError **error)
+{
+        smlTrace(TRACE_ENTRY, "%s(%p, %i, %i, %i, %p)", __func__, assm, cmdRef, msgRef, cmdID, error);
+        smlAssert(assm);
+        
+        /* We first start a new writer that will write our status into a buffer */
+        SmlXmlAssemblerStatus *res = smlTryMalloc0(sizeof(SmlXmlAssemblerStatus), error);
+        if (!res)
+                goto error;
+        res->cmdRef = cmdRef;
+        res->cmdID = cmdID;
+        res->msgRef = msgRef;
+        res->isResult = TRUE;
+        
+        /* Now we can append the buffer */
+        if (cmdRef != 0)
+                assm->statuses = g_list_append(assm->statuses, res);
+        else
+                assm->statuses = g_list_prepend(assm->statuses, res);
+        assm->reserved_statuses++;
+        
+        smlTrace(TRACE_EXIT, "%s", __func__);
+        return TRUE;
+        
+error:
+        smlTrace(TRACE_EXIT_ERROR, "%s: %s", __func__, smlErrorPrint(error));
+        return FALSE;
+}
+
-SmlBool smlXmlAssemblerReserveStatus(SmlXmlAssembler *assm, unsigned int cmdRef, unsigned int msgRef, unsigned int cmdID, SmlError **error)
-{
@@ -1352 +1381 @@
-        for (b = assm->statuses; b; b = b->next) {
-                SmlXmlAssemblerStatus *status = b->data;
-
+ && !status->isResult
-                        smlTrace(TRACE_INTERNAL, "Reserved status %i is missing", status->cmdRef);
-                        missingstatus = TRUE;
@@ -1358 +1387 @@
-                }
-                
+                if (!status->buffer)
+                        continue;
+                        
-                buffersize += xmlBufferLength(status->buffer);
-                if (maxsize && buffersize > maxsize)
@@ -1526 +1558 @@
-        functions->add_status = (SmlAssemblerStatusFunction)smlXmlAssemblerAddStatus;
-        functions->rem_status = (SmlAssemblerRemStatusFunction)smlXmlAssemblerRemStatus;
+        functions->reserve_result = (SmlAssemblerReserveResultFunction)smlXmlAssemblerReserveResult;
-        functions->reserve_status = (SmlAssemblerReserveStatusFunction)smlXmlAssemblerReserveStatus;
-        functions->missing_status = (SmlAssemblerStatusMissingFunction)smlXmlAssemblerMissingStatus;

branches/libsyncml-threaded/libsyncml/parser/sml_xml_assm_internals.h

@@ -55 +55 @@
-        /** The command id.*/
-        unsigned int cmdID;
+        SmlBool isResult;
-} SmlXmlAssemblerStatus;
-

branches/libsyncml-threaded/libsyncml/sml_defines.h

@@ -164 +164 @@
-        SML_CONTENT_TYPE_VCAL = 2,
-        SML_CONTENT_TYPE_VTODO = 3,
-
+
+
-} SmlContentType;
-

branches/libsyncml-threaded/libsyncml/sml_devinf.c

@@ -71 +71 @@
-}
-
-
-SmlStatus *smlDevInfNewResult(SmlCommand *cmd, SmlLocation *source, SmlDevInf *devinf, SmlError **error)
-{
@@ -161 +160 @@
-                goto error;*/
-                
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        *size = strlen(dev) + 1;
-        
@@ -169 +267 @@
-        return TRUE;
-        
-/*
-
-*/
+
+
+
-}
-

branches/libsyncml-threaded/libsyncml/sml_devinf.h

@@ -21 +21 @@
-#ifndef _SML_DEVINF_H_
-#define _SML_DEVINF_H_
+
+typedef enum  {
+        SML_DEVINF_VERSION_UNKNOWN = 0,
+        SML_DEVINF_VERSION_11 = 1
+} SmlDevInfVersion;
-
-#define SML_DEVINF_ELEMENT_CTCAP "CTCap"
@@ -67 +72 @@
-SmlDevInf *smlDevInfParse(const char *data, unsigned int length, SmlError **error);
-SmlBool smlDevInfAssemble(SmlDevInf *devinf, char **data, unsigned int *size, SmlError **error);
+void smlDevInfAddDataStore(SmlDevInf *devinf, SmlDevInfDataStore *datastore);
-
+SmlDevInfDataStore *smlDevInfDataStoreNew(SmlLocation *sourceRef, SmlContentType recvContentType, SmlError **error);
+void smlDevInfDataStoreFree(SmlDevInfDataStore *datastore);
+SmlBool smlDevInfDataStoreAssemble(SmlDevInfDataStore *datastore, char **data, unsigned int *size, SmlError **error);
-#endif //_SML_DEVINF_H_

branches/libsyncml-threaded/libsyncml/sml_devinf_internals.h

@@ -23 +23 @@
-
-struct SmlDevInf {
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-};
-

branches/libsyncml-threaded/libsyncml/sml_manager.c

@@ -299 +299 @@
-                        break;
-                case SML_SESSION_EVENT_CHILD_COMMAND:
+                        if (!smlManagerDispatchChildCommand(manager, session, parent, command, &locerror))
+                                goto error;
+                        break;
-                case SML_SESSION_EVENT_COMMAND:
-                        if (!smlManagerDispatchCommand(manager, session, command, &locerror))

branches/libsyncml-threaded/libsyncml/sml_manager.h

@@ -48 +48 @@
-void smlManagerObjectFree(SmlObject *object);
-SmlObject *smlManagerObjectFind(SmlManager *manager, SmlCommand *cmd);
+SmlBool smlManagerDispatchChildCommand(SmlManager *manager, SmlSession *session, SmlCommand *parent, SmlCommand *cmd, SmlError **error);
-SmlBool smlManagerDispatchHeader(SmlManager *manager, SmlSession *session, SmlHeader *header, SmlError **error);
-SmlBool smlManagerDispatchCommand(SmlManager *manager, SmlSession *session, SmlCommand *cmd, SmlError **error);

branches/libsyncml-threaded/libsyncml/sml_notification.c

@@ -51 +51 @@
- */
-
-
-
-p)", __func__
+MimeType type, Sml
+
+i, %i, %i, %i, %s, %i, %p)", __func__, version, mode, init, sessionID, identifier, type
-
-        SmlNotification *san = smlTryMalloc0(sizeof(SmlNotification), error);
@@ -64 +64 @@
-        san->sessionID = sessionID;
-        san->identifier = g_strdup(identifier);
+        san->type = type;
-        
-        smlTrace(TRACE_EXIT, "%s: %p", __func__, san);
@@ -252 +253 @@
-}
-
-
-
-p)", __func__, san, data, size
+ProtocolVersion version, Sml
+
+i, %p)", __func__, san, data, size, version
-        smlAssert(san);
-        smlAssert(data);
@@ -261 +262 @@
-        SmlCommand *cmd = NULL;
-
-SML_MIMETYPE_WBXML
+san->type
-        if (!assm)
-                goto error;
@@ -273 +274 @@
-                goto error_free_assm;
-        
-SML_MIMETYPE_WBXML, SML_VERSION_11
+san->type, version
-        if (!session) {
-                smlLocationFree(source);
@@ -297 +298 @@
-                        goto error_free_session;
-                
-
-
-
-
-
-
+
-                if (!cmd) {
-                        smlLocationFree(loc);
@@ -452 +448 @@
-                case SML_SAN_VERSION_12:
-                        return _smlNotificationAssemble12(san, data, size, error);
+                case SML_SAN_VERSION_10:
+                        return _smlNotificationAssemble11(san, data, size, SML_VERSION_10, error);
-                case SML_SAN_VERSION_11:
-
+
+