<!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][14354] </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=14354">14354</a></dd>
<dt>Author</dt> <dd>mikej</dd>
<dt>Date</dt> <dd>2009-07-24 15:13:36 -0500 (Fri, 24 Jul 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>mod_event_socket: sendevent Fire events with correct event-name and subclass (<a href="http://jira.freeswitch.org/browse/MODEVENT-41">MODEVENT-41</a>)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcincludeswitch_eventh">freeswitch/trunk/src/include/switch_event.h</a></li>
<li><a href="#freeswitchtrunksrcmodevent_handlersmod_event_socketmod_event_socketc">freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c</a></li>
<li><a href="#freeswitchtrunksrcswitch_eventc">freeswitch/trunk/src/switch_event.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunksrcincludeswitch_eventh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/include/switch_event.h (14353 => 14354)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/include/switch_event.h 2009-07-24 19:34:32 UTC (rev 14353)
+++ freeswitch/trunk/src/include/switch_event.h 2009-07-24 20:13:36 UTC (rev 14354)
</span><span class="lines">@@ -163,6 +163,9 @@
</span><span class="cx"> SWITCH_DECLARE(switch_status_t) switch_event_add_header(switch_event_t *event, switch_stack_t stack,
</span><span class="cx"> const char *header_name, const char *fmt, ...) PRINTF_FUNCTION(4, 5);
</span><span class="cx"> #endif
</span><ins>+
+SWITCH_DECLARE(switch_status_t) switch_event_set_subclass_name(switch_event_t *event, const char *subclass_name);
+
</ins><span class="cx"> /*!
</span><span class="cx"> \brief Add a string header to an event
</span><span class="cx"> \param event the event to add the header to
</span></span></pre></div>
<a id="freeswitchtrunksrcmodevent_handlersmod_event_socketmod_event_socketc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c (14353 => 14354)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c 2009-07-24 19:34:32 UTC (rev 14353)
+++ freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c 2009-07-24 20:13:36 UTC (rev 14354)
</span><span class="lines">@@ -1085,6 +1085,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> if (var && val) {
</span><ins>+ switch_event_del_header(*event, var);
</ins><span class="cx"> switch_event_add_header_string(*event, SWITCH_STACK_BOTTOM, var, val);
</span><span class="cx"> if (!strcasecmp(var, "content-length")) {
</span><span class="cx"> clen = atoi(val);
</span><span class="lines">@@ -1687,7 +1688,12 @@
</span><span class="cx"> if (ename) {
</span><span class="cx"> switch_event_types_t etype;
</span><span class="cx"> if (switch_name_event(ename, &etype) == SWITCH_STATUS_SUCCESS) {
</span><ins>+ const char *subclass_name = switch_event_get_header(*event, "Event-Subclass");
</ins><span class="cx"> (*event)->event_id = etype;
</span><ins>+
+ if (etype == SWITCH_EVENT_CUSTOM && subclass_name) {
+ switch_event_set_subclass_name(*event, subclass_name);
+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="freeswitchtrunksrcswitch_eventc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_event.c (14353 => 14354)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_event.c 2009-07-24 19:34:32 UTC (rev 14353)
+++ freeswitch/trunk/src/switch_event.c 2009-07-24 20:13:36 UTC (rev 14354)
</span><span class="lines">@@ -782,6 +782,17 @@
</span><span class="cx"> return switch_event_base_add_header(event, stack, header_name, data);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+SWITCH_DECLARE(switch_status_t) switch_event_set_subclass_name(switch_event_t *event, const char *subclass_name)
+{
+ if (!event || !subclass_name) return SWITCH_STATUS_GENERR;
+
+ switch_safe_free(event->subclass_name);
+ event->subclass_name = DUP(subclass_name);
+ switch_event_del_header(event, "Event-Subclass");
+ switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Event-Subclass", subclass_name);
+ return SWITCH_STATUS_SUCCESS;
+}
+
</ins><span class="cx"> SWITCH_DECLARE(switch_status_t) switch_event_add_header_string(switch_event_t *event, switch_stack_t stack, const char *header_name, const char *data)
</span><span class="cx"> {
</span><span class="cx"> if (data) {
</span><span class="lines">@@ -848,6 +859,7 @@
</span><span class="cx"> *event = NULL;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> SWITCH_DECLARE(switch_status_t) switch_event_dup(switch_event_t **event, switch_event_t *todup)
</span><span class="cx"> {
</span><span class="cx"> switch_event_header_t *hp;
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>