Changeset 3579

Timestamp:

08/22/08 15:16:14 (3 months ago)

Author:

bellmich

Message:

several fixes which were discovered during http client tests

Location:

plugins/syncml/src

Files:

• syncml-http-client (modified) (2 diffs)
• syncml-http-server (modified) (4 diffs)
• syncml_common.c (modified) (7 diffs)
• syncml_common.h (modified) (1 diff)
• syncml_ds_client.c (modified) (4 diffs)
• syncml_ds_server.c (modified) (4 diffs)
• syncml_http_client.c (modified) (1 diff)
• syncml_http_server.c (modified) (1 diff)
• syncml_obex_client.c (modified) (1 diff)

plugins/syncml/src/syncml-http-client

@@ -21 +21 @@
    </AdvancedOption>
    <AdvancedOption>
-     <DisplayName>URL fo the remote server</DisplayName>
-     <Name>URL</Name>
-     <Type>string</Type>
-     <Value>http://127.0.0.1:8080</Value>
+     <DisplayName>Path for the remote server</DisplayName>
+     <Name>Path</Name>
+     <Type>string</Type>
+     <Value></Value>
    </AdvancedOption>
    <AdvancedOption>
@@ -149 +149 @@
     <Password></Password>
   </Authentication>
+  <Connection>
+    <Network>
+      <Address>127.0.0.1</Address>
+      <Port>8080</Port>
+      <Protocol>http</Protocol>
+    </Network>
+  </Connection>
 
   <!-- To be filed by UI or hand:

plugins/syncml/src/syncml-http-server

@@ -99 +99 @@
   <Resources>
     <Resource>
-      <Name>Contacts</Name>
-      <ObjType>contact</ObjType>
+      <Enabled>1</Enabled>
       <Formats>
         <Format>
@@ -106 +105 @@
         </Format>
       </Formats>
-      <Enabled>1</Enabled>
+      <Name>Contacts</Name>
+      <ObjType>contact</ObjType>
     </Resource>
     <Resource>
-      <Name>Calendar</Name>
-      <ObjType>event</ObjType>
+      <Enabled>1</Enabled>
       <Formats>
         <Format>
@@ -116 +115 @@
         </Format>
       </Formats>
-      <Enabled>1</Enabled>
+      <Name>Calendar</Name>
+      <ObjType>event</ObjType>
     </Resource>
     <Resource>
-      <Name>Notes</Name>
-      <ObjType>note</ObjType>
+      <Enabled>1</Enabled>
       <Formats>
         <Format>
@@ -126 +125 @@
         </Format>
       </Formats>
-      <Enabled>1</Enabled>
+      <Name>Notes</Name>
+      <ObjType>note</ObjType>
     </Resource>
   </Resources>

plugins/syncml/src/syncml_common.c

@@ -431 +431 @@
 osync_bool discover(const char *name, void *data, OSyncPluginInfo *info, OSyncError **error)
 {
-        osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, data, info, error);
+        osync_trace(TRACE_ENTRY, "%s(%s, %p, %p, %p)", __func__, name, data, info, error);
         
         SmlPluginEnv *env = (SmlPluginEnv *)data;
@@ -459 +459 @@
                 OSyncError **oerror)
 {
-        osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, dsObject, config, oerror);
+        osync_trace(TRACE_ENTRY, "%s(%d, %p, %p, %p)",
+                __func__, tsp, dsObject, config, oerror);
         OSyncPluginConnection *conn;
+        char *url = NULL;
         SmlError *error = NULL;
 
@@ -525 +527 @@
                             !smlDataSyncSetOption(dsObject, "CONNECTION_TYPE", "NET", &error))
                                 goto error;
-                        char *port = g_strdup_printf("%u", osync_plugin_connection_net_get_port(conn));
-                        if (!smlDataSyncSetOption(dsObject, "PORT", port, &error))
+                        if (tsp == SML_TRANSPORT_HTTP_CLIENT)
                         {
+                                url = g_strdup_printf("%s://%s:%d",
+                                                osync_plugin_connection_net_get_protocol(conn),
+                                                osync_plugin_connection_net_get_address(conn),
+                                                osync_plugin_connection_net_get_port(conn));
+                        } else {
+                                char *port = g_strdup_printf("%u", osync_plugin_connection_net_get_port(conn));
+                                if (!smlDataSyncSetOption(dsObject, "PORT", port, &error))
+                                {
+                                        smlSafeCFree(&port);
+                                        goto error;
+                                }
                                 smlSafeCFree(&port);
-                                goto error;
                         }
-                        smlSafeCFree(&port);
                         break;
                 case OSYNC_PLUGIN_CONNECTION_UNKNOWN:
@@ -597 +607 @@
                 } else if (!strcmp(SYNCML_PLUGIN_CONFIG_PROXY, name)) {
                         key = "PROXY";
-                } else if (!strcmp(SYNCML_PLUGIN_CONFIG_URL, name)) {
-                        key = "URL";
+                } else if (!strcmp(SYNCML_PLUGIN_CONFIG_PATH, name)) {
+                        /* build URL together with connection config */
+                        char *value = g_strdup_printf("%s%s", url, val);
+                        safe_cfree(&url);
+                        if (!smlDataSyncSetOption(dsObject, "URL", value, &error)) {
+                                safe_cfree(&value);
+                                goto error;
+                        }
+                        safe_cfree(&value);
                 } else if (!strcmp(SYNCML_PLUGIN_CONFIG_CAFILE, name)) {
-                        key = "CAFILE";
+                        key = "SSL_CA_FILE";
                 } else if (!strcmp(SYNCML_PLUGIN_CONFIG_AUTH_TYPE, name)) {
                         key = "AUTH_TYPE";
@@ -618 +635 @@
         }
 
-        osync_trace(TRACE_EXIT, "%s", __func__);
+        osync_trace(TRACE_EXIT, "%s - TRUE", __func__);
         return TRUE;
 error:
@@ -651 +668 @@
         env->dsObject1 = smlDataSyncNew(sessionType, tspType, &error);
         if (!env->dsObject1)
-                goto error;
+                goto error_free_env;
         if (sessionType == SML_SESSION_TYPE_CLIENT)
         {
                 env->dsObject2 = smlDataSyncNew(sessionType, tspType, &error);
                 if (!env->dsObject2)
-                        goto error;
+                        goto error_free_env;
         }
 
@@ -707 +724 @@
                 smlDataSyncRegisterChangeStatusCallback(env->dsObject2, _recv_change_status);
         }
+        osync_trace(TRACE_INTERNAL, "%s: config loaded", __func__);
 
         /* configure databases */

plugins/syncml/src/syncml_common.h

@@ -70 +70 @@
 #define SYNCML_PLUGIN_CONFIG_ONLYLOCALTIME "OnlyLocaltime"
 
-#define SYNCML_PLUGIN_CONFIG_URL "Url"
-#define SYNCML_PLUGIN_CONFIG_PORT "Port"
+#define SYNCML_PLUGIN_CONFIG_PATH "Path"
 #define SYNCML_PLUGIN_CONFIG_CAFILE "CaFile"
 #define SYNCML_PLUGIN_CONFIG_PROXY "Proxy"

plugins/syncml/src/syncml_ds_client.c

@@ -5 +5 @@
 SmlBool ds_client_init_databases(SmlPluginEnv *env, OSyncPluginInfo *info, OSyncError **oerror)
 {
+
+        osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, env, info, oerror);
         SmlDatabase *database = NULL;
         SmlError *error = NULL;
         OSyncPluginConfig *config = osync_plugin_info_get_config(info);
+        OSyncFormatEnv *formatenv = osync_plugin_info_get_format_env(info);
         unsigned int i, num_objtypes = osync_plugin_info_num_objtypes(info);
+        osync_trace(TRACE_INTERNAL, "%s: %d objtypes", __func__, num_objtypes);
+
 
         for (i=0; i < num_objtypes; i++) {
                 OSyncObjTypeSink *sink = osync_plugin_info_nth_objtype(info, i);
-                const char *objtype = osync_objtype_sink_get_name(sink);
+                osync_bool sinkEnabled = osync_objtype_sink_is_enabled(sink);
+                osync_trace(TRACE_INTERNAL, "%s: enabled => %d", __func__, sinkEnabled);
+                if (!sinkEnabled)
+                        continue;
 
-                database->sink = sink;
-                
+
                 OSyncObjTypeSinkFunctions functions;
                 memset(&functions, 0, sizeof(functions));
@@ -22 +29 @@
                 functions.batch_commit = ds_client_batch_commit;
 
+                const char *objtype = osync_objtype_sink_get_name(sink);
                 OSyncPluginResource *res = osync_plugin_config_find_active_resource(config, objtype);
                 if (!(database = syncml_config_parse_database(env, res, oerror)))
                         goto oerror;
                 
+                database->sink = sink;
+
+                /* TODO: Handle all available format sinks! */
+                OSyncList *fs = osync_plugin_resource_get_objformat_sinks(res);
+                OSyncObjFormatSink *fmtsink = osync_list_nth_data(fs, 0);
+                const char *objformat = osync_objformat_sink_get_objformat(fmtsink);
+
+                database->objformat = osync_format_env_find_objformat(formatenv, objformat);
+
+                /* TODO: Handle error about missing objformat in a nice way. */
+                g_assert(database->objformat);
+
+                osync_objformat_ref(database->objformat);
+
                 osync_objtype_sink_set_functions(sink, functions, database);
+
+                env->databases = g_list_append(env->databases, database);
 
                 if (!smlDataSyncAddDatastore(
@@ -35 +59 @@
                                         &error))
                                 goto error;
+                if (!smlDataSyncAddDatastore(
+                                        env->dsObject2,
+                                        get_database_pref_content_type(database, oerror),
+                                        NULL,
+                                        database->url,
+                                        &error))
+                                goto error;
         }
+        osync_trace(TRACE_EXIT, "%s - TRUE", __func__);
         return TRUE;
 error:
@@ -41 +73 @@
         smlErrorDeref(&error);
 oerror:
+        osync_trace(TRACE_EXIT_ERROR, "%s - %s", __func__, osync_error_print(oerror));
         return FALSE;
 }
-        
+
 void ds_client_get_changeinfo(void *data, OSyncPluginInfo *info, OSyncContext *ctx)
 {

plugins/syncml/src/syncml_ds_server.c

@@ -5 +5 @@
 SmlBool ds_server_init_databases(SmlPluginEnv *env, OSyncPluginInfo *info, OSyncError **oerror)
 {
-        smlTrace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, env, info, oerror);
+        osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, env, info, oerror);
         SmlDatabase *database = NULL;
         SmlError *error = NULL;
@@ -11 +11 @@
         OSyncFormatEnv *formatenv = osync_plugin_info_get_format_env(info);
         unsigned int i, num_objtypes = osync_plugin_info_num_objtypes(info);
-        smlTrace(TRACE_INTERNAL, "%s: %d objtypes", __func__, num_objtypes);
+        osync_trace(TRACE_INTERNAL, "%s: %d objtypes", __func__, num_objtypes);
 
         for (i=0; i < num_objtypes; i++) {
                 OSyncObjTypeSink *sink = osync_plugin_info_nth_objtype(info, i);
                 osync_bool sinkEnabled = osync_objtype_sink_is_enabled(sink);
-                smlTrace(TRACE_INTERNAL, "%s: enabled => %d", __func__, sinkEnabled);
+                osync_trace(TRACE_INTERNAL, "%s: enabled => %d", __func__, sinkEnabled);
                 if (!sinkEnabled)
                         continue;
@@ -57 +57 @@
                                 goto error;
         }
-        smlTrace(TRACE_EXIT, "%s - TRUE", __func__);
+        osync_trace(TRACE_EXIT, "%s - TRUE", __func__);
         return TRUE;
 error:
@@ -63 +63 @@
         smlErrorDeref(&error);
 oerror:
-        smlTrace(TRACE_EXIT_ERROR, "%s - %s", __func__, osync_error_print(oerror));
+        osync_trace(TRACE_EXIT_ERROR, "%s - %s", __func__, osync_error_print(oerror));
         return FALSE;
 }

plugins/syncml/src/syncml_http_client.c

@@ -56 +56 @@
                 goto error;
 
+        osync_trace(TRACE_EXIT, "%s - %p", __func__, env);
+        return env;
 error:
-        osync_trace(TRACE_EXIT_ERROR, "%s: %s", __func__, osync_error_print(oerror));
+        osync_trace(TRACE_EXIT_ERROR, "%s - %s", __func__, osync_error_print(oerror));
         return NULL;
 }

plugins/syncml/src/syncml_http_server.c

@@ -32 +32 @@
                 goto error;
 
+        osync_trace(TRACE_EXIT, "%s - %p", __func__, env);
+        return env;
 error:
         osync_trace(TRACE_EXIT_ERROR, "%s: %s", __func__, osync_error_print(oerror));

plugins/syncml/src/syncml_obex_client.c

@@ -49 +49 @@
         osync_trace(TRACE_EXIT, "%s: %p", __func__, env);
         return (void *)env;
-
 error_free_env:
         finalize(env);