Changeset 488

Timestamp:

07/11/08 17:32:06 (4 months ago)

Author:

bellmich

Message:

- enforce error handling in DevInf? code more agressively
- enforce notification handling by manager if a normal SyncML

message is used for notification

- removed unnecessary MaxSize? functions from notification code

Files:

• trunk/libsyncml/parser/sml_xml_parse.c (modified) (4 diffs)
• trunk/libsyncml/sml_devinf.c (modified) (16 diffs)
• trunk/libsyncml/sml_manager.c (modified) (5 diffs)
• trunk/libsyncml/sml_notification.c (modified) (5 diffs)
• trunk/libsyncml/sml_notification.h (modified) (1 diff)
• trunk/tests/check_san.c (modified) (3 diffs)
• trunk/tests/check_session.c (modified) (3 diffs)
• trunk/tools/syncml-obex-client.c (modified) (3 diffs)

trunk/libsyncml/parser/sml_xml_parse.c

@@ -2401 +2401 @@
-                /* determine list item type */
-                SmlDevInfCTCapType type;
-NULL
+error
-                value = NULL;
-                if (type != SML_DEVINF_CTCAP_UNKNOWN)
@@ -2576 +2576 @@
-                /* determine item type */
-                SmlDevInfCTCapType type;
-NULL
+error
-                value = NULL;
-                if (type != SML_DEVINF_CTCAP_UNKNOWN)
@@ -2657 +2657 @@
-                /* determine item type */
-                SmlDevInfCTCapType type;
-NULL
+error
-                value = NULL;
-                if (type != SML_DEVINF_CTCAP_UNKNOWN &&
@@ -2761 +2761 @@
-                /* determine item type */
-                SmlDevInfCTCapType type;
-NULL
+error
-                value = NULL;
-                if (type != SML_DEVINF_CTCAP_UNKNOWN &&

trunk/libsyncml/sml_devinf.c

@@ -49 +49 @@
-SmlDevInfDevTyp smlDevInfDevTypeFromString(const char *name, SmlError **error)
-{
+        smlAssert(error);
+        smlAssert(*error == NULL);
+
-        if (!strcmp(name, SML_ELEMENT_DEVTYP_PAGER)) {
-                return SML_DEVINF_DEVTYPE_PAGER;
@@ -71 +74 @@
-const char *smlDevInfDevTypeToString(SmlDevInfDevTyp type, SmlError **error)
-{
+        smlAssert(error);
+        smlAssert(*error == NULL);
+
-        switch (type) {
-                case SML_DEVINF_DEVTYPE_PAGER:
@@ -97 +103 @@
-{
-        smlAssert(devid);
+        smlAssert(error);
+        smlAssert(*error == NULL);
-        smlTrace(TRACE_ENTRY, "%s(%s, %i, %p)", __func__, devid, devtyp, error);
-        
@@ -365 +373 @@
-SmlDevInfDataStore *smlDevInfDataStoreNew(const char *sourceRef, SmlError **error)
-{
+        smlAssert(error);
+        smlAssert(*error == NULL);
-        smlTrace(TRACE_ENTRY, "%s(%p, %p)", __func__, sourceRef, error);
-        
@@ -651 +661 @@
-        smlTrace(TRACE_ENTRY, "%s(%p, %i, %p, %p)", __func__, cmd, devinf, version, error);
-        smlAssert(cmd);
+        smlAssert(error);
+        smlAssert(*error == NULL);
-        SmlLocation *source = NULL;
-
@@ -692 +704 @@
-        smlTrace(TRACE_ENTRY, "%s(%p, %i, %p)", __func__, devinf, version, error);
-        smlAssert(devinf);
+        smlAssert(error);
+        smlAssert(*error == NULL);
-        SmlLocation *source = NULL;
-
@@ -740 +754 @@
-{
-        smlTrace(TRACE_ENTRY, "%s(%i, %p)", __func__, version, error);
+        smlAssert(error);
+        smlAssert(*error == NULL);
-        SmlLocation *target = NULL;
-        
@@ -773 +789 @@
-        smlAssert(data);
-        smlAssert(length);
+        smlAssert(error);
+        smlAssert(*error == NULL);
-        
-        SmlDevInf *devinf = smlXmlDevInfParse(data, length, error);
@@ -790 +808 @@
-        smlTrace(TRACE_ENTRY, "%s(%p, %p)", __func__, result, error);
-        smlAssert(result);
+        smlAssert(error);
+        smlAssert(*error == NULL);
-        
-        if (result->type != SML_COMMAND_TYPE_RESULTS) {
@@ -821 +841 @@
-SmlDevInfCTCapType smlDevInfCTCapTypeFromString(const char *name, SmlError **error)
-{
+        smlAssert(error);
+        smlAssert(*error == NULL);
+
-        if (!strcmp(name, SML_ELEMENT_CTTYPE)) {
-                return SML_DEVINF_CTCAP_CTTYPE;
@@ -854 +877 @@
-const char *smlDevInfCTCapTypeToString(SmlDevInfCTCapType type, SmlError **error)
-{
+        smlAssert(error);
+        smlAssert(*error == NULL);
+
-        switch (type) {
-                case SML_DEVINF_CTCAP_CTTYPE:
@@ -894 +920 @@
-{
-    smlTrace(TRACE_ENTRY, "%s(%p)", __func__, error);
+    smlAssert(error);
+    smlAssert(*error == NULL);
-
-    SmlDevInfPropParam *param = smlTryMalloc0(sizeof(SmlDevInfPropParam), error);
@@ -1018 +1046 @@
-{
-    smlTrace(TRACE_ENTRY, "%s(%p)", __func__, error);
+    smlAssert(error);
+    smlAssert(*error == NULL);
-
-    SmlDevInfProperty *property = smlTryMalloc0(sizeof(SmlDevInfProperty), error);
@@ -1251 +1281 @@
-{
-    smlTrace(TRACE_ENTRY, "%s(%p)", __func__, error);
+    smlAssert(error);
+    smlAssert(*error == NULL);
-
-    SmlDevInfContentType *ct = smlTryMalloc0(sizeof(SmlDevInfContentType), error);
@@ -1298 +1330 @@
-{
-    smlTrace(TRACE_ENTRY, "%s(%p)", __func__, error);
+    smlAssert(error);
+    smlAssert(*error == NULL);
-
-    SmlDevInfCTCap *ctcap = smlTryMalloc0(sizeof(SmlDevInfCTCap), error);
@@ -1401 +1435 @@
-        const SmlDevInfCTCap *ctcap = smlDevInfGetNthCTCap(devinf, nth);
-        char *type = smlDevInfCTCapGetCTType(ctcap);
-
+
+
-        smlSafeCFree(&type);
-        return cttype;

trunk/libsyncml/sml_manager.c

@@ -235 +235 @@
-                                if (!(session = smlSessionNew(SML_SESSION_TYPE_SERVER, data->type, header->version, header->protocol, header->source, header->target, header->sessionID, 1, &locerror)))
-                                        goto error_free_header;
-                                if (manager->localMaxMsgSize)
-                                        smlSessionSetLocalMaxMsgSize(session, manager->localMaxMsgSize);
-                                if (manager->localMaxObjSize)
-                                        smlSessionSetLocalMaxObjSize(session, manager->localMaxObjSize);
-                                
-                                if (!smlManagerSessionAdd(manager, session, link, &locerror))
-                                        goto error_free_header;
+                                smlSessionUnref(session);
-                        }
-
@@ -634 +630 @@
-        smlTrace(TRACE_ENTRY, "%s(%p, %p, %p, %p)", __func__, manager, session, link, error);
-        
+        smlSessionRef(session);
+
-        if (smlSessionGetSessionID(session)) {
-                //Check if sessionID exists
@@ -646 +644 @@
-                        manager->lastSessionID = atoi(smlSessionGetSessionID(session));
-        } else {
+                /* FIXME: This is critical because the session ID is predictable. */
+                g_warning("%s: Using predictable session numbering.", __func__);
-                manager->lastSessionID++;
-                char *lastid = g_strdup_printf("%i", manager->lastSessionID);
@@ -667 +667 @@
-        
-        manager->sessions = g_list_append(manager->sessions, sess);
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        smlSessionSetEventCallback(session, _event_callback, manager);
-        smlSessionSetDataCallback(session, _data_send_callback, sess);
@@ -677 +696 @@
-                
-error:
+        smlSessionUnref(session);
-        smlTrace(TRACE_EXIT_ERROR, "%s: %s", __func__, smlErrorPrint(error));
-        return FALSE;

trunk/libsyncml/sml_notification.c

@@ -25 +25 @@
-#include "sml_transport_internals.h"
-#include "sml_command_internals.h"
+#include "sml_manager_internals.h"
-
-/**
@@ -95 +96 @@
-        // FIXME: this is a hack because the original implementation
-        // FIXME: only support server
+        // Only one question which client sends a notification!?
-        san->sessionType = SML_SESSION_TYPE_CLIENT;
-        smlCredRef(cred);
@@ -317 +319 @@
-        smlAssert(data);
-        smlAssert(size);
+
+        /* If a notification is sent via a normal SyncML message
+         * then the used session must be managed to guarantee the
+         * consistency of the session.
+         */
+        smlAssert(san->manager);
+
-        SmlSanAlert *alert = NULL;
-        SmlCommand *cmd = NULL;
@@ -328 +337 @@
-                goto error_free_assm;
-
-
+
+
+
-        if (!session) {
-                smlLocationUnref(source);
-                goto error_free_assm;
-        }
-
-
+
+
+
+
+
-        if (san->cred)
-                smlSessionRegisterCred(session, san->cred);
-        if (san->manager)
-                smlManagerSessionAdd(san->manager, session, NULL, error);
-
-        if (!smlAssemblerStart(assm, session, error))
@@ -618 +630 @@
-}
-
-void smlNotificationSetLocalMaxMsgSize(SmlNotification *san, unsigned int size)
-{
-        smlAssert(san);
-        san->localMaxMsgSize = size;
-}
-
-void smlNotificationSetLocalMaxObjSize(SmlNotification *san, unsigned int size)
-{
-        smlAssert(san);
-        san->localMaxObjSize = size;
-}
-
-/*@}*/

trunk/libsyncml/sml_notification.h

@@ -64 +64 @@
-const char *smlSanAlertGetServerURI(SmlSanAlert *alert);
-
-void smlNotificationSetLocalMaxMsgSize(SmlNotification *san, unsigned int size);
-void smlNotificationSetLocalMaxObjSize(SmlNotification *san, unsigned int size);
-
-#endif //_SML_NOTIFICATION_H_

trunk/tests/check_san.c

@@ -21 +21 @@
-#include "support.h"
-
+/* If the notification is a normal SyncML message then a manager is
+ * required. The easiest way are two function which create and destroy
+ * a default manager - only for testing.
+ */
+
+SmlTransport *_tsp = NULL;
+
+SmlManager* _start_manager()
+{
+        unsigned int defaultMaxMsgSize = 10240;
+        unsigned int defaultMaxObjSize = 1024000;
+
+        SmlError *error = NULL;
+        _tsp = smlTransportNew(SML_TRANSPORT_HTTP_SERVER, &error);
+        fail_unless(_tsp != NULL, smlErrorPrint(&error));
+        fail_unless(error == NULL, smlErrorPrint(&error));
+        
+        SmlManager *manager = smlManagerNew(_tsp, &error);
+        fail_unless(manager != NULL, smlErrorPrint(&error));
+        fail_unless(error == NULL, smlErrorPrint(&error));
+
+        smlManagerSetLocalMaxMsgSize(manager, defaultMaxMsgSize);
+        smlManagerSetLocalMaxObjSize(manager, defaultMaxObjSize);
+
+        return manager;
+}
+
+void *_stop_manager(SmlManager *manager)
+{
+        smlManagerFree(manager);
+        smlTransportFree(_tsp);
+}
+
-START_TEST (check_san_new)
-{
@@ -176 +209 @@
-        fail_unless(san != NULL, NULL);
-        fail_unless(error == NULL, NULL);
+        SmlManager *manager = _start_manager();
+        smlNotificationSetManager(san, manager);
-        
-        fail_unless(smlNotificationNewAlert(san, SML_ALERT_TWO_WAY_BY_SERVER, SML_ELEMENT_TEXT_VCARD, "tttt", &error), NULL);
-        fail_unless(error == NULL, NULL);
-        smlNotificationSetLocalMaxMsgSize(san, 1024);
-        smlNotificationSetLocalMaxObjSize(san, 102400);
-        
-        char *buffer = NULL;
@@ -187 +220 @@
-        fail_unless(error == NULL, NULL);
-        smlNotificationFree(san);
+
+        _stop_manager(manager);
-
-        /* SyncML 1.1 SAN parsing is not supported today. */

trunk/tests/check_session.c

@@ -252 +252 @@
-        smlTrace(TRACE_EXIT, "%s", __func__);
-}
+
+/* If the notification is a normal SyncML message then a manager is
+ * required. The easiest way are two function which create and destroy
+ * a default manager - only for testing.
+ */
+
+SmlTransport *_tsp = NULL;
+
+SmlManager* _start_manager()
+{
+        unsigned int defaultMaxMsgSize = 10240;
+        unsigned int defaultMaxObjSize = 1024000;
+
+        SmlError *error = NULL;
+        _tsp = smlTransportNew(SML_TRANSPORT_HTTP_SERVER, &error);
+        fail_unless(_tsp != NULL, smlErrorPrint(&error));
+        fail_unless(error == NULL, smlErrorPrint(&error));
+        
+        SmlManager *manager = smlManagerNew(_tsp, &error);
+        fail_unless(manager != NULL, smlErrorPrint(&error));
+        fail_unless(error == NULL, smlErrorPrint(&error));
+
+        smlManagerSetLocalMaxMsgSize(manager, defaultMaxMsgSize);
+        smlManagerSetLocalMaxObjSize(manager, defaultMaxObjSize);
+
+        return manager;
+}
+
+void *_stop_manager(SmlManager *manager)
+{
+        smlManagerFree(manager);
+        smlTransportFree(_tsp);
+}
+
-
-START_TEST (check_session_new)
@@ -2508 +2542 @@
-        
-        SmlNotification *san = smlNotificationNew(SML_SAN_VERSION_11, SML_SAN_UIMODE_USER, SML_SAN_INITIATOR_SERVER, 65535, "test", "/", SML_MIMETYPE_XML, &error);
-NULL
-NULL
-smlNotificationSetLocalMaxMsgSize(san, defaultMaxMsgSize
-LocalMaxObjSize(san, defaultMaxObjSize
+smlErrorPrint(&error)
+smlErrorPrint(&error)
+SmlManager *manager = _start_manager(
+Manager(san, manager
-        
-        fail_unless(smlNotificationNewAlert(san, SML_ALERT_TWO_WAY_BY_SERVER, SML_ELEMENT_TEXT_VCARD, "tttt", &error), NULL);
@@ -2595 +2629 @@
-        smlSessionUnref(session2);
-        smlSessionUnref(session);
+
+        _stop_manager(manager);
-}
-END_TEST

trunk/tools/syncml-obex-client.c

@@ -625 +625 @@
-                goto error;
-        smlManagerSetEventCallback(manager, _manager_event, NULL);
+        if (useLargeObjs)
+        {
+                /* This is a server which supports SyncML 1.1 or higher.
+                 * So large objects must be supported.
+                 */
+                smlManagerSetLocalMaxMsgSize(manager, recvLimit);
+                smlManagerSetLocalMaxObjSize(manager, maxObjSize);
+        }
-        
-        /* The authenticator */
@@ -660 +668 @@
-        if (!san)
-                goto error;
+        smlNotificationSetManager(san, manager);
-                
-        for (i = 1; i < argc; i++) {
@@ -756 +765 @@
-                goto error;
-
-        /* Send notification */
-        if (useLargeObjs)
-        {
-                /* This is a server which uses SyncML 1.1 or higher.
-                 * So large objects must be supported.
-                 */
-                smlNotificationSetLocalMaxMsgSize(san, recvLimit);
-                smlNotificationSetLocalMaxObjSize(san, maxObjSize);
-        }
-        if (!smlNotificationSend(san, client, &error))
-                goto error;