diff options
| author | Kevin Harwell <kharwell@digium.com> | 2013-12-04 21:42:39 +0000 |
|---|---|---|
| committer | Kevin Harwell <kharwell@digium.com> | 2013-12-04 21:42:39 +0000 |
| commit | e8208e8899b0daa9678fbc04bd8d84a797b66a1b (patch) | |
| tree | 176c1515e421a164c25dcebc4661037732f5b665 /res/res_pjsip_registrar.c | |
| parent | 236462681192cfde8bd3e17b3a3e4ebbcbcb2c13 (diff) | |
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
Diffstat (limited to 'res/res_pjsip_registrar.c')
| -rw-r--r-- | res/res_pjsip_registrar.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/res/res_pjsip_registrar.c b/res/res_pjsip_registrar.c index 82d97a0d5..9771bdc98 100644 --- a/res/res_pjsip_registrar.c +++ b/res/res_pjsip_registrar.c @@ -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)); |