Changeset 163

Timestamp:

05/18/06 16:36:45 (3 years ago)

Author:

abauer

Message:

Added warning events besides error events

Files:

• branches/dev-branch/libsyncml/parser/sml_xml_parse.c (modified) (2 diffs)
• branches/dev-branch/libsyncml/sml_command.c (modified) (2 diffs)
• branches/dev-branch/libsyncml/sml_manager.c (modified) (4 diffs)
• branches/dev-branch/libsyncml/sml_manager.h (modified) (1 diff)
• branches/dev-branch/tests/check_devinf.c (modified) (1 diff)
• branches/dev-branch/tests/check_manager.c (modified) (1 diff)
• branches/dev-branch/tests/check_sync.c (modified) (1 diff)
• branches/dev-branch/tools/syncml-http-server.c (modified) (9 diffs)
• branches/dev-branch/tools/syncml-obex-client.c (modified) (5 diffs)

branches/dev-branch/libsyncml/parser/sml_xml_parse.c

@@ -1206 +1206 @@
-        
-        if (!(*cmd)->private.access.item) {
-
+/Get
-                goto error_free_cmd;
-        }
@@ -1213 +1213 @@
-         * a content type set */
-        if ((*cmd)->private.access.item->contenttype == SML_CONTENT_TYPE_UNKNOWN) {
-                if (!contenttype) {
-                        smlErrorSet(error, SML_ERROR_GENERIC, "Put is missing content type");
-                        goto error_free_cmd;
-                }
-                
-                (*cmd)->private.access.item->contenttype = smlContentTypeFromString(contenttype, error);
-!(*cmd)->private.access.item->contenttype
+smlErrorIsSet(error)
-                        goto error_free_cmd;
-        }

branches/dev-branch/libsyncml/sml_command.c

@@ -38 +38 @@
-SmlContentType smlContentTypeFromString(const char *name, SmlError **error)
-{
+        if (!name)
+                return SML_CONTENT_TYPE_UNKNOWN;
+        
-        if (!strcmp(name, SML_ELEMENT_TEXT_VCARD))
-                return SML_CONTENT_TYPE_VCARD;
@@ -72 +75 @@
-SmlCommandType smlCommandTypeFromString(const char *name, SmlError **error)
-{
+        if (!name)
+                return SML_COMMAND_TYPE_UNKNOWN;
+        
-        if (!strcmp(name, SML_ELEMENT_ALERT)) {
-                return SML_COMMAND_TYPE_ALERT;

branches/dev-branch/libsyncml/sml_manager.c

@@ -472 +472 @@
-                        break;
-                case SML_SESSION_EVENT_CHILD_COMMAND:
-
+
+
-                                goto error;
+                        }
-                        break;
-                case SML_SESSION_EVENT_COMMAND:
-
+
+
-                                goto error;
+                        }
-                        break;
-                case SML_SESSION_EVENT_FINAL:
@@ -494 +498 @@
-                        /* Pass the error through */
-                        smlErrorDuplicate(&locerror, &error);
+                        _smlManagerSendEvent(manager, SML_MANAGER_SESSION_ERROR, session, NULL, NULL, locerror);
-                        goto error;
-                        break;
@@ -502 +507 @@
-                
-error:
-        _smlManagerSendEvent(manager, SML_MANAGER_SESSION_ERROR, session, NULL, NULL, locerror);
-        smlTrace(TRACE_EXIT_ERROR, "%s: %s", __func__, smlErrorPrint(&locerror));
-        smlErrorDeref(&locerror);
@@ -850 +854 @@
-                object->commandCallback(session, cmd, object->commandCallbackUserdata);
-        } else {
-GENERIC
+NOT_FOUND
-                
-                SmlStatus *reply = smlCommandNewReply(cmd, SML_ERROR_NOT_FOUND, error);

branches/dev-branch/libsyncml/sml_manager.h

@@ -30 +30 @@
-        SML_MANAGER_SESSION_END,
-        SML_MANAGER_SESSION_FLUSH,
+        SML_MANAGER_SESSION_WARNING,
-        SML_MANAGER_SESSION_ERROR
-} SmlManagerEventType;

branches/dev-branch/tests/check_devinf.c

@@ -70 +70 @@
-                        break;
-                case SML_MANAGER_SESSION_ERROR:
+                case SML_MANAGER_SESSION_WARNING:
-                        session_errors++;
-                        break;

branches/dev-branch/tests/check_manager.c

@@ -115 +115 @@
-                        break;
-                case SML_MANAGER_SESSION_ERROR:
+                case SML_MANAGER_SESSION_WARNING:
-                        session_errors++;
-                        break;

branches/dev-branch/tests/check_sync.c

@@ -86 +86 @@
-                        break;
-                case SML_MANAGER_SESSION_ERROR:
+                case SML_MANAGER_SESSION_WARNING:
-                        session_errors++;
-                        break;

branches/dev-branch/tools/syncml-http-server.c

@@ -63 +63 @@
-        fprintf (stderr, "[--allowLateStatus]\t\t\tAllows that a phone can send commands before statuses (Needed for some phones)\n\n");
-        fprintf (stderr, "[--maxObjSize <limit>]\t\t\tThe maximum size of a object that we can receive (Needed for some phones)\n\n");
-
+
+
-        fprintf (stderr, "Example: %s --port 9999 --sync vcal /events --sync vcard /addressbook --multi --san\n", name);
-        exit (ecode);
@@ -226 +227 @@
-SmlBool lateStatus = FALSE;
-SmlBool noPending = FALSE;
+SmlBool dumpinfo = FALSE;
+SmlProtocolVersion sessionVersion = SML_VERSION_UNKNOWN;
+SmlDevInf *deviceDevinf = NULL;
+
-
-static void _manager_event(SmlManager *manager, SmlManagerEventType type, SmlSession *session, SmlError *error, void *userdata)
-{
-        smlTrace(TRACE_ENTRY, "%s(%p, %i, %p, %p, %p)", __func__, manager, type, session, error, userdata);
-DevInf *devinf
+Error *locerror
-        
-        switch (type) {
@@ -240 +245 @@
-                        break;
-                case SML_MANAGER_TRANSPORT_ERROR:
-
+
+
+
-                        break;
-                case SML_MANAGER_SESSION_NEW:
-                        printf("Just received a new session with ID %s\n", smlSessionGetSessionID(session));
+                        sessionVersion = smlSessionGetVersion(session);
-                        
-                        if (recvLimit)
@@ -258 +266 @@
-                        break;
-                case SML_MANAGER_SESSION_FINAL:
-(d
+!deviceDevinf && (deviceD
-                                printf("Received the DevInf\n");
+                        
+                        /* We want to know about the device so we check if we received
+                         * the devinf already */
+                        if (dumpinfo && !deviceDevinf) {
+                                printf("Going to request the devinf\n");
+                                if (!smlDevInfAgentRequestDevInf(agent, session, &locerror))
+                                        goto error;
+                        }
-                        
-                        printf("Session %s reported final. flushing\n", smlSessionGetSessionID(session));
@@ -271 +287 @@
-                        }
-                        break;
+                case SML_MANAGER_SESSION_WARNING:
+                        printf("WARNING: %s", smlErrorPrint(&error));
+                        break;
-                case SML_MANAGER_SESSION_ERROR:
-                        printf("There was an error in the session %s: %s", smlSessionGetSessionID(session), smlErrorPrint(&error));
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -336 +365 @@
-        config.url = NULL;
-        config.interface = NULL;
+        
+        char *contactDB = NULL;
+        char *eventDB = NULL;
+        char *todoDB = NULL;
+        char *noteDB = NULL;
-        
-        SmlError *error = NULL;
@@ -373 +407 @@
-                } else if (!strcmp (arg, "--noPendingReplies")) {
-                        noPending = TRUE;
+                } else if (!strcmp (arg, "--dumpinfo")) {
+                        dumpinfo = TRUE;
-                } else if (!strcmp (arg, "--help")) {
-                        usage (argv[0], 0);
@@ -426 +462 @@
-                        
-                        SmlContentType type = SML_CONTENT_TYPE_UNKNOWN;
-
+ {
-                                type = SML_CONTENT_TYPE_VCAL;
-
+
+
-                                type = SML_CONTENT_TYPE_VCARD;
-
+
+
-                                type = SML_CONTENT_TYPE_VTODO;
+                                todoDB = argv[i];
+                        } else if (!strcmp(argv[i], "note")) {
+                                type = SML_CONTENT_TYPE_PLAIN;
+                                noteDB = argv[i];
+                        }
-                        
-                        if (type == SML_CONTENT_TYPE_UNKNOWN)
@@ -543 +586 @@
-        smlTransportFree(client);
-        
+        if (dumpinfo) {
+                if (!deviceDevinf) {
+                        printf("Didnt receive the devinf though it was requested\n");
+                } else {
+                        printf("Send the output below to the libsyncml developers\n");
+                        printf("\n========================================\n");
+                        printf("Man: %s\n", smlDevInfGetManufacturer(deviceDevinf));
+                        printf("Mod: %s\n", smlDevInfGetModel(deviceDevinf));
+                        printf("FirmwareVersion: %s\n", smlDevInfGetFirmwareVersion(deviceDevinf));
+                        printf("SoftwareVersion: %s\n", smlDevInfGetSoftwareVersion(deviceDevinf));
+                        printf("HardwareVersion: %s\n", smlDevInfGetHardwareVersion(deviceDevinf));
+                        printf("\n");
+                        printf("ReceiveLimit: %i\n", recvLimit);
+                        printf("MaxObjSize: %i\n", maxObjSize);
+                        printf("AllowLateStatus: %s\n", lateStatus ? "yes" : "no");
+                        printf("NoPendingReplies: %s\n", noPending ? "yes" : "no");
+                        printf("Connection used: Obex\n");
+                        printf("Contact DB: %s\n", contactDB);
+                        printf("Event DB: %s\n", eventDB);
+                        printf("Todo DB: %s\n", todoDB);
+                        printf("Note DB: %s\n", noteDB);
+                        printf("\n");
+                        printf("SyncML Version: 1.%i\n", sessionVersion - 1);
+                        printf("SupportsNumberofChanges: %s\n", smlDevInfSupportsNumberOfChanges(deviceDevinf) ? "Yes" : "No");
+                        printf("SupportsLargeObjects: %s\n", smlDevInfSupportsLargeObjs(deviceDevinf) ? "Yes" : "No");
+                }
+        }
+        
-        return 0;
-

branches/dev-branch/tools/syncml-obex-client.c

@@ -311 +311 @@
-                        g_main_loop_quit(loop);
-                        break;
+                case SML_MANAGER_SESSION_WARNING:
+                        printf("WARNING: %s", smlErrorPrint(&error));
+                        break;
-                case SML_MANAGER_SESSION_FLUSH:
-                        break;
@@ -429 +432 @@
-        char *noteDB = NULL;
-        
-t
+mimeT
-        
-        SmlError *error = NULL;
@@ -520 +523 @@
-                        usage (argv[0], 0);
-                } else if (!strcmp (arg, "--wbxml")) {
-t
+mimeT
-                } else if (!strcmp (arg, "--dumpinfo")) {
-                        dumpinfo = TRUE;
@@ -569 +572 @@
-                identifier = g_strdup("LibSyncML Test Suite");
-                
-t
+mimeT
-        if (!san)
-                goto error;
@@ -751 +754 @@
-                        printf("\n");
-                        printf("Bluetooth: %s\n", config.type == SML_OBEX_TYPE_BLUETOOTH ? "Yes" : "Unknown"); 
-t
+mimeT
-                        printf("SyncML Version: 1.%i\n", sessionVersion - 1);
-                        printf("SupportsNumberofChanges: %s\n", smlDevInfSupportsNumberOfChanges(deviceDevinf) ? "Yes" : "No");