Changeset 415

Timestamp:

03/14/08 15:25:16 (8 months ago)

Author:

bellmich

Message:

- target reset initiated on session end if RespURI was used
- error messages for ADD, REPLACE and DELETE are now handled more correctly

Files:

• trunk/libsyncml/objects/sml_devinf_obj.c (modified) (2 diffs)
• trunk/libsyncml/parser/sml_xml_parse.c (modified) (2 diffs)
• trunk/libsyncml/sml_session.c (modified) (5 diffs)
• trunk/libsyncml/sml_session_internals.h (modified) (2 diffs)

trunk/libsyncml/objects/sml_devinf_obj.c

@@ -271 +271 @@
-void smlDevInfAgentSetDevInf(SmlDevInfAgent *agent, SmlDevInf *devinf)
-{
+        smlTrace(TRACE_ENTRY, "%s(%p, %p)", __func__, agent, devinf);
-        smlAssert(agent);
-        smlAssert(devinf);
-        agent->recvDevInf = devinf;
+        smlTrace(TRACE_EXIT, "%s", __func__);   
-}
-
@@ -279 +281 @@
-SmlDevInf *smlDevInfAgentGetDevInf(SmlDevInfAgent *agent)
-{
+        smlTrace(TRACE_INTERNAL, "%s(%p)", __func__, agent);
-        smlAssert(agent);
-        return agent->recvDevInf;

trunk/libsyncml/parser/sml_xml_parse.c

@@ -1876 +1876 @@
-                                goto error_free_status;
-                } else if (!strcmp((char *)xmlTextReaderConstName(parser->reader), SML_ELEMENT_ITEM)) {
-
+
+
+
+
+
-                        if (!item)
-                                goto error_free_status;
@@ -1894 +1898 @@
-                goto error_free_status;
-        }
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                smlItemUnref(item);
-        }

trunk/libsyncml/sml_session.c

@@ -139 +139 @@
-                smlTrace(TRACE_INTERNAL, "Ending session now");
-                session->end = TRUE;
+                smlSessionRestoreTargetURI(session);
-                smlSessionDispatchEvent(session, SML_SESSION_EVENT_END, NULL, NULL, NULL, NULL);
-        }
@@ -608 +609 @@
-         * then the URI in the transport layer must be adjusted. */
-        if (header->responseURI) {
-
+
+
+
+
+
+
+
+
+
+
+
-                session->target = smlLocationNew(
-                                        header->responseURI,
-t
+orgT
-                                        error);
-                smlLocationUnref(old);
-                if (!session->target)
-                        goto error;
-                smlSessionDispatchEvent(session, SML_SESSION_EVENT_RESPONSE_URI, NULL, NULL, NULL, NULL);
+                smlTrace(TRACE_INTERNAL, "%s: RespURI: %s, Target: %s", __func__,
+                        smlLocationGetURI(session->target),
+                        smlLocationGetURI(session->orgTarget));
-        }
-        smlTrace(TRACE_EXIT, "%s", __func__);
@@ -1299 +1312 @@
-                 */
-                if (!final || session->sessionType != SML_SESSION_TYPE_SERVER)
+                {
+                        smlSessionRestoreTargetURI(session);
-                        smlSessionDispatchEvent(session, SML_SESSION_EVENT_END, NULL, NULL, NULL, NULL);
+                }
-        }
-
@@ -1657 +1673 @@
-                 */
-                smlTrace(TRACE_INTERNAL, "%s: no status/command ... only sending event", __func__);
+                smlSessionRestoreTargetURI(session);
-                smlSessionDispatchEvent(session, SML_SESSION_EVENT_END, NULL, NULL, NULL, NULL);
-        }
@@ -1666 +1683 @@
-        smlTrace(TRACE_EXIT_ERROR, "%s: %s", __func__, smlErrorPrint(error));
-        return FALSE;
+}
+
+void smlSessionRestoreTargetURI(SmlSession *session)
+{
+        smlTrace(TRACE_ENTRY, "%s(%p)", __func__, session);
+        smlAssert(session);
+
+        if (session->orgTarget) {
+                /* Restore original target if RespURI was used.
+                 * This is important if somebody re-use the transport layer.
+                 * Example: Sometimes an OMA DS client needs two OMA DS sessions
+                 *          to synchronize (e.g. OpenSync's SyncML plugin).
+                 */
+                smlLocationUnref(session->target);
+                session->target = session->orgTarget;
+                session->orgTarget = NULL;
+                smlSessionDispatchEvent(session, SML_SESSION_EVENT_RESPONSE_URI, NULL, NULL, NULL, NULL);
+        }
+
+        smlTrace(TRACE_EXIT, "%s", __func__);
-}
-

trunk/libsyncml/sml_session_internals.h

@@ -41 +41 @@
-        
-        SmlLocation *target;
+        SmlLocation *orgTarget;
-        SmlLocation *source;
-        SmlCred *cred;
@@ -97 +98 @@
-void smlSessionUnlock(SmlSession *session);
-
+void smlSessionRestoreTargetURI(SmlSession *session);
+
-#endif //_SML_SESSION_INTERNALS_H_