[asterisk-commits] pabelanger: trunk r334845 - in /trunk: ./ channels/chan_iax2.c

[SVN commits to the Asterisk project]

Author: pabelanger
Date: Wed Sep  7 14:38:58 2011
New Revision: 334845

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=334845
Log:
Merged revisions 334844 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r334844 | pabelanger | 2011-09-07 15:37:24 -0400 (Wed, 07 Sep 2011) | 11 lines
  
  Merged revisions 334843 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r334843 | pabelanger | 2011-09-07 15:35:52 -0400 (Wed, 07 Sep 2011) | 4 lines
    
    Cleanup chan_iax2.c log messages
    
    Review: https://code.asterisk.org/code/cru/CR-AST-11
  ........
................

Modified:
    trunk/   (props changed)
    trunk/channels/chan_iax2.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-10-merged' - no diff available.

Modified: trunk/channels/chan_iax2.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_iax2.c?view=diff&rev=334845&r1=334844&r2=334845
==============================================================================
--- trunk/channels/chan_iax2.c (original)
+++ trunk/channels/chan_iax2.c Wed Sep  7 14:38:58 2011
@@ -8513,12 +8513,15 @@
 	struct sockaddr_in reg_addr;
 
 	memset(&us, 0, sizeof(us));
-	if (ies->apparent_addr)
+	if (ies->apparent_addr) {
 		memmove(&us, ies->apparent_addr, sizeof(us));
-	if (ies->username)
+	}
+	if (ies->username) {
 		ast_copy_string(peer, ies->username, sizeof(peer));
-	if (ies->refresh)
+	}
+	if (ies->refresh) {
 		refresh = ies->refresh;
+	}
 	if (ies->calling_number) {
 		/* We don't do anything with it really, but maybe we should */
 	}
@@ -8535,24 +8538,26 @@
 		return -1;
 	}
 	memcpy(&reg->us, &us, sizeof(reg->us));
-	if (ies->msgcount >= 0)
+	if (ies->msgcount >= 0) {
 		reg->messages = ies->msgcount & 0xffff;		/* only low 16 bits are used in the transmission of the IE */
+	}
 	/* always refresh the registration at the interval requested by the server
 	   we are registering to
 	*/
 	reg->refresh = refresh;
-	reg->expire = iax2_sched_replace(reg->expire, sched, 
+	reg->expire = iax2_sched_replace(reg->expire, sched,
 		(5 * reg->refresh / 6) * 1000, iax2_do_register_s, reg);
 	if (inaddrcmp(&oldus, &reg->us) || (reg->messages != oldmsgs)) {
-			if (reg->messages > 255)
-				snprintf(msgstatus, sizeof(msgstatus), " with %d new and %d old messages waiting", reg->messages & 0xff, reg->messages >> 8);
-			else if (reg->messages > 1)
-				snprintf(msgstatus, sizeof(msgstatus), " with %d new messages waiting\n", reg->messages);
-			else if (reg->messages > 0)
-				ast_copy_string(msgstatus, " with 1 new message waiting\n", sizeof(msgstatus));
-			else
-				ast_copy_string(msgstatus, " with no messages waiting\n", sizeof(msgstatus));
-			snprintf(ourip, sizeof(ourip), "%s:%d", ast_inet_ntoa(reg->us.sin_addr), ntohs(reg->us.sin_port));
+		if (reg->messages > 255) {
+			snprintf(msgstatus, sizeof(msgstatus), " with %d new and %d old messages waiting", reg->messages & 0xff, reg->messages >> 8);
+		} else if (reg->messages > 1) {
+			snprintf(msgstatus, sizeof(msgstatus), " with %d new messages waiting", reg->messages);
+		} else if (reg->messages > 0) {
+			ast_copy_string(msgstatus, " with 1 new message waiting", sizeof(msgstatus));
+		} else {
+			ast_copy_string(msgstatus, " with no messages waiting", sizeof(msgstatus));
+		}
+		snprintf(ourip, sizeof(ourip), "%s:%d", ast_inet_ntoa(reg->us.sin_addr), ntohs(reg->us.sin_port));
 		ast_verb(3, "Registered IAX2 to '%s', who sees us as %s%s\n", ast_inet_ntoa(sin->sin_addr), ourip, msgstatus);
 		manager_event(EVENT_FLAG_SYSTEM, "Registry", "ChannelType: IAX2\r\nDomain: %s\r\nStatus: Registered\r\n", ast_inet_ntoa(sin->sin_addr));
 	}