<!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][15042] </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=15042">15042</a></dd>
<dt>Author</dt> <dd>gled</dd>
<dt>Date</dt> <dd>2009-10-02 04:59:53 -0500 (Fri, 02 Oct 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>set callerid added</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 (15041 => 15042)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/gled/esl2agi/esl2agi.c 2009-10-02 09:45:56 UTC (rev 15041)
+++ freeswitch/trunk/contrib/gled/esl2agi/esl2agi.c 2009-10-02 09:59:53 UTC (rev 15042)
</span><span class="lines">@@ -37,6 +37,13 @@
</span><span class="cx">
</span><span class="cx"> #include "esl2agi.h"
</span><span class="cx">
</span><ins>+static command_binding_t bindings[_MAX_CMD] = {
+ { {"ANSWER" , NULL}, handle_answer },
+ { {"HANGUP" , NULL}, handle_hangup },
+ { {"STREAM", "FILE" , NULL}, handle_streamfile },
+ { {"SET", "CALLERID" , NULL}, handle_set_caller_id },
+};
+
</ins><span class="cx"> /*
</span><span class="cx"> * Translator thread entry point
</span><span class="cx"> */
</span><span class="lines">@@ -139,7 +146,6 @@
</span><span class="cx"> else {
</span><span class="cx"> /*TODO: correct ugly hack to remove final \n */
</span><span class="cx"> sbuf[r-1] = '\0';
</span><del>- // fprintf(stderr,"Treating: '%s'\n",sbuf);
</del><span class="cx"> if ( find_and_exec_command(&eslC,pipes.socket[1],(char *) &sbuf) < 0 )
</span><span class="cx"> goto end;
</span><span class="cx"> }
</span><span class="lines">@@ -383,7 +389,6 @@
</span><span class="cx"> return res;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-
</del><span class="cx"> /*
</span><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="lines">@@ -403,6 +408,34 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /*
</span><ins>+ * SET CALLERID
+ */
+static int handle_set_caller_id(esl_handle_t *eslC,int fd,int *argc, char *argv[]) {
+ int res;
+ int size;
+ char *buf=NULL;
+
+ if (*argc < 3 && *argc > 4)
+ return -1;
+
+ if (argv[2]) {
+ size = strlen(argv[2]) + 30;
+ buf = malloc(size + 1);
+ snprintf(buf,size +1 ,"origination_caller_id_number=%s",argv[2]);
+ }
+ else
+ return -1;
+
+ res = do_execute(eslC,"set",buf,NULL,NULL);
+
+ 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"> * STREAM FILE agi cmd
</span><span class="cx"> * TODO: rewrites with good string handling :)
</span><span class="cx"> */
</span><span class="lines">@@ -444,7 +477,6 @@
</span><span class="cx"> offset = 0;
</span><span class="cx"> if ( do_execute(eslC,"playback",buf,NULL,&reply) < 0 ) { /* We should write about NON success there instead of returning stock */
</span><span class="cx"> offset = -1;
</span><del>- fprintf(stderr,"do_execute stream file failed\n");
</del><span class="cx"> }
</span><span class="cx"> else {
</span><span class="cx"> free(buf);
</span><span class="lines">@@ -456,24 +488,19 @@
</span><span class="cx"> else
</span><span class="cx"> offset = atoi(buf);
</span><span class="cx">
</span><del>- fprintf(stderr,"Offset is %d, res is %d, buf is %s\n",offset,res,buf);
-
</del><span class="cx"> res = fill_buffer_from_header(reply,&buf,"variable_playback_terminator_used","%s");
</span><span class="cx"> // sbuf = esl_event_get_header(reply, "variable_playback_terminator_used");
</span><span class="cx"> if (res > 0)
</span><span class="cx"> snprintf((char *)&dtmf,2,"%s",buf);
</span><span class="cx"> }
</span><span class="cx"> else {
</span><del>- fprintf(stderr,"No event reply in stream file\n");
</del><span class="cx"> offset=-1;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> if (buf != NULL)
</span><span class="cx"> free(buf);
</span><del>- fprintf(stderr,"End stream file %d %s\n",offset,dtmf);
</del><span class="cx"> if (offset < 0) {
</span><span class="cx"> if ( write(fd,"200 result=-1 endpos=0\n\n",128) < 0 ) {
</span><del>- fprintf(stderr,"Write failed\n");
</del><span class="cx"> return -1;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -483,7 +510,6 @@
</span><span class="cx"> snprintf(buf,64,"200 result=%s endpos=%d\n\n",dtmf,offset);
</span><span class="cx"> if ( write(fd,buf,64) < 0 ) {
</span><span class="cx"> free(buf);
</span><del>- fprintf(stderr,"Write failed\n");
</del><span class="cx"> return -1;
</span><span class="cx"> }
</span><span class="cx"> free(buf);
</span><span class="lines">@@ -543,13 +569,6 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static command_binding_t bindings[_MAX_CMD] = {
- { {"ANSWER" , NULL}, handle_answer },
- { {"HANGUP" , NULL}, handle_hangup },
- { {"STREAM", "FILE" , NULL}, handle_streamfile },
-};
-
-
</del><span class="cx"> static command_binding_t *find_binding(char *cmd[]) {
</span><span class="cx"> int x,y,match=0;
</span><span class="cx">
</span></span></pre></div>
<a id="freeswitchtrunkcontribgledesl2agiesl2agih"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/gled/esl2agi/esl2agi.h (15041 => 15042)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/gled/esl2agi/esl2agi.h 2009-10-02 09:45:56 UTC (rev 15041)
+++ freeswitch/trunk/contrib/gled/esl2agi/esl2agi.h 2009-10-02 09:59:53 UTC (rev 15042)
</span><span class="lines">@@ -109,6 +109,7 @@
</span><span class="cx">
</span><span class="cx"> static int handle_streamfile(esl_handle_t *eslC,int fd,int *argc, char *argv[_MAX_CMD_ARGS]);
</span><span class="cx">
</span><ins>+static int handle_set_caller_id(esl_handle_t *eslC,int fd,int *argc, char *argv[_MAX_CMD_ARGS]);
</ins><span class="cx">
</span><span class="cx"> /* TODO
</span><span class="cx"> * - EXEC application OPTIONS
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>