[svn-commits] twilson: branch group/srtp_reboot r247837 - in /team/group/srtp_reboot: chann...

[SVN commits to the Digium repositories]

Author: twilson
Date: Thu Feb 18 16:33:46 2010
New Revision: 247837

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=247837
Log:
Use US English spelling of 'signaling'

Modified:
    team/group/srtp_reboot/channels/chan_sip.c
    team/group/srtp_reboot/include/asterisk/global_datastores.h
    team/group/srtp_reboot/main/global_datastores.c

Modified: team/group/srtp_reboot/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/team/group/srtp_reboot/channels/chan_sip.c?view=diff&rev=247837&r1=247836&r2=247837
==============================================================================
--- team/group/srtp_reboot/channels/chan_sip.c (original)
+++ team/group/srtp_reboot/channels/chan_sip.c Thu Feb 18 16:33:46 2010
@@ -4175,8 +4175,8 @@
 	/* Check to see if we should try to force encryption */
 	if ((ds = ast_channel_datastore_find(ast, &encrypt_call_info, NULL))) {
 		struct ast_encrypt_call_store *encrypt = ds->data;
-		if (encrypt->signalling && p->socket.type != SIP_TRANSPORT_TLS) {
-		   ast_log(LOG_WARNING, "Encrypted signalling is required\n");
+		if (encrypt->signaling && p->socket.type != SIP_TRANSPORT_TLS) {
+		   ast_log(LOG_WARNING, "Encrypted signaling is required\n");
 		   ast->hangupcause = AST_CAUSE_BEARERCAPABILITY_NOTAVAIL;
 		   return -1;
 		}

Modified: team/group/srtp_reboot/include/asterisk/global_datastores.h
URL: http://svnview.digium.com/svn/asterisk/team/group/srtp_reboot/include/asterisk/global_datastores.h?view=diff&rev=247837&r1=247836&r2=247837
==============================================================================
--- team/group/srtp_reboot/include/asterisk/global_datastores.h (original)
+++ team/group/srtp_reboot/include/asterisk/global_datastores.h Thu Feb 18 16:33:46 2010
@@ -35,7 +35,7 @@
 };
 
 struct ast_encrypt_call_store {
-	unsigned int signalling:1;
+	unsigned int signaling:1;
 	unsigned int media:1;
 };
 #endif

Modified: team/group/srtp_reboot/main/global_datastores.c
URL: http://svnview.digium.com/svn/asterisk/team/group/srtp_reboot/main/global_datastores.c?view=diff&rev=247837&r1=247836&r2=247837
==============================================================================
--- team/group/srtp_reboot/main/global_datastores.c (original)
+++ team/group/srtp_reboot/main/global_datastores.c Thu Feb 18 16:33:46 2010
@@ -100,7 +100,7 @@
 	if (!(new = ast_calloc(1, sizeof(*new)))) {
 		return NULL;
 	}
-	new->signalling = old->signalling;
+	new->signaling = old->signaling;
 	new->media = old->media;
 
 	return new;