diff options
| author | Philippe Sultan <philippe.sultan@gmail.com> | 2007-09-25 09:07:30 +0000 |
|---|---|---|
| committer | Philippe Sultan <philippe.sultan@gmail.com> | 2007-09-25 09:07:30 +0000 |
| commit | 3a5f263bf0881333f3055a501710cd3613b79237 (patch) | |
| tree | 281d2ca1f4d90762cff70b79d3dbf7e34767f3cd /include/asterisk/jingle.h | |
| parent | 437b439c6135b7ee0dbd8567eeec676359157135 (diff) | |
Comply with latest XEP-0166, XEP-0167, XEP-0176.
No real Jingle implementation being available, testing was made using
two Asterisk servers relaying SIP calls over their Jingle channels:
SIP Phone 1 --- [chan_sip]Asterisk 1[chan_jingle] --- [chan_jingle]Asterisk 2[chan_sip] --- SIP Phone 2
Thus, it was possible to test the code in both ways, and make the
Jingle channel comply with the latest specifications. No sound available yet.
Main modifications include :
- modified the 'jingle_candidate' structure and the
'jingle_create_candidates' function according to XEP-0176 ;
- modified the 'jingle_action' function in order to properly terminate
a Jingle session, in conformance with XEP-0166 ;
- modified username format used in STUN requests ;
- actually make the bindaddr configuration field useable.
Todo :
- set audio paths up (no native bridging) ;
- make the CLI gtalk functions available to jingle ;
- clean up the storage space used in strings.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@83743 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'include/asterisk/jingle.h')
| -rw-r--r-- | include/asterisk/jingle.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/include/asterisk/jingle.h b/include/asterisk/jingle.h index 457045c98..bc3b0f217 100644 --- a/include/asterisk/jingle.h +++ b/include/asterisk/jingle.h @@ -49,10 +49,13 @@ #define JINGLE_INITIATE "session-initiate" -#define JINGLE_ACCEPT "accept" +#define JINGLE_ACCEPT "session-accept" #define GOOGLE_ACCEPT "accept" -#define JINGLE_NEGOTIATE "negotiate" +#define JINGLE_NEGOTIATE "transport-info" #define GOOGLE_NEGOTIATE "candidates" +#define JINGLE_INFO "session-info" +#define JINGLE_TERMINATE "session-terminate" + #endif |