<!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][15044] </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=15044">15044</a></dd>
<dt>Author</dt> <dd>gled</dd>
<dt>Date</dt> <dd>2009-10-02 07:59:51 -0500 (Fri, 02 Oct 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>exec app preliminary support</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunkcontribgledesl2agiesl2agic">freeswitch/trunk/contrib/gled/esl2agi/esl2agi.c</a></li>
<li><a href="#freeswitchtrunkcontribgledesl2agiesl2agih">freeswitch/trunk/contrib/gled/esl2agi/esl2agi.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunkcontribgledesl2agiesl2agic"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/gled/esl2agi/esl2agi.c (15043 => 15044)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/gled/esl2agi/esl2agi.c 2009-10-02 10:31:59 UTC (rev 15043)
+++ freeswitch/trunk/contrib/gled/esl2agi/esl2agi.c 2009-10-02 12:59:51 UTC (rev 15044)
</span><span class="lines">@@ -43,8 +43,13 @@
</span><span class="cx"> { {"STREAM", "FILE" , NULL}, handle_streamfile },
</span><span class="cx"> { {"SET", "CALLERID" , NULL}, handle_set_caller_id },
</span><span class="cx"> { {"SET", "VARIABLE" , NULL}, handle_set_variable },
</span><ins>+ { {"EXEC", NULL}, handle_exec },
</ins><span class="cx"> };
</span><span class="cx">
</span><ins>+static command_binding_t exec_bindings[_MAX_CMD] = {
+ { {"DIAL" , NULL}, handle_dial },
+};
+
</ins><span class="cx"> /*
</span><span class="cx"> * Translator thread entry point
</span><span class="cx"> */
</span><span class="lines">@@ -187,8 +192,7 @@
</span><span class="cx"> * Copyright (c) 2009, Anthony Minessale II
</span><span class="cx"> * TODO: - add mod_dialplan_asterisk lookup and load if not present.
</span><span class="cx"> */
</span><del>-int main(int argc, char *argv[])
-{
</del><ins>+int main(int argc, char *argv[]) {
</ins><span class="cx"> int i;
</span><span class="cx"> char *ip = NULL;
</span><span class="cx"> int port = 0;
</span><span class="lines">@@ -409,6 +413,28 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /*
</span><ins>+ * EXEC command, will search exec_bindings for an entry.
+ */
+static int handle_exec(esl_handle_t *eslC,int fd,int *argc, char *args[]) {
+ int res;
+ int size;
+ int i;
+ char *argv[_MAX_CMD_ARGS];
+ char *buf=NULL;
+
+ for (i = 1;i<=*argc;i++)
+ argv[i-1] = args[i];
+
+ res = find_and_exec_app(eslC,fd,*argc, argv);
+
+ size = safe_int_snprintf_buffer(&buf,"200 result=%d\n\n",res);
+
+ res = write(fd,buf,size);
+ free(buf);
+ return res;
+}
+
+/*
</ins><span class="cx"> * SET CALLERID
</span><span class="cx"> */
</span><span class="cx"> static int handle_set_caller_id(esl_handle_t *eslC,int fd,int *argc, char *argv[]) {
</span><span class="lines">@@ -437,6 +463,14 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /*
</span><ins>+ * DIAL command
+ * TODO: implement heh
+ */
+static int handle_dial(esl_handle_t *eslC,int fd,int *argc, char *argv[]) {
+ return 0;
+}
+
+/*
</ins><span class="cx"> * SET VARIABLE
</span><span class="cx"> */
</span><span class="cx"> static int handle_set_variable(esl_handle_t *eslC,int fd,int *argc, char *argv[]) {
</span><span class="lines">@@ -622,6 +656,29 @@
</span><span class="cx"> return NULL;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static command_binding_t *find_app_binding(char *cmd[]) {
+ int x,y,match=0;
+
+ for (x=0; x < sizeof(exec_bindings); x++) {
+ if ( ! exec_bindings[x].cmd[0] ) {
+ break;
+ }
+ match = 1;
+
+ for (y=0; match && cmd[y]; y++) {
+ if (!exec_bindings[x].cmd[y]) /* Is the next part existing ?*/
+ break;
+ if ( strncasecmp(exec_bindings[x].cmd[y],cmd[y], MAX(strlen(exec_bindings[x].cmd[y]),strlen(cmd[y]) ) ) )
+ match=0;
+ }
+ if (exec_bindings[x].cmd[y]) /* There's a word missing in cmd */
+ match=0;
+ if (match)
+ return &exec_bindings[x];
+ }
+ return NULL;
+}
+
</ins><span class="cx"> static int find_and_exec_command(esl_handle_t *eslC,int fd,char *buf) {
</span><span class="cx"> char *argv[1024];
</span><span class="cx"> int argc = 0;
</span><span class="lines">@@ -636,3 +693,14 @@
</span><span class="cx"> }
</span><span class="cx"> return r;
</span><span class="cx"> }
</span><ins>+
+static int find_and_exec_app(esl_handle_t *eslC,int fd,int argc,char *argv[]) {
+ int r = -1;
+ command_binding_t *bind;
+
+ bind = find_app_binding(argv);
+ if (bind) {
+ r = bind->handler(eslC,fd,&argc,argv);
+ }
+ return r;
+}
</ins></span></pre></div>
<a id="freeswitchtrunkcontribgledesl2agiesl2agih"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/gled/esl2agi/esl2agi.h (15043 => 15044)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/gled/esl2agi/esl2agi.h 2009-10-02 10:31:59 UTC (rev 15043)
+++ freeswitch/trunk/contrib/gled/esl2agi/esl2agi.h 2009-10-02 12:59:51 UTC (rev 15044)
</span><span class="lines">@@ -95,14 +95,17 @@
</span><span class="cx">
</span><span class="cx"> static command_binding_t *find_binding(char *cmd[]);
</span><span class="cx">
</span><ins>+static command_binding_t *find_app_binding(char *cmd[]);
+
</ins><span class="cx"> static int find_and_exec_command(esl_handle_t *eslC,int fd,char *buf);
</span><span class="cx">
</span><ins>+static int find_and_exec_app(esl_handle_t *eslC,int fd,int argc,char *argv[]);
+
</ins><span class="cx"> static int do_execute(esl_handle_t *eslC,char *cmd,char *args,char *uuid,esl_event_t **save_reply);
</span><span class="cx">
</span><span class="cx"> /*
</span><span class="cx"> * ported agi commands
</span><span class="cx"> */
</span><del>-
</del><span class="cx"> static int handle_hangup(esl_handle_t *eslC,int fd,int *argc, char *argv[_MAX_CMD_ARGS]);
</span><span class="cx">
</span><span class="cx"> static int handle_answer(esl_handle_t *eslC,int fd, int *argc, char *argv[_MAX_CMD_ARGS]);
</span><span class="lines">@@ -113,6 +116,10 @@
</span><span class="cx">
</span><span class="cx"> static int handle_set_variable(esl_handle_t *eslC,int fd,int *argc, char *argv[_MAX_CMD_ARGS]);
</span><span class="cx">
</span><ins>+static int handle_exec(esl_handle_t *eslC,int fd,int *argc, char *argv[_MAX_CMD_ARGS]);
+
+static int handle_dial(esl_handle_t *eslC,int fd,int *argc, char *argv[]);
+
</ins><span class="cx"> /* TODO
</span><span class="cx"> * - ANSWER : OK
</span><span class="cx"> * - EXEC application OPTIONS
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>