<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[Freeswitch-trunk][14426] </title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<div id="header">FreeSWITCH Subversion</div>
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://fisheye.freeswitch.org/changelog/FreeSWITCH?cs=14426">14426</a></dd>
<dt>Author</dt> <dd>mikej</dd>
<dt>Date</dt> <dd>2009-07-29 18:11:03 -0500 (Wed, 29 Jul 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>fix build warnings</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcmodendpointsmod_dingalingmod_dingalingc">freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c</a></li>
<li><a href="#freeswitchtrunksrcmodevent_handlersmod_event_multicastmod_event_multicastc">freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunksrcmodendpointsmod_dingalingmod_dingalingc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c (14425 => 14426)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c 2009-07-29 22:48:43 UTC (rev 14425)
+++ freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c 2009-07-29 23:11:03 UTC (rev 14426)
</span><span class="lines">@@ -596,7 +596,7 @@
</span><span class="cx"> for (hi = switch_hash_first(NULL, globals.profile_hash); hi; hi = switch_hash_next(hi)) {
</span><span class="cx"> switch_hash_this(hi, NULL, NULL, &val);
</span><span class="cx"> profile = (mdl_profile_t *) val;
</span><del>- if (!strcmp(profile->extip, old_ip4)) {
</del><ins>+ if (old_ip4 && !strcmp(profile->extip, old_ip4)) {
</ins><span class="cx"> tmp = profile->extip;
</span><span class="cx"> profile->extip = strdup(new_ip4);
</span><span class="cx"> switch_safe_free(tmp);
</span><span class="lines">@@ -1989,15 +1989,15 @@
</span><span class="cx"> profile->name = switch_core_strdup(module_pool, val);
</span><span class="cx"> } else if (!strcasecmp(var, "message") && !switch_strlen_zero(val)) {
</span><span class="cx"> profile->message = switch_core_strdup(module_pool, val);
</span><del>- } else if (!strcasecmp(var, "local-network-acl")) {
</del><ins>+ } else if (!strcasecmp(var, "local-network-acl") && !switch_strlen_zero(val)) {
</ins><span class="cx"> profile->local_network = switch_core_strdup(module_pool, val);
</span><span class="cx"> } else if (!strcasecmp(var, "rtp-ip")) {
</span><span class="cx"> profile->ip = switch_core_strdup(module_pool, strcasecmp(switch_str_nil(val), "auto") ? switch_str_nil(val) : globals.guess_ip);
</span><span class="cx"> } else if (!strcasecmp(var, "ext-rtp-ip")) {
</span><span class="cx"> char *ip = globals.guess_ip;
</span><del>- if (!strcasecmp(val, "auto-nat")) {
</del><ins>+ if (val && !strcasecmp(val, "auto-nat")) {
</ins><span class="cx"> ip = globals.auto_nat ? switch_core_get_variable("nat_public_addr") : globals.guess_ip;
</span><del>- } else if (!strcasecmp(val, "auto")) {
</del><ins>+ } else if (val && !strcasecmp(val, "auto")) {
</ins><span class="cx"> globals.auto_nat = 0;
</span><span class="cx"> ip = globals.guess_ip;
</span><span class="cx"> } else {
</span></span></pre></div>
<a id="freeswitchtrunksrcmodevent_handlersmod_event_multicastmod_event_multicastc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c (14425 => 14426)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c 2009-07-29 22:48:43 UTC (rev 14425)
+++ freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c 2009-07-29 23:11:03 UTC (rev 14426)
</span><span class="lines">@@ -68,7 +68,7 @@
</span><span class="cx">
</span><span class="cx"> struct peer_status {
</span><span class="cx"> switch_bool_t active;
</span><del>- int lastseen;
</del><ins>+ time_t lastseen;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_address, globals.address);
</span><span class="lines">@@ -179,11 +179,12 @@
</span><span class="cx"> if (event->subclass_name && (!strcmp(event->subclass_name, MULTICAST_EVENT) ||
</span><span class="cx"> !strcmp(event->subclass_name, MULTICAST_PEERUP) ||
</span><span class="cx"> !strcmp(event->subclass_name, MULTICAST_PEERDOWN))) {
</span><del>- char * event_name;
- if ((event_name = switch_event_get_header(event, "orig-event-name")) && !strcasecmp(event_name, "HEARTBEAT")) {
- char *sender = switch_event_get_header(event, "orig-multicast-sender");
</del><ins>+ char * event_name, *sender;
+ if ((event_name = switch_event_get_header(event, "orig-event-name")) &&
+ !strcasecmp(event_name, "HEARTBEAT") &&
+ (sender = switch_event_get_header(event, "orig-multicast-sender"))) {
</ins><span class="cx"> struct peer_status *p;
</span><del>- int now = switch_epoch_time_now(NULL);
</del><ins>+ time_t now = switch_epoch_time_now(NULL);
</ins><span class="cx">
</span><span class="cx"> if (!(p = switch_core_hash_find(globals.peer_hash, sender))) {
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Host %s not already in hash\n", sender);
</span><span class="lines">@@ -200,7 +201,7 @@
</span><span class="cx"> char lastseen[21];
</span><span class="cx"> switch_event_add_header_string(local_event, SWITCH_STACK_BOTTOM, "Peer", sender);
</span><span class="cx"> if (p->lastseen) {
</span><del>- switch_snprintf(lastseen, sizeof(lastseen), "%d", p->lastseen);
</del><ins>+ switch_snprintf(lastseen, sizeof(lastseen), "%d", (int)p->lastseen);
</ins><span class="cx"> } else {
</span><span class="cx"> switch_snprintf(lastseen, sizeof(lastseen), "%s", "Never");
</span><span class="cx"> }
</span><span class="lines">@@ -243,7 +244,7 @@
</span><span class="cx"> switch_ssize_t keylen;
</span><span class="cx"> const void *key;
</span><span class="cx"> void *value;
</span><del>- int now = switch_epoch_time_now(NULL);
</del><ins>+ time_t now = switch_epoch_time_now(NULL);
</ins><span class="cx"> struct peer_status *last;
</span><span class="cx"> char *host;
</span><span class="cx">
</span><span class="lines">@@ -258,7 +259,7 @@
</span><span class="cx"> if (switch_event_create_subclass(&local_event, SWITCH_EVENT_CUSTOM, MULTICAST_PEERDOWN) == SWITCH_STATUS_SUCCESS) {
</span><span class="cx"> char lastseen[21];
</span><span class="cx"> switch_event_add_header_string(local_event, SWITCH_STACK_BOTTOM, "Peer", host);
</span><del>- switch_snprintf(lastseen, sizeof(lastseen), "%d", last->lastseen);
</del><ins>+ switch_snprintf(lastseen, sizeof(lastseen), "%d", (int)last->lastseen);
</ins><span class="cx"> switch_event_add_header_string(local_event, SWITCH_STACK_BOTTOM, "Lastseen", lastseen);
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Peer %s has gone down; last seen: %s\n", host, lastseen);
</span><span class="cx">
</span><span class="lines">@@ -347,7 +348,7 @@
</span><span class="cx"> switch_ssize_t keylen;
</span><span class="cx"> const void *key;
</span><span class="cx"> void *value;
</span><del>- int now = switch_epoch_time_now(NULL);
</del><ins>+ time_t now = switch_epoch_time_now(NULL);
</ins><span class="cx"> struct peer_status *last;
</span><span class="cx"> char *host;
</span><span class="cx"> int i = 0;
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>