Ticket #104: libsyncml-devinf12-0.4.2+svn20070208.diff

libsyncml/objects/sml_devinf_obj.c

@@ -95 +95 @@
-        
-        if (!agent->devinfSent) {
-                if (get) {
-
+
+
-                                result = smlDevInfNewResult(get, agent->devinf, SML_DEVINF_VERSION_10, error);
-
+ if (ver == SML_VERSION_11)
-                                result = smlDevInfNewResult(get, agent->devinf, SML_DEVINF_VERSION_11, error);
-
+
+
+
-                        if (!result)
-                                goto error;
-                        
@@ -123 +126 @@
-                } else {
-                        if (smlSessionGetVersion(session) == SML_VERSION_10)
-                                cmd = smlDevInfNewPut(agent->devinf, SML_DEVINF_VERSION_10, error);
-
+ if (smlSessionGetVersion(session) == SML_VERSION_11)
-                                cmd = smlDevInfNewPut(agent->devinf, SML_DEVINF_VERSION_11, error);
-
+
+
-                        if (!cmd)
-                                goto error;
-                        
@@ -281 +285 @@
-        
-        if (smlSessionGetVersion(session) == SML_VERSION_10)
-                get = smlDevInfNewGet(SML_DEVINF_VERSION_10, error);
-
+ if (smlSessionGetVersion(session) == SML_VERSION_11)
-                get = smlDevInfNewGet(SML_DEVINF_VERSION_11, error);
-
+
+
+
-        if (!get)
-                goto error;
-                
@@ -308 +314 @@
-        smlAssert(agent);
-        smlAssert(manager);
-
-        SmlLocation *devinf11 = smlLocationNew("./devinf11", NULL, error);
-        SmlLocation *devinf10 = smlLocationNew("./devinf10", NULL, error);
+        SmlLocation *devinf11 = smlLocationNew("./devinf11", NULL, error);
+        SmlLocation *devinf12 = smlLocationNew("./devinf12", NULL, error);
-
-1 || !devinf10
+0 || !devinf11 || !devinf12
-                goto error;
-
-        if (!smlManagerObjectRegister(manager, SML_COMMAND_TYPE_PUT, session, NULL, devinf10, NULL, _recv_devinf, NULL, agent, error))
-                goto error_free_loc;
-        if (!smlManagerObjectRegister(manager, SML_COMMAND_TYPE_PUT, session, NULL, devinf11, NULL, _recv_devinf, NULL, agent, error))
-                goto error_free_loc;
+        if (!smlManagerObjectRegister(manager, SML_COMMAND_TYPE_PUT, session, NULL, devinf12, NULL, _recv_devinf, NULL, agent, error))
+                goto error_free_loc;
-
-        if (!smlManagerObjectRegister(manager, SML_COMMAND_TYPE_GET, session, devinf10, NULL, NULL, _request_devinf, NULL, agent, error))
-                goto error_free_loc;
-        if (!smlManagerObjectRegister(manager, SML_COMMAND_TYPE_GET, session, devinf11, NULL, NULL, _request_devinf, NULL, agent, error))
-                goto error_free_loc;
+        if (!smlManagerObjectRegister(manager, SML_COMMAND_TYPE_GET, session, devinf12, NULL, NULL, _request_devinf, NULL, agent, error))
+                goto error_free_loc;
-
-        smlLocationUnref(devinf10);
-        smlLocationUnref(devinf11);
+        smlLocationUnref(devinf12);
-
-        smlTrace(TRACE_EXIT, "%s", __func__);
-        return TRUE;
@@ -335 +347 @@
-                smlLocationUnref(devinf10);
-        if (devinf11)
-                smlLocationUnref(devinf11);
+        if (devinf12)
+                smlLocationUnref(devinf12);
-error:
-        smlTrace(TRACE_EXIT_ERROR, "%s: %s", __func__, smlErrorPrint(error));
-        return FALSE;

libsyncml/parser/sml_xml_assm.c

@@ -1871 +1871 @@
-        
-        //Verdtd
-        switch (version) {
+                case SML_DEVINF_VERSION_10:
+                        if (!_smlXmlAssemblerAddString(assm, SML_ELEMENT_VERDTD, "1.0", error))
+                                goto error_free_writer;
+                        break;
-                case SML_DEVINF_VERSION_11:
-                        if (!_smlXmlAssemblerAddString(assm, SML_ELEMENT_VERDTD, "1.1", error))
-                                goto error_free_writer;
-                        break;
-0
-0
+2
+2
-                                goto error_free_writer;
-                        break;
-                case SML_DEVINF_VERSION_UNKNOWN:

libsyncml/parser/sml_xml_parse.c

@@ -2219 +2219 @@
-                } else if (!strcmp((char *)xmlTextReaderConstName(parser->reader), SML_ELEMENT_DSMEM)) { 
-                        if (!_smlXmlDevInfDataStoreParseDSMem(parser, datastore, error))
-                                goto error_free_datastore;
+                } else if (!strcmp((char *)xmlTextReaderConstName(parser->reader), SML_ELEMENT_CTCAP) &&
+                devinf->version >= SML_DEVINF_VERSION_12) {
+                        // Ignore for now 
+                        smlTrace(TRACE_INTERNAL, "Skipping ctcap node in SyncML 1.2"); 
+                        if (xmlTextReaderNext(parser->reader) != 1) { 
+                                smlErrorSet(error, SML_ERROR_GENERIC, "Unable to skip ctcap node"); 
+                                goto error; 
+                        } 
+                        continue; 
-                } else {
-                        smlErrorSet(error, SML_ERROR_GENERIC, "wrong initial node (%s)", (char *)xmlTextReaderConstName(parser->reader));
-                        goto error_free_datastore;
@@ -2295 +2304 @@
-                        if (!_smlXmlParserGetString(parser, &verdtd, SML_ELEMENT_VERDTD, error))
-                                goto error_free_devinf;
-                        
-
-
-
+
-                                devinf->version = SML_DEVINF_VERSION_10;
+                        else if (verdtd && !strcmp(verdtd, "1.1"))
+                                devinf->version = SML_DEVINF_VERSION_11;
+                        else if (verdtd && !strcmp(verdtd, "1.2"))
+                                devinf->version = SML_DEVINF_VERSION_12;
-                        else {
-                                g_free(verdtd);
-                                smlErrorSet(error, SML_ERROR_GENERIC, "Unknown devinf version");

libsyncml/sml_defines.h

@@ -187 +187 @@
-typedef enum  {
-        SML_DEVINF_VERSION_UNKNOWN = 0,
-        SML_DEVINF_VERSION_10 = 1,
-
+
+
-} SmlDevInfVersion;
-
-typedef enum {