<!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][14362] </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=14362">14362</a></dd>
<dt>Author</dt> <dd>andrew</dd>
<dt>Date</dt> <dd>2009-07-25 13:53:34 -0500 (Sat, 25 Jul 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Sync up freeswitch.erl</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcmodevent_handlersmod_erlang_eventfreeswitcherl">freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/freeswitch.erl</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunksrcmodevent_handlersmod_erlang_eventfreeswitcherl"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/freeswitch.erl (14361 => 14362)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/freeswitch.erl 2009-07-25 18:25:13 UTC (rev 14361)
+++ freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/freeswitch.erl 2009-07-25 18:53:34 UTC (rev 14362)
</span><span class="lines">@@ -18,8 +18,8 @@
</span><span class="cx"> nixevent/2, noevents/1, close/1,
</span><span class="cx"> get_event_header/2, get_event_body/1,
</span><span class="cx"> get_event_name/1, getpid/1, sendmsg/3,
</span><del>- sendevent/3, handlecall/2, handlecall/3, start_fetch_handler/4,
- start_log_handler/3, start_event_handler/3]).
</del><ins>+ sendevent/3, sendevent_custom/3, handlecall/2, handlecall/3, start_fetch_handler/5,
+ start_log_handler/4, start_event_handler/4]).
</ins><span class="cx"> -define(TIMEOUT, 5000).
</span><span class="cx">
</span><span class="cx"> %% @doc Return the value for a specific header in an event or `{error,notfound}'.
</span><span class="lines">@@ -79,6 +79,7 @@
</span><span class="cx"> %% sent to calling process after it is received. This function
</span><span class="cx"> %% returns the result of the initial bgapi call or `timeout' if FreeSWITCH fails
</span><span class="cx"> %% to respond.
</span><ins>+-spec(bgapi/3 :: (Node :: atom(), Cmd :: atom(), Args :: string()) -> {'ok', string()} | {'error', any()} | 'timeout').
</ins><span class="cx"> bgapi(Node, Cmd, Args) ->
</span><span class="cx"> Self = self(),
</span><span class="cx"> % spawn a new process so that both responses go here instead of directly to
</span><span class="lines">@@ -91,13 +92,13 @@
</span><span class="cx"> Self ! {api, {error, Reason}};
</span><span class="cx"> {ok, JobID} ->
</span><span class="cx"> % send the reply to the calling process
</span><del>- Self ! {api, ok},
</del><ins>+ Self ! {api, {ok, JobID}},
</ins><span class="cx"> receive % wait for the job's reply
</span><span class="cx"> {bgok, JobID, Reply} ->
</span><span class="cx"> % send the actual command output back to the calling process
</span><del>- Self ! {bgok, Reply};
</del><ins>+ Self ! {bgok, JobID, Reply};
</ins><span class="cx"> {bgerror, JobID, Reply} ->
</span><del>- Self ! {bgerror, Reply}
</del><ins>+ Self ! {bgerror, JobID, Reply}
</ins><span class="cx"> end
</span><span class="cx"> after ?TIMEOUT ->
</span><span class="cx"> % send a timeout to the calling process
</span><span class="lines">@@ -115,6 +116,7 @@
</span><span class="cx"> %% passed as the argument to `Fun' after it is received. This function
</span><span class="cx"> %% returns the result of the initial bgapi call or `timeout' if FreeSWITCH fails
</span><span class="cx"> %% to respond.
</span><ins>+-spec(bgapi/4 :: (Node :: atom(), Cmd :: atom(), Args :: string(), Fun :: fun()) -> 'ok' | {'error', any()} | 'timeout').
</ins><span class="cx"> bgapi(Node, Cmd, Args, Fun) ->
</span><span class="cx"> Self = self(),
</span><span class="cx"> % spawn a new process so that both responses go here instead of directly to
</span><span class="lines">@@ -201,6 +203,19 @@
</span><span class="cx"> timeout
</span><span class="cx"> end.
</span><span class="cx">
</span><ins>+%% @doc Send a CUSTOM event to FreeSWITCH. `SubClassName' is the name of the event
+%% subclass and `Headers' is a list of `{Key, Value}' string tuples. See the
+%% mod_event_socket documentation for more information.
+sendevent_custom(Node, SubClassName, Headers) ->
+ {sendevent, Node} ! {sendevent, 'CUSTOM', SubClassName, Headers},
+ receive
+ ok -> ok;
+ {error, Reason} -> {error, Reason}
+ after ?TIMEOUT ->
+ timeout
+ end.
+
+
</ins><span class="cx"> %% @doc Send a message to the call identified by `UUID'. `Headers' is a list of
</span><span class="cx"> %% `{Key, Value}' string tuples.
</span><span class="cx"> sendmsg(Node, UUID, Headers) ->
</span><span class="lines">@@ -246,15 +261,16 @@
</span><span class="cx"> end.
</span><span class="cx">
</span><span class="cx"> %% @private
</span><del>-start_handler(Node, Type, Module, Function) ->
</del><ins>+start_handler(Node, Type, Module, Function, State) ->
</ins><span class="cx"> Self = self(),
</span><span class="cx"> spawn(fun() ->
</span><span class="cx"> monitor_node(Node, true),
</span><span class="cx"> {foo, Node} ! Type,
</span><span class="cx"> receive
</span><span class="cx"> ok ->
</span><ins>+ io:format("OK!!!!!!!~n"),
</ins><span class="cx"> Self ! {Type, {ok, self()}},
</span><del>- apply(Module, Function, [Node]);
</del><ins>+ apply(Module, Function, [Node, State]);
</ins><span class="cx"> {error,Reason} ->
</span><span class="cx"> Self ! {Type, {error, Reason}}
</span><span class="cx"> after ?TIMEOUT ->
</span><span class="lines">@@ -281,8 +297,8 @@
</span><span class="cx"> %% This function returns either `{ok, Pid}' where `Pid' is the pid of the newly
</span><span class="cx"> %% spawned process, `{error, Reason}' or the atom `timeout' if FreeSWITCH did
</span><span class="cx"> %% not respond.
</span><del>-start_log_handler(Node, Module, Function) ->
- start_handler(Node, register_log_handler, Module, Function).
</del><ins>+start_log_handler(Node, Module, Function, State) ->
+ start_handler(Node, register_log_handler, Module, Function, State).
</ins><span class="cx">
</span><span class="cx"> %% @todo Notify the process if it gets replaced with a new event handler.
</span><span class="cx">
</span><span class="lines">@@ -300,8 +316,8 @@
</span><span class="cx"> %% This function returns either `{ok, Pid}' where `Pid' is the pid of the newly
</span><span class="cx"> %% spawned process, `{error, Reason}' or the atom `timeout' if FreeSWITCH did
</span><span class="cx"> %% not respond.
</span><del>-start_event_handler(Node, Module, Function) ->
- start_handler(Node, register_event_handler, Module, Function).
</del><ins>+start_event_handler(Node, Module, Function, State) ->
+ start_handler(Node, register_event_handler, Module, Function, State).
</ins><span class="cx">
</span><span class="cx"> %% @doc Spawn Module:Function as an XML config fetch handler for configs of type
</span><span class="cx"> %% `Section'. See the FreeSWITCH documentation for mod_xml_rpc for more
</span><span class="lines">@@ -321,5 +337,5 @@
</span><span class="cx"> %% This function returns either `{ok, Pid}' where `Pid' is the pid of the newly
</span><span class="cx"> %% spawned process, `{error, Reason}' or the atom `timeout' if FreeSWITCH did
</span><span class="cx"> %% not respond.
</span><del>-start_fetch_handler(Node, Section, Module, Function) ->
- start_handler(Node, {bind, Section}, Module, Function).
</del><ins>+start_fetch_handler(Node, Section, Module, Function, State) ->
+ start_handler(Node, {bind, Section}, Module, Function, State).
</ins></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>