Skip to content
Snippets Groups Projects
Commit 54b603de authored by Yalu Zhang's avatar Yalu Zhang
Browse files

Merge branch asterisk_rdkb into devel

Head of devel before merging: ddae5785
Head of asterisk_rdkb to merge: d8dedeeb

Manually fixed conflicts:
channels/chan_pjsip.c
docs/api/uci.asterisk.md
include/asterisk/channel.h
main/channel_internal_api.c
res/res_pjsip.c
res/res_pjsip/config_global.c
res/res_pjsip_outbound_registration.c
res/res_pjsip_sdp_rtp.c
res/res_pjsip_session.c
schemas/uci/asterisk.json

Automatically merged:
apps/app_dial.c
configure.ac
include/asterisk/cdr.h
include/asterisk/dt_logger.h
include/asterisk/logger.h
include/asterisk/res_pjsip.h
include/asterisk/res_pjsip_outbound_registration.h
include/asterisk/res_pjsip_session.h
include/asterisk/rtp_engine.h
include/asterisk/stasis_channels.h
include/asterisk/utils.h
main/Makefile
main/asterisk.c
main/cdr.c
main/codec_builtin.c
main/dns_naptr.c
main/dt_logger.c
main/rtp_engine.c
main/utils.c
menuselect/configure.ac
res/Makefile
res/res_pjsip/config_system.c
res/res_pjsip/config_transport.c
res/res_pjsip/pjsip_config.xml
res/res_pjsip/pjsip_configuration.c
res/res_pjsip/pjsip_distributor.c
res/res_pjsip/pjsip_message_ip_updater.c
res/res_pjsip/pjsip_resolver.c
res/res_pjsip_authenticator_digest.c
res/res_pjsip_caller_id.c
res/res_pjsip_logger.c
res/res_pjsip_outbound_authenticator_digest.c
res/res_pjsip_outbound_registration.exports.in
res/res_pjsip_registrar.c
res/res_pjsip_session/pjsip_session_caps.c
res/res_resolver_unbound.c
res/res_rtp_asterisk.c
sounds/audio_voip.gsm
sounds/audio_wan.gsm
third-party/apply_patches
third-party/jansson/Makefile
third-party/pjproject/patches/0011-Add-support-for-Session-ID-header.patch
third-party/pjproject/patches/0012-increase-cseq-for-PRACK-per-each-dialog.patch
third-party/pjproject/patches/0013-1TR114-failover.patch
third-party/pjproject/patches/0014-Implementation-for-pjproject-DT-logging-mechanism.patch
third-party/pjproject/patches/0015-Scure-Sip-syslog-template-related-code-in-pjproject.patch
third-party/pjproject/patches/0016-Remove-event-code-from-log-string-in-VoIPlog.txt.patch
third-party/pjproject/patches/0017-securesip-syslog-under-pjproject-part-1-implementati.patch
third-party/pjproject/patches/0018-implementation-of-securesip-syslog-part2-under-pjpro.patch
third-party/pjproject/patches/0019-TLSv13-ciphers.patch
third-party/pjproject/patches/0020-return-444-while-register-request-timeout.patch
third-party/pjproject/patches/0021-Update-for-Authorization-header-handling.patch
third-party/pjproject/patches/0021-stateless-send-transport-handle-no-dest-addr.patch
third-party/pjproject/patches/config_site.h
parents ddae5785 d8dedeeb
Branches
Tags
No related merge requests found
Showing
with 456 additions and 75 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment