[asterisk-commits] trunk - r7336 in /trunk: ./ channels/chan_sip.c

[asterisk-commits at lists.digium.com]

Author: russell
Date: Sun Dec  4 18:06:09 2005
New Revision: 7336

URL: http://svn.digium.com/view/asterisk?rev=7336&view=rev
Log:
Merged revisions 7335 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r7335 | russell | 2005-12-04 19:01:17 -0500 (Sun, 04 Dec 2005) | 2 lines

fix the order of arguments to an error message (issue #5927)

........

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

Propchange: trunk/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Sun Dec  4 18:06:09 2005
@@ -1,1 +1,1 @@
-/branches/1.2:1-7329
+/branches/1.2:1-7335

Modified: trunk/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_sip.c?rev=7336&r1=7335&r2=7336&view=diff
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Sun Dec  4 18:06:09 2005
@@ -1067,7 +1067,7 @@
 		res=sendto(sipsock, data, len, 0, (struct sockaddr *)&p->sa, sizeof(struct sockaddr_in));
 
 	if (res != len) {
-		ast_log(LOG_WARNING, "sip_xmit of %p (len %d) to %s:%d returned %d: %s\n", data, len, ast_inet_ntoa(iabuf, sizeof(iabuf), p->sa.sin_addr), res, ntohs(p->sa.sin_port), strerror(errno));
+		ast_log(LOG_WARNING, "sip_xmit of %p (len %d) to %s:%d returned %d: %s\n", data, len, ast_inet_ntoa(iabuf, sizeof(iabuf), p->sa.sin_addr), ntohs(p->sa.sin_port), res, strerror(errno));
 	}
 	return res;
 }