[asterisk-commits] irroot: branch irroot/distrotech-customers-1.8 r320824 - in /team/irroot/dist...
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Wed May 25 12:07:34 CDT 2011
Author: irroot
Date: Wed May 25 12:07:22 2011
New Revision: 320824
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=320824
Log:
Merge SRTP Changes From DTS-trunk
Modified:
team/irroot/distrotech-customers-1.8/ (props changed)
team/irroot/distrotech-customers-1.8/CHANGES
team/irroot/distrotech-customers-1.8/cel/cel_odbc.c (props changed)
team/irroot/distrotech-customers-1.8/channels/chan_sip.c
team/irroot/distrotech-customers-1.8/channels/sip/include/sip.h
team/irroot/distrotech-customers-1.8/configs/cel_odbc.conf.sample (props changed)
team/irroot/distrotech-customers-1.8/contrib/realtime/mysql/iaxfriends.sql (props changed)
team/irroot/distrotech-customers-1.8/contrib/realtime/mysql/meetme.sql (props changed)
team/irroot/distrotech-customers-1.8/contrib/realtime/mysql/sipfriends.sql (props changed)
team/irroot/distrotech-customers-1.8/contrib/realtime/mysql/voicemail.sql (props changed)
team/irroot/distrotech-customers-1.8/contrib/realtime/postgresql/realtime.sql (props changed)
Propchange: team/irroot/distrotech-customers-1.8/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 25 12:07:22 2011
@@ -1,4 +1,5 @@
/be/branches/C.3:256426
/team/irroot/distrotech-customers-1.8:319067
+/team/irroot/distrotech-customers-trunk:320619,320821-320822
/team/irroot/t38gateway-1.8:318979-319017,319357
/team/irroot/t38gateway-trunk:318977-319016,319067,319071
Modified: team/irroot/distrotech-customers-1.8/CHANGES
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-1.8/CHANGES?view=diff&rev=320824&r1=320823&r2=320824
==============================================================================
--- team/irroot/distrotech-customers-1.8/CHANGES (original)
+++ team/irroot/distrotech-customers-1.8/CHANGES Wed May 25 12:07:22 2011
@@ -78,6 +78,8 @@
* Addition of the 'auth_options_requests' option for turning on and off
authentication for OPTIONS requests in chan_sip.
* Add T38 support for REJECTED state where T.38 Negotiation is explicitly rejected.
+ * Enable Optional SRTP by setting encryption=try
+ * Add option encryption_taglen to set auth taglen only 32 and 80 are supported currently.
IAX2 Changes
-----------
Propchange: team/irroot/distrotech-customers-1.8/cel/cel_odbc.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 25 12:07:22 2011
@@ -1,4 +1,5 @@
/be/branches/C.3/cel/cel_adaptive_odbc.c:256426
/team/irroot/distrotech-customers-1.8/cel/cel_odbc.c:319067
+/team/irroot/distrotech-customers-trunk/cel/cel_odbc.c:320619,320821-320822
/team/irroot/t38gateway-1.8/cel/cel_odbc.c:318979-319017,319357
/team/irroot/t38gateway-trunk/cel/cel_odbc.c:318977-319016,319067,319071
Modified: team/irroot/distrotech-customers-1.8/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-1.8/channels/chan_sip.c?view=diff&rev=320824&r1=320823&r2=320824
==============================================================================
--- team/irroot/distrotech-customers-1.8/channels/chan_sip.c (original)
+++ team/irroot/distrotech-customers-1.8/channels/chan_sip.c Wed May 25 12:07:22 2011
@@ -25913,20 +25913,6 @@
} else if (!strcasecmp(v->name, "buggymwi")) {
ast_set_flag(&mask[1], SIP_PAGE2_BUGGY_MWI);
ast_set2_flag(&flags[1], ast_true(v->value), SIP_PAGE2_BUGGY_MWI);
- } else if (!strcasecmp(v->name, "encryption_taglen")) {
- ast_set_flag(&mask[2], SIP_PAGE3_SRTP_TAG_32);
- ast_set2_flag(&flags[2], !strcasecmp(v->value, "32"), SIP_PAGE3_SRTP_TAG_32);
- } else if (!strcasecmp(v->name, "encryption")) {
- ast_set_flag(&mask[1], SIP_PAGE2_USE_SRTP);
- ast_set_flag(&mask[2], SIP_PAGE3_SRTP_TRY);
-
- if (!strcasecmp(v->value, "try")) {
- ast_set_flag(&flags[1], SIP_PAGE2_USE_SRTP);
- ast_set_flag(&flags[2], SIP_PAGE3_SRTP_TRY);
- } else {
- ast_set2_flag(&flags[1], ast_true(v->value), SIP_PAGE2_USE_SRTP);
- ast_clear_flag(&flags[2], SIP_PAGE3_SRTP_TRY);
- }
} else
res = 0;
@@ -26664,6 +26650,16 @@
ast_string_field_set(peer, unsolicited_mailbox, v->value);
} else if (!strcasecmp(v->name, "use_q850_reason")) {
ast_set2_flag(&peer->flags[1], ast_true(v->value), SIP_PAGE2_Q850_REASON);
+ } else if (!strcasecmp(v->name, "encryption")) {
+ if (!strcasecmp(v->value, "try")) {
+ ast_set_flag(&peer->flags[1], SIP_PAGE2_USE_SRTP);
+ ast_set_flag(&peer->flags[2], SIP_PAGE3_SRTP_TRY);
+ } else {
+ ast_set2_flag(&peer->flags[1], ast_true(v->value), SIP_PAGE2_USE_SRTP);
+ ast_clear_flag(&peer->flags[2], SIP_PAGE3_SRTP_TRY);
+ }
+ } else if (!strcasecmp(v->name, "encryption_taglen")) {
+ ast_set2_flag(&peer->flags[2], !strcasecmp(v->value, "32"), SIP_PAGE3_SRTP_TAG_32);
} else if (!strcasecmp(v->name, "snom_aoc_enabled")) {
ast_set2_flag(&peer->flags[2], ast_true(v->value), SIP_PAGE3_SNOM_AOC);
}
Modified: team/irroot/distrotech-customers-1.8/channels/sip/include/sip.h
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-1.8/channels/sip/include/sip.h?view=diff&rev=320824&r1=320823&r2=320824
==============================================================================
--- team/irroot/distrotech-customers-1.8/channels/sip/include/sip.h (original)
+++ team/irroot/distrotech-customers-1.8/channels/sip/include/sip.h Wed May 25 12:07:22 2011
@@ -351,8 +351,8 @@
#define SIP_PAGE3_SNOM_AOC (1 << 0) /*!< DPG: Allow snom aoc messages */
-#define SIP_PAGE3_SRTP_TAG_32 (1 << 1)
-#define SIP_PAGE3_SRTP_TRY (1 << 2)
+#define SIP_PAGE3_SRTP_TAG_32 (1 << 1) /*!< DP: Use a 32bit auth tag in INVITE not 80bit */
+#define SIP_PAGE3_SRTP_TRY (1 << 2) /*!< DP: Attempt SRTP / do not enforce it */
#define SIP_PAGE3_FLAGS_TO_COPY \
(SIP_PAGE3_SNOM_AOC | SIP_PAGE3_SRTP_TAG_32 | SIP_PAGE3_SRTP_TRY)
Propchange: team/irroot/distrotech-customers-1.8/configs/cel_odbc.conf.sample
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 25 12:07:22 2011
@@ -1,4 +1,5 @@
/be/branches/C.3/configs/cel_adaptive_odbc.conf.sample:256426
/team/irroot/distrotech-customers-1.8/configs/cel_odbc.conf.sample:319067
+/team/irroot/distrotech-customers-trunk/configs/cel_odbc.conf.sample:320619,320821-320822
/team/irroot/t38gateway-1.8/configs/cel_odbc.conf.sample:318979-319017,319357
/team/irroot/t38gateway-trunk/configs/cel_odbc.conf.sample:318977-319016,319067,319071
Propchange: team/irroot/distrotech-customers-1.8/contrib/realtime/mysql/iaxfriends.sql
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 25 12:07:22 2011
@@ -1,3 +1,4 @@
/team/irroot/distrotech-customers-1.8/contrib/realtime/mysql/iaxfriends.sql:319067
+/team/irroot/distrotech-customers-trunk/contrib/realtime/mysql/iaxfriends.sql:320619,320821-320822
/team/irroot/t38gateway-1.8/contrib/realtime/mysql/iaxfriends.sql:318979-319017,319357
/team/irroot/t38gateway-trunk/contrib/realtime/mysql/iaxfriends.sql:318977-319016,319067,319071
Propchange: team/irroot/distrotech-customers-1.8/contrib/realtime/mysql/meetme.sql
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 25 12:07:22 2011
@@ -1,3 +1,4 @@
/team/irroot/distrotech-customers-1.8/contrib/realtime/mysql/meetme.sql:319067
+/team/irroot/distrotech-customers-trunk/contrib/realtime/mysql/meetme.sql:320619,320821-320822
/team/irroot/t38gateway-1.8/contrib/realtime/mysql/meetme.sql:318979-319017,319357
/team/irroot/t38gateway-trunk/contrib/realtime/mysql/meetme.sql:318977-319016,319067,319071
Propchange: team/irroot/distrotech-customers-1.8/contrib/realtime/mysql/sipfriends.sql
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 25 12:07:22 2011
@@ -1,3 +1,4 @@
/team/irroot/distrotech-customers-1.8/contrib/realtime/mysql/sipfriends.sql:319067
+/team/irroot/distrotech-customers-trunk/contrib/realtime/mysql/sipfriends.sql:320619,320821-320822
/team/irroot/t38gateway-1.8/contrib/realtime/mysql/sipfriends.sql:318979-319017,319357
/team/irroot/t38gateway-trunk/contrib/realtime/mysql/sipfriends.sql:318977-319016,319067,319071
Propchange: team/irroot/distrotech-customers-1.8/contrib/realtime/mysql/voicemail.sql
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 25 12:07:22 2011
@@ -1,3 +1,4 @@
/team/irroot/distrotech-customers-1.8/contrib/realtime/mysql/voicemail.sql:319067
+/team/irroot/distrotech-customers-trunk/contrib/realtime/mysql/voicemail.sql:320619,320821-320822
/team/irroot/t38gateway-1.8/contrib/realtime/mysql/voicemail.sql:318979-319017,319357
/team/irroot/t38gateway-trunk/contrib/realtime/mysql/voicemail.sql:318977-319016,319067,319071
Propchange: team/irroot/distrotech-customers-1.8/contrib/realtime/postgresql/realtime.sql
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 25 12:07:22 2011
@@ -1,3 +1,4 @@
/team/irroot/distrotech-customers-1.8/contrib/realtime/postgresql/realtime.sql:319067
+/team/irroot/distrotech-customers-trunk/contrib/realtime/postgresql/realtime.sql:320619,320821-320822
/team/irroot/t38gateway-1.8/contrib/realtime/postgresql/realtime.sql:318979-319017,319357
/team/irroot/t38gateway-trunk/contrib/realtime/postgresql/realtime.sql:318977-319016,319067,319071
More information about the asterisk-commits
mailing list