[Freeswitch-svn] [commit] r10898 - in freeswitch/trunk/libs/esl: . src src/include
FreeSWITCH SVN
anthm at freeswitch.org
Sun Dec 21 13:54:44 PST 2008
Author: anthm
Date: Sun Dec 21 16:54:43 2008
New Revision: 10898
Log:
update
Modified:
freeswitch/trunk/libs/esl/Makefile
freeswitch/trunk/libs/esl/fs_cli.c
freeswitch/trunk/libs/esl/src/esl.c
freeswitch/trunk/libs/esl/src/esl_event.c
freeswitch/trunk/libs/esl/src/include/esl.h
freeswitch/trunk/libs/esl/testclient.c
Modified: freeswitch/trunk/libs/esl/Makefile
==============================================================================
--- freeswitch/trunk/libs/esl/Makefile (original)
+++ freeswitch/trunk/libs/esl/Makefile Sun Dec 21 16:54:43 2008
@@ -1,15 +1,19 @@
PWD=$(shell pwd)
INCS=-I$(PWD)/src/include
LIBEDIT_DIR=../../libs/libedit
-CFLAGS=$(INCS) -g -ggdb -I$(LIBEDIT_DIR)/src/
+DEBUG=-g -ggdb
+PICKY=-O2 -ffast-math -Wall -Werror -Wunused-variable -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes
+CFLAGS=$(INCS) -D_GNU_SOURCE $(DEBUG) -I$(LIBEDIT_DIR)/src/ $(PICKY)
MYLIB=libesl.a
LIBS=-lesl -lncurses -lpthread
LDFLAGS=-L.
OBJS=src/esl.o src/esl_event.o src/esl_threadmutex.o src/esl_config.o
+SRC=src/esl.c src/esl_event.c src/esl_threadmutex.c src/esl_config.c
+HEADERS=src/include/esl_config.h src/include/esl_event.h src/include/esl.h src/include/esl_threadmutex.h
all: $(MYLIB) fs_cli testclient testserver
-$(MYLIB): $(OBJS) $(HEADERS)
+$(MYLIB): $(OBJS) $(HEADERS) $(SRC)
ar rcs $(MYLIB) $(OBJS)
ranlib $(MYLIB)
Modified: freeswitch/trunk/libs/esl/fs_cli.c
==============================================================================
--- freeswitch/trunk/libs/esl/fs_cli.c (original)
+++ freeswitch/trunk/libs/esl/fs_cli.c Sun Dec 21 16:54:43 2008
@@ -5,28 +5,21 @@
#include <sys/select.h>
#include <histedit.h>
+
static char prompt_str[512] = "";
static char hostname[512] = "";
-char *prompt(EditLine * e)
+static char *prompt(EditLine * e)
{
- if (*prompt_str == '\0') {
- gethostname(hostname, sizeof(hostname));
- snprintf(prompt_str, sizeof(prompt_str), "freeswitch@%s> ", hostname);
- }
-
return prompt_str;
-
}
static EditLine *el;
static History *myhistory;
static HistEvent ev;
-static char *hfile = NULL;
static int running = 1;
static int thread_running = 0;
-
static void handle_SIGINT(int sig)
{
if (sig);
@@ -89,8 +82,6 @@
usleep(1000);
}
- done:
-
thread_running = 0;
esl_log(ESL_LOG_DEBUG, "Thread Done\n");
@@ -131,17 +122,33 @@
}
typedef struct {
+ char name[128];
char host[128];
- char pass[128];
esl_port_t port;
+ char pass[128];
} cli_profile_t;
-static cli_profile_t profiles[128] = { 0 };
+static cli_profile_t profiles[128] = {{{0}}};
static int pcount;
+
+static int get_profile(const char *name, cli_profile_t **profile)
+{
+ int x;
+
+ for (x = 0; x < pcount; x++) {
+ if (!strcmp(profiles[x].name, name)) {
+ *profile = &profiles[x];
+ return 0;
+ }
+ }
+
+ return -1;
+}
+
int main(int argc, char *argv[])
{
- esl_handle_t handle = {0};
+ esl_handle_t handle = {{0}};
int count;
const char *line;
char cmd_str[1024] = "";
@@ -150,11 +157,13 @@
char *home = getenv("HOME");
esl_config_t cfg;
cli_profile_t *profile = &profiles[0];
+ int cur = 0;
strncpy(profiles[0].host, "localhost", sizeof(profiles[0].host));
strncpy(profiles[0].pass, "ClueCon", sizeof(profiles[0].pass));
+ strncpy(profiles[0].name, "default", sizeof(profiles[0].name));
profiles[0].port = 8021;
- pcount = 1;
+ pcount++;
if (home) {
snprintf(hfile, sizeof(hfile), "%s/.fs_cli_history", home);
@@ -165,27 +174,58 @@
gethostname(hostname, sizeof(hostname));
handle.debug = 0;
-
+ esl_global_set_default_logger(7);
if (esl_config_open_file(&cfg, cfile)) {
char *var, *val;
+ char cur_cat[128] = "";
+
while (esl_config_next_pair(&cfg, &var, &val)) {
+ if (strcmp(cur_cat, cfg.category)) {
+ cur++;
+ esl_set_string(cur_cat, cfg.category);
+ esl_set_string(profiles[cur].name, cur_cat);
+ esl_set_string(profiles[cur].host, "localhost");
+ esl_set_string(profiles[cur].pass, "ClueCon");
+ profiles[cur].port = 8021;
+ esl_log(ESL_LOG_INFO, "Found Profile [%s]\n", profiles[cur].name);
+ pcount++;
+ }
+ if (!strcasecmp(var, "host")) {
+ esl_set_string(profiles[cur].host, val);
+ } else if (!strcasecmp(var, "password")) {
+ esl_set_string(profiles[cur].pass, val);
+ } else if (!strcasecmp(var, "port")) {
+ int pt = atoi(val);
+ if (pt > 0) {
+ profiles[cur].port = pt;
+ }
+ }
}
esl_config_close_file(&cfg);
}
-
- if (esl_connect(&handle, profile->host, profile->port, profile->pass)) {
- printf("Error Connecting [%s]\n", handle.err);
- return -1;
+ if (argv[1]) {
+ if (get_profile(argv[1], &profile)) {
+ esl_log(ESL_LOG_INFO, "Chosen profile %s does not exist using builtin default\n", argv[1]);
+ profile = &profiles[0];
+ } else {
+ esl_log(ESL_LOG_INFO, "Chosen profile %s\n", profile->name);
+ }
}
+ esl_log(ESL_LOG_INFO, "Using profile %s\n", profile->name);
+
+ gethostname(hostname, sizeof(hostname));
+ snprintf(prompt_str, sizeof(prompt_str), "freeswitch@%s> ", profile->name);
- if (handle.debug) {
- esl_global_set_default_logger(7);
+
+ if (esl_connect(&handle, profile->host, profile->port, profile->pass)) {
+ esl_log(ESL_LOG_ERROR, "Error Connecting [%s]\n", handle.err);
+ return -1;
}
-
+
esl_thread_create_detached(msg_thread_run, &handle);
el = el_init(__FILE__, stdout, stdout, stdout);
@@ -194,7 +234,7 @@
myhistory = history_init();
if (myhistory == 0) {
- fprintf(stderr, "history could not be initialized\n");
+ esl_log(ESL_LOG_ERROR, "history could not be initialized\n");
goto done;
}
@@ -202,10 +242,11 @@
el_set(el, EL_HIST, history, myhistory);
history(myhistory, &ev, H_LOAD, hfile);
-
snprintf(cmd_str, sizeof(cmd_str), "log info\n\n");
esl_send_recv(&handle, cmd_str);
+ esl_log(ESL_LOG_INFO, "FS CLI Ready.\n");
+
while (running) {
line = el_gets(el, &count);
Modified: freeswitch/trunk/libs/esl/src/esl.c
==============================================================================
--- freeswitch/trunk/libs/esl/src/esl.c (original)
+++ freeswitch/trunk/libs/esl/src/esl.c Sun Dec 21 16:54:43 2008
@@ -32,7 +32,6 @@
*/
#include <esl.h>
-#include <sys/signal.h>
#ifndef HAVE_GETHOSTBYNAME_R
extern int gethostbyname_r (const char *__name,
@@ -367,6 +366,8 @@
send(handle->sock, "\n\n", 2, 0);
free(txt);
+
+ return ESL_SUCCESS;
}
esl_status_t esl_execute(esl_handle_t *handle, const char *app, const char *arg, const char *uuid)
@@ -390,7 +391,7 @@
snprintf(send_buf, sizeof(send_buf), "%s\ncall-command: execute\n%s%s\n", cmd_buf, app_buf, arg_buf);
- esl_send_recv(handle, send_buf);
+ return esl_send_recv(handle, send_buf);
}
esl_status_t esl_listen(const char *host, esl_port_t port, esl_listen_callback_t callback)
@@ -452,7 +453,6 @@
struct hostent *result;
char sendbuf[256];
- char recvbuf[256];
int rval;
const char *hval;
@@ -560,7 +560,7 @@
{
fd_set rfds, efds;
struct timeval tv = { 0, ms * 1000 };
- int max, activity, i = 0;
+ int max, activity;
esl_status_t status = ESL_SUCCESS;
esl_mutex_lock(handle->mutex);
@@ -820,21 +820,31 @@
esl_log(ESL_LOG_DEBUG, "SEND\n%s\n", cmd);
}
- send(handle->sock, cmd, strlen(cmd), 0);
+ if (send(handle->sock, cmd, strlen(cmd), 0)) {
+ strerror_r(handle->errno, handle->err, sizeof(handle->err));
+ return ESL_FAIL;
+ }
if (!(*e == '\n' && *(e-1) == '\n')) {
- send(handle->sock, "\n\n", 2, 0);
+ if (send(handle->sock, "\n\n", 2, 0)) {
+ strerror_r(handle->errno, handle->err, sizeof(handle->err));
+ return ESL_FAIL;
+ }
}
+
+ return ESL_SUCCESS;
+
}
esl_status_t esl_send_recv(esl_handle_t *handle, const char *cmd)
{
const char *hval;
-
+ esl_status_t status;
+
esl_mutex_lock(handle->mutex);
esl_send(handle, cmd);
- esl_recv_event(handle, &handle->last_sr_event);
+ status = esl_recv_event(handle, &handle->last_sr_event);
if (handle->last_sr_event) {
hval = esl_event_get_header(handle->last_sr_event, "reply-text");
@@ -845,6 +855,8 @@
}
esl_mutex_unlock(handle->mutex);
+
+ return status;
}
Modified: freeswitch/trunk/libs/esl/src/esl_event.c
==============================================================================
--- freeswitch/trunk/libs/esl/src/esl_event.c (original)
+++ freeswitch/trunk/libs/esl/src/esl_event.c Sun Dec 21 16:54:43 2008
@@ -31,6 +31,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+
#include <esl.h>
#include <esl_event.h>
@@ -56,7 +57,7 @@
/* make sure this is synced with the esl_event_types_t enum in esl_types.h
also never put any new ones before EVENT_ALL
*/
-static char *EVENT_NAMES[] = {
+static const char *EVENT_NAMES[] = {
"CUSTOM",
"CHANNEL_CREATE",
"CHANNEL_DESTROY",
@@ -277,7 +278,7 @@
return status;
}
-esl_status_t esl_event_base_add_header(esl_event_t *event, esl_stack_t stack, const char *header_name, char *data)
+static esl_status_t esl_event_base_add_header(esl_event_t *event, esl_stack_t stack, const char *header_name, char *data)
{
esl_event_header_t *header;
esl_ssize_t hlen = -1;
Modified: freeswitch/trunk/libs/esl/src/include/esl.h
==============================================================================
--- freeswitch/trunk/libs/esl/src/include/esl.h (original)
+++ freeswitch/trunk/libs/esl/src/include/esl.h Sun Dec 21 16:54:43 2008
@@ -149,15 +149,19 @@
#include <sys/time.h>
#endif
+#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <sys/signal.h>
+#include <unistd.h>
+#include <ctype.h>
+
#ifdef HAVE_STRINGS_H
#include <strings.h>
#endif
#include <assert.h>
-
#define esl_assert(_x) assert(_x)
#define esl_safe_free(_x) if (_x) free(_x); _x = NULL
#define esl_strlen_zero(s) (!s || *(s) == '\0')
@@ -261,6 +265,7 @@
size_t esl_url_encode(const char *url, char *buf, size_t len);
char *esl_url_decode(char *s);
+const char *esl_stristr(const char *instr, const char *str);
int esl_toupper(int c);
int esl_tolower(int c);
Modified: freeswitch/trunk/libs/esl/testclient.c
==============================================================================
--- freeswitch/trunk/libs/esl/testclient.c (original)
+++ freeswitch/trunk/libs/esl/testclient.c Sun Dec 21 16:54:43 2008
@@ -5,7 +5,7 @@
int main(void)
{
- esl_handle_t handle = {0};
+ esl_handle_t handle = {{0}};
handle.debug = 1;
More information about the Freeswitch-svn
mailing list