[svn-commits] kharwell: branch kharwell/pimp_sip_security r391863 - in /team/kharwell/pimp_...

[SVN commits to the Digium repositories]

Author: kharwell
Date: Fri Jun 14 14:12:03 2013
New Revision: 391863

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=391863
Log:
review updates

Modified:
    team/kharwell/pimp_sip_security/include/asterisk/res_sip.h
    team/kharwell/pimp_sip_security/res/res_sip.c
    team/kharwell/pimp_sip_security/res/res_sip/config_security.c
    team/kharwell/pimp_sip_security/res/res_sip/sip_distributor.c

Modified: team/kharwell/pimp_sip_security/include/asterisk/res_sip.h
URL: http://svnview.digium.com/svn/asterisk/team/kharwell/pimp_sip_security/include/asterisk/res_sip.h?view=diff&rev=391863&r1=391862&r2=391863
==============================================================================
--- team/kharwell/pimp_sip_security/include/asterisk/res_sip.h (original)
+++ team/kharwell/pimp_sip_security/include/asterisk/res_sip.h Fri Jun 14 14:12:03 2013
@@ -793,11 +793,11 @@
 int ast_sip_initialize_distributor(void);
 
 /*!
- * \brief Finalize the distributor module
+ * \brief Destruct the distributor module.
  *
  * Unregisters pjsip modules and cleans up any allocated resources.
  */
-void ast_sip_finalize_distributor(void);
+void ast_sip_destroy_distributor(void);
 
 /*!
  * \brief Retrieves a reference to the artificial auth.

Modified: team/kharwell/pimp_sip_security/res/res_sip.c
URL: http://svnview.digium.com/svn/asterisk/team/kharwell/pimp_sip_security/res/res_sip.c?view=diff&rev=391863&r1=391862&r2=391863
==============================================================================
--- team/kharwell/pimp_sip_security/res/res_sip.c (original)
+++ team/kharwell/pimp_sip_security/res/res_sip.c Fri Jun 14 14:12:03 2013
@@ -53,7 +53,7 @@
 					It contains the core SIP related options only, endpoints are <emphasis>NOT</emphasis>
 					dialable entries of their own. Communication with another SIP device is
 					accomplished via Addresses of Record (AoRs) which have one or more
-					contacts assicated with them. Endpoints <emphasis>NOT</emphasis> configured to 
+					contacts assicated with them. Endpoints <emphasis>NOT</emphasis> configured to
 					use a <literal>transport</literal> will default to first transport found
 					in <filename>res_sip.conf</filename> that matches its type.
 					</para>
@@ -1138,7 +1138,7 @@
 	pj_str_t hdr_name;
 	pj_str_t hdr_value;
 	pjsip_generic_string_hdr *hdr;
-	
+
 	pj_cstr(&hdr_name, name);
 	pj_cstr(&hdr_value, value);
 
@@ -1157,7 +1157,7 @@
 	pj_cstr(&type, body->type);
 	pj_cstr(&subtype, body->subtype);
 	pj_cstr(&body_text, body->body_text);
-	
+
 	return pjsip_msg_body_create(pool, &type, &subtype, &body_text);
 }
 
@@ -1435,7 +1435,7 @@
 return AST_MODULE_LOAD_SUCCESS;
 
 error:
-	ast_sip_finalize_distributor();
+	ast_sip_destroy_distributor();
 	ast_res_sip_destroy_configuration();
 	if (monitor_thread) {
 		stop_monitor_thread();
@@ -1478,6 +1478,7 @@
 
 static int unload_module(void)
 {
+	ast_sip_destroy_distributor();
 	ast_res_sip_destroy_configuration();
 	if (monitor_thread) {
 		stop_monitor_thread();

Modified: team/kharwell/pimp_sip_security/res/res_sip/config_security.c
URL: http://svnview.digium.com/svn/asterisk/team/kharwell/pimp_sip_security/res/res_sip/config_security.c?view=diff&rev=391863&r1=391862&r2=391863
==============================================================================
--- team/kharwell/pimp_sip_security/res/res_sip/config_security.c (original)
+++ team/kharwell/pimp_sip_security/res/res_sip/config_security.c Fri Jun 14 14:12:03 2013
@@ -41,7 +41,7 @@
 	} else {
 		ast_append_acl(var->name, var->value, &security->acl, &error, &ignore);
 	}
-	ast_log(LOG_VERBOSE, "ERROR ERROR = %d\n", error);
+
 	return error;
 }
 

Modified: team/kharwell/pimp_sip_security/res/res_sip/sip_distributor.c
URL: http://svnview.digium.com/svn/asterisk/team/kharwell/pimp_sip_security/res/res_sip/sip_distributor.c?view=diff&rev=391863&r1=391862&r2=391863
==============================================================================
--- team/kharwell/pimp_sip_security/res/res_sip/sip_distributor.c (original)
+++ team/kharwell/pimp_sip_security/res/res_sip/sip_distributor.c Fri Jun 14 14:12:03 2013
@@ -125,7 +125,7 @@
 	.on_rx_request = endpoint_lookup,
 };
 
-static struct ast_sip_auth *artificial_auth = NULL;
+static struct ast_sip_auth *artificial_auth;
 
 static int create_artificial_auth(void)
 {
@@ -148,7 +148,7 @@
 	return artificial_auth;
 }
 
-static struct ast_sip_endpoint *artificial_endpoint = NULL;
+static struct ast_sip_endpoint *artificial_endpoint;
 
 static int create_artificial_endpoint(void)
 {
@@ -198,7 +198,6 @@
 		}
 
 		ast_sip_report_invalid_endpoint(name, rdata);
-		return PJ_TRUE;
 	}
 	rdata->endpt_info.mod_data[endpoint_mod.id] = endpoint;
 	return PJ_FALSE;
@@ -300,7 +299,7 @@
 	return 0;
 }
 
-void ast_sip_finalize_distributor(void)
+void ast_sip_destroy_distributor(void)
 {
 	ast_sip_unregister_service(&distributor_mod);
 	ast_sip_unregister_service(&endpoint_mod);