[asterisk-commits] kharwell: trunk r403378 - in /trunk: ./ res/res_pjsip_registrar.c

[SVN commits to the Asterisk project]

Author: kharwell
Date: Wed Dec  4 15:42:39 2013
New Revision: 403378

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=403378
Log:
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

Modified:
    trunk/   (props changed)
    trunk/res/res_pjsip_registrar.c

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-12-merged (original)
+++ branch-12-merged Wed Dec  4 15:42:39 2013
@@ -1,1 +1,1 @@
-/branches/12:1-398558,398560-398577,398579-399305,399307-401390,401392-403175,403179,403207,403209,403221,403223,403240,403256,403258,403271,403290,403311-403312,403324,403329,403349,403364
+/branches/12:1-398558,398560-398577,398579-399305,399307-401390,401392-403175,403179,403207,403209,403221,403223,403240,403256,403258,403271,403290,403311-403312,403324,403329,403349,403364,403377

Modified: trunk/res/res_pjsip_registrar.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_pjsip_registrar.c?view=diff&rev=403378&r1=403377&r2=403378
==============================================================================
--- trunk/res/res_pjsip_registrar.c (original)
+++ trunk/res/res_pjsip_registrar.c Wed Dec  4 15:42:39 2013
@@ -588,6 +588,15 @@
 	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 @@
 
 	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));