<!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][15097] </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=15097">15097</a></dd>
<dt>Author</dt> <dd>gled</dd>
<dt>Date</dt> <dd>2009-10-06 06:46:53 -0500 (Tue, 06 Oct 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>some missing AGI answer</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 (15096 => 15097)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/gled/esl2agi/esl2agi.c 2009-10-06 11:39:58 UTC (rev 15096)
+++ freeswitch/trunk/contrib/gled/esl2agi/esl2agi.c 2009-10-06 11:46:53 UTC (rev 15097)
</span><span class="lines">@@ -49,6 +49,7 @@
</span><span class="cx"> static command_binding_t exec_bindings[_MAX_CMD] = {
</span><span class="cx"> { {"DIAL" , NULL}, handle_dial },
</span><span class="cx"> { {"SET" , NULL}, handle_set_variable },
</span><ins>+ { {"SIPADDHEADER",NULL}, handle_sipaddheader },
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> /*
</span><span class="lines">@@ -396,6 +397,23 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /*
</span><ins>+ * SIPADDHEADER(header=value)
+ * TODO: split on = and set the sip_h_header var
+ */
+static int handle_sipaddheader(esl_handle_t *eslC,int fd,int *argc, char *argv[]) {
+ int res;
+ int size;
+ char *buf=NULL;
+
+ res = -1;
+ 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"> * Hangup AGI cmd
</span><span class="cx"> * TODO: - Add arg support to know which channel we want to hangup.
</span><span class="cx"> */
</span><span class="lines">@@ -437,19 +455,24 @@
</span><span class="cx"> int size;
</span><span class="cx"> char *buf=NULL;
</span><span class="cx">
</span><del>- if (*argc < 3 && *argc > 4)
- return -1;
</del><ins>+ if (*argc < 3 && *argc > 4) {
+ res = -1;
+ goto end;
+ }
</ins><span class="cx">
</span><span class="cx"> if (argv[2]) {
</span><span class="cx"> size = strlen(argv[2]) + 30;
</span><span class="cx"> buf = malloc(size + 1);
</span><span class="cx"> snprintf(buf,size +1 ,"origination_caller_id_number=%s",argv[2]);
</span><span class="cx"> }
</span><del>- else
- return -1;
</del><ins>+ else {
+ res = -1;
+ goto end;
+ }
</ins><span class="cx">
</span><span class="cx"> res = do_execute(eslC,"set",buf,NULL,NULL);
</span><span class="cx">
</span><ins>+end:
</ins><span class="cx"> size = safe_int_snprintf_buffer(&buf,"200 result=%d\n\n",res);
</span><span class="cx">
</span><span class="cx"> res = write(fd,buf,size);
</span><span class="lines">@@ -467,7 +490,7 @@
</span><span class="cx">
</span><span class="cx"> /*
</span><span class="cx"> * SET VARIABLE
</span><del>- * TODO: - add support for exec('SET','var=value').
</del><ins>+ * TODO: - verify support for exec('SET','var=value').
</ins><span class="cx"> - add support for exec('SET','FUNC(param)=value')
</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">@@ -475,13 +498,16 @@
</span><span class="cx"> int size;
</span><span class="cx"> char *buf=NULL;
</span><span class="cx">
</span><del>- if (*argc < 2 && *argc > 3) /* SET VARIABLE var value or SET var=value */
- return -1;
</del><ins>+ if (*argc < 2 && *argc > 3) { /* SET VARIABLE var value or SET var=value */
+ res = -1;
+ goto end;
+ }
</ins><span class="cx">
</span><span class="cx"> if ( (strstr("=",argv[1])) != NULL ) { /* Support for exec set var=value*/
</span><span class="cx"> if (strstr("(",argv[1]) != NULL && strstr(")",argv[1]) != NULL ) {
</span><del>- /* We should implement * func */
- return -1;
</del><ins>+ /* TODO implement * func */
+ res = -1;
+ goto end;
</ins><span class="cx"> }
</span><span class="cx"> else {
</span><span class="cx"> size = strlen(argv[1]);
</span><span class="lines">@@ -494,11 +520,13 @@
</span><span class="cx"> buf = malloc(size + 1);
</span><span class="cx"> snprintf(buf,size +1 ,"%s=%s",argv[2],argv[3]);
</span><span class="cx"> }
</span><del>- else
- return -1;
</del><ins>+ else {
+ res = -1;
+ goto end;
+ }
</ins><span class="cx">
</span><span class="cx"> res = do_execute(eslC,"set",buf,NULL,NULL);
</span><del>-
</del><ins>+end:
</ins><span class="cx"> size = safe_int_snprintf_buffer(&buf,"200 result=%d\n\n",res);
</span><span class="cx">
</span><span class="cx"> res = write(fd,buf,size);
</span><span class="lines">@@ -518,9 +546,11 @@
</span><span class="cx">
</span><span class="cx"> esl_event_t *reply=NULL;
</span><span class="cx">
</span><del>- if (*argc < 3 || *argc > 5)
- return -1;
-
</del><ins>+ if (*argc < 3 || *argc > 5) {
+ offset=-1;
+ goto end;
+ }
+
</ins><span class="cx"> if (argv[3] && strncasecmp("\"\"",argv[3],2) ) {
</span><span class="cx"> /* We should set playback_terminators var there */
</span><span class="cx"> buf = malloc(strlen(argv[3])+22);
</span><span class="lines">@@ -570,6 +600,8 @@
</span><span class="cx"> }
</span><span class="cx"> if (buf != NULL)
</span><span class="cx"> free(buf);
</span><ins>+
+end:
</ins><span class="cx"> if (offset < 0) {
</span><span class="cx"> if ( write(fd,"200 result=-1 endpos=0\n\n",128) < 0 ) {
</span><span class="cx"> return -1;
</span></span></pre></div>
<a id="freeswitchtrunkcontribgledesl2agiesl2agih"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/gled/esl2agi/esl2agi.h (15096 => 15097)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/gled/esl2agi/esl2agi.h 2009-10-06 11:39:58 UTC (rev 15096)
+++ freeswitch/trunk/contrib/gled/esl2agi/esl2agi.h 2009-10-06 11:46:53 UTC (rev 15097)
</span><span class="lines">@@ -120,6 +120,8 @@
</span><span class="cx">
</span><span class="cx"> static int handle_dial(esl_handle_t *eslC,int fd,int *argc, char *argv[]);
</span><span class="cx">
</span><ins>+static int handle_sipaddheader(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>