- reorganize SIP extensions alphabetically, to make it easier to synch with the IANA list

- add a few new registered and well-known extension names


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@127995 65c4cc65-6c06-0410-ace0-fbb531ad65f3

1 files changed, 28 insertions, 19 deletions

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 8d6adf4f3..655b9de80 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -550,7 +550,10 @@ static const struct  cfsip_methods {
 #define SIP_OPT_NOREFERSUB	(1 << 14)
 #define SIP_OPT_HISTINFO	(1 << 15)
 #define SIP_OPT_RESPRIORITY	(1 << 16)
-#define SIP_OPT_UNKNOWN		(1 << 17)
+#define SIP_OPT_FROMCHANGE	(1 << 17)
+#define SIP_OPT_RECLISTINV	(1 << 18)
+#define SIP_OPT_RECLISTSUB	(1 << 19)
+#define SIP_OPT_UNKNOWN		(1 << 20)
 
 
 /*! \brief List of well-known SIP options. If we get this in a require,
@@ -560,18 +563,22 @@ static const struct cfsip_options {
 	int supported;		/*!< Supported by Asterisk ? */
 	char * const text;	/*!< Text id, as in standard */
 } sip_options[] = {	/* XXX used in 3 places */
-	/* RFC3891: Replaces: header for transfer */
-	{ SIP_OPT_REPLACES,	SUPPORTED,	"replaces" },	
-	/* One version of Polycom firmware has the wrong label */
-	{ SIP_OPT_REPLACES,	SUPPORTED,	"replace" },	
 	/* RFC3262: PRACK 100% reliability */
 	{ SIP_OPT_100REL,	NOT_SUPPORTED,	"100rel" },	
-	/* RFC4028: SIP Session-Timers */
-	{ SIP_OPT_TIMER,	SUPPORTED,	"timer" },
 	/* RFC3959: SIP Early session support */
 	{ SIP_OPT_EARLY_SESSION, NOT_SUPPORTED,	"early-session" },
+	/* SIMPLE events:  RFC4662 */
+	{ SIP_OPT_EVENTLIST,	NOT_SUPPORTED,	"eventlist" },
+	/* RFC 4916- Connected line ID updates */
+	{ SIP_OPT_FROMCHANGE,	NOT_SUPPORTED,	"from-change" },
+	/* GRUU: Globally Routable User Agent URI's */
+	{ SIP_OPT_GRUU,		NOT_SUPPORTED,	"gruu" },
+	/* RFC4244 History info */
+	{ SIP_OPT_HISTINFO,	NOT_SUPPORTED,	"histinfo" },
 	/* RFC3911: SIP Join header support */
 	{ SIP_OPT_JOIN,		NOT_SUPPORTED,	"join" },
+	/* Disable the REFER subscription, RFC 4488 */
+	{ SIP_OPT_NOREFERSUB,	NOT_SUPPORTED,	"norefersub" },
 	/* RFC3327: Path support */
 	{ SIP_OPT_PATH,		NOT_SUPPORTED,	"path" },
 	/* RFC3840: Callee preferences */
@@ -580,22 +587,24 @@ static const struct cfsip_options {
 	{ SIP_OPT_PRECONDITION,	NOT_SUPPORTED,	"precondition" },
 	/* RFC3323: Privacy with proxies*/
 	{ SIP_OPT_PRIVACY,	NOT_SUPPORTED,	"privacy" },
-	/* RFC4092: Usage of the SDP ANAT Semantics in the SIP */
-	{ SIP_OPT_SDP_ANAT,	NOT_SUPPORTED,	"sdp-anat" },
+	/* RFC-ietf-sip-uri-list-conferencing-02.txt conference invite lists */
+	{ SIP_OPT_RECLISTINV,	NOT_SUPPORTED,	"recipient-list-invite" },
+	/* RFC-ietf-sip-uri-list-subscribe-02.txt - subscription lists */
+	{ SIP_OPT_RECLISTSUB,	NOT_SUPPORTED,	"recipient-list-subscribe" },
+	/* RFC3891: Replaces: header for transfer */
+	{ SIP_OPT_REPLACES,	SUPPORTED,	"replaces" },	
+	/* One version of Polycom firmware has the wrong label */
+	{ SIP_OPT_REPLACES,	SUPPORTED,	"replace" },	
+	/* RFC4412 Resource priorities */
+	{ SIP_OPT_RESPRIORITY,	NOT_SUPPORTED,	"resource-priority" },
 	/* RFC3329: Security agreement mechanism */
 	{ SIP_OPT_SEC_AGREE,	NOT_SUPPORTED,	"sec_agree" },
-	/* SIMPLE events:  RFC4662 */
-	{ SIP_OPT_EVENTLIST,	NOT_SUPPORTED,	"eventlist" },
-	/* GRUU: Globally Routable User Agent URI's */
-	{ SIP_OPT_GRUU,		NOT_SUPPORTED,	"gruu" },
+	/* RFC4092: Usage of the SDP ANAT Semantics in the SIP */
+	{ SIP_OPT_SDP_ANAT,	NOT_SUPPORTED,	"sdp-anat" },
+	/* RFC4028: SIP Session-Timers */
+	{ SIP_OPT_TIMER,	SUPPORTED,	"timer" },
 	/* RFC4538: Target-dialog */
 	{ SIP_OPT_TARGET_DIALOG,NOT_SUPPORTED,	"tdialog" },
-	/* Disable the REFER subscription, RFC 4488 */
-	{ SIP_OPT_NOREFERSUB,	NOT_SUPPORTED,	"norefersub" },
-	/* ietf-sip-history-info-06.txt */
-	{ SIP_OPT_HISTINFO,	NOT_SUPPORTED,	"histinfo" },
-	/* ietf-sip-resource-priority-10.txt */
-	{ SIP_OPT_RESPRIORITY,	NOT_SUPPORTED,	"resource-priority" },
 };