From: Joshua Colp Date: Mon, 20 Apr 2015 22:23:56 +0000 (-0500) Subject: Merge "pjsip_options: Fix non-qualified contacts showing as unavailable" into 13 X-Git-Tag: 13.4.0-rc1~100 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=96e18453f4e14612737c84301fc442ffc53eec46;p=thirdparty%2Fasterisk.git Merge "pjsip_options: Fix non-qualified contacts showing as unavailable" into 13 --- 96e18453f4e14612737c84301fc442ffc53eec46 diff --cc res/res_pjsip/pjsip_options.c index 2653b339bb,692cbdbf55..40b6f7b4c8 --- a/res/res_pjsip/pjsip_options.c +++ b/res/res_pjsip/pjsip_options.c @@@ -137,9 -148,9 +148,9 @@@ static void update_contact_status(cons ast_test_suite_event_notify("AOR_CONTACT_QUALIFY_RESULT", "Contact: %s\r\n" "Status: %s\r\n" - "RTT: %ld", + "RTT: %" PRId64, ast_sorcery_object_get_id(update), - (update->status == AVAILABLE ? "Available" : "Unavailable"), + ast_sip_get_contact_status_label(update->status), update->rtt); if (ast_sorcery_update(ast_sip_get_sorcery(), update)) {