mirror of
https://github.com/signalwire/freeswitch.git
synced 2026-11-17 14:58:34 +00:00
Merge remote branch 'fsorig/master' into releases.3.5
Conflicts: build/modules.conf.in libs/freetdm/mod_freetdm/mod_freetdm.c
This commit is contained in:
commit
eb0404d025
798 files changed
+62916
-81327
No files matched your search
+73
-28
@@ -58,6 +58,7 @@ typedef struct {
|
||||
const char *console_fnkeys[12];
|
||||
char loglevel[128];
|
||||
int quiet;
|
||||
int batch_mode;
|
||||
char prompt_color[12];
|
||||
char input_text_color[12];
|
||||
char output_text_color[12];
|
||||
@@ -109,6 +110,7 @@ static void sleep_s(int secs) { _sleep_ns(secs, 0); }
|
||||
static int process_command(esl_handle_t *handle, const char *cmd);
|
||||
|
||||
static void clear_cli(void) {
|
||||
if (global_profile->batch_mode) return;
|
||||
putchar('\r');
|
||||
printf("\033[%dC", bare_prompt_str_len);
|
||||
printf("\033[K");
|
||||
@@ -402,7 +404,9 @@ static BOOL console_readConsole(HANDLE conIn, char *buf, int len, int *pRed, int
|
||||
{
|
||||
DWORD recordIndex, bufferIndex, toRead, red;
|
||||
PINPUT_RECORD pInput;
|
||||
GetNumberOfConsoleInputEvents(conIn, &toRead);
|
||||
if (GetNumberOfConsoleInputEvents(conIn, &toRead) == 0) {
|
||||
return(FALSE);
|
||||
}
|
||||
if (len < (int)toRead) {
|
||||
toRead = len;
|
||||
}
|
||||
@@ -549,6 +553,7 @@ static const char *usage_str =
|
||||
" -r, --retry Retry connection on failure\n"
|
||||
" -R, --reconnect Reconnect if disconnected\n"
|
||||
" -d, --debug=level Debug Level (0 - 7)\n"
|
||||
" -b, --batchmode Batch mode\n"
|
||||
" -t, --timeout Timeout for API commands (in miliseconds)\n\n";
|
||||
|
||||
static int usage(char *name){
|
||||
@@ -598,6 +603,7 @@ static int write_char(int c) {
|
||||
#ifdef WIN32
|
||||
static void clear_line(void)
|
||||
{
|
||||
if (global_profile->batch_mode) return;
|
||||
putchar('\r');
|
||||
printf("\033[K");
|
||||
fflush(stdout);
|
||||
@@ -606,6 +612,7 @@ static void clear_line(void)
|
||||
#else
|
||||
static void clear_line(void)
|
||||
{
|
||||
if (global_profile->batch_mode) return;
|
||||
if (!(write_char('\r'))) goto done;
|
||||
if (!(write_str("\033[K"))) goto done;
|
||||
done:
|
||||
@@ -618,6 +625,7 @@ static void redisplay(void)
|
||||
#ifndef WIN32
|
||||
const LineInfo *lf = el_line(el);
|
||||
const char *c = lf->buffer;
|
||||
if (global_profile->batch_mode) return;
|
||||
if (!(write_str(prompt_str))) goto done;
|
||||
while (c < lf->lastchar && *c) {
|
||||
if (!(write_char(*c))) goto done;
|
||||
@@ -643,7 +651,9 @@ static int output_printf(const char *fmt, ...)
|
||||
int r;
|
||||
va_start(ap, fmt);
|
||||
#ifndef WIN32
|
||||
printf("%s", output_text_color);
|
||||
if (!(global_profile->batch_mode)) {
|
||||
printf("%s", output_text_color);
|
||||
}
|
||||
#endif
|
||||
r = vprintf(fmt, ap);
|
||||
va_end(ap);
|
||||
@@ -681,15 +691,23 @@ static void *msg_thread_run(esl_thread_t *me, void *obj)
|
||||
#ifndef WIN32
|
||||
if (aok) {
|
||||
if (feature_level) clear_line();
|
||||
printf("%s%s", colors[level], handle->last_event->body);
|
||||
if (!feature_level) printf("%s", ESL_SEQ_DEFAULT_COLOR);
|
||||
if(!(global_profile->batch_mode)) {
|
||||
printf("%s%s", colors[level], handle->last_event->body);
|
||||
if (!feature_level) printf("%s", ESL_SEQ_DEFAULT_COLOR);
|
||||
} else {
|
||||
printf("%s", handle->last_event->body);
|
||||
}
|
||||
if (feature_level) redisplay();
|
||||
}
|
||||
#else
|
||||
if (aok) {
|
||||
SetConsoleTextAttribute(hStdout, colors[level]);
|
||||
if(!(global_profile->batch_mode)) {
|
||||
SetConsoleTextAttribute(hStdout, colors[level]);
|
||||
}
|
||||
WriteFile(hStdout, handle->last_event->body, len, &outbytes, NULL);
|
||||
SetConsoleTextAttribute(hStdout, wOldColorAttrs);
|
||||
if(!(global_profile->batch_mode)) {
|
||||
SetConsoleTextAttribute(hStdout, wOldColorAttrs);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
}
|
||||
@@ -832,20 +850,27 @@ static int get_profile(const char *name, cli_profile_t **profile)
|
||||
return -1;
|
||||
}
|
||||
|
||||
#ifndef HAVE_EDITLINE
|
||||
static char command_buf[CMD_BUFLEN+1] = "";
|
||||
|
||||
static const char *basic_gets(int *cnt)
|
||||
{
|
||||
#ifndef _MSC_VER
|
||||
int x = 0;
|
||||
#ifdef _MSC_VER
|
||||
int read, key;
|
||||
char keys[CMD_BUFLEN];
|
||||
HANDLE stdinHandle;
|
||||
if (global_profile->batch_mode) {
|
||||
#endif
|
||||
printf("%s", prompt_str);
|
||||
if (global_profile->batch_mode) fflush(stdout);
|
||||
memset(&command_buf, 0, sizeof(command_buf));
|
||||
for (x = 0; x < (sizeof(command_buf) - 1); x++) {
|
||||
int c = getchar();
|
||||
if (c < 0) {
|
||||
int y = read(fileno(stdin), command_buf, sizeof(command_buf) - 1);
|
||||
command_buf[y - 1] = '\0';
|
||||
if (fgets(command_buf, sizeof(command_buf) - 1, stdin) != command_buf) {
|
||||
break;
|
||||
}
|
||||
command_buf[strlen(command_buf)-1] = '\0'; /* remove endline */
|
||||
break;
|
||||
}
|
||||
command_buf[x] = (char) c;
|
||||
@@ -855,27 +880,28 @@ static const char *basic_gets(int *cnt)
|
||||
}
|
||||
}
|
||||
*cnt = x;
|
||||
#else
|
||||
int read, key;
|
||||
char keys[CMD_BUFLEN];
|
||||
HANDLE stdinHandle = GetStdHandle(STD_INPUT_HANDLE);
|
||||
console_bufferInput (0, 0, prompt_str, PROMPT_OP);
|
||||
printf("%s", prompt_str);
|
||||
*cnt = 0;
|
||||
memset(&command_buf, 0, sizeof(command_buf));
|
||||
while (!*cnt) {
|
||||
if (console_readConsole(stdinHandle, keys, (int)sizeof(keys), &read, &key)) {
|
||||
*cnt = console_bufferInput(keys, read, command_buf, key);
|
||||
if (!strcmp(command_buf, "Empty")) {
|
||||
command_buf[0] = 0;
|
||||
#ifdef _MSC_VER
|
||||
} else {
|
||||
stdinHandle = GetStdHandle(STD_INPUT_HANDLE);
|
||||
console_bufferInput (0, 0, prompt_str, PROMPT_OP);
|
||||
printf("%s", prompt_str);
|
||||
if (global_profile->batch_mode) fflush(stdout);
|
||||
*cnt = 0;
|
||||
memset(&command_buf, 0, sizeof(command_buf));
|
||||
while (!*cnt) {
|
||||
if (console_readConsole(stdinHandle, keys, (int)sizeof(keys), &read, &key)) {
|
||||
*cnt = console_bufferInput(keys, read, command_buf, key);
|
||||
if (global_profile->batch_mode) fflush(stdout);
|
||||
if (!strcmp(command_buf, "Empty")) {
|
||||
command_buf[0] = 0;
|
||||
}
|
||||
}
|
||||
sleep_ms(20);
|
||||
}
|
||||
sleep_ms(20);
|
||||
}
|
||||
#endif
|
||||
return command_buf;
|
||||
}
|
||||
#endif
|
||||
|
||||
static void print_banner(FILE *stream)
|
||||
{
|
||||
@@ -1067,6 +1093,8 @@ static void read_config(const char *dft_cfile, const char *cfile) {
|
||||
if (pt > 0) {
|
||||
profiles[pcount-1].port = (esl_port_t)pt;
|
||||
}
|
||||
} else if (!strcasecmp(var, "batchmode")) {
|
||||
profiles[pcount-1].batch_mode = esl_true(val);
|
||||
} else if (!strcasecmp(var, "debug")) {
|
||||
int dt = atoi(val);
|
||||
if (dt > -1 && dt < 8){
|
||||
@@ -1100,6 +1128,7 @@ static void clear_el_buffer(void) {
|
||||
#ifdef HAVE_EDITLINE
|
||||
const LineInfo *lf = el_line(el);
|
||||
int len = (int)(lf->lastchar - lf->buffer);
|
||||
if (global_profile->batch_mode) return;
|
||||
el_deletestr(el, len);
|
||||
memset((char*)lf->buffer, 0, len);
|
||||
#endif
|
||||
@@ -1134,6 +1163,7 @@ int main(int argc, char *argv[])
|
||||
{"execute", 1, 0, 'x'},
|
||||
{"loglevel", 1, 0, 'l'},
|
||||
{"quiet", 0, 0, 'q'},
|
||||
{"batchmode", 0, 0, 'b'},
|
||||
{"retry", 0, 0, 'r'},
|
||||
{"interrupt", 0, 0, 'i'},
|
||||
{"reconnect", 0, 0, 'R'},
|
||||
@@ -1154,6 +1184,7 @@ int main(int argc, char *argv[])
|
||||
char argv_command[1024] = "";
|
||||
char argv_loglevel[128] = "";
|
||||
int argv_quiet = 0;
|
||||
int argv_batch = 0;
|
||||
int loops = 2, reconnect = 0, timeout = 0;
|
||||
|
||||
|
||||
@@ -1186,7 +1217,7 @@ int main(int argc, char *argv[])
|
||||
esl_global_set_default_logger(6); /* default debug level to 6 (info) */
|
||||
for(;;) {
|
||||
int option_index = 0;
|
||||
opt = getopt_long(argc, argv, "H:U:P:S:u:p:d:x:l:t:qrRhi?", options, &option_index);
|
||||
opt = getopt_long(argc, argv, "H:U:P:S:u:p:d:x:l:t:qrRhib?", options, &option_index);
|
||||
if (opt == -1) break;
|
||||
switch (opt) {
|
||||
case 'H':
|
||||
@@ -1229,6 +1260,9 @@ int main(int argc, char *argv[])
|
||||
case 'q':
|
||||
argv_quiet = 1;
|
||||
break;
|
||||
case 'b':
|
||||
argv_batch = 1;
|
||||
break;
|
||||
case 'i':
|
||||
allow_ctl_c = 1;
|
||||
break;
|
||||
@@ -1279,6 +1313,10 @@ int main(int argc, char *argv[])
|
||||
if (argv_pass) {
|
||||
esl_set_string(profile->pass, temp_pass);
|
||||
}
|
||||
if (argv_batch || profile->batch_mode) {
|
||||
profile->batch_mode = 1;
|
||||
feature_level=0;
|
||||
}
|
||||
if (*argv_loglevel) {
|
||||
esl_set_string(profile->loglevel, argv_loglevel);
|
||||
profile->quiet = 0;
|
||||
@@ -1423,6 +1461,9 @@ int main(int argc, char *argv[])
|
||||
snprintf(cmd_str, sizeof(cmd_str), "log %s\n\n", profile->loglevel);
|
||||
esl_send_recv(&handle, cmd_str);
|
||||
}
|
||||
if (global_profile->batch_mode) {
|
||||
setvbuf(stdout, (char*)NULL, _IONBF, 0);
|
||||
}
|
||||
print_banner(stdout);
|
||||
|
||||
esl_log(ESL_LOG_INFO, "Netborder SS7 CLI Ready.\nenter /help for a list of commands.\n");
|
||||
@@ -1431,9 +1472,13 @@ int main(int argc, char *argv[])
|
||||
while (running > 0) {
|
||||
int r;
|
||||
#ifdef HAVE_EDITLINE
|
||||
line = el_gets(el, &count);
|
||||
#else
|
||||
if (!(global_profile->batch_mode)) {
|
||||
line = el_gets(el, &count);
|
||||
} else {
|
||||
#endif
|
||||
line = basic_gets(&count);
|
||||
#ifdef HAVE_EDITLINE
|
||||
}
|
||||
#endif
|
||||
if (count > 1 && !esl_strlen_zero(line)) {
|
||||
char *p, *cmd = strdup(line);
|
||||
|
||||
+80
-19
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2009, Anthony Minessale II
|
||||
* Copyright (c) 2009-2012, Anthony Minessale II
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
@@ -36,11 +36,56 @@
|
||||
#include <esl.h>
|
||||
#include <errno.h>
|
||||
|
||||
static void my_forking_callback(esl_socket_t server_sock, esl_socket_t client_sock, struct sockaddr_in *addr)
|
||||
{
|
||||
esl_handle_t handle = {{0}};
|
||||
char path_buffer[1024] = { 0 };
|
||||
const char *path;
|
||||
char arg[64] = { 0 };
|
||||
|
||||
if (fork()) {
|
||||
close(client_sock);
|
||||
return;
|
||||
}
|
||||
|
||||
if (esl_attach_handle(&handle, client_sock, addr) != ESL_SUCCESS || !handle.info_event) {
|
||||
esl_log(ESL_LOG_ERROR, "Socket Error\n");
|
||||
exit(0);
|
||||
}
|
||||
|
||||
if (!(path = esl_event_get_header(handle.info_event, "variable_ivr_path"))) {
|
||||
esl_disconnect(&handle);
|
||||
esl_log(ESL_LOG_ERROR, "Missing ivr_path param!\n");
|
||||
exit(0);
|
||||
}
|
||||
|
||||
snprintf(arg, sizeof(arg), "%d", client_sock);
|
||||
|
||||
strncpy(path_buffer, path, sizeof(path_buffer) - 1);
|
||||
|
||||
/* hotwire the socket to STDIN/STDOUT */
|
||||
/* hotwire the socket to STDIN/STDOUT */
|
||||
if (!(dup2(client_sock, STDIN_FILENO)) && !(dup2(client_sock, STDOUT_FILENO))){
|
||||
esl_disconnect(&handle);
|
||||
esl_log(ESL_LOG_ERROR, "Socket Error hotwiring socket to STDIN/STDOUT!\n");
|
||||
return;
|
||||
}
|
||||
|
||||
/* close the handle but leak the socket on purpose cos the child will need it open */
|
||||
handle.sock = -1;
|
||||
esl_disconnect(&handle);
|
||||
|
||||
execl(path_buffer, path_buffer, arg, (char *)NULL);
|
||||
close(client_sock);
|
||||
exit(0);
|
||||
}
|
||||
|
||||
static void mycallback(esl_socket_t server_sock, esl_socket_t client_sock, struct sockaddr_in *addr)
|
||||
{
|
||||
esl_handle_t handle = {{0}};
|
||||
const char *path;
|
||||
|
||||
char path_buffer[1024] = { 0 };
|
||||
|
||||
if (esl_attach_handle(&handle, client_sock, addr) != ESL_SUCCESS || !handle.info_event) {
|
||||
close(client_sock);
|
||||
esl_log(ESL_LOG_ERROR, "Socket Error\n");
|
||||
@@ -53,16 +98,13 @@ static void mycallback(esl_socket_t server_sock, esl_socket_t client_sock, struc
|
||||
return;
|
||||
}
|
||||
|
||||
/* hotwire the socket to STDIN/STDOUT */
|
||||
if (!(dup2(client_sock, STDIN_FILENO)) && !(dup2(client_sock, STDOUT_FILENO))){
|
||||
esl_disconnect(&handle);
|
||||
esl_log(ESL_LOG_ERROR, "Socket Error hotwiring socket to STDIN/STDOUT!\n");
|
||||
return;
|
||||
}
|
||||
snprintf(path_buffer, sizeof(path_buffer), "%s %d", path, client_sock);
|
||||
|
||||
if(system(path)) {
|
||||
|
||||
if (system(path_buffer)) {
|
||||
esl_log(ESL_LOG_ERROR, "System Call Failed! [%s]\n", strerror(errno));
|
||||
}
|
||||
|
||||
esl_disconnect(&handle);
|
||||
|
||||
}
|
||||
@@ -71,24 +113,43 @@ int main(int argc, char *argv[])
|
||||
{
|
||||
int i;
|
||||
char *ip = NULL;
|
||||
int port = 0;
|
||||
int port = 0, thread = 0;
|
||||
|
||||
for (i = 1; i + 1 < argc; ) {
|
||||
if (!strcasecmp(argv[i], "-h")) {
|
||||
ip = argv[++i];
|
||||
} else if (!strcasecmp(argv[i], "-p")) {
|
||||
port = atoi(argv[++i]);
|
||||
} else {
|
||||
i++;
|
||||
for (i = 1; i < argc; ) {
|
||||
int cont = 0;
|
||||
|
||||
if (i + 1 < argc) {
|
||||
if (!strcasecmp(argv[i], "-h")) {
|
||||
ip = argv[++i]; cont++;
|
||||
} else if (!strcasecmp(argv[i], "-p")) {
|
||||
port = atoi(argv[++i]); cont++;
|
||||
}
|
||||
}
|
||||
|
||||
if (cont) {
|
||||
i++;
|
||||
continue;
|
||||
}
|
||||
|
||||
if (!strcasecmp(argv[i], "-t")) {
|
||||
thread++;
|
||||
}
|
||||
|
||||
i++;
|
||||
}
|
||||
|
||||
if (!(ip && port)) {
|
||||
fprintf(stderr, "Usage %s -h <host> -p <port>\n", argv[0]);
|
||||
fprintf(stderr, "Usage %s [-t] -h <host> -p <port>\n", argv[0]);
|
||||
return -1;
|
||||
}
|
||||
|
||||
esl_listen(ip, port, mycallback, 100000);
|
||||
if (thread) {
|
||||
printf("Starting threaded listener.\n");
|
||||
esl_listen_threaded(ip, port, mycallback, 100000);
|
||||
} else {
|
||||
printf("Starting forking listener.\n");
|
||||
esl_listen(ip, port, my_forking_callback);
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
+89
-31
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2007, Anthony Minessale II
|
||||
* Copyright (c) 2007-2012, Anthony Minessale II
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
@@ -51,7 +51,7 @@
|
||||
|
||||
#include <esl.h>
|
||||
#ifndef WIN32
|
||||
#define closesocket(x) close(x)
|
||||
#define closesocket(x) shutdown(x, 2); close(x)
|
||||
#include <fcntl.h>
|
||||
#include <errno.h>
|
||||
#else
|
||||
@@ -491,7 +491,9 @@ ESL_DECLARE(esl_status_t) esl_attach_handle(esl_handle_t *handle, esl_socket_t s
|
||||
ESL_DECLARE(esl_status_t) esl_sendevent(esl_handle_t *handle, esl_event_t *event)
|
||||
{
|
||||
char *txt;
|
||||
char event_buf[256] = "";
|
||||
char *event_buf = NULL;
|
||||
esl_status_t status = ESL_FAIL;
|
||||
size_t len = 0;
|
||||
|
||||
if (!handle->connected || !event) {
|
||||
return ESL_FAIL;
|
||||
@@ -500,23 +502,20 @@ ESL_DECLARE(esl_status_t) esl_sendevent(esl_handle_t *handle, esl_event_t *event
|
||||
esl_event_serialize(event, &txt, ESL_FALSE);
|
||||
|
||||
esl_log(ESL_LOG_DEBUG, "SEND EVENT\n%s\n", txt);
|
||||
|
||||
snprintf(event_buf, sizeof(event_buf), "sendevent %s\n", esl_event_name(event->event_id));
|
||||
|
||||
if (send(handle->sock, event_buf, strlen(event_buf), 0) <= 0) goto fail;
|
||||
if (send(handle->sock, txt, strlen(txt), 0) <= 0) goto fail;
|
||||
len = strlen(txt) + 100;
|
||||
event_buf = malloc(len);
|
||||
assert(event_buf);
|
||||
memset(event_buf, 0, len);
|
||||
|
||||
free(txt);
|
||||
|
||||
return esl_recv(handle);
|
||||
|
||||
fail:
|
||||
|
||||
handle->connected = 0;
|
||||
snprintf(event_buf, len, "sendevent %s\n%s", esl_event_name(event->event_id), txt);
|
||||
|
||||
status = esl_send_recv(handle, event_buf);
|
||||
|
||||
free(txt);
|
||||
free(event_buf);
|
||||
|
||||
return ESL_FAIL;
|
||||
return status;
|
||||
|
||||
}
|
||||
|
||||
@@ -554,34 +553,36 @@ ESL_DECLARE(esl_status_t) esl_execute(esl_handle_t *handle, const char *app, con
|
||||
|
||||
ESL_DECLARE(esl_status_t) esl_sendmsg(esl_handle_t *handle, esl_event_t *event, const char *uuid)
|
||||
{
|
||||
char cmd_buf[128] = "sendmsg\n";
|
||||
char *cmd_buf = NULL;
|
||||
char *txt;
|
||||
|
||||
size_t len = 0;
|
||||
esl_status_t status = ESL_FAIL;
|
||||
|
||||
if (!handle || !handle->connected || handle->sock == ESL_SOCK_INVALID) {
|
||||
return ESL_FAIL;
|
||||
}
|
||||
|
||||
esl_event_serialize(event, &txt, ESL_FALSE);
|
||||
len = strlen(txt) + 100;
|
||||
cmd_buf = malloc(len);
|
||||
assert(cmd_buf);
|
||||
memset(cmd_buf, 0, len);
|
||||
|
||||
|
||||
if (uuid) {
|
||||
snprintf(cmd_buf, sizeof(cmd_buf), "sendmsg %s\n", uuid);
|
||||
snprintf(cmd_buf, sizeof(cmd_buf), "sendmsg %s\n%s", uuid, txt);
|
||||
} else {
|
||||
snprintf(cmd_buf, sizeof(cmd_buf), "sendmsg\n%s", txt);
|
||||
}
|
||||
|
||||
esl_event_serialize(event, &txt, ESL_FALSE);
|
||||
esl_log(ESL_LOG_DEBUG, "%s%s\n", cmd_buf, txt);
|
||||
|
||||
if (send(handle->sock, cmd_buf, strlen(cmd_buf), 0) <= 0) goto fail;
|
||||
if (send(handle->sock, txt, strlen(txt), 0) <= 0) goto fail;
|
||||
|
||||
free(txt);
|
||||
|
||||
return esl_recv(handle);
|
||||
|
||||
fail:
|
||||
|
||||
handle->connected = 0;
|
||||
status = esl_send_recv(handle, cmd_buf);
|
||||
|
||||
free(txt);
|
||||
free(cmd_buf);
|
||||
|
||||
return ESL_FAIL;
|
||||
return status;
|
||||
}
|
||||
|
||||
|
||||
@@ -648,7 +649,64 @@ static void *client_thread(esl_thread_t *me, void *obj)
|
||||
|
||||
}
|
||||
|
||||
ESL_DECLARE(esl_status_t) esl_listen(const char *host, esl_port_t port, esl_listen_callback_t callback, int max)
|
||||
ESL_DECLARE(esl_status_t) esl_listen(const char *host, esl_port_t port, esl_listen_callback_t callback)
|
||||
{
|
||||
esl_socket_t server_sock = ESL_SOCK_INVALID;
|
||||
struct sockaddr_in addr;
|
||||
esl_status_t status = ESL_SUCCESS;
|
||||
|
||||
if ((server_sock = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP)) < 0) {
|
||||
return ESL_FAIL;
|
||||
}
|
||||
|
||||
esl_socket_reuseaddr(server_sock);
|
||||
|
||||
memset(&addr, 0, sizeof(addr));
|
||||
addr.sin_family = AF_INET;
|
||||
addr.sin_addr.s_addr = htonl(INADDR_ANY);
|
||||
addr.sin_port = htons(port);
|
||||
|
||||
if (bind(server_sock, (struct sockaddr *) &addr, sizeof(addr)) < 0) {
|
||||
status = ESL_FAIL;
|
||||
goto end;
|
||||
}
|
||||
|
||||
if (listen(server_sock, 10000) < 0) {
|
||||
status = ESL_FAIL;
|
||||
goto end;
|
||||
}
|
||||
|
||||
for (;;) {
|
||||
int client_sock;
|
||||
struct sockaddr_in echoClntAddr;
|
||||
#ifdef WIN32
|
||||
int clntLen;
|
||||
#else
|
||||
unsigned int clntLen;
|
||||
#endif
|
||||
|
||||
clntLen = sizeof(echoClntAddr);
|
||||
|
||||
if ((client_sock = accept(server_sock, (struct sockaddr *) &echoClntAddr, &clntLen)) == ESL_SOCK_INVALID) {
|
||||
status = ESL_FAIL;
|
||||
goto end;
|
||||
}
|
||||
|
||||
callback(server_sock, client_sock, &echoClntAddr);
|
||||
}
|
||||
|
||||
end:
|
||||
|
||||
if (server_sock != ESL_SOCK_INVALID) {
|
||||
closesocket(server_sock);
|
||||
server_sock = ESL_SOCK_INVALID;
|
||||
}
|
||||
|
||||
return status;
|
||||
|
||||
}
|
||||
|
||||
ESL_DECLARE(esl_status_t) esl_listen_threaded(const char *host, esl_port_t port, esl_listen_callback_t callback, int max)
|
||||
{
|
||||
esl_socket_t server_sock = ESL_SOCK_INVALID;
|
||||
struct sockaddr_in addr;
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2010, Anthony Minessale II
|
||||
* Copyright (c) 2010-2012, Anthony Minessale II
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2007, Anthony Minessale II
|
||||
* Copyright (c) 2007-2012, Anthony Minessale II
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2007, Anthony Minessale II
|
||||
* Copyright (c) 2007-2012, Anthony Minessale II
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2007, Anthony Minessale II
|
||||
* Copyright (c) 2007-2012, Anthony Minessale II
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
@@ -391,7 +391,9 @@ ESL_DECLARE(esl_status_t) esl_attach_handle(esl_handle_t *handle, esl_socket_t s
|
||||
\param port Port to bind to
|
||||
\param callback Callback that will be called upon data received
|
||||
*/
|
||||
ESL_DECLARE(esl_status_t) esl_listen(const char *host, esl_port_t port, esl_listen_callback_t callback, int max);
|
||||
|
||||
ESL_DECLARE(esl_status_t) esl_listen(const char *host, esl_port_t port, esl_listen_callback_t callback);
|
||||
ESL_DECLARE(esl_status_t) esl_listen_threaded(const char *host, esl_port_t port, esl_listen_callback_t callback, int max);
|
||||
/*!
|
||||
\brief Executes application with sendmsg to a specific UUID. Used for outbound socket.
|
||||
\param handle Handle that the msg will be sent
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2010, Anthony Minessale II
|
||||
* Copyright (c) 2010-2012, Anthony Minessale II
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2007, Anthony Minessale II
|
||||
* Copyright (c) 2007-2012, Anthony Minessale II
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2007, Anthony Minessale II
|
||||
* Copyright (c) 2007-2012, Anthony Minessale II
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2007, Anthony Minessale II
|
||||
* Copyright (c) 2007-2012, Anthony Minessale II
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
|
||||
@@ -48,7 +48,7 @@ static void mycallback(esl_socket_t server_sock, esl_socket_t client_sock, struc
|
||||
int main(void)
|
||||
{
|
||||
esl_global_set_default_logger(7);
|
||||
esl_listen("localhost", 8084, mycallback, 100000);
|
||||
esl_listen_threaded("localhost", 8084, mycallback, 100000);
|
||||
|
||||
return 0;
|
||||
}
|
||||
Reference in new issue
Block a user