diff options
| author | Liong Sauw Ming <ming@teluu.com> | 2013-07-15 04:23:31 +0000 |
|---|---|---|
| committer | Liong Sauw Ming <ming@teluu.com> | 2013-07-15 04:23:31 +0000 |
| commit | 551dc7de88217169f01624a64c4a20ded378c7d8 (patch) | |
| tree | c22d1ebff97d68b00372fb024cc4ccbce5c481f3 /pjmedia | |
| parent | 8d9d6c3f11a8eac5204f2c4c18046e6d4dab18f3 (diff) | |
Re #817: Initial work for allowing application to respond to re-INVITE manually.
Patches integrated in this fix (with some modifications for adjustment to the current trunk):
- sip_inv-on_rx_reinvite.patch
Move the place where to call the callback so the callback will still be called when the re-invite contains no SDP
- sdp_neg_cancel_remote_offer
pjmedia_sdp_neg_cancel_remote_offer() is no longer necessary since pjmedia_sdp_neg_cancel_offer() can already handle that. Only integrate the chart for sdp negotiation doc.
- sip_inv-terminate-reinvite-tsx-on-cancel
- sip_inv-cancel_sdp_neg_on_sending_negative_reply_to_reinvite
- pjsip-allow_cancel_reinvite
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@4562 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjmedia')
| -rw-r--r-- | pjmedia/include/pjmedia/sdp_neg.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/pjmedia/include/pjmedia/sdp_neg.h b/pjmedia/include/pjmedia/sdp_neg.h index 0be9e528..3f6eb319 100644 --- a/pjmedia/include/pjmedia/sdp_neg.h +++ b/pjmedia/include/pjmedia/sdp_neg.h @@ -52,15 +52,15 @@ * create_w_local_offer() +-------------+ send_local_offer() * ----------------------->| LOCAL_OFFER |<----------------------- * | +-------------+______ | - * | | \______ cancel() | - * | set_remote_answer() | \______ | - * | V \ | + * | | \_____________ | + * | set_remote_answer() | cancel_offer() \ | + * | V v | * +--+---+ +-----------+ negotiate() +-~----+ * | NULL | | WAIT_NEGO |-------------------->| DONE | * +------+ +-----------+ +------+ - * | A | - * | set_local_answer() | | - * | | | + * | A ______________________^ | + * | set_local_answer() | / cancel_offer() | + * | | / | * | +--------------+ set_remote_offer() | * ----------------------->| REMOTE_OFFER |<---------------------- * create_w_remote_offer() +--------------+ |