kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-12 15:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

REVERTING res_pjsip: make it unloadable

Browse Source 
Due to the original patch causing memory corruptions the patch is
being removed until the problem can be resolved.
........

Merged revisions 430734 from http://svn.asterisk.org/svn/asterisk/branches/13


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@430735 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin Harwell
2015-01-17 00:35:59 +00:00
parent 1111944afb
commit 07e2a48ab1
11 changed files with 32 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
res/res_pjsip/pjsip_distributor.c
View File

@@ -21,7 +21,6 @@
#include <pjsip.h>
#include "asterisk/res_pjsip.h"
#include "include/res_pjsip_private.h"
static int distribute(void *data);
static pj_bool_t distributor(pjsip_rx_data *rdata);
@@ -223,7 +222,7 @@ struct ast_sip_auth *ast_sip_get_artificial_auth(void)
return artificial_auth;
}
static struct ast_sip_endpoint *artificial_endpoint = NULL;
static struct ast_sip_endpoint *artificial_endpoint;
static int create_artificial_endpoint(void)
{
@@ -237,7 +236,7 @@ static int create_artificial_endpoint(void)
* the proper size of the vector is returned. This value is
* not actually used anywhere
*/
AST_VECTOR_APPEND(&artificial_endpoint->inbound_auths, ast_strdup("artificial-auth"));
AST_VECTOR_APPEND(&artificial_endpoint->inbound_auths, "artificial-auth");
return 0;
}
@@ -374,13 +373,13 @@ int ast_sip_initialize_distributor(void)
return -1;
}
if (internal_sip_register_service(&distributor_mod)) {
if (ast_sip_register_service(&distributor_mod)) {
return -1;
}
if (internal_sip_register_service(&endpoint_mod)) {
if (ast_sip_register_service(&endpoint_mod)) {
return -1;
}
if (internal_sip_register_service(&auth_mod)) {
if (ast_sip_register_service(&auth_mod)) {
return -1;
}
@@ -389,9 +388,9 @@ int ast_sip_initialize_distributor(void)
void ast_sip_destroy_distributor(void)
{
internal_sip_unregister_service(&distributor_mod);
internal_sip_unregister_service(&endpoint_mod);
internal_sip_unregister_service(&auth_mod);
ast_sip_unregister_service(&distributor_mod);
ast_sip_unregister_service(&endpoint_mod);
ast_sip_unregister_service(&auth_mod);
ao2_cleanup(artificial_auth);
ao2_cleanup(artificial_endpoint);