[asterisk-commits] irroot: branch irroot/distrotech-customers-trunk r329389 - in /team/irroot/di...

[SVN commits to the Asterisk project]

Author: irroot
Date: Sun Jul 24 12:59:48 2011
New Revision: 329389

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=329389
Log:
Some small cleanups

Modified:
    team/irroot/distrotech-customers-trunk/channels/chan_sip.c
    team/irroot/distrotech-customers-trunk/channels/sip/sdp_crypto.c
    team/irroot/distrotech-customers-trunk/configs/sip.conf.sample

Modified: team/irroot/distrotech-customers-trunk/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-trunk/channels/chan_sip.c?view=diff&rev=329389&r1=329388&r2=329389
==============================================================================
--- team/irroot/distrotech-customers-trunk/channels/chan_sip.c (original)
+++ team/irroot/distrotech-customers-trunk/channels/chan_sip.c Sun Jul 24 12:59:48 2011
@@ -24777,7 +24777,7 @@
 		}
 
 		p->subscribed = MWI_NOTIFICATION;
-		if (!ast_test_flag(&authpeer->flags[1], SIP_PAGE2_SUBSCRIBEMWIONLY)) {
+		if (ast_test_flag(&authpeer->flags[1], SIP_PAGE2_SUBSCRIBEMWIONLY)) {
 			add_peer_mwi_subs(authpeer);
 		}
 		if (authpeer->mwipvt && authpeer->mwipvt != p) {	/* Destroy old PVT if this is a new one */
@@ -29519,7 +29519,7 @@
 		return FALSE;
 	}
 
-	if (sdp_crypto_process((*srtp)->crypto, a, rtp, (*srtp)) < 0) {
+	if (sdp_crypto_process((*srtp)->crypto, a, rtp, *srtp) < 0) {
 		return FALSE;
 	}
 

Modified: team/irroot/distrotech-customers-trunk/channels/sip/sdp_crypto.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-trunk/channels/sip/sdp_crypto.c?view=diff&rev=329389&r1=329388&r2=329389
==============================================================================
--- team/irroot/distrotech-customers-trunk/channels/sip/sdp_crypto.c (original)
+++ team/irroot/distrotech-customers-trunk/channels/sip/sdp_crypto.c Sun Jul 24 12:59:48 2011
@@ -286,7 +286,7 @@
 	return 0;
 }
 
-int sdp_crypto_offer(struct sdp_crypto *p,int taglen)
+int sdp_crypto_offer(struct sdp_crypto *p, int taglen)
 {
 	char crypto_buf[128];
 

Modified: team/irroot/distrotech-customers-trunk/configs/sip.conf.sample
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-trunk/configs/sip.conf.sample?view=diff&rev=329389&r1=329388&r2=329389
==============================================================================
--- team/irroot/distrotech-customers-trunk/configs/sip.conf.sample (original)
+++ team/irroot/distrotech-customers-trunk/configs/sip.conf.sample Sun Jul 24 12:59:48 2011
@@ -901,6 +901,9 @@
 ;encryption=no                  ; Whether to offer SRTP encrypted media (and only SRTP encrypted media)
                                 ; on outgoing calls to a peer. Calls will fail with HANGUPCAUSE=58 if
                                 ; the peer does not support SRTP. Defaults to no.
+                                ; this option can be set to try to offer encryption and not fail if peer 
+                                ; ignores the request. the peer may reject this based on local settings.
+;encryption_tag=80              ; Set the auth tag length offered in the INVITE either 32/80 default 80
 
 ;----------------------------------------- REALTIME SUPPORT ------------------------
 ; For additional information on ARA, the Asterisk Realtime Architecture,