Changeset 162

Timestamp:

05/06/06 17:29:28 (3 years ago)

Author:

azrael

Message:

Fixed several bugs

added support for the 6230

Files:

• branches/dev-branch/devices.txt (modified) (1 diff)
• branches/dev-branch/libsyncml/parser/sml_xml_assm.c (modified) (2 diffs)
• branches/dev-branch/libsyncml/parser/sml_xml_parse.c (modified) (5 diffs)
• branches/dev-branch/tools/syncml-obex-client.c (modified) (5 diffs)

branches/dev-branch/devices.txt

@@ -67 +67 @@
-
-Supported: Unknown
+
+========================================
+Man: Nokia
+Mod: Nokia 6230
+FirmwareVersion: V 05.50
+SoftwareVersion: V 05.50
+HardwareVersion: 0606
+
+ReceiveLimit: 0
+MaxObjSize: 0
+AllowLateStatus: no
+NoPendingReplies: no
+Connection used: Obex
+Identifier: PC Suite
+Contact DB: vcard
+Event DB: (null)
+Todo DB: (null)
+Note DB: (null)
+
+Bluetooth: Yes
+Wbxml: Yes
+SyncML Version: 1.1
+SupportsNumberofChanges: No
+SupportsLargeObjects: No

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

@@ -448 +448 @@
-                goto error;
-        
-
+/*
-                if (!_smlXmlAssemblerAddID(assm, SML_ELEMENT_NUMBEROFCHANGES, cmd->private.sync.numChanged, error))
-                        goto error;
-
+*/
-        
-        smlTrace(TRACE_EXIT, "%s", __func__);
@@ -1102 +1102 @@
-                goto error;
-        
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-        
-        switch (status->type) {

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

@@ -583 +583 @@
-                                                goto error_free_item;
-                                        break;
+                                case SML_COMMAND_TYPE_RESULTS:
-                                case SML_COMMAND_TYPE_PUT:;
-                                        /* Some phones send the type information for the devinf put
@@ -1924 +1925 @@
-        smlAssert(element);
-        smlAssert(cttype);
-
+
+
+
+
+
+
-        while (1) {
-                if (!_smlXmlParserStep(parser)) {
-                        smlErrorSet(error, SML_ERROR_GENERIC, "Missing nodes");
-                        goto error;
-                }
-                
-                if (!strcmp((char *)xmlTextReaderConstName(parser->reader), element) && \
-                xmlTextReaderNodeType(parser->reader) == XML_NODE_CLOSE) {
-                        break;
-                } else if (xmlTextReaderNodeType(parser->reader) != XML_NODE_START) {
-"
+: %s %i", (char *)xmlTextReaderConstName(parser->reader), xmlTextReaderNodeType(parser->reader)
-                        goto error;
-                }
@@ -1943 +1944 @@
-                                goto error;
-                } else if (!strcmp((char *)xmlTextReaderConstName(parser->reader), SML_ELEMENT_VERCT)) {
-
+
+
+
+
-                                goto error;
+                        }
+                        
+                        if (!strcmp((char *)xmlTextReaderConstName(parser->reader), SML_ELEMENT_VERCT) && \
+                                xmlTextReaderNodeType(parser->reader) == XML_NODE_CLOSE) {
+                                *version = g_strdup("");
+                        } else if (xmlTextReaderNodeType(parser->reader) == XML_NODE_TEXT) {
+                                *version = g_strstrip(g_strdup((char *)xmlTextReaderConstValue(parser->reader)));
+                                
+                                if (!_smlXmlParserExpectNode(parser, XML_NODE_CLOSE, FALSE, SML_ELEMENT_VERCT, error))
+                                        goto error;
+                        } else {
+                                *version = g_strdup("");
+                                continue;
+                        }
-                } else {
-                        smlErrorSet(error, SML_ERROR_GENERIC, "wrong initial node");
+                        goto error;
+                }
+                
+                if (!_smlXmlParserStep(parser)) {
+                        smlErrorSet(error, SML_ERROR_GENERIC, "Missing nodes");
-                        goto error;
-                }
@@ -2088 +2111 @@
-                
-        while (1) {
+                if (!strcmp((char *)xmlTextReaderConstName(parser->reader), SML_ELEMENT_DEVINF) && \
+                xmlTextReaderNodeType(parser->reader) == XML_NODE_CLOSE) {
+                        break;
+                } else if (xmlTextReaderNodeType(parser->reader) != XML_NODE_START) {
+                        smlErrorSet(error, SML_ERROR_GENERIC, "Not a start node");
+                        goto error_free_devinf;
+                }
+                
+                
-                if (!strcmp((char *)xmlTextReaderConstName(parser->reader), SML_ELEMENT_CTCAP)) {
-                        /* Ignored for now */
+                        smlTrace(TRACE_INTERNAL, "Skipping ctcap node");
-                        if (xmlTextReaderNext(parser->reader) != 1) {
-                                smlErrorSet(error, SML_ERROR_GENERIC, "Unable to skip ctcap node");
-                                goto error;
-                        }
-
-
-
-
-
-
-
-
-
-
-
+
+
-                        char *verdtd = NULL;
-                        if (!_smlXmlParserGetString(parser, &verdtd, SML_ELEMENT_VERDTD, error))
@@ -2214 +2238 @@
-                                goto error_free_devinf;
-                } else {
-"
+: %s", (char *)xmlTextReaderConstName(parser->reader)
-                        goto error_free_devinf;
-                }

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

@@ -74 +74 @@
-        fprintf (stderr, "[--allowLateStatus]\t\t\tAllows that a phone can send commands before statuses (Needed for some phones)\n\n");
-        fprintf (stderr, "[--noPendingReplies]\t\t\tRequire that no pending replies are allowed (Needed for some phones)\n\n");
+        fprintf (stderr, "[--noStringTable]\t\t\tDont use wbxml string tables (Needed for some phones)\n\n");
-        fprintf (stderr, "[--dumpinfo]\t\t\tPrint info about the phone at the end which can be sent to the developers\n");
-        exit (ecode);
@@ -245 +246 @@
-SmlBool noPending = FALSE;
-SmlBool dumpinfo = FALSE;
+SmlBool noStringTable = FALSE;
-SmlProtocolVersion sessionVersion = SML_VERSION_UNKNOWN;
-SmlDevInf *deviceDevinf = NULL;
@@ -280 +282 @@
-                        if (noPending)
-                                smlSessionSetNoPendingReplies(session, noPending);
+                                
+                        if (noStringTable)
+                                smlSessionUseStringTable(session, FALSE);
-                        break;
-                case SML_MANAGER_SESSION_FINAL:
@@ -497 +502 @@
-                } else if (!strcmp (arg, "--noPendingReplies")) {
-                        noPending = TRUE;
+                } else if (!strcmp (arg, "--noStringTable")) {
+                        noStringTable = TRUE;
-                } else if (!strcmp (arg, "--version")) {
-                        i++;
@@ -732 +739 @@
-                        printf("HardwareVersion: %s\n", smlDevInfGetHardwareVersion(deviceDevinf));
-                        printf("\n");
-
-
-
-
-
-
-
+
+
+
+
-                        printf("Connection used: Obex\n");
-                        printf("Identifier: %s\n", identifier);