<!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][17210] </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=17210">17210</a></dd>
<dt>Author</dt> <dd>anthm</dd>
<dt>Date</dt> <dd>2010-04-02 16:40:24 -0500 (Fri, 02 Apr 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>add apr func to disable loopback on multicast to simplify mod_multicast_event</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcincludeswitch_aprh">freeswitch/trunk/src/include/switch_apr.h</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>
<li><a href="#freeswitchtrunksrcswitch_aprc">freeswitch/trunk/src/switch_apr.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunksrcincludeswitch_aprh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/include/switch_apr.h (17209 => 17210)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/include/switch_apr.h 2010-04-02 19:45:36 UTC (rev 17209)
+++ freeswitch/trunk/src/include/switch_apr.h 2010-04-02 21:40:24 UTC (rev 17210)
</span><span class="lines">@@ -1213,6 +1213,7 @@
</span><span class="cx"> */
</span><span class="cx"> SWITCH_DECLARE(switch_status_t) switch_mcast_hops(switch_socket_t *sock, uint8_t ttl);
</span><span class="cx">
</span><ins>+SWITCH_DECLARE(switch_status_t) switch_mcast_loopback(switch_socket_t *sock, uint8_t opt);
</ins><span class="cx">
</span><span class="cx"> /** @} */
</span><span class="cx">
</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 (17209 => 17210)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c 2010-04-02 19:45:36 UTC (rev 17209)
+++ freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c 2010-04-02 21:40:24 UTC (rev 17210)
</span><span class="lines">@@ -52,7 +52,6 @@
</span><span class="cx"> char *bindings;
</span><span class="cx"> uint32_t key_count;
</span><span class="cx"> char hostname[80];
</span><del>- uint64_t host_hash;
</del><span class="cx"> switch_port_t port;
</span><span class="cx"> switch_sockaddr_t *addr;
</span><span class="cx"> switch_socket_t *udp_socket;
</span><span class="lines">@@ -295,36 +294,35 @@
</span><span class="cx">
</span><span class="cx"> switch_uuid_get(&uuid);
</span><span class="cx"> switch_uuid_format(uuid_str, &uuid);
</span><del>- len = strlen(packet) + sizeof(globals.host_hash) + SWITCH_UUID_FORMATTED_LENGTH + EVP_MAX_IV_LENGTH + strlen((char *) MAGIC);
</del><ins>+ len = strlen(packet) + SWITCH_UUID_FORMATTED_LENGTH + EVP_MAX_IV_LENGTH + strlen((char *) MAGIC);
</ins><span class="cx"> #else
</span><del>- len = strlen(packet) + sizeof(globals.host_hash) + strlen((char *) MAGIC);
</del><ins>+ len = strlen(packet) + strlen((char *) MAGIC);
</ins><span class="cx"> #endif
</span><span class="cx"> buf = malloc(len + 1);
</span><span class="cx"> memset(buf, 0, len + 1);
</span><span class="cx"> switch_assert(buf);
</span><del>- memcpy(buf, &globals.host_hash, sizeof(globals.host_hash));
</del><span class="cx">
</span><span class="cx"> #ifdef HAVE_OPENSSL
</span><span class="cx"> if (globals.psk) {
</span><del>- switch_copy_string(buf + sizeof(globals.host_hash), uuid_str, SWITCH_UUID_FORMATTED_LENGTH);
</del><ins>+ switch_copy_string(buf, uuid_str, SWITCH_UUID_FORMATTED_LENGTH);
</ins><span class="cx">
</span><span class="cx"> EVP_CIPHER_CTX_init(&ctx);
</span><span class="cx"> EVP_EncryptInit(&ctx, EVP_bf_cbc(), NULL, NULL);
</span><span class="cx"> EVP_CIPHER_CTX_set_key_length(&ctx, strlen(globals.psk));
</span><span class="cx"> EVP_EncryptInit(&ctx, NULL, (unsigned char *) globals.psk, (unsigned char *) uuid_str);
</span><del>- EVP_EncryptUpdate(&ctx, (unsigned char *) buf + sizeof(globals.host_hash) + SWITCH_UUID_FORMATTED_LENGTH,
</del><ins>+ EVP_EncryptUpdate(&ctx, (unsigned char *) buf + SWITCH_UUID_FORMATTED_LENGTH,
</ins><span class="cx"> &outlen, (unsigned char *) packet, (int) strlen(packet));
</span><del>- EVP_EncryptUpdate(&ctx, (unsigned char *) buf + sizeof(globals.host_hash) + SWITCH_UUID_FORMATTED_LENGTH + outlen,
</del><ins>+ EVP_EncryptUpdate(&ctx, (unsigned char *) buf + SWITCH_UUID_FORMATTED_LENGTH + outlen,
</ins><span class="cx"> &tmplen, (unsigned char *) MAGIC, (int) strlen((char *) MAGIC));
</span><span class="cx"> outlen += tmplen;
</span><del>- EVP_EncryptFinal(&ctx, (unsigned char *) buf + sizeof(globals.host_hash) + SWITCH_UUID_FORMATTED_LENGTH + outlen, &tmplen);
</del><ins>+ EVP_EncryptFinal(&ctx, (unsigned char *) buf + SWITCH_UUID_FORMATTED_LENGTH + outlen, &tmplen);
</ins><span class="cx"> outlen += tmplen;
</span><del>- len = (size_t) outlen + sizeof(globals.host_hash) + SWITCH_UUID_FORMATTED_LENGTH;
- *(buf + sizeof(globals.host_hash) + SWITCH_UUID_FORMATTED_LENGTH + outlen) = '\0';
</del><ins>+ len = (size_t) outlen + SWITCH_UUID_FORMATTED_LENGTH;
+ *(buf + SWITCH_UUID_FORMATTED_LENGTH + outlen) = '\0';
</ins><span class="cx"> } else {
</span><span class="cx"> #endif
</span><del>- switch_copy_string(buf + sizeof(globals.host_hash), packet, len - sizeof(globals.host_hash));
- switch_copy_string(buf + sizeof(globals.host_hash) + strlen(packet), (char *) MAGIC, strlen((char *) MAGIC) + 1);
</del><ins>+ switch_copy_string(buf, packet, len);
+ switch_copy_string(buf + strlen(packet), (char *) MAGIC, strlen((char *) MAGIC) + 1);
</ins><span class="cx"> #ifdef HAVE_OPENSSL
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="lines">@@ -369,7 +367,6 @@
</span><span class="cx"> SWITCH_MODULE_LOAD_FUNCTION(mod_event_multicast_load)
</span><span class="cx"> {
</span><span class="cx"> switch_api_interface_t *api_interface;
</span><del>- switch_ssize_t hlen = -1;
</del><span class="cx"> switch_status_t status = SWITCH_STATUS_GENERR;
</span><span class="cx">
</span><span class="cx"> memset(&globals, 0, sizeof(globals));
</span><span class="lines">@@ -381,7 +378,6 @@
</span><span class="cx"> switch_core_hash_init(&globals.peer_hash, module_pool);
</span><span class="cx">
</span><span class="cx"> gethostname(globals.hostname, sizeof(globals.hostname));
</span><del>- globals.host_hash = switch_hashfunc_default(globals.hostname, &hlen);
</del><span class="cx"> globals.key_count = 0;
</span><span class="cx">
</span><span class="cx"> if (load_config() != SWITCH_STATUS_SUCCESS) {
</span><span class="lines">@@ -414,6 +410,11 @@
</span><span class="cx"> switch_goto_status(SWITCH_STATUS_TERM, fail);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (switch_mcast_loopback(globals.udp_socket, 0) != SWITCH_STATUS_SUCCESS) {
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to disable loopback\n");
+ switch_goto_status(SWITCH_STATUS_TERM, fail);
+ }
+
</ins><span class="cx"> if (switch_socket_bind(globals.udp_socket, globals.addr) != SWITCH_STATUS_SUCCESS) {
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Bind Error\n");
</span><span class="cx"> switch_goto_status(SWITCH_STATUS_TERM, fail);
</span><span class="lines">@@ -501,7 +502,6 @@
</span><span class="cx"> char *myaddr;
</span><span class="cx"> size_t len = MULTICAST_BUFFSIZE;
</span><span class="cx"> char *packet;
</span><del>- uint64_t host_hash = 0;
</del><span class="cx"> switch_status_t status;
</span><span class="cx"> memset(buf, 0, len);
</span><span class="cx">
</span><span class="lines">@@ -520,12 +520,8 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- memcpy(&host_hash, buf, sizeof(host_hash));
- packet = buf + sizeof(host_hash);
</del><ins>+ packet = buf;
</ins><span class="cx">
</span><del>- if (host_hash == globals.host_hash) {
- continue;
- }
</del><span class="cx"> #ifdef HAVE_OPENSSL
</span><span class="cx"> if (globals.psk) {
</span><span class="cx"> char uuid_str[SWITCH_UUID_FORMATTED_LENGTH + 1];
</span><span class="lines">@@ -533,7 +529,7 @@
</span><span class="cx"> int outl, tmplen;
</span><span class="cx"> EVP_CIPHER_CTX ctx;
</span><span class="cx">
</span><del>- len -= sizeof(host_hash) + SWITCH_UUID_FORMATTED_LENGTH;
</del><ins>+ len -= SWITCH_UUID_FORMATTED_LENGTH;
</ins><span class="cx">
</span><span class="cx"> tmp = malloc(len);
</span><span class="cx">
</span></span></pre></div>
<a id="freeswitchtrunksrcswitch_aprc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_apr.c (17209 => 17210)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_apr.c 2010-04-02 19:45:36 UTC (rev 17209)
+++ freeswitch/trunk/src/switch_apr.c 2010-04-02 21:40:24 UTC (rev 17210)
</span><span class="lines">@@ -768,6 +768,10 @@
</span><span class="cx"> return apr_mcast_hops(sock, ttl);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+SWITCH_DECLARE(switch_status_t) switch_mcast_loopback(switch_socket_t *sock, uint8_t opt)
+{
+ return apr_mcast_loopback(sock, opt);
+}
</ins><span class="cx">
</span><span class="cx"> /* socket functions */
</span><span class="cx">
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>