changeset 70:5b1249ce812d

[/trunk] Changeset 84 by mikael * Add an option in config file to enable SSL
author mikael
date Tue, 12 Apr 2005 16:17:31 +0000
parents c5a5707f495d
children 1e9d4949bcfd
files mcabber/mcabberrc.example mcabber/src/main.c
diffstat 2 files changed, 10 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/mcabber/mcabberrc.example	Tue Apr 12 16:15:40 2005 +0000
+++ b/mcabber/mcabberrc.example	Tue Apr 12 16:17:31 2005 +0000
@@ -1,12 +1,14 @@
 # Sample .mcabberrc file
 
 # The jid will be the following: username@server/resource
+# Use ssl = 1 to enable SSL
 
 username = yourusername
 password = yourpassword
 server = your.jabber.server
 port = 5222
 resource = yourresource
+ssl = 0
 
 
 #  The colors
--- a/mcabber/src/main.c	Tue Apr 12 16:15:40 2005 +0000
+++ b/mcabber/src/main.c	Tue Apr 12 16:17:31 2005 +0000
@@ -80,13 +80,13 @@
   char *username, *password, *resource;
   char *servername;
   char *jid;
-  char *portstring;
+  char *portstring, *sslstring;
   int key;
   unsigned int port;
   unsigned int ping;
+  int ssl;
   int ret = 0;
 
-
   credits();
 
   /* SET THIS >0 TO ENABLE LOG */
@@ -156,15 +156,19 @@
   ut_WriteLog("Drawing main window...\n");
   scr_DrawMainWindow();
 
+  ssl = 0;
+  sslstring = cfg_read("ssl");
+  if (sslstring && (atoi(sslstring) > 0))
+    ssl = 1;
   portstring = cfg_read("port");
-  port = (portstring != NULL) ? (unsigned int) atoi(portstring) : -1U;
+  port = (portstring != NULL) ? (unsigned int) atoi(portstring) : 0;
 
   /* Connect to server */
   ut_WriteLog("Connecting to server: %s:%d\n", servername, port);
   scr_LogPrint("Connecting to server: %s:%d", servername, port);
 
   jid = compose_jid(username, servername, resource);
-  jc = jb_connect(jid, port, 0, password);
+  jc = jb_connect(jid, port, ssl, password);
   free(jid);
   if (!jc) {
     ut_WriteLog("\terror!!!\n");