[svn-commits] mmichelson: trunk r400750 - in /trunk: ./ res/ res/res_pjsip/

[SVN commits to the Digium repositories]

Author: mmichelson
Date: Tue Oct  8 15:52:04 2013
New Revision: 400750

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=400750
Log:
Switch from using pjsip_strerror to pj_strerror.

pjsip_strerror is only aware of PJSIP-specific error
codes. pj_strerror() is aware of all PJProject error
codes and OS-specific error codes.

This specifically fixes an oft-seen error in transport
configuration code where EADDRINUSE would result in
"Unknown PJSIP error 120098" instead of a useful
message.
........

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

Modified:
    trunk/   (props changed)
    trunk/res/res_pjsip.c
    trunk/res/res_pjsip/config_transport.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-12-merged' - no diff available.

Modified: trunk/res/res_pjsip.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_pjsip.c?view=diff&rev=400750&r1=400749&r2=400750
==============================================================================
--- trunk/res/res_pjsip.c (original)
+++ trunk/res/res_pjsip.c Tue Oct  8 15:52:04 2013
@@ -1437,7 +1437,7 @@
 	if (status != PJ_SUCCESS) {
 		char err[PJ_ERR_MSG_SIZE];
 
-		pjsip_strerror(status, err, sizeof(err));
+		pj_strerror(status, err, sizeof(err));
 		ast_log(LOG_ERROR, "Could not create dialog with endpoint %s. %s\n",
 				ast_sorcery_object_get_id(endpoint), err);
 		return NULL;

Modified: trunk/res/res_pjsip/config_transport.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_pjsip/config_transport.c?view=diff&rev=400750&r1=400749&r2=400750
==============================================================================
--- trunk/res/res_pjsip/config_transport.c (original)
+++ trunk/res/res_pjsip/config_transport.c Tue Oct  8 15:52:04 2013
@@ -184,7 +184,7 @@
 	if (res != PJ_SUCCESS) {
 		char msg[PJ_ERR_MSG_SIZE];
 
-		pjsip_strerror(res, msg, sizeof(msg));
+		pj_strerror(res, msg, sizeof(msg));
 		ast_log(LOG_ERROR, "Transport '%s' could not be started: %s\n", ast_sorcery_object_get_id(obj), msg);
 		return -1;
 	}