[asterisk-commits] russell: branch russell/chan_refcount r100147 - in /team/russell/chan_refcoun...
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Thu Jan 24 11:15:04 CST 2008
Author: russell
Date: Thu Jan 24 11:15:04 2008
New Revision: 100147
URL: http://svn.digium.com/view/asterisk?view=rev&rev=100147
Log:
resolve, reset
Modified:
team/russell/chan_refcount/ (props changed)
team/russell/chan_refcount/channels/chan_iax2.c
team/russell/chan_refcount/channels/chan_mgcp.c
team/russell/chan_refcount/channels/chan_sip.c
team/russell/chan_refcount/channels/chan_zap.c
team/russell/chan_refcount/main/acl.c
team/russell/chan_refcount/main/channel.c
team/russell/chan_refcount/main/dial.c
team/russell/chan_refcount/main/features.c
team/russell/chan_refcount/res/res_phoneprov.c
Change Statistics:
0 files changed
Propchange: team/russell/chan_refcount/
------------------------------------------------------------------------------
automerge = yesplzanddontbreakanymorekthxbye
Propchange: team/russell/chan_refcount/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.
Propchange: team/russell/chan_refcount/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Jan 24 11:15:04 2008
@@ -1,1 +1,1 @@
-/trunk:1-100090
+/trunk:1-100144
Modified: team/russell/chan_refcount/channels/chan_iax2.c
URL: http://svn.digium.com/view/asterisk/team/russell/chan_refcount/channels/chan_iax2.c?view=diff&rev=100147&r1=100146&r2=100147
==============================================================================
--- team/russell/chan_refcount/channels/chan_iax2.c (original)
+++ team/russell/chan_refcount/channels/chan_iax2.c Thu Jan 24 11:15:04 2008
@@ -31,7 +31,6 @@
/*** MODULEINFO
<use>zaptel</use>
<use>crypto</use>
- <depend>res_features</depend>
***/
#include "asterisk.h"
Modified: team/russell/chan_refcount/channels/chan_mgcp.c
URL: http://svn.digium.com/view/asterisk/team/russell/chan_refcount/channels/chan_mgcp.c?view=diff&rev=100147&r1=100146&r2=100147
==============================================================================
--- team/russell/chan_refcount/channels/chan_mgcp.c (original)
+++ team/russell/chan_refcount/channels/chan_mgcp.c Thu Jan 24 11:15:04 2008
@@ -27,9 +27,6 @@
*
* \ingroup channel_drivers
*/
-/*** MODULEINFO
- <depend>res_features</depend>
- ***/
#include "asterisk.h"
Modified: team/russell/chan_refcount/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/team/russell/chan_refcount/channels/chan_sip.c?view=diff&rev=100147&r1=100146&r2=100147
==============================================================================
--- team/russell/chan_refcount/channels/chan_sip.c (original)
+++ team/russell/chan_refcount/channels/chan_sip.c Thu Jan 24 11:15:04 2008
@@ -83,7 +83,7 @@
*/
/*** MODULEINFO
- <depend>res_features</depend>
+ <depend>chan_local</depend>
***/
/*! \page sip_session_timers SIP Session Timers in Asterisk Chan_sip
Modified: team/russell/chan_refcount/channels/chan_zap.c
URL: http://svn.digium.com/view/asterisk/team/russell/chan_refcount/channels/chan_zap.c?view=diff&rev=100147&r1=100146&r2=100147
==============================================================================
--- team/russell/chan_refcount/channels/chan_zap.c (original)
+++ team/russell/chan_refcount/channels/chan_zap.c Thu Jan 24 11:15:04 2008
@@ -42,7 +42,6 @@
<depend>zaptel_vldtmf</depend>
<depend>zaptel</depend>
<depend>tonezone</depend>
- <depend>res_features</depend>
<use>pri</use>
<use>ss7</use>
***/
Modified: team/russell/chan_refcount/main/acl.c
URL: http://svn.digium.com/view/asterisk/team/russell/chan_refcount/main/acl.c?view=diff&rev=100147&r1=100146&r2=100147
==============================================================================
--- team/russell/chan_refcount/main/acl.c (original)
+++ team/russell/chan_refcount/main/acl.c Thu Jan 24 11:15:04 2008
@@ -28,7 +28,6 @@
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/network.h"
-#include <ifaddrs.h>
#if defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__Darwin__)
#include <fcntl.h>
@@ -37,6 +36,9 @@
#if defined(SOLARIS)
#include <sys/sockio.h>
+#include <net/if.h>
+#else
+#include <ifaddrs.h>
#endif
#include "asterisk/acl.h"
@@ -118,8 +120,9 @@
int rtnerr;
const struct sockaddr_in *sin;
#endif /* BSD_OR_LINUX */
- struct in_addr best_addr = { 0, };
+ struct in_addr best_addr;
int best_score = -100;
+ memset(&best_addr, 0, sizeof(best_addr));
#if defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__linux__) || defined(__Darwin__)
rtnerr = getifaddrs(&ifaphead);
@@ -177,7 +180,7 @@
for (ifr = (struct lifreq *)buf, x = 0; x < ifn.lifn_count; ifr++, x++) {
sa = (struct sockaddr_in *)&(ifr->lifr_addr);
- score_address(sin, &best_addr, &best_score);
+ score_address(sa, &best_addr, &best_score);
res = 0;
if (best_score == 0)
Modified: team/russell/chan_refcount/main/channel.c
URL: http://svn.digium.com/view/asterisk/team/russell/chan_refcount/main/channel.c?view=diff&rev=100147&r1=100146&r2=100147
==============================================================================
--- team/russell/chan_refcount/main/channel.c (original)
+++ team/russell/chan_refcount/main/channel.c Thu Jan 24 11:15:04 2008
@@ -607,10 +607,13 @@
fmts &= AST_FORMAT_AUDIO_MASK;
/* Find the first preferred codec in the format given */
- for (x=0; x < (sizeof(prefs) / sizeof(prefs[0]) ); x++)
+ for (x = 0; x < (sizeof(prefs) / sizeof(prefs[0]) ); x++) {
if (fmts & prefs[x])
return prefs[x];
+ }
+
ast_log(LOG_WARNING, "Don't know any of 0x%x formats\n", fmts);
+
return 0;
}
Modified: team/russell/chan_refcount/main/dial.c
URL: http://svn.digium.com/view/asterisk/team/russell/chan_refcount/main/dial.c?view=diff&rev=100147&r1=100146&r2=100147
==============================================================================
--- team/russell/chan_refcount/main/dial.c (original)
+++ team/russell/chan_refcount/main/dial.c Thu Jan 24 11:15:04 2008
@@ -20,7 +20,7 @@
*
* \brief Dialing API
*
- * \author Joshua 'file' Colp <jcolp at digium.com>
+ * \author Joshua Colp <jcolp at digium.com>
*/
#include "asterisk.h"
Modified: team/russell/chan_refcount/main/features.c
URL: http://svn.digium.com/view/asterisk/team/russell/chan_refcount/main/features.c?view=diff&rev=100147&r1=100146&r2=100147
==============================================================================
--- team/russell/chan_refcount/main/features.c (original)
+++ team/russell/chan_refcount/main/features.c Thu Jan 24 11:15:04 2008
@@ -22,10 +22,6 @@
*
* \author Mark Spencer <markster at digium.com>
*/
-
-/*** MODULEINFO
- <depend>chan_local</depend>
- ***/
#include "asterisk.h"
Modified: team/russell/chan_refcount/res/res_phoneprov.c
URL: http://svn.digium.com/view/asterisk/team/russell/chan_refcount/res/res_phoneprov.c?view=diff&rev=100147&r1=100146&r2=100147
==============================================================================
--- team/russell/chan_refcount/res/res_phoneprov.c (original)
+++ team/russell/chan_refcount/res/res_phoneprov.c Thu Jan 24 11:15:04 2008
@@ -31,7 +31,9 @@
#include <sys/ioctl.h>
#include <sys/socket.h>
#include <net/if.h>
-
+#ifdef SOLARIS
+#include <sys/sockio.h>
+#endif
ASTERISK_FILE_VERSION(__FILE__, "$Revision: 96773 $")
#include "asterisk/file.h"
More information about the asterisk-commits
mailing list