<!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][17533] </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=17533">17533</a></dd>
<dt>Author</dt> <dd>moy</dd>
<dt>Date</dt> <dd>2010-05-12 10:54:50 -0500 (Wed, 12 May 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>freetdm: added dso sample app</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunklibsfreetdmMakefileam">freeswitch/trunk/libs/freetdm/Makefile.am</a></li>
<li><a href="#freeswitchtrunklibsfreetdmsrcincludeftdm_dsoh">freeswitch/trunk/libs/freetdm/src/include/ftdm_dso.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>freeswitch/trunk/libs/freetdm/sample/dso/</li>
<li><a href="#freeswitchtrunklibsfreetdmsampledsoMakefile">freeswitch/trunk/libs/freetdm/sample/dso/Makefile</a></li>
<li><a href="#freeswitchtrunklibsfreetdmsampledsoftdmloadc">freeswitch/trunk/libs/freetdm/sample/dso/ftdmload.c</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#freeswitchtrunklibsfreetdmsrcincludeprivateftdm_dsoh">freeswitch/trunk/libs/freetdm/src/include/private/ftdm_dso.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunklibsfreetdmMakefileam"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/freetdm/Makefile.am (17532 => 17533)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/freetdm/Makefile.am 2010-05-12 15:49:16 UTC (rev 17532)
+++ freeswitch/trunk/libs/freetdm/Makefile.am 2010-05-12 15:54:50 UTC (rev 17533)
</span><span class="lines">@@ -77,7 +77,8 @@
</span><span class="cx"> $(SRC)/include/freetdm.h \
</span><span class="cx"> $(SRC)/include/ftdm_declare.h \
</span><span class="cx"> $(SRC)/include/ftdm_threadmutex.h \
</span><del>-$(SRC)/include/ftdm_os.h
</del><ins>+$(SRC)/include/ftdm_os.h \
+$(SRC)/include/ftdm_dso.h
</ins><span class="cx">
</span><span class="cx"> lib_LTLIBRARIES = libfreetdm.la
</span><span class="cx"> libfreetdm_la_CFLAGS = $(AM_CFLAGS) $(MY_CFLAGS)
</span></span></pre></div>
<a id="freeswitchtrunklibsfreetdmsampledsoMakefile"></a>
<div class="addfile"><h4>Added: freeswitch/trunk/libs/freetdm/sample/dso/Makefile (0 => 17533)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/freetdm/sample/dso/Makefile (rev 0)
+++ freeswitch/trunk/libs/freetdm/sample/dso/Makefile 2010-05-12 15:54:50 UTC (rev 17533)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+CC=gcc
+CFLAGS=-Wall -I/usr/local/freeswitch/include
+LDFLAGS=-L/usr/local/freeswitch/lib -lfreetdm
+
+ftdmload: ftdmload.o
+
+clean:
+ rm -rf ftdmload.o
+
+export:
+ export LD_LIBRARY_PATH=/usr/local/freeswitch/lib
+
+
</ins></span></pre></div>
<a id="freeswitchtrunklibsfreetdmsampledsoftdmloadc"></a>
<div class="addfile"><h4>Added: freeswitch/trunk/libs/freetdm/sample/dso/ftdmload.c (0 => 17533)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/freetdm/sample/dso/ftdmload.c (rev 0)
+++ freeswitch/trunk/libs/freetdm/sample/dso/ftdmload.c 2010-05-12 15:54:50 UTC (rev 17533)
</span><span class="lines">@@ -0,0 +1,108 @@
</span><ins>+#include <stdio.h>
+#include <stdlib.h>
+#include <freetdm.h>
+#include <ftdm_dso.h>
+
+#define ARRLEN(obj) (sizeof(obj)/sizeof(obj[0]))
+
+struct dso_entry {
+ char name[25];
+ ftdm_dso_lib_t lib;
+};
+
+struct dso_entry loaded[10];
+
+int load(char *name)
+{
+ char path[255];
+ char *err;
+ struct dso_entry *entry = NULL;
+ int i;
+
+ for (i = 0; i < ARRLEN(loaded); i++) {
+ if (!loaded[i].lib) {
+ entry = &loaded[i];
+ break;
+ }
+ }
+
+ if (!entry) {
+ ftdm_log(FTDM_LOG_CRIT, "Cannot load more libraries\n");
+ return -1;
+ }
+
+ ftdm_build_dso_path(name, path, sizeof(path));
+ ftdm_log(FTDM_LOG_DEBUG, "Loading %s!\n", path);
+ entry->lib = ftdm_dso_open(path, &err);
+ if (!entry->lib) {
+ ftdm_log(FTDM_LOG_CRIT, "Cannot load library '%s': %s\n", path, err);
+ return -1;
+ }
+ strncpy(entry->name, name, sizeof(entry->name)-1);
+ entry->name[sizeof(entry->name)-1] = 0;
+ return 0;
+}
+
+int unload(char *name)
+{
+ int i;
+ struct dso_entry *entry = NULL;
+ ftdm_log(FTDM_LOG_DEBUG, "Unloading %s!\n", name);
+ for (i = 0; i < ARRLEN(loaded); i++) {
+ if (loaded[i].lib && !strcasecmp(loaded[i].name, name)) {
+ entry = &loaded[i];
+ break;
+ }
+ }
+
+ if (!entry) {
+ ftdm_log(FTDM_LOG_CRIT, "Library %s not found\n", name);
+ return -1;
+ }
+
+ ftdm_dso_destroy(&entry->lib);
+ entry->lib = NULL;
+ return 0;
+}
+
+int main(int argc, char *argv[])
+{
+ char cmdline[255];
+ char name[255];
+
+ ftdm_global_set_default_logger(FTDM_LOG_LEVEL_DEBUG);
+
+ ftdm_cpu_monitor_disable();
+
+ if (ftdm_global_init() != FTDM_SUCCESS) {
+ fprintf(stderr, "Error loading FreeTDM\n");
+ exit(-1);
+ }
+
+ memset(loaded, 0, sizeof(loaded));
+
+ printf("CLI> ");
+ while (fgets(cmdline, sizeof(cmdline), stdin)) {
+ if (sscanf(cmdline, "load=%s\n", name) == 1) {
+ load(name);
+ } else if (sscanf(cmdline, "unload=%s\n", name) == 1) {
+ unload(name);
+ } else if (!strncasecmp(cmdline, "exit", sizeof("exit")-1)) {
+ printf("Quitting ...\n");
+ sleep(1);
+ break;
+ } else {
+ fprintf(stderr, "load=<name> | unload=<name> | exit\n");
+ }
+ printf("\nCLI> ");
+ }
+
+
+ ftdm_global_destroy();
+
+ printf("Done, press any key to die!\n");
+
+ getchar();
+ return 0;
+}
+
</ins></span></pre></div>
<a id="freeswitchtrunklibsfreetdmsrcincludeftdm_dsoh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/freetdm/src/include/ftdm_dso.h (17532 => 17533)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/freetdm/src/include/ftdm_dso.h 2010-05-12 15:49:16 UTC (rev 17532)
+++ freeswitch/trunk/libs/freetdm/src/include/ftdm_dso.h 2010-05-12 15:54:50 UTC (rev 17533)
</span><span class="lines">@@ -17,6 +17,7 @@
</span><span class="cx"> *
</span><span class="cx"> */
</span><span class="cx">
</span><ins>+#include "freetdm.h"
</ins><span class="cx">
</span><span class="cx"> #ifndef _FTDM_DSO_H
</span><span class="cx"> #define _FTDM_DSO_H
</span><span class="lines">@@ -28,10 +29,12 @@
</span><span class="cx"> typedef void (*ftdm_func_ptr_t) (void);
</span><span class="cx"> typedef void * ftdm_dso_lib_t;
</span><span class="cx">
</span><del>-FT_DECLARE(void) ftdm_dso_destroy(ftdm_dso_lib_t *lib);
</del><ins>+FT_DECLARE(ftdm_status_t) ftdm_dso_destroy(ftdm_dso_lib_t *lib);
</ins><span class="cx"> FT_DECLARE(ftdm_dso_lib_t) ftdm_dso_open(const char *path, char **err);
</span><span class="cx"> FT_DECLARE(void *) ftdm_dso_func_sym(ftdm_dso_lib_t lib, const char *sym, char **err);
</span><ins>+FT_DECLARE(char *) ftdm_build_dso_path(const char *name, char *path, ftdm_size_t len);
</ins><span class="cx">
</span><ins>+
</ins><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> }
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="freeswitchtrunklibsfreetdmsrcincludeprivateftdm_dsoh"></a>
<div class="delfile"><h4>Deleted: freeswitch/trunk/libs/freetdm/src/include/private/ftdm_dso.h</h4></div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>