Changeset 2546

Timestamp:

10/10/07 12:01:12 (1 year ago)

Author:

gcobb

Message:

gpe-sync: add protocol version checking

Files:

• plugins/gpe/ChangeLog (modified) (1 diff)
• plugins/gpe/src/gpe_sync.c (modified) (4 diffs)
• plugins/gpe/src/gpe_sync.h (modified) (1 diff)

plugins/gpe/ChangeLog

@@ +1 @@
+2007-10-09  Graham Cobb  <g+770@cobb.uk.net>
+
+        * src/gpe_sync.h, src/gpe_sync.c (discover): Add protocol version checking
+
-2007-09-11  Graham Cobb  <g+770@cobb.uk.net>
-

plugins/gpe/src/gpe_sync.c

@@ -26 +26 @@
- * \param ctx           The context of the plugin
- */
-
-
-
-
-
-
-
+
+
+
+
-        // Do nothing if already connected
-        if (env->client) {
-          osync_trace(TRACE_INTERNAL, "GPE-SYNC %s: already connected", __func__);
-        } else {
-          char *client_err;
-          if (env->use_local) {
-&
+
-          }
-          else if (env->use_ssh)
-            {
-              gchar *path = g_strdup_printf ("%s@%s", env->username, env->device_addr);
-&
+
-            }
-          else
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-        
@@ -81 +91 @@
- * \brief ctx           The context of the plugin
- */
-
-
-
-
+
+
+
-        
-        if (env->client) {
@@ -90 +99 @@
-                env->client = NULL;
-        }
+
+        osync_trace(TRACE_EXIT, "GPE-SYNC %s", __func__);
+}
+static void gpe_disconnect(void *userdata, OSyncPluginInfo *info, OSyncContext *ctx)
+{
+        osync_trace(TRACE_ENTRY, "GPE-SYNC %s(%p, %p, %p)", __func__, userdata, info, ctx);
+        gpe_environment *env = ((sink_environment *)userdata)->gpe_env;
+        
+        gpe_disconnect_internal(env);
-
-        //Answer the call
@@ -192 +210 @@
-static osync_bool discover(void *userdata, OSyncPluginInfo *info, OSyncError **error)
-{
+        gchar *err_string = NULL;
+        gchar *response = NULL;
+        unsigned int v_major = 1, v_minor = 0, v_edit = 0; // Default version 1.0.0
+
-        osync_trace(TRACE_ENTRY, "GPE-SYNC %s(%p, %p, %p)", __func__, userdata, info, error);
-
-        gpe_environment *env = (gpe_environment *)userdata;
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        OSyncVersion *version = osync_version_new(error);
-        osync_version_set_plugin(version, "gpe-sync");
-        //osync_version_set_modelversion(version, "version");
-        //osync_version_set_firmwareversion(version, "firmwareversion");
-//osync_version_set_softwareversion(version, "softwareversion"
+osync_version_set_softwareversion(version, version_string
-        //osync_version_set_hardwareversion(version, "hardwareversion");
-        osync_plugin_info_set_version(info, version);
-        osync_version_unref(version);
+        g_free(version_string);
+
+        // Report avaliable sinks...
+        // GPE always supports contacts, todos and events
+        if (env->contact_sink.sink) osync_objtype_sink_set_available(env->contact_sink.sink, TRUE);
+        if (env->todo_sink.sink) osync_objtype_sink_set_available(env->todo_sink.sink, TRUE);
+        if (env->calendar_sink.sink) osync_objtype_sink_set_available(env->calendar_sink.sink, TRUE);
+        // One day we may add notes...
+
+        gpe_disconnect_internal(env);
-
-        osync_trace(TRACE_EXIT, "GPE-SYNC %s", __func__);

plugins/gpe/src/gpe_sync.h

@@ -82 +82 @@
-#define GPE_HASH_LOAD_ERROR 3
-
+/*
+ * Minimum protocol version number supported
+ *
+ * Major number must be equal: increment this if we cannot even parse
+ * the protocol correctly any more
+ *
+ * Minor number must be less than or equal to the other end: increment 
+ * this if a new command is vital for correct operation
+ *
+ * Edit number ignored but reported in logs
+ */
+#define MIN_PROTOCOL_MAJOR 1
+#define MIN_PROTOCOL_MINOR 0
+
-#endif