Changeset 2838

Timestamp:

02/16/10 22:26:39 (5 months ago)

Author:

kuhlmann

Message:

* if ressource conflict happens, set a flag before reconnect to append random digits to the ressource * add savable flag for the same * change default ressource from "iks" to "climm"

Files:

• climm/include/util_opts.h (modified) (1 diff)
• climm/src/util_opts.c (modified) (1 diff)
• climm/src/xmpp_base.c (modified) (2 diffs)

climm/include/util_opts.h

@@ -87 +87 @@
-#define CO_SCRIPT        (COF_BOOL    | CO_GLOBAL  | 0x000104UL) /* open a scripting connection       */
-#define CO_S5USE         (COF_BOOL    | CO_SERVER  | 0x000404UL) /* use Socks 5 proxy                 */
+#define CO_TAGRESSOURCE  (COF_BOOL    | CO_SERVER  | 0x001004UL) /* append random string to ressource to make unique */
+#define CO_AUTOTAGRES    (COF_BOOL    | CO_SERVER  | 0x004004UL) /* append random string to ressource to make unique (automatically set) */
-
-#define CO_LOCAL         (COF_BOOL    | CO_CONTACT | 0x000105UL) /* local contact (do not put on roster, don't get/send status) */

climm/src/util_opts.c

@@ -68 +68 @@
-  { "dcauth",        CO_DCAUTH        },
-  { "dccont",        CO_DCCONT        },
+  { "tagressource",  CO_TAGRESSOURCE  },
-  { "revealtime",    CO_REVEALTIME    },
-  { "autoaway",      CO_AUTOAWAY      },

climm/src/xmpp_base.c

@@ -1116 +1116 @@
-            return IKS_NET_DROPPED;
-        case IKS_NODE_ERROR:
+            if (!strcmp (iks_name (iks_first_tag (node)), "conflict"))
+                OptSetVal (&serv->copts, CO_AUTOTAGRES, 1);
-            XmppStreamError (serv, s_sprintf ("stream error [%s]", iks_name (iks_first_tag (node))));
-            if (node) iks_delete (node);
@@ -1244 +1246 @@
-                    conn->serv->xmpp_id = iks_id_new (iks_parser_stack (prs), conn->serv->screen);
-                    if (!conn->serv->xmpp_id->resource)
-
+
+
+
+
+
-                    iks_set_log_hook (prs, XmppSaveLog);
-                }