# HG changeset patch
# User Mikael Berthe <mikael@lilotux.net>
# Date 1203272150 -3600
# Node ID 0b8701386bdec1a7c08d8561298b22e2f8e93cad
# Parent  08f641e91f945385b70c7ccd3eeb3a6846dc5ce6
Randomize the default resource

diff -r 08f641e91f94 -r 0b8701386bde mcabber/src/main.c
--- a/mcabber/src/main.c	Sun Feb 17 19:14:56 2008 +0100
+++ b/mcabber/src/main.c	Sun Feb 17 19:15:50 2008 +0100
@@ -70,7 +70,8 @@
 {
   const char *username, *password, *resource, *servername;
   const char *proxy_host;
-  char *bjid;
+  char *dynresource = NULL;
+  char *fjid;
   int ssl;
   int sslverify = -1;
   const char *sslvopt = NULL, *cafile = NULL, *capath = NULL, *ciphers = NULL;
@@ -100,8 +101,6 @@
     scr_LogPrint(LPRINT_NORMAL, "Password has not been specified!");
     return;
   }
-  if (!resource)
-    resource = "mcabber";
 
   port    = (unsigned int) settings_opt_get_int("port");
 
@@ -139,11 +138,22 @@
   // We can't free the ca*_xp variables now, because they're not duplicated
   // in cw_set_ssl_options().
 
+  if (!resource) {
+    unsigned int tab[2];
+    srand(time(NULL));
+    tab[0] = (unsigned int) (0xffff * (rand() / (RAND_MAX + 1.0)));
+    tab[1] = (unsigned int) (0xffff * (rand() / (RAND_MAX + 1.0)));
+    dynresource = g_strdup_printf("%s.%04x%04x", PACKAGE_NAME,
+                                  tab[0], tab[1]);
+    resource = dynresource;
+  }
+
   /* Connect to server */
   scr_LogPrint(LPRINT_NORMAL|LPRINT_DEBUG, "Connecting to server: %s",
                servername);
   if (port)
     scr_LogPrint(LPRINT_NORMAL|LPRINT_DEBUG, " using port %d", port);
+  scr_LogPrint(LPRINT_NORMAL|LPRINT_DEBUG, " resource %s", resource);
 
   if (proxy_host) {
     int proxy_port = settings_opt_get_int("proxy_port");
@@ -160,12 +170,13 @@
     }
   }
 
-  bjid = compose_jid(username, servername, resource);
+  fjid = compose_jid(username, servername, resource);
 #if defined(HAVE_LIBOTR)
-  otr_init(bjid);
+  otr_init(fjid);
 #endif
-  jc = jb_connect(bjid, servername, port, ssl, password);
-  g_free(bjid);
+  jc = jb_connect(fjid, servername, port, ssl, password);
+  g_free(fjid);
+  g_free(dynresource);
 
   if (!jc)
     scr_LogPrint(LPRINT_LOGNORM, "Error connecting to (%s)", servername);