[Home]

Summary:ASTERISK-30325: Upgrade Asterisk to bundled pjproject 2.13
Reporter:Stanislav Abramenkov (silentindark)Labels:patch
Date Opened:2022-11-24 02:52:59.000-0600Date Closed:2023-02-07 07:43:59.000-0600
Priority:MajorRegression?
Status:Closed/CompleteComponents:Resources/res_pjsip
Versions:18.15.0 19.7.0 20.0.0 Frequency of
Occurrence
Related
Issues:
Environment:Attachments:( 0) pjproject_2_13-patch1.diff
Description:pjproject 2.13 has been released

More information:
https://github.com/pjsip/pjproject/releases/tag/2.13

Pull request to third-party
https://github.com/asterisk/third-party/pull/13
Comments:By: Asterisk Team (asteriskteam) 2022-11-24 02:53:00.196-0600

Thanks for creating a report! The issue has entered the triage process. That means the issue will wait in this status until a Bug Marshal has an opportunity to review the issue. Once the issue has been reviewed you will receive comments regarding the next steps towards resolution. Please note that log messages and other files should not be sent to the Sangoma Asterisk Team unless explicitly asked for. All files should be placed on this issue in a sanitized fashion as needed.

A good first step is for you to review the [Asterisk Issue Guidelines|https://wiki.asterisk.org/wiki/display/AST/Asterisk+Issue+Guidelines] if you haven't already. The guidelines detail what is expected from an Asterisk issue report.

Then, if you are submitting a patch, please review the [Patch Contribution Process|https://wiki.asterisk.org/wiki/display/AST/Patch+Contribution+Process].

Please note that once your issue enters an open state it has been accepted. As Asterisk is an open source project there is no guarantee or timeframe on when your issue will be looked into. If you need expedient resolution you will need to find and pay a suitable developer. Asking for an update on your issue will not yield any progress on it and will not result in a response. All updates are posted to the issue when they occur.

Please note that by submitting data, code, or documentation to Sangoma through JIRA, you accept the Terms of Use present at [https://www.asterisk.org/terms-of-use/|https://www.asterisk.org/terms-of-use/].
By: Stanislav Abramenkov (silentindark) 2022-11-24 06:25:16.933-0600

To test the Patch

1)
Patching process:
Copy patch into asterisk folder.
# patch -p0 <./pjproject_2_13.diff
patching file third-party/versions.mak
patching file third-party/pjproject/pjproject-2.12.1.tar.bz2.md5
patching file third-party/pjproject/pjproject-2.13.tar.bz2.md5
patching file third-party/pjproject/patches/0100-allow_multiple_auth_headers.patch
patching file third-party/pjproject/patches/0000-remove-third-party.patch

2)
Then in file
third-party/pjproject/Makefile.rules
I changed line from
PACKAGE_URL ?= https://raw.githubusercontent.com/asterisk/third-party/master/pjproject/$(PJPROJECT_VERSION)
TO
PACKAGE_URL ?= https://raw.githubusercontent.com/silentindark/third-party/master/pjproject/$(PJPROJECT_VERSION)

3) Configuring
checking for embedded pjproject (may have to download)... configuring
[pjproject]  Verifying /tmp/pjproject-2.13.tar.bz2
[pjproject]  Verify successful
[pjproject]  Verifying /tmp/pjproject-2.13.tar.bz2
[pjproject]  Verify successful
[pjproject]  Unpacking /tmp/pjproject-2.13.tar.bz2
[pjproject]  Applying patches /usr/src/asterisk-18.15.0/third-party/pjproject/patches /usr/src/asterisk-18.15.0/third-party/pjproject/source
[pjproject]  Applying user.mak
[pjproject]  Rebuilding
[pjproject]  Applying custom include file patches/asterisk_malloc_debug.h
[pjproject]  Applying custom include file patches/config_site.h
[pjproject]  Configuring with --prefix=/opt/pjproject --disable-speex-codec --disable-speex-aec --disable-bcg729 --disable-gsm-codec --disable-ilbc-codec --disable-l16-codec --disable-g722-codec --disable-g7221-codec --disable-opencore-amr --disable-silk --disable-opus --disable-video --disable-v4l2 --disable-sound --disable-ext-sound --disable-sdl --disable-libyuv --disable-ffmpeg --disable-openh264 --disable-ipp --disable-libwebrtc --without-external-pa --without-external-srtp --disable-resample --disable-g711-codec --enable-epoll
checking for bundled pjproject... yes

4) Compiling

[pjproject]  Compiling libpj-x86_64-unknown-linux-gnu.a
[pjproject]  Compiling libpjlib-util-x86_64-unknown-linux-gnu.a
[pjproject]  Compiling libpjsua-x86_64-unknown-linux-gnu.a
[pjproject]  Compiling libpjsip-ua-x86_64-unknown-linux-gnu.a
[pjproject]  Compiling libpjsip-simple-x86_64-unknown-linux-gnu.a
[pjproject]  Compiling libpjsip-x86_64-unknown-linux-gnu.a
[pjproject]  Compiling libpjmedia-codec-x86_64-unknown-linux-gnu.a
[pjproject]  Compiling libpjmedia-videodev-x86_64-unknown-linux-gnu.a
[pjproject]  Compiling libpjmedia-x86_64-unknown-linux-gnu.a
[pjproject]  Compiling libpjmedia-audiodev-x86_64-unknown-linux-gnu.a
[pjproject]  Compiling libpjnath-x86_64-unknown-linux-gnu.a
[pjproject]  Generating symbols

All other modules compiled successfully, I will continue the testing

  [CC] res_pjproject.c -> res_pjproject.o
  [LD] res_pjproject.o -> res_pjproject.so
  [CC] res_pjsip_acl.c -> res_pjsip_acl.o
  [LD] res_pjsip_acl.o -> res_pjsip_acl.so
  [CC] res_pjsip_authenticator_digest.c -> res_pjsip_authenticator_digest.o
  [LD] res_pjsip_authenticator_digest.o -> res_pjsip_authenticator_digest.so
  [CC] res_pjsip.c -> res_pjsip.o
  [CC] res_pjsip/config_auth.c -> res_pjsip/config_auth.o
  [CC] res_pjsip/config_domain_aliases.c -> res_pjsip/config_domain_aliases.o
  [CC] res_pjsip/config_global.c -> res_pjsip/config_global.o
  [CC] res_pjsip/config_system.c -> res_pjsip/config_system.o
  [CC] res_pjsip/config_transport.c -> res_pjsip/config_transport.o
  [CC] res_pjsip/location.c -> res_pjsip/location.o
  [CC] res_pjsip/pjsip_cli.c -> res_pjsip/pjsip_cli.o
  [CC] res_pjsip/pjsip_configuration.c -> res_pjsip/pjsip_configuration.o
  [CC] res_pjsip/pjsip_distributor.c -> res_pjsip/pjsip_distributor.o
  [CC] res_pjsip/pjsip_global_headers.c -> res_pjsip/pjsip_global_headers.o
  [CC] res_pjsip/pjsip_message_filter.c -> res_pjsip/pjsip_message_filter.o
  [CC] res_pjsip/pjsip_options.c -> res_pjsip/pjsip_options.o
  [CC] res_pjsip/pjsip_resolver.c -> res_pjsip/pjsip_resolver.o
  [CC] res_pjsip/pjsip_scheduler.c -> res_pjsip/pjsip_scheduler.o
  [CC] res_pjsip/pjsip_session.c -> res_pjsip/pjsip_session.o
  [CC] res_pjsip/pjsip_transport_events.c -> res_pjsip/pjsip_transport_events.o
  [CC] res_pjsip/pjsip_transport_management.c -> res_pjsip/pjsip_transport_management.o
  [CC] res_pjsip/presence_xml.c -> res_pjsip/presence_xml.o
  [CC] res_pjsip/security_events.c -> res_pjsip/security_events.o
  [LD] res_pjsip.o res_pjsip/config_auth.o res_pjsip/config_domain_aliases.o res_pjsip/config_global.o res_pjsip/config_system.o res_pjsip/config_transport.o res_pjsip/location.o res_pjsip/pjsip_cli.o res_pjsip/pjsip_configuration.o res_pjsip/pjsip_distributor.o res_pjsip/pjsip_global_headers.o res_pjsip/pjsip_message_filter.o res_pjsip/pjsip_options.o res_pjsip/pjsip_resolver.o res_pjsip/pjsip_scheduler.o res_pjsip/pjsip_session.o res_pjsip/pjsip_transport_events.o res_pjsip/pjsip_transport_management.o res_pjsip/presence_xml.o res_pjsip/security_events.o -> res_pjsip.so
  [CC] res_pjsip_caller_id.c -> res_pjsip_caller_id.o
  [LD] res_pjsip_caller_id.o -> res_pjsip_caller_id.so
  [CC] res_pjsip_config_wizard.c -> res_pjsip_config_wizard.o
  [LD] res_pjsip_config_wizard.o -> res_pjsip_config_wizard.so
  [CC] res_pjsip_dialog_info_body_generator.c -> res_pjsip_dialog_info_body_generator.o
  [LD] res_pjsip_dialog_info_body_generator.o -> res_pjsip_dialog_info_body_generator.so
  [CC] res_pjsip_diversion.c -> res_pjsip_diversion.o
  [LD] res_pjsip_diversion.o -> res_pjsip_diversion.so
  [CC] res_pjsip_dlg_options.c -> res_pjsip_dlg_options.o
  [LD] res_pjsip_dlg_options.o -> res_pjsip_dlg_options.so
  [CC] res_pjsip_dtmf_info.c -> res_pjsip_dtmf_info.o
  [LD] res_pjsip_dtmf_info.o -> res_pjsip_dtmf_info.so
  [CC] res_pjsip_empty_info.c -> res_pjsip_empty_info.o
  [LD] res_pjsip_empty_info.o -> res_pjsip_empty_info.so
  [CC] res_pjsip_endpoint_identifier_anonymous.c -> res_pjsip_endpoint_identifier_anonymous.o
  [LD] res_pjsip_endpoint_identifier_anonymous.o -> res_pjsip_endpoint_identifier_anonymous.so
  [CC] res_pjsip_endpoint_identifier_ip.c -> res_pjsip_endpoint_identifier_ip.o
  [LD] res_pjsip_endpoint_identifier_ip.o -> res_pjsip_endpoint_identifier_ip.so
  [CC] res_pjsip_endpoint_identifier_user.c -> res_pjsip_endpoint_identifier_user.o
  [LD] res_pjsip_endpoint_identifier_user.o -> res_pjsip_endpoint_identifier_user.so
  [CC] res_pjsip_exten_state.c -> res_pjsip_exten_state.o
  [LD] res_pjsip_exten_state.o -> res_pjsip_exten_state.so
  [CC] res_pjsip_header_funcs.c -> res_pjsip_header_funcs.o
  [LD] res_pjsip_header_funcs.o -> res_pjsip_header_funcs.so
  [CC] res_pjsip_history.c -> res_pjsip_history.o
  [LD] res_pjsip_history.o -> res_pjsip_history.so
  [CC] res_pjsip_logger.c -> res_pjsip_logger.o
  [LD] res_pjsip_logger.o -> res_pjsip_logger.so
  [CC] res_pjsip_messaging.c -> res_pjsip_messaging.o
  [LD] res_pjsip_messaging.o -> res_pjsip_messaging.so
  [CC] res_pjsip_mwi_body_generator.c -> res_pjsip_mwi_body_generator.o
  [LD] res_pjsip_mwi_body_generator.o -> res_pjsip_mwi_body_generator.so
  [CC] res_pjsip_mwi.c -> res_pjsip_mwi.o
  [LD] res_pjsip_mwi.o -> res_pjsip_mwi.so
  [CC] res_pjsip_nat.c -> res_pjsip_nat.o
  [LD] res_pjsip_nat.o -> res_pjsip_nat.so
  [CC] res_pjsip_notify.c -> res_pjsip_notify.o
  [LD] res_pjsip_notify.o -> res_pjsip_notify.so
  [CC] res_pjsip_one_touch_record_info.c -> res_pjsip_one_touch_record_info.o
  [LD] res_pjsip_one_touch_record_info.o -> res_pjsip_one_touch_record_info.so
  [CC] res_pjsip_outbound_authenticator_digest.c -> res_pjsip_outbound_authenticator_digest.o
  [LD] res_pjsip_outbound_authenticator_digest.o -> res_pjsip_outbound_authenticator_digest.so
  [CC] res_pjsip_outbound_publish.c -> res_pjsip_outbound_publish.o
  [LD] res_pjsip_outbound_publish.o -> res_pjsip_outbound_publish.so
  [CC] res_pjsip_outbound_registration.c -> res_pjsip_outbound_registration.o
  [LD] res_pjsip_outbound_registration.o -> res_pjsip_outbound_registration.so
  [CC] res_pjsip_path.c -> res_pjsip_path.o
  [LD] res_pjsip_path.o -> res_pjsip_path.so
  [CC] res_pjsip_phoneprov_provider.c -> res_pjsip_phoneprov_provider.o
  [LD] res_pjsip_phoneprov_provider.o -> res_pjsip_phoneprov_provider.so
  [CC] res_pjsip_pidf_body_generator.c -> res_pjsip_pidf_body_generator.o
  [LD] res_pjsip_pidf_body_generator.o -> res_pjsip_pidf_body_generator.so
  [CC] res_pjsip_pidf_digium_body_supplement.c -> res_pjsip_pidf_digium_body_supplement.o
  [LD] res_pjsip_pidf_digium_body_supplement.o -> res_pjsip_pidf_digium_body_supplement.so
  [CC] res_pjsip_pidf_eyebeam_body_supplement.c -> res_pjsip_pidf_eyebeam_body_supplement.o
  [LD] res_pjsip_pidf_eyebeam_body_supplement.o -> res_pjsip_pidf_eyebeam_body_supplement.so
  [CC] res_pjsip_publish_asterisk.c -> res_pjsip_publish_asterisk.o
  [LD] res_pjsip_publish_asterisk.o -> res_pjsip_publish_asterisk.so
  [CC] res_pjsip_pubsub.c -> res_pjsip_pubsub.o
  [LD] res_pjsip_pubsub.o -> res_pjsip_pubsub.so
  [CC] res_pjsip_refer.c -> res_pjsip_refer.o
  [LD] res_pjsip_refer.o -> res_pjsip_refer.so
  [CC] res_pjsip_registrar.c -> res_pjsip_registrar.o
  [LD] res_pjsip_registrar.o -> res_pjsip_registrar.so
  [CC] res_pjsip_rfc3326.c -> res_pjsip_rfc3326.o
  [LD] res_pjsip_rfc3326.o -> res_pjsip_rfc3326.so
  [CC] res_pjsip_sdp_rtp.c -> res_pjsip_sdp_rtp.o
  [LD] res_pjsip_sdp_rtp.o -> res_pjsip_sdp_rtp.so
  [CC] res_pjsip_send_to_voicemail.c -> res_pjsip_send_to_voicemail.o
  [LD] res_pjsip_send_to_voicemail.o -> res_pjsip_send_to_voicemail.so
  [CC] res_pjsip_session.c -> res_pjsip_session.o
  [CC] res_pjsip_session/pjsip_session_caps.c -> res_pjsip_session/pjsip_session_caps.o
  [LD] res_pjsip_session.o res_pjsip_session/pjsip_session_caps.o -> res_pjsip_session.so
  [CC] res_pjsip_sips_contact.c -> res_pjsip_sips_contact.o
  [LD] res_pjsip_sips_contact.o -> res_pjsip_sips_contact.so
  [CC] res_pjsip_t38.c -> res_pjsip_t38.o
  [LD] res_pjsip_t38.o -> res_pjsip_t38.so
  [CC] res_pjsip_transport_websocket.c -> res_pjsip_transport_websocket.o
  [LD] res_pjsip_transport_websocket.o -> res_pjsip_transport_websocket.so
  [CC] res_pjsip_xpidf_body_generator.c -> res_pjsip_xpidf_body_generator.o
  [LD] res_pjsip_xpidf_body_generator.o -> res_pjsip_xpidf_body_generator.so
By: Joshua C. Colp (jcolp) 2023-01-12 06:01:40.331-0600

This can not be merged as-is due to a change in PJSIP which requires alteration of res_pjsip_pubsub. The following commit:

{noformat}
commit b04abebc3357d22358204d50e5da8b78392f74a3
Author: sauwming <ming@teluu.com>
Date:   Mon Jun 6 11:40:41 2022 +0800

   Fixed issues with event subscription regarding on_rx_refresh() and unsubscription (#3126)
{noformat}

Alters callback execution order and changes evsub, such that the following assertion:

{noformat}
[Jan 12 08:00:05] WARNING[620475]: asterisk.asterisk:249 errReceived: Asterisk 127.0.0.1 received error: asterisk: ../src/pjsip-simple/evsub.c:2227: on_tsx_state_uas: Assertion `sub->pending_notify' failed.
{noformat}

Is triggered on the following tests:

{noformat}
tests/channels/pjsip/subscriptions/mwi/sub_setup_teardown
tests/channels/pjsip/subscriptions/mwi/sub_setup_teardown_drop_options
tests/channels/pjsip/subscriptions/presence/unsubscribe
tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/resubscribe_full_state
tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/termination_full_state
tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/resubscribe_full_state
tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/termination_full_state
tests/channels/pjsip/transport/symmetric/notify
{noformat}

This will need to be resolved before moving to 2.13.

I have this in queue as a high priority item for the Sangoma Asterisk team.
By: Friendly Automation (friendly-automation) 2023-02-07 07:44:00.997-0600

Change 19890 merged by Friendly Automation:
res_pjsip: Upgraded bundled pjsip to 2.13

[https://gerrit.asterisk.org/c/asterisk/+/19890|https://gerrit.asterisk.org/c/asterisk/+/19890]
By: Friendly Automation (friendly-automation) 2023-02-07 07:44:03.695-0600

Change 19891 merged by Friendly Automation:
res_pjsip: Upgraded bundled pjsip to 2.13

[https://gerrit.asterisk.org/c/asterisk/+/19891|https://gerrit.asterisk.org/c/asterisk/+/19891]
By: Friendly Automation (friendly-automation) 2023-02-07 08:43:33.872-0600

Change 19792 merged by Friendly Automation:
res_pjsip: Upgraded bundled pjsip to 2.13

[https://gerrit.asterisk.org/c/asterisk/+/19792|https://gerrit.asterisk.org/c/asterisk/+/19792]