Changeset 3583

Timestamp:

08/22/08 16:42:09 (3 months ago)

Author:

bellmich

Message:

Fixes for OMA DS client support

- fixed the alert type of the second connection
- sent an empty sync command during the first connection
- the second connection is only initialized if there are

any changes to send

Files:

• plugins/syncml/src/syncml_callbacks.c (modified) (3 diffs)

plugins/syncml/src/syncml_callbacks.c

@@ -62 +62 @@
                         if (!env->abort)
                         {
-                                if (dsObject == env->dsObject1 && env->dsObject2) {
-                                        if (!smlDataSyncInit(env->dsObject2, &locerror))
-                                                goto error;
-                                        if (!smlDataSyncRun(env->dsObject2, &locerror))
-                                                goto error;
-                                } else {
+                                if (!env->dsObject2 || dsObject == env->dsObject2) {
                                         /* This is the real end of the sync process and
                                          * so it is a good idea to commit the changes here
@@ -92 +87 @@
                                 if (env->connectCtx)
                                         report_success_on_context(&(env->connectCtx));
+                                if (env->dsObject2)
+                                {
+                                        /* If this is the first connection of an
+                                         * OMA DS client then we send an empty sync.
+                                         */
+                                        if (!smlDataSyncSendChanges(env->dsObject1, &locerror))
+                                                goto error;
+                                }
                         } else {
                                 if (!smlDataSyncSendChanges(env->dsObject2, &locerror))
@@ -160 +163 @@
 
         SmlPluginEnv *env = userdata;
-        SmlDatabase *database = get_database_from_source(env, source, error);
-        if (!database)
-                goto error;
-
-        /* locate alert type of sink */
-        if (osync_objtype_sink_get_slowsync(database->sink))
-                type = SML_ALERT_SLOW_SYNC;
-        else
+
+        if (env->dsObject2 && env->dsObject2 == dsObject)
+        {
+                /* If this is the second connection of an OMA DS client
+                 * then first connection should be successful and so the
+                 * second connection should be no SLOW-SYNC.
+                 */
                 type = SML_ALERT_TWO_WAY;
+        } else {
+                SmlDatabase *database = get_database_from_source(env, source, error);
+                if (!database)
+                        goto error;
+
+                /* locate alert type of sink */
+                if (osync_objtype_sink_get_slowsync(database->sink))
+                        type = SML_ALERT_SLOW_SYNC;
+                else
+                        type = SML_ALERT_TWO_WAY;
+        }
 
         osync_trace(TRACE_EXIT, "%s - %d", __func__, type);