sysmocom
/
asterisk
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

res_pjsip_registrar: undefined function pointer symbol 

Used a static wrapper around the offending function to alleviate the issue.

Reported by: rmudgett
........

Merged revisions 403377 from http://svn.asterisk.org/svn/asterisk/branches/12


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@403378 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin Harwell 2013-12-04 21:42:39 +00:00
parent 2364626811
commit e8208e8899
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
res/res_pjsip_registrar.c
View File

@ -588,6 +588,15 @@ static pj_bool_t registrar_on_rx_request(struct pjsip_rx_data *rdata)
return PJ_TRUE;
}
/* function pointer to callback needs to be within the module
in order to avoid problems with an undefined symbol */
static int sip_contact_to_str(const struct ast_sip_aor *aor,
const struct ast_sip_contact *contact,
int last, void *arg)
{
return ast_sip_contact_to_str(aor, contact, last, arg);
}
static int ami_registrations_aor(void *obj, void *arg, int flags)
{
struct ast_sip_aor *aor = obj;
@ -602,7 +611,7 @@ static int ami_registrations_aor(void *obj, void *arg, int flags)
ast_sip_sorcery_object_to_ami(aor, &buf);
ast_str_append(&buf, 0, "Contacts: ");
ast_sip_for_each_contact(aor, ast_sip_contact_to_str, &buf);
ast_sip_for_each_contact(aor, sip_contact_to_str, &buf);
ast_str_append(&buf, 0, "\r\n");
astman_append(ami->s, "%s\r\n", ast_str_buffer(buf));