<!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][15791] </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=15791">15791</a></dd>
<dt>Author</dt> <dd>anthm</dd>
<dt>Date</dt> <dd>2009-12-04 14:32:56 -0600 (Fri, 04 Dec 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>clean up mod_event_multicast to use blocking recvfrom and better error checking</pre>
<h3>Modified Paths</h3>
<ul>
<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="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 (15790 => 15791)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c 2009-12-04 20:28:55 UTC (rev 15790)
+++ freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c 2009-12-04 20:32:56 UTC (rev 15791)
</span><span class="lines">@@ -59,7 +59,6 @@
</span><span class="cx"> switch_hash_t *event_hash;
</span><span class="cx"> uint8_t event_list[SWITCH_EVENT_ALL + 1];
</span><span class="cx"> int running;
</span><del>- switch_event_node_t *node;
</del><span class="cx"> uint8_t ttl;
</span><span class="cx"> char *psk;
</span><span class="cx"> switch_mutex_t *mutex;
</span><span class="lines">@@ -373,6 +372,7 @@
</span><span class="cx"> {
</span><span class="cx"> switch_api_interface_t *api_interface;
</span><span class="cx"> switch_ssize_t hlen = -1;
</span><ins>+ switch_status_t status = SWITCH_STATUS_GENERR;
</ins><span class="cx">
</span><span class="cx"> memset(&globals, 0, sizeof(globals));
</span><span class="cx">
</span><span class="lines">@@ -388,95 +388,96 @@
</span><span class="cx">
</span><span class="cx"> if (load_config() != SWITCH_STATUS_SUCCESS) {
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot Configure\n");
</span><del>- return SWITCH_STATUS_TERM;
</del><ins>+ switch_goto_status(SWITCH_STATUS_TERM, fail);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (switch_sockaddr_info_get(&globals.addr, globals.address, SWITCH_UNSPEC, globals.port, 0, module_pool) != SWITCH_STATUS_SUCCESS) {
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot find address\n");
</span><del>- return SWITCH_STATUS_TERM;
</del><ins>+ switch_goto_status(SWITCH_STATUS_TERM, fail);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (switch_socket_create(&globals.udp_socket, AF_INET, SOCK_DGRAM, 0, module_pool) != SWITCH_STATUS_SUCCESS) {
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Socket Error\n");
</span><del>- return SWITCH_STATUS_TERM;
</del><ins>+ switch_goto_status(SWITCH_STATUS_TERM, fail);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (switch_socket_opt_set(globals.udp_socket, SWITCH_SO_REUSEADDR, 1) != SWITCH_STATUS_SUCCESS) {
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Socket Option Error\n");
</span><del>- switch_socket_close(globals.udp_socket);
- return SWITCH_STATUS_TERM;
</del><ins>+ switch_goto_status(SWITCH_STATUS_TERM, fail);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (switch_mcast_join(globals.udp_socket, globals.addr, NULL, NULL) != SWITCH_STATUS_SUCCESS) {
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Multicast Error\n");
</span><del>- switch_socket_close(globals.udp_socket);
- return SWITCH_STATUS_TERM;
</del><ins>+ switch_goto_status(SWITCH_STATUS_TERM, fail);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (switch_mcast_hops(globals.udp_socket, globals.ttl) != SWITCH_STATUS_SUCCESS) {
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to set ttl to '%d'\n", globals.ttl);
</span><del>- switch_socket_close(globals.udp_socket);
- return SWITCH_STATUS_TERM;
</del><ins>+ switch_goto_status(SWITCH_STATUS_TERM, fail);
</ins><span class="cx"> }
</span><span class="cx">
</span><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><del>- switch_socket_close(globals.udp_socket);
- return SWITCH_STATUS_TERM;
</del><ins>+ switch_goto_status(SWITCH_STATUS_TERM, fail);
</ins><span class="cx"> }
</span><del>-
- /* connect my internal structure to the blank pointer passed to me */
- *module_interface = switch_loadable_module_create_module_interface(pool, modname);
-
</del><ins>+
</ins><span class="cx"> if (switch_event_reserve_subclass(MULTICAST_EVENT) != SWITCH_STATUS_SUCCESS) {
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't register subclass %s!\n", MULTICAST_EVENT);
</span><del>- return SWITCH_STATUS_GENERR;
</del><ins>+ switch_goto_status(SWITCH_STATUS_GENERR, fail);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (switch_event_reserve_subclass(MULTICAST_PEERUP) != SWITCH_STATUS_SUCCESS) {
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't register subclass %s!\n", MULTICAST_PEERUP);
</span><del>- return SWITCH_STATUS_GENERR;
</del><ins>+ switch_goto_status(SWITCH_STATUS_GENERR, fail);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (switch_event_reserve_subclass(MULTICAST_PEERDOWN) != SWITCH_STATUS_SUCCESS) {
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't register subclass %s!\n", MULTICAST_PEERDOWN);
</span><del>- return SWITCH_STATUS_GENERR;
</del><ins>+ switch_goto_status(SWITCH_STATUS_GENERR, fail);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (switch_event_bind(modname, SWITCH_EVENT_ALL, SWITCH_EVENT_SUBCLASS_ANY, event_handler, NULL) != SWITCH_STATUS_SUCCESS) {
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't bind!\n");
</span><del>- switch_socket_close(globals.udp_socket);
- return SWITCH_STATUS_GENERR;
</del><ins>+ switch_goto_status(SWITCH_STATUS_GENERR, fail);
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+#ifdef USE_NONBLOCK
</ins><span class="cx"> switch_socket_opt_set(globals.udp_socket, SWITCH_SO_NONBLOCK, TRUE);
</span><ins>+#endif
</ins><span class="cx">
</span><ins>+ /* connect my internal structure to the blank pointer passed to me */
+ *module_interface = switch_loadable_module_create_module_interface(pool, modname);
</ins><span class="cx">
</span><span class="cx"> SWITCH_ADD_API(api_interface, "multicast_peers", "Show status of multicast peers", multicast_peers, "");
</span><span class="cx">
</span><span class="cx"> /* indicate that the module should continue to be loaded */
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><ins>+
+
+ fail:
+
+ if (globals.udp_socket) {
+ switch_socket_close(globals.udp_socket);
+ }
+
+ switch_event_free_subclass(MULTICAST_EVENT);
+ switch_event_free_subclass(MULTICAST_PEERUP);
+ switch_event_free_subclass(MULTICAST_PEERDOWN);
+
+ return status;
+
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_event_multicast_shutdown)
</span><span class="cx"> {
</span><del>- int x = 0;
</del><ins>+ globals.running = 0;
+ switch_event_unbind_callback(event_handler);
</ins><span class="cx">
</span><del>- if (globals.running == 1) {
- globals.running = -1;
- while (x < 100000 && globals.running) {
- x++;
- switch_cond_next();
- }
- }
-
</del><span class="cx"> if (globals.udp_socket) {
</span><del>- switch_socket_close(globals.udp_socket);
- globals.udp_socket = NULL;
</del><ins>+ switch_socket_shutdown(globals.udp_socket, 2);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- switch_event_unbind(&globals.node);
</del><span class="cx"> switch_event_free_subclass(MULTICAST_EVENT);
</span><span class="cx"> switch_event_free_subclass(MULTICAST_PEERUP);
</span><span class="cx"> switch_event_free_subclass(MULTICAST_PEERDOWN);
</span><span class="lines">@@ -508,8 +509,11 @@
</span><span class="cx"> memset(buf, 0, len);
</span><span class="cx">
</span><span class="cx"> switch_sockaddr_ip_get(&myaddr, globals.addr);
</span><del>- status = switch_socket_recvfrom(addr, globals.udp_socket, 0, buf, &len);
</del><ins>+ if ((status = switch_socket_recvfrom(addr, globals.udp_socket, 0, buf, &len)) != SWITCH_STATUS_SUCCESS || !len || !globals.running) {
+ break;
+ }
</ins><span class="cx">
</span><ins>+#ifdef USE_NONBLOCK
</ins><span class="cx"> if (!len) {
</span><span class="cx"> if (SWITCH_STATUS_IS_BREAK(status)) {
</span><span class="cx"> switch_yield(100000);
</span><span class="lines">@@ -518,6 +522,7 @@
</span><span class="cx">
</span><span class="cx"> break;
</span><span class="cx"> }
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> memcpy(&host_hash, buf, sizeof(host_hash));
</span><span class="cx"> packet = buf + sizeof(host_hash);
</span><span class="lines">@@ -606,6 +611,12 @@
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+
+ if (globals.udp_socket) {
+ switch_socket_close(globals.udp_socket);
+ globals.udp_socket = NULL;
+ }
+
</ins><span class="cx"> globals.running = 0;
</span><span class="cx"> free(buf);
</span><span class="cx"> return SWITCH_STATUS_TERM;
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>