Merge in current pimp_my_sip work, including:
authorJoshua Colp <jcolp@digium.com>
Sat, 22 Jun 2013 14:03:22 +0000 (14:03 +0000)
committerJoshua Colp <jcolp@digium.com>
Sat, 22 Jun 2013 14:03:22 +0000 (14:03 +0000)
commit77002bc377f19ea11e60732c486b6ef371688773
treec19fd245c519c6d7905403849a7af9c7e4a4be3e
parentea03516cb5426915d183526335d3a7d662ea29dc
Merge in current pimp_my_sip work, including:

1. Security events
2. Websocket support
3. Diversion header + redirecting support
4. An anonymous endpoint identifier
5. Inbound extension state subscription support
6. PIDF notify generation
7. One touch recording support (special thanks Sean Bright!)
8. Blind and attended transfer support
9. Automatic inbound registration expiration
10. SRTP support
11. Media offer control dialplan function
12. Connected line support
13. SendText() support
14. Qualify support
15. Inband DTMF detection
16. Call and pickup groups
17. Messaging support

Thanks everyone!

Side note: I'm reminded of the song "How Far We've Come" by Matchbox Twenty.

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@392565 65c4cc65-6c06-0410-ace0-fbb531ad65f3
42 files changed:
channels/chan_gulp.c
channels/chan_sip.c
channels/sip/include/sdp_crypto.h [deleted file]
channels/sip/include/sip.h
channels/sip/include/srtp.h [deleted file]
channels/sip/srtp.c [deleted file]
configs/res_sip.conf.sample
include/asterisk/res_sip.h
include/asterisk/res_sip_exten_state.h [new file with mode: 0644]
include/asterisk/res_sip_pubsub.h
include/asterisk/res_sip_session.h
include/asterisk/sdp_srtp.h [new file with mode: 0644]
main/pbx.c
main/sdp_srtp.c [moved from channels/sip/sdp_crypto.c with 68% similarity]
res/res_sip.c
res/res_sip.exports.in
res/res_sip/config_transport.c
res/res_sip/include/res_sip_private.h
res/res_sip/location.c
res/res_sip/security_events.c [new file with mode: 0644]
res/res_sip/sip_configuration.c
res/res_sip/sip_distributor.c
res/res_sip/sip_options.c
res/res_sip_caller_id.c
res/res_sip_diversion.c [new file with mode: 0644]
res/res_sip_dtmf_info.c
res/res_sip_endpoint_identifier_anonymous.c [new file with mode: 0644]
res/res_sip_exten_state.c [new file with mode: 0644]
res/res_sip_exten_state.exports.in [new file with mode: 0644]
res/res_sip_messaging.c [new file with mode: 0644]
res/res_sip_one_touch_record_info.c [new file with mode: 0644]
res/res_sip_outbound_registration.c
res/res_sip_pidf.c [new file with mode: 0644]
res/res_sip_pubsub.c
res/res_sip_pubsub.exports.in
res/res_sip_refer.c [new file with mode: 0644]
res/res_sip_registrar.c
res/res_sip_registrar_expire.c [new file with mode: 0644]
res/res_sip_sdp_rtp.c
res/res_sip_session.c
res/res_sip_session.exports.in
res/res_sip_transport_websocket.c [new file with mode: 0644]