[asterisk-commits] anthonyl: branch anthonyl/testing-branch r42875 - /team/anthonyl/testing-bran...

[asterisk-commits at lists.digium.com]

Author: anthonyl
Date: Tue Sep 12 17:05:30 2006
New Revision: 42875

URL: http://svn.digium.com/view/asterisk?rev=42875&view=rev
Log:
update to not need my ossl interface

Modified:
    team/anthonyl/testing-branch/main/manager.c

Modified: team/anthonyl/testing-branch/main/manager.c
URL: http://svn.digium.com/view/asterisk/team/anthonyl/testing-branch/main/manager.c?rev=42875&r1=42874&r2=42875&view=diff
==============================================================================
--- team/anthonyl/testing-branch/main/manager.c (original)
+++ team/anthonyl/testing-branch/main/manager.c Tue Sep 12 17:05:30 2006
@@ -69,7 +69,7 @@
 #include "asterisk/threadstorage.h"
 #include "asterisk/linkedlists.h"
 /* include for the openssl info */
-#include "asterisk/openssl.h"
+/* #include "asterisk/openssl.h" */
 
 
 struct fast_originate_helper {
@@ -187,7 +187,9 @@
 AST_MUTEX_DEFINE_STATIC(actionlock);
 
 static void *session_do(void *data);
+
 /* this is the main thread for manaing ssl manager connections */
+/*
 static int *astman_ssl_thread(void)
 {
   	int ret;
@@ -195,7 +197,7 @@
 	struct eventqent *eqe;
 	struct mansession *s;
 	struct protoent *p;
-	struct ast_openssl_context *openssl_context;
+	 struct ast_openssl_context *openssl_context;
 	int arg = 1;
 	int flags;
 	time_t now;
@@ -206,7 +208,6 @@
   	pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
 	
 	for(;;) {
-		/* modify to use the new version */	
   	 	openssl_context = ast_socket_openssl(5039,AST_SOCKET_TLS1);
 		
   		if (openssl_context == NULL) {
@@ -216,14 +217,9 @@
 		return 0;
 	}
 	
-	/* accept the connection then call do_session */
-	/* the mansession struct should just set the flag for a ssl connection */
-        /* then get_input..etc will go ssl specific */
 	
 	if (!(s = ast_calloc(1, sizeof(*s)))) {
-		/* out of memory */
 	} else {
-		/* we are all ok */
 	} 
 	
 	memset( (char *)s,0x00,sizeof(*s));
@@ -234,16 +230,14 @@
 	s->send_events = -1;
 	s->eventq = master_eventq;
 	
-	/* set the ssl flag on for the mansession */	
 	s->flag_ssl = 1;
 
 	if (ast_pthread_create(&s->t, &attr, session_do ,s)) {
-		/* we are done with the session destory it */
 	}
 	
   return 0;
 }
-
+*/
 
 /*! \brief Convert authority code to string with serveral options */
 static char *authority_to_str(int authority, char *res, int reslen)
@@ -2666,12 +2660,13 @@
 			ast_verbose("Asterisk Management interface listening on port %d\n", portno);
 		
 		ast_pthread_create(&t, NULL, accept_thread, NULL);
-		
+	/*	
 		if(ssl_on) {
 		  ast_pthread_create(&ssl_main_thread,NULL,astman_ssl_thread ,NULL);
 		  if (option_verbose)
 		    ast_verbose("Asterisk Managment interface SSL starting\n");
 		}
+	*/
 
 	}
 	return 0;