From 2904a198d55ca64e2a77c77710a286630812dd37 Mon Sep 17 00:00:00 2001 From: Mark Michelson Date: Tue, 8 Oct 2013 20:52:04 +0000 Subject: [PATCH] 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 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@400750 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- res/res_pjsip.c | 2 +- res/res_pjsip/config_transport.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/res/res_pjsip.c b/res/res_pjsip.c index d522ad581a..4d9a19e2b6 100644 --- a/res/res_pjsip.c +++ b/res/res_pjsip.c @@ -1437,7 +1437,7 @@ pjsip_dialog *ast_sip_create_dialog_uas(const struct ast_sip_endpoint *endpoint, 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; diff --git a/res/res_pjsip/config_transport.c b/res/res_pjsip/config_transport.c index cf0b5e8787..fa5603e542 100644 --- a/res/res_pjsip/config_transport.c +++ b/res/res_pjsip/config_transport.c @@ -184,7 +184,7 @@ static int transport_apply(const struct ast_sorcery *sorcery, void *obj) 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; }