[asterisk-commits] phsultan: branch 1.6.0 r125704 - in /branches/1.6.0: ./ include/asterisk/ res/

[SVN commits to the Asterisk project]

Author: phsultan
Date: Fri Jun 27 02:41:54 2008
New Revision: 125704

URL: http://svn.digium.com/view/asterisk?view=rev&rev=125704
Log:
Merged revisions 125703 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
r125703 | phsultan | 2008-06-27 09:28:17 +0200 (Fri, 27 Jun 2008) | 1 line

Fix a compile time error that occurs if OpenSSL is not installed. Reported by Noel Morais on the users mailing list
........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/include/asterisk/jabber.h
    branches/1.6.0/res/res_jabber.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/include/asterisk/jabber.h
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/include/asterisk/jabber.h?view=diff&rev=125704&r1=125703&r2=125704
==============================================================================
--- branches/1.6.0/include/asterisk/jabber.h (original)
+++ branches/1.6.0/include/asterisk/jabber.h Fri Jun 27 02:41:54 2008
@@ -49,12 +49,12 @@
 #include <openssl/err.h>
 #define TRY_SECURE 2
 #define SECURE 4
+
+#endif /* HAVE_OPENSSL */
 /* file is read by blocks with this size */
 #define NET_IO_BUF_SIZE 4096
 /* Return value for timeout connection expiration */
 #define IKS_NET_EXPIRED 12
-
-#endif /* HAVE_OPENSSL */
 
 #include <iksemel.h>
 #include "asterisk/astobj.h"

Modified: branches/1.6.0/res/res_jabber.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/res/res_jabber.c?view=diff&rev=125704&r1=125703&r2=125704
==============================================================================
--- branches/1.6.0/res/res_jabber.c (original)
+++ branches/1.6.0/res/res_jabber.c Fri Jun 27 02:41:54 2008
@@ -71,8 +71,10 @@
 static int aji_send_exec(struct ast_channel *chan, void *data);
 static int aji_status_exec(struct ast_channel *chan, void *data);
 static int aji_is_secure(struct aji_client *client);
+#ifdef HAVE_OPENSSL
 static int aji_start_tls(struct aji_client *client);
 static int aji_tls_handshake(struct aji_client *client);
+#endif
 static int aji_io_recv(struct aji_client *client, char *buffer, size_t buf_len, int timeout);
 static int aji_recv(struct aji_client *client, int timeout);
 static int aji_send_header(struct aji_client *client, const char *to);
@@ -497,7 +499,7 @@
 #endif
 }
 
-
+#ifdef HAVE_OPENSSL
 /*!
  * \brief Starts the TLS procedure
  * \param client the configured XMPP client we use to connect to a XMPP server
@@ -507,15 +509,13 @@
 static int aji_start_tls(struct aji_client *client)
 {
 	int ret;
-#ifndef HAVE_OPENSSL
-	return IKS_NET_TLSFAIL;
-#endif	
+
 	/* This is sent not encrypted */
 	ret = iks_send_raw(client->p, "<starttls xmlns='urn:ietf:params:xml:ns:xmpp-tls'/>");
 	if (ret)
 		return ret;
+
 	client->stream_flags |= TRY_SECURE;
-
 	return IKS_OK;
 }
 
@@ -528,10 +528,6 @@
 {
 	int ret;
 	int sock;
-
-#ifndef HAVE_OPENSSL
-	return IKS_NET_TLSFAIL;
-#endif
 	
 	ast_debug(1, "Starting TLS handshake\n"); 
 
@@ -573,6 +569,7 @@
 
 	return IKS_OK;
 }
+#endif /* HAVE_OPENSSL */
 
 /*! 
  * \brief Secured or unsecured IO socket receiving function
@@ -871,12 +868,17 @@
 		switch (type) {
 		case IKS_NODE_START:
 			if (client->usetls && !aji_is_secure(client)) {
+#ifndef HAVE_OPENSSL
+				ast_log(LOG_ERROR, "OpenSSL not installed. You need to install OpenSSL on this system, or disable the TLS option in your configuration file\n");
+				ASTOBJ_UNREF(client, aji_client_destroy);
+				return IKS_HOOK;
+#else
 				if (aji_start_tls(client) == IKS_NET_TLSFAIL) {
-					ast_log(LOG_ERROR, "OpenSSL not installed. You need to install OpenSSL on this system\n");
+					ast_log(LOG_ERROR, "Could not start TLS\n");
 					ASTOBJ_UNREF(client, aji_client_destroy);
 					return IKS_HOOK;		
 				}
-
+#endif
 				break;
 			}
 			if (!client->usesasl) {
@@ -894,12 +896,13 @@
 			break;
 
 		case IKS_NODE_NORMAL:
+#ifdef HAVE_OPENSSL
 			if (client->stream_flags & TRY_SECURE) {
 				if (!strcmp("proceed", iks_name(node))) {
 					return aji_tls_handshake(client);
 				}
 			}
-
+#endif
 			if (!strcmp("stream:features", iks_name(node))) {
 				features = iks_stream_features(node);
 				if (client->usesasl) {
@@ -2252,10 +2255,11 @@
 static int aji_initialize(struct aji_client *client)
 {
 	int connected = IKS_NET_NOCONN;
-	
+
+#ifdef HAVE_OPENSSL	
 	/* reset stream flags */
 	client->stream_flags = 0;
-
+#endif
 	/* If it's a component, connect to user, otherwise, connect to server */
 	connected = iks_connect_via(client->p, S_OR(client->serverhost, client->jid->server), client->port, client->component ? client->user : client->jid->server);