Changeset 1139

Timestamp:

08/02/06 06:27:37 (2 years ago)

Author:

ehabkost

Message:

Send objtype_enabled information to plugin process

The objtype_enabled information needs to be sent to the plugin process,
also. Otherwise osync_member_objtype_enabled() won't work properly.

This fix the msynctool --filter-objtype option, that was broken by the
IPC code.

Location:

trunk

Files:

• opensync/opensync_member.c (modified) (3 diffs)
• opensync/opensync_member_internals.h (modified) (1 diff)
• osengine/osengine_client.c (modified) (3 diffs)
• osplugin/osplugin.c (modified) (3 diffs)

trunk/opensync/opensync_member.c

@@ -1506 +1506 @@
 
 /** Write the list of objtypes that had slow-sync set to a message */
-void osync_member_write_slow_sync_list(OSyncMember *member, OSyncMessage *message)
+void osync_member_write_sink_info(OSyncMember *member, OSyncMessage *message)
 {
         GList *obj = NULL;
         for (osync_member_get_objtype_sinks(member, &obj, NULL); obj; obj = obj->next) {
                 OSyncObjTypeSink *sink = obj->data;
-                if (osync_member_get_slow_sync(member, sink->objtype->name) == TRUE) 
-                        osync_message_write_string(message, sink->objtype->name);
+                int slow;
+                slow = osync_member_get_slow_sync(member, sink->objtype->name);
+                osync_message_write_string(message, sink->objtype->name);
+                osync_message_write_int(message, sink->read);
+                osync_message_write_int(message, sink->write);
+                osync_message_write_int(message, sink->enabled);
+                osync_message_write_int(message, slow);
         }
         osync_message_write_string(message, NULL);
 }
+
+/** Read sink info for member
+ *
+ * @see osync_member_read_sink_info_full(), osync_member_read_sink_info()
+ */
+int __sync_member_read_sink_info(OSyncMember *member, OSyncMessage *message)
+{
+        char *objtypestr;
+        int r = 0;
+        for (;;) {
+                int read, write, enabled, slow;
+                osync_message_read_string(message, &objtypestr);
+                if (!objtypestr)
+                        break;
+
+                osync_message_read_int(message, &read);
+                osync_message_read_int(message, &write);
+                osync_message_read_int(message, &enabled);
+                osync_message_read_int(message, &slow);
+
+                OSyncObjTypeSink *sink = osync_member_find_objtype_sink(member, objtypestr);
+                if (!sink)
+                        continue;
+
+                sink->read = read;
+                sink->write = write;
+                sink->enabled = enabled;
+
+                if (slow) {
+                        osync_member_set_slow_sync(member, objtypestr, TRUE);
+                        r++;
+                }
+
+                free(objtypestr);
+        }
+        return r;
+}
+
 
 /** Read a list of objtypes that had slow-sync set, replacing old settings
@@ -1530 +1573 @@
  * group.
  */
-void osync_member_read_slow_sync_full_list(OSyncMember *member, OSyncMessage *message)
-{
-        char *objtypestr;
+void osync_member_read_sink_info_full(OSyncMember *member, OSyncMessage *message)
+{
         osync_group_reset_slow_sync(member->group, "data");
-        for (;;) {
-                osync_message_read_string(message, &objtypestr);
-                if (!objtypestr)
-                        break;
-
-                osync_member_set_slow_sync(member, objtypestr, TRUE);
-                free(objtypestr);
-        }
+        __sync_member_read_sink_info(member, message);
 }
 
@@ -1556 +1591 @@
  * to osplugin.
  */
-void osync_member_read_slow_sync_list(OSyncMember *member, OSyncMessage *message)
-{
-        char *objtypestr;
-        osync_bool set_for_any = FALSE;
-
-        for (;;) {
-                osync_message_read_string(message, &objtypestr);
-                if (!objtypestr)
-                        break;
-
-                set_for_any = TRUE;
-                osync_member_set_slow_sync(member, objtypestr, TRUE);
-                free(objtypestr);
-
-        }
+void osync_member_read_sink_info(OSyncMember *member, OSyncMessage *message)
+{
+        int set_for_any;
+
+        set_for_any = __sync_member_read_sink_info(member, message);
 
         if (set_for_any) {

trunk/opensync/opensync_member_internals.h

@@ -52 +52 @@
 osync_bool osync_member_require_sink_info(OSyncMember *member, OSyncError **error);
 
-void osync_member_write_slow_sync_list(OSyncMember *member, OSyncMessage *message);
-void osync_member_read_slow_sync_list(OSyncMember *member, OSyncMessage *message);
-void osync_member_read_slow_sync_full_list(OSyncMember *member, OSyncMessage *message);
+void osync_member_write_sink_info(OSyncMember *member, OSyncMessage *message);
+void osync_member_read_sink_info(OSyncMember *member, OSyncMessage *message);
+void osync_member_read_sink_info_full(OSyncMember *member, OSyncMessage *message);
 

trunk/osengine/osengine_client.c

@@ -103 +103 @@
                 
         } else {
-                osync_member_read_slow_sync_list(sender->member, message);
+                osync_member_read_sink_info(sender->member, message);
 
                 osync_status_update_member(engine, sender, MEMBER_CONNECTED, NULL);
@@ -396 +396 @@
         osync_message_set_handler(message, (OSyncMessageHandler)_get_changes_reply_receiver, target);
 
-        osync_member_write_slow_sync_list(target->member, message);
+        osync_member_write_sink_info(target->member, message);
         
         OSyncPluginTimeouts timeouts = osync_client_get_timeouts(target);
@@ -467 +467 @@
                 goto error;
                 
-        osync_member_write_slow_sync_list(target->member, message);
+        osync_member_write_sink_info(target->member, message);
 
         osync_message_set_handler(message, (OSyncMessageHandler)_connect_reply_receiver, target);

trunk/osplugin/osplugin.c

@@ -334 +334 @@
 
         case OSYNC_MESSAGE_CONNECT:
-                osync_member_read_slow_sync_full_list(member, message);
+                osync_member_read_sink_info_full(member, message);
 
                 ctx = g_malloc0(sizeof(context));
@@ -350 +350 @@
 
         case OSYNC_MESSAGE_GET_CHANGES:
-                osync_member_read_slow_sync_full_list(member, message);
+                osync_member_read_sink_info_full(member, message);
 
                 ctx = g_malloc0(sizeof(context));
@@ -523 +523 @@
         assert(member);
 
-        osync_member_write_slow_sync_list(member, reply);
+        osync_member_write_sink_info(member, reply);
         
         return TRUE;