- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r10101 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 21 Oct '08

21 Oct '08

Author: mikej Date: Tue Oct 21 16:01:48 2008 New Revision: 10101 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: MODENDP-133 (add parsing of another header for privacy info) Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Tue Oct 21 16:01:48 2008 @@ -3334,6 +3334,7 @@ sip_remote_party_id_t *rpid = NULL; sip_p_asserted_identity_t *passerted = NULL; sip_p_preferred_identity_t *ppreferred = NULL; + sip_privacy_t *privacy = NULL; sip_alert_info_t *alert_info = NULL; private_object_t *tech_pvt = NULL; switch_channel_t *channel = NULL; @@ -3836,6 +3837,12 @@ } } + if ((privacy = sip_privacy(sip))) { + if(msg_params_find(privacy->priv_values, "id")) { + switch_set_flag(tech_pvt->caller_profile, SWITCH_CPF_HIDE_NAME | SWITCH_CPF_HIDE_NUMBER); + } + } + /* Loop thru unknown Headers Here so we can do something with them */ for (un = sip->sip_unknown; un; un = un->un_next) { if (!strncasecmp(un->un_name, "Diversion", 9)) {

1 0

[commit] r10100 - freeswitch/trunk/src/mod/languages/mod_lua/lua
by Freeswitch SVN 21 Oct '08

21 Oct '08

Author: mikej Date: Tue Oct 21 15:39:57 2008 New Revision: 10100 Modified: freeswitch/trunk/src/mod/languages/mod_lua/lua/lapi.c freeswitch/trunk/src/mod/languages/mod_lua/lua/lbaselib.c freeswitch/trunk/src/mod/languages/mod_lua/lua/ldebug.c freeswitch/trunk/src/mod/languages/mod_lua/lua/loadlib.c freeswitch/trunk/src/mod/languages/mod_lua/lua/lobject.h freeswitch/trunk/src/mod/languages/mod_lua/lua/lstrlib.c freeswitch/trunk/src/mod/languages/mod_lua/lua/ltablib.c freeswitch/trunk/src/mod/languages/mod_lua/lua/lua.h freeswitch/trunk/src/mod/languages/mod_lua/lua/luaconf.h freeswitch/trunk/src/mod/languages/mod_lua/lua/lundump.c Log: MODLANG-87 - Update to lua 5.1.4 release Modified: freeswitch/trunk/src/mod/languages/mod_lua/lua/lapi.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_lua/lua/lapi.c (original) +++ freeswitch/trunk/src/mod/languages/mod_lua/lua/lapi.c Tue Oct 21 15:39:57 2008 @@ -1,5 +1,5 @@ /* -** $Id: lapi.c,v 2.55.1.3 2008/01/03 15:20:39 roberto Exp $ +** $Id: lapi.c,v 2.55.1.5 2008/07/04 18:41:18 roberto Exp $ ** Lua API ** See Copyright Notice in lua.h */ @@ -93,15 +93,14 @@ LUA_API int lua_checkstack (lua_State *L, int size) { - int res; + int res = 1; lua_lock(L); - if ((L->top - L->base + size) > LUAI_MAXCSTACK) + if (size > LUAI_MAXCSTACK || (L->top - L->base + size) > LUAI_MAXCSTACK) res = 0; /* stack overflow */ - else { + else if (size > 0) { luaD_checkstack(L, size); if (L->ci->top < L->top + size) L->ci->top = L->top + size; - res = 1; } lua_unlock(L); return res; @@ -930,10 +929,13 @@ g->GCthreshold = g->totalbytes - a; else g->GCthreshold = 0; - while (g->GCthreshold <= g->totalbytes) + while (g->GCthreshold <= g->totalbytes) { luaC_step(L); - if (g->gcstate == GCSpause) /* end of cycle? */ - res = 1; /* signal it */ + if (g->gcstate == GCSpause) { /* end of cycle? */ + res = 1; /* signal it */ + break; + } + } break; } case LUA_GCSETPAUSE: { Modified: freeswitch/trunk/src/mod/languages/mod_lua/lua/lbaselib.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_lua/lua/lbaselib.c (original) +++ freeswitch/trunk/src/mod/languages/mod_lua/lua/lbaselib.c Tue Oct 21 15:39:57 2008 @@ -1,5 +1,5 @@ /* -** $Id: lbaselib.c,v 1.191.1.4 2008/01/20 13:53:22 roberto Exp $ +** $Id: lbaselib.c,v 1.191.1.6 2008/02/14 16:46:22 roberto Exp $ ** Basic library ** See Copyright Notice in lua.h */ @@ -344,10 +344,12 @@ luaL_checktype(L, 1, LUA_TTABLE); i = luaL_optint(L, 2, 1); e = luaL_opt(L, luaL_checkint, 3, luaL_getn(L, 1)); + if (i > e) return 0; /* empty range */ n = e - i + 1; /* number of elements */ - if (n <= 0) return 0; /* empty range */ - luaL_checkstack(L, n, "table too big to unpack"); - for (; i<=e; i++) /* push arg[i...e] */ + if (n <= 0 || !lua_checkstack(L, n)) /* n <= 0 means arith. overflow */ + return luaL_error(L, "too many results to unpack"); + lua_rawgeti(L, 1, i); /* push arg[i] (avoiding overflow problems) */ + while (i++ < e) /* push arg[i + 1...e] */ lua_rawgeti(L, 1, i); return n; } @@ -526,7 +528,7 @@ status = lua_resume(co, narg); if (status == 0 || status == LUA_YIELD) { int nres = lua_gettop(co); - if (!lua_checkstack(L, nres)) + if (!lua_checkstack(L, nres + 1)) luaL_error(L, "too many results to resume"); lua_xmove(co, L, nres); /* move yielded values */ return nres; Modified: freeswitch/trunk/src/mod/languages/mod_lua/lua/ldebug.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_lua/lua/ldebug.c (original) +++ freeswitch/trunk/src/mod/languages/mod_lua/lua/ldebug.c Tue Oct 21 15:39:57 2008 @@ -1,5 +1,5 @@ /* -** $Id: ldebug.c,v 2.29.1.3 2007/12/28 15:32:23 roberto Exp $ +** $Id: ldebug.c,v 2.29.1.6 2008/05/08 16:56:26 roberto Exp $ ** Debug Interface ** See Copyright Notice in lua.h */ @@ -275,12 +275,12 @@ static int precheck (const Proto *pt) { check(pt->maxstacksize <= MAXSTACK); - lua_assert(pt->numparams+(pt->is_vararg & VARARG_HASARG) <= pt->maxstacksize); - lua_assert(!(pt->is_vararg & VARARG_NEEDSARG) || + check(pt->numparams+(pt->is_vararg & VARARG_HASARG) <= pt->maxstacksize); + check(!(pt->is_vararg & VARARG_NEEDSARG) || (pt->is_vararg & VARARG_HASARG)); check(pt->sizeupvalues <= pt->nups); check(pt->sizelineinfo == pt->sizecode || pt->sizelineinfo == 0); - check(GET_OPCODE(pt->code[pt->sizecode-1]) == OP_RETURN); + check(pt->sizecode > 0 && GET_OPCODE(pt->code[pt->sizecode-1]) == OP_RETURN); return 1; } @@ -346,9 +346,18 @@ int dest = pc+1+b; check(0 <= dest && dest < pt->sizecode); if (dest > 0) { - /* cannot jump to a setlist count */ - Instruction d = pt->code[dest-1]; - check(!(GET_OPCODE(d) == OP_SETLIST && GETARG_C(d) == 0)); + int j; + /* check that it does not jump to a setlist count; this + is tricky, because the count from a previous setlist may + have the same value of an invalid setlist; so, we must + go all the way back to the first of them (if any) */ + for (j = 0; j < dest; j++) { + Instruction d = pt->code[dest-1-j]; + if (!(GET_OPCODE(d) == OP_SETLIST && GETARG_C(d) == 0)) break; + } + /* if 'j' is even, previous value is not a setlist (even if + it looks like one) */ + check((j&1) == 0); } } break; @@ -363,7 +372,11 @@ } switch (op) { case OP_LOADBOOL: { - check(c == 0 || pc+2 < pt->sizecode); /* check its jump */ + if (c == 1) { /* does it jump? */ + check(pc+2 < pt->sizecode); /* check its jump */ + check(GET_OPCODE(pt->code[pc+1]) != OP_SETLIST || + GETARG_C(pt->code[pc+1]) != 0); + } break; } case OP_LOADNIL: { @@ -428,7 +441,10 @@ } case OP_SETLIST: { if (b > 0) checkreg(pt, a + b); - if (c == 0) pc++; + if (c == 0) { + pc++; + check(pc < pt->sizecode - 1); + } break; } case OP_CLOSURE: { Modified: freeswitch/trunk/src/mod/languages/mod_lua/lua/loadlib.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_lua/lua/loadlib.c (original) +++ freeswitch/trunk/src/mod/languages/mod_lua/lua/loadlib.c Tue Oct 21 15:39:57 2008 @@ -1,5 +1,5 @@ /* -** $Id: loadlib.c,v 1.52.1.2 2007/12/28 14:58:43 roberto Exp $ +** $Id: loadlib.c,v 1.52.1.3 2008/08/06 13:29:28 roberto Exp $ ** Dynamic library loader for Lua ** See Copyright Notice in lua.h ** @@ -506,8 +506,10 @@ static void setfenv (lua_State *L) { lua_Debug ar; - lua_getstack(L, 1, &ar); - lua_getinfo(L, "f", &ar); + if (lua_getstack(L, 1, &ar) == 0 || + lua_getinfo(L, "f", &ar) == 0 || /* get calling function */ + lua_iscfunction(L, -1)) + luaL_error(L, LUA_QL("module") " not called from a Lua function"); lua_pushvalue(L, -2); lua_setfenv(L, -2); lua_pop(L, 1); Modified: freeswitch/trunk/src/mod/languages/mod_lua/lua/lobject.h ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_lua/lua/lobject.h (original) +++ freeswitch/trunk/src/mod/languages/mod_lua/lua/lobject.h Tue Oct 21 15:39:57 2008 @@ -1,5 +1,5 @@ /* -** $Id: lobject.h,v 2.20.1.1 2007/12/27 13:02:25 roberto Exp $ +** $Id: lobject.h,v 2.20.1.2 2008/08/06 13:29:48 roberto Exp $ ** Type definitions for Lua objects ** See Copyright Notice in lua.h */ @@ -208,7 +208,7 @@ #define getstr(ts) cast(const char *, (ts) + 1) -#define svalue(o) getstr(tsvalue(o)) +#define svalue(o) getstr(rawtsvalue(o)) Modified: freeswitch/trunk/src/mod/languages/mod_lua/lua/lstrlib.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_lua/lua/lstrlib.c (original) +++ freeswitch/trunk/src/mod/languages/mod_lua/lua/lstrlib.c Tue Oct 21 15:39:57 2008 @@ -1,5 +1,5 @@ /* -** $Id: lstrlib.c,v 1.132.1.3 2007/12/28 15:32:23 roberto Exp $ +** $Id: lstrlib.c,v 1.132.1.4 2008/07/11 17:27:21 roberto Exp $ ** Standard library for string operations and pattern-matching ** See Copyright Notice in lua.h */ @@ -35,7 +35,8 @@ static ptrdiff_t posrelat (ptrdiff_t pos, size_t len) { /* relative string position: negative means back from end */ - return (pos>=0) ? pos : (ptrdiff_t)len+pos+1; + if (pos < 0) pos += (ptrdiff_t)len + 1; + return (pos >= 0) ? pos : 0; } Modified: freeswitch/trunk/src/mod/languages/mod_lua/lua/ltablib.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_lua/lua/ltablib.c (original) +++ freeswitch/trunk/src/mod/languages/mod_lua/lua/ltablib.c Tue Oct 21 15:39:57 2008 @@ -1,5 +1,5 @@ /* -** $Id: ltablib.c,v 1.38.1.2 2007/12/28 15:32:23 roberto Exp $ +** $Id: ltablib.c,v 1.38.1.3 2008/02/14 16:46:58 roberto Exp $ ** Library for Table Manipulation ** See Copyright Notice in lua.h */ @@ -132,6 +132,15 @@ } +static void addfield (lua_State *L, luaL_Buffer *b, int i) { + lua_rawgeti(L, 1, i); + if (!lua_isstring(L, -1)) + luaL_error(L, "invalid value (%s) at index %d in table for " + LUA_QL("concat"), luaL_typename(L, -1), i); + luaL_addvalue(b); +} + + static int tconcat (lua_State *L) { luaL_Buffer b; size_t lsep; @@ -141,13 +150,12 @@ i = luaL_optint(L, 3, 1); last = luaL_opt(L, luaL_checkint, 4, luaL_getn(L, 1)); luaL_buffinit(L, &b); - for (; i <= last; i++) { - lua_rawgeti(L, 1, i); - luaL_argcheck(L, lua_isstring(L, -1), 1, "table contains non-strings"); - luaL_addvalue(&b); - if (i != last) - luaL_addlstring(&b, sep, lsep); + for (; i < last; i++) { + addfield(L, &b, i); + luaL_addlstring(&b, sep, lsep); } + if (i == last) /* add last value (if interval was not empty) */ + addfield(L, &b, i); luaL_pushresult(&b); return 1; } Modified: freeswitch/trunk/src/mod/languages/mod_lua/lua/lua.h ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_lua/lua/lua.h (original) +++ freeswitch/trunk/src/mod/languages/mod_lua/lua/lua.h Tue Oct 21 15:39:57 2008 @@ -1,5 +1,5 @@ /* -** $Id: lua.h,v 1.218.1.4 2008/01/03 15:41:15 roberto Exp $ +** $Id: lua.h,v 1.218.1.5 2008/08/06 13:30:12 roberto Exp $ ** Lua - An Extensible Extension Language ** Lua.org, PUC-Rio, Brazil (http://www.lua.org) ** See Copyright Notice at the end of this file @@ -17,7 +17,7 @@ #define LUA_VERSION "Lua 5.1" -#define LUA_RELEASE "Lua 5.1.3" +#define LUA_RELEASE "Lua 5.1.4" #define LUA_VERSION_NUM 501 #define LUA_COPYRIGHT "Copyright (C) 1994-2008 Lua.org, PUC-Rio" #define LUA_AUTHORS "R. Ierusalimschy, L. H. de Figueiredo & W. Celes" Modified: freeswitch/trunk/src/mod/languages/mod_lua/lua/luaconf.h ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_lua/lua/luaconf.h (original) +++ freeswitch/trunk/src/mod/languages/mod_lua/lua/luaconf.h Tue Oct 21 15:39:57 2008 @@ -1,5 +1,5 @@ /* -** $Id: luaconf.h,v 1.82.1.6 2008/01/18 17:07:48 roberto Exp $ +** $Id: luaconf.h,v 1.82.1.7 2008/02/11 16:25:08 roberto Exp $ ** Configuration file for Lua ** See Copyright Notice in lua.h */ @@ -91,7 +91,7 @@ ".\\?.lua;" LUA_LDIR"?.lua;" LUA_LDIR"?\\init.lua;" \ LUA_CDIR"?.lua;" LUA_CDIR"?\\init.lua" #define LUA_CPATH_DEFAULT \ - ".\\?.dll;" LUA_CDIR"?.dll;" LUA_CDIR"loadall.dll" + ".\\?.dll;" ".\\?51.dll;" LUA_CDIR"?.dll;" LUA_CDIR"?51.dll;" LUA_CDIR"clibs\\?.dll;" LUA_CDIR"clibs\\?51.dll;" LUA_CDIR"loadall.dll;" LUA_CDIR"clibs\\loadall.dll" #else #define LUA_ROOT "/usr/local/" @@ -101,7 +101,7 @@ "./?.lua;" LUA_LDIR"?.lua;" LUA_LDIR"?/init.lua;" \ LUA_CDIR"?.lua;" LUA_CDIR"?/init.lua" #define LUA_CPATH_DEFAULT \ - "./?.so;" LUA_CDIR"?.so;" LUA_CDIR"loadall.so" + "./?.so;" "./lib?51.so;" LUA_CDIR"?.so;" LUA_CDIR"lib?51.so;" LUA_CDIR"loadall.so" #endif @@ -440,10 +440,10 @@ @* can use. ** CHANGE it if you need lots of (Lua) stack space for your C ** functions. This limit is arbitrary; its only purpose is to stop C -** functions to consume unlimited stack space. +** functions to consume unlimited stack space. (must be smaller than +** -LUA_REGISTRYINDEX) */ -#define LUAI_MCS_AUX ((int)(INT_MAX / (4*sizeof(LUA_NUMBER)))) -#define LUAI_MAXCSTACK (LUAI_MCS_AUX > SHRT_MAX ? SHRT_MAX : LUAI_MCS_AUX) +#define LUAI_MAXCSTACK 8000 Modified: freeswitch/trunk/src/mod/languages/mod_lua/lua/lundump.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_lua/lua/lundump.c (original) +++ freeswitch/trunk/src/mod/languages/mod_lua/lua/lundump.c Tue Oct 21 15:39:57 2008 @@ -1,5 +1,5 @@ /* -** $Id: lundump.c,v 2.7.1.2 2008/01/18 16:39:11 roberto Exp $ +** $Id: lundump.c,v 2.7.1.4 2008/04/04 19:51:41 roberto Exp $ ** load precompiled Lua chunks ** See Copyright Notice in lua.h */ @@ -48,7 +48,6 @@ static void LoadBlock(LoadState* S, void* b, size_t size) { size_t r=luaZ_read(S->Z,b,size); - UNUSED(r); IF (r!=0, "unexpected end"); } @@ -115,7 +114,7 @@ setnilvalue(o); break; case LUA_TBOOLEAN: - setbvalue(o,LoadChar(S)); + setbvalue(o,LoadChar(S)!=0); break; case LUA_TNUMBER: setnvalue(o,LoadNumber(S)); @@ -161,7 +160,9 @@ static Proto* LoadFunction(LoadState* S, TString* p) { - Proto* f=luaF_newproto(S->L); + Proto* f; + if (++S->L->nCcalls > LUAI_MAXCCALLS) error(S,"code too deep"); + f=luaF_newproto(S->L); setptvalue2s(S->L,S->L->top,f); incr_top(S->L); f->source=LoadString(S); if (f->source==NULL) f->source=p; f->linedefined=LoadInt(S); @@ -175,6 +176,7 @@ LoadDebug(S,f); IF (!luaG_checkcode(f), "bad code"); S->L->top--; + S->L->nCcalls--; return f; }

1 0

[commit] r10099 - in freeswitch/trunk/src/mod: applications/mod_commands endpoints/mod_sofia
by Freeswitch SVN 21 Oct '08

21 Oct '08

Author: anthm Date: Tue Oct 21 15:19:49 2008 New Revision: 10099 Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Log: add tab complete Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c (original) +++ freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Tue Oct 21 15:19:49 2008 @@ -2870,8 +2870,11 @@ switch_console_set_complete("add fsctl shutdown"); switch_console_set_complete("add fsctl shutdown restart"); switch_console_set_complete("add fsctl shutdown elegant"); + switch_console_set_complete("add fsctl shutdown asap"); switch_console_set_complete("add fsctl shutdown elegant restart"); switch_console_set_complete("add fsctl shutdown restart elegant"); + switch_console_set_complete("add fsctl shutdown asap restart"); + switch_console_set_complete("add fsctl shutdown restart asap"); switch_console_set_complete("add fsctl shutdown cancel"); switch_console_set_complete("add fsctl sps"); switch_console_set_complete("add fsctl sync_clock"); Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Tue Oct 21 15:19:49 2008 @@ -1087,7 +1087,7 @@ const char *invite_params = switch_channel_get_variable(tech_pvt->channel, "sip_invite_params"); if (switch_strlen_zero(tech_pvt->dest)) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "URL Error! [%s]\n", tech_pvt->dest); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "URL Error!\n"); return SWITCH_STATUS_FALSE; }

1 0

[commit] r10098 - freeswitch/trunk/src
by Freeswitch SVN 21 Oct '08

21 Oct '08

Author: brian Date: Tue Oct 21 15:18:40 2008 New Revision: 10098 Modified: freeswitch/trunk/src/switch_channel.c Log: use the define for this Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Tue Oct 21 15:18:40 2008 @@ -1501,7 +1501,7 @@ switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, NULL, SWITCH_LOG_NOTICE, "Pre-Answer %s!\n", channel->name); switch_channel_set_flag(channel, CF_EARLY_MEDIA); - switch_channel_set_variable(channel, "endpoint_disposition", "EARLY MEDIA"); + switch_channel_set_variable(channel, SWITCH_ENDPOINT_DISPOSITION_VARIABLE, "EARLY MEDIA"); if (switch_event_create(&event, SWITCH_EVENT_CHANNEL_PROGRESS_MEDIA) == SWITCH_STATUS_SUCCESS) { switch_channel_event_set_data(channel, event); switch_event_fire(&event); @@ -1649,7 +1649,7 @@ } } - switch_channel_set_variable(channel, "endpoint_disposition", "ANSWER"); + switch_channel_set_variable(channel, SWITCH_ENDPOINT_DISPOSITION_VARIABLE, "ANSWER"); switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, NULL, SWITCH_LOG_NOTICE, "Channel [%s] has been answered\n", channel->name); if ((var = switch_channel_get_variable(channel, SWITCH_CHANNEL_EXECUTE_ON_ANSWER_VARIABLE)) && !switch_strlen_zero(var)) { char *arg = NULL;

1 0

[commit] r10097 - in freeswitch/trunk/src: . include mod/applications/mod_commands
by Freeswitch SVN 21 Oct '08

21 Oct '08

Author: anthm Date: Tue Oct 21 15:05:25 2008 New Revision: 10097 Modified: freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c freeswitch/trunk/src/switch_core.c Log: add some stuff Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Tue Oct 21 15:05:25 2008 @@ -1224,7 +1224,9 @@ SCSC_MAX_DTMF_DURATION, SCSC_DEFAULT_DTMF_DURATION, SCSC_SHUTDOWN_ELEGANT, - SCSC_CANCEL_SHUTDOWN + SCSC_SHUTDOWN_ASAP, + SCSC_CANCEL_SHUTDOWN, + SCSC_SEND_SIGHUP } switch_session_ctl_t; typedef struct apr_pool_t switch_memory_pool_t; Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c (original) +++ freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Tue Oct 21 15:05:25 2008 @@ -709,7 +709,7 @@ return SWITCH_STATUS_SUCCESS; } -#define CTL_SYNTAX "[hupall|pause|resume|shutdown [cancel|elegant|restart]|sps|sync_clock|reclaim_mem|max_sessions|max_dtmf_duration [num]|loglevel [level]]" +#define CTL_SYNTAX "[send_sighup|hupall|pause|resume|shutdown [cancel|elegant|asap|restart]|sps|sync_clock|reclaim_mem|max_sessions|max_dtmf_duration [num]|loglevel [level]]" SWITCH_STANDARD_API(ctl_function) { int argc; @@ -732,6 +732,10 @@ arg = 1; switch_core_session_ctl(SCSC_PAUSE_INBOUND, &arg); stream->write_function(stream, "+OK\n"); + } else if (!strcasecmp(argv[0], "send_sighup")) { + arg = 1; + switch_core_session_ctl(SCSC_SEND_SIGHUP, &arg); + stream->write_function(stream, "+OK\n"); } else if (!strcasecmp(argv[0], "resume")) { arg = 0; switch_core_session_ctl(SCSC_PAUSE_INBOUND, &arg); @@ -748,6 +752,8 @@ break; } else if (!strcasecmp(argv[x], "elegant")) { command = SCSC_SHUTDOWN_ELEGANT; + } else if (!strcasecmp(argv[x], "asap")) { + command = SCSC_SHUTDOWN_ASAP; } else if (!strcasecmp(argv[x], "restart")) { arg = 1; } @@ -1789,25 +1795,6 @@ return status; } -static void sch_api_callback(switch_scheduler_task_t *task) -{ - char *cmd, *arg = NULL; - switch_stream_handle_t stream = { 0 }; - - switch_assert(task); - - cmd = (char *) task->cmd_arg; - - if ((arg = strchr(cmd, ' '))) { - *arg++ = '\0'; - } - - SWITCH_STANDARD_STREAM(stream); - switch_api_execute(cmd, arg, NULL, &stream); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Command %s(%s):\n%s\n", cmd, switch_str_nil(arg), switch_str_nil((char *) stream.data)); - switch_safe_free(stream.data); -} - SWITCH_STANDARD_API(sched_del_function) { uint32_t cnt = 0; @@ -1879,14 +1866,65 @@ return SWITCH_STATUS_SUCCESS; } +struct api_task { + uint32_t recur; + char cmd[]; +}; + +static void sch_api_callback(switch_scheduler_task_t *task) +{ + char *cmd, *arg = NULL; + switch_stream_handle_t stream = { 0 }; + struct api_task *api_task = (struct api_task *) task->cmd_arg; + switch_assert(task); + + cmd = strdup(api_task->cmd); + switch_assert(cmd); + + if ((arg = strchr(cmd, ' '))) { + *arg++ = '\0'; + } + + SWITCH_STANDARD_STREAM(stream); + switch_api_execute(cmd, arg, NULL, &stream); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Command %s(%s):\n%s\n", cmd, switch_str_nil(arg), switch_str_nil((char *) stream.data)); + switch_safe_free(stream.data); + switch_safe_free(cmd); + + if (api_task->recur) { + task->runtime = switch_timestamp(NULL) + api_task->recur; + } + + +} + +#define UNSCHED_SYNTAX "<task_id>" +SWITCH_STANDARD_API(unsched_api_function) +{ + uint32_t id; + + if (!cmd) { + stream->write_function(stream, "-ERR Invalid syntax. USAGE: %s\n", UNSCHED_SYNTAX); + return SWITCH_STATUS_SUCCESS; + } + + if ((id = (uint32_t) atol(cmd))) { + stream->write_function(stream, "%s\n", switch_scheduler_del_task_id(id) ? "+OK" : "-ERR no such id"); + } + + return SWITCH_STATUS_SUCCESS; +} + +#define SCHED_SYNTAX "[+@]<time> <group_name> <command_string>" SWITCH_STANDARD_API(sched_api_function) { char *tm = NULL, *dcmd, *group; time_t when; - + struct api_task *api_task = NULL; + uint32_t recur = 0; + if (!cmd) { - stream->write_function(stream, "-ERR Invalid syntax\n"); - return SWITCH_STATUS_SUCCESS; + goto bad; } tm = strdup(cmd); switch_assert(tm != NULL); @@ -1899,21 +1937,32 @@ if ((dcmd = strchr(group, ' '))) { *dcmd++ = '\0'; + if (*tm == '+') { when = switch_timestamp(NULL) + atol(tm + 1); + } else if (*tm == '@') { + recur = (uint32_t) atol(tm + 1); + when = switch_timestamp(NULL) + recur; } else { when = atol(tm); } - id = switch_scheduler_add_task(when, sch_api_callback, (char *) __SWITCH_FUNC__, group, 0, strdup(dcmd), SSHF_FREE_ARG); + switch_zmalloc(api_task, sizeof(*api_task) + strlen(dcmd) + 1); + switch_copy_string(api_task->cmd, dcmd, strlen(dcmd)); + api_task->recur = recur; + + id = switch_scheduler_add_task(when, sch_api_callback, (char *) __SWITCH_FUNC__, group, 0, api_task, SSHF_FREE_ARG); stream->write_function(stream, "+OK Added: %u\n", id); goto good; } } - stream->write_function(stream, "-ERR Invalid syntax\n"); + bad: + + stream->write_function(stream, "-ERR Invalid syntax. USAGE: %s\n", SCHED_SYNTAX); good: + switch_safe_free(tm); return SWITCH_STATUS_SUCCESS; } @@ -2837,7 +2886,8 @@ SWITCH_ADD_API(commands_api_interface, "sched_transfer", "Schedule a broadcast event to a running call", sched_transfer_function, SCHED_TRANSFER_SYNTAX); SWITCH_ADD_API(commands_api_interface, "create_uuid", "Create a uuid", uuid_function, UUID_SYNTAX); - SWITCH_ADD_API(commands_api_interface, "sched_api", "Schedule an api command", sched_api_function, "[+]<time> <group_name> <command_string>"); + SWITCH_ADD_API(commands_api_interface, "sched_api", "Schedule an api command", sched_api_function, SCHED_SYNTAX); + SWITCH_ADD_API(commands_api_interface, "unsched_api", "Unschedule an api command", unsched_api_function, UNSCHED_SYNTAX); SWITCH_ADD_API(commands_api_interface, "bgapi", "Execute an api command in a thread", bgapi_function, "<command>[ <arg>]"); SWITCH_ADD_API(commands_api_interface, "sched_del", "Delete a Scheduled task", sched_del_function, "<task_id>|<group_id>"); SWITCH_ADD_API(commands_api_interface, "xml_wrap", "Wrap another api command in xml", xml_wrap_api_function, "<command> <args>"); Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Tue Oct 21 15:05:25 2008 @@ -1295,6 +1295,9 @@ } switch (cmd) { + case SCSC_SEND_SIGHUP: + handle_SIGHUP(1); + break; case SCSC_SYNC_CLOCK: switch_time_sync(); *val = 0; @@ -1313,21 +1316,29 @@ switch_clear_flag((&runtime), SCF_SHUTDOWN_REQUESTED); break; case SCSC_SHUTDOWN_ELEGANT: + case SCSC_SHUTDOWN_ASAP: { int x = 19; - + uint32_t count; + switch_set_flag((&runtime), SCF_SHUTDOWN_REQUESTED); - switch_set_flag((&runtime), SCF_NO_NEW_SESSIONS); + if (cmd == SCSC_SHUTDOWN_ASAP) { + switch_set_flag((&runtime), SCF_NO_NEW_SESSIONS); + } - while(runtime.running && switch_test_flag((&runtime), SCF_SHUTDOWN_REQUESTED) && switch_core_session_count()) { + while(runtime.running && switch_test_flag((&runtime), SCF_SHUTDOWN_REQUESTED) && (count = switch_core_session_count())) { switch_yield(500000); if (++x == 20) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Shutdown in progress.....\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, + "Shutdown in progress, %u session(s) remain.\nShutting down %s\n", + count, + cmd == SCSC_SHUTDOWN_ASAP ? "ASAP" : "Once there are no active calls."); x = 0; } } if (switch_test_flag((&runtime), SCF_SHUTDOWN_REQUESTED)) { + switch_set_flag((&runtime), SCF_NO_NEW_SESSIONS); if (*val) { switch_set_flag((&runtime), SCF_RESTART); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Restarting\n");

1 0

[commit] r10096 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 21 Oct '08

21 Oct '08

Author: anthm Date: Tue Oct 21 14:14:37 2008 New Revision: 10096 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Log: add debug message Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Tue Oct 21 14:14:37 2008 @@ -1316,6 +1316,10 @@ } route_uri = sofia_overcome_sip_uri_weakness(tech_pvt->session, route_uri, 0, SWITCH_TRUE, NULL); + } + + + if (route_uri) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s Setting proxy route to %s\n", route_uri, switch_channel_get_name(channel)); }

1 0

[commit] r10095 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 21 Oct '08

21 Oct '08

Author: anthm Date: Tue Oct 21 14:13:35 2008 New Revision: 10095 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Log: add debug message Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Tue Oct 21 14:13:35 2008 @@ -1316,6 +1316,7 @@ } route_uri = sofia_overcome_sip_uri_weakness(tech_pvt->session, route_uri, 0, SWITCH_TRUE, NULL); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s Setting proxy route to %s\n", route_uri, switch_channel_get_name(channel)); } nua_invite(tech_pvt->nh,

1 0

[commit] r10094 - freeswitch/trunk/src
by Freeswitch SVN 21 Oct '08

21 Oct '08

Author: anthm Date: Tue Oct 21 14:04:20 2008 New Revision: 10094 Modified: freeswitch/trunk/src/switch_rtp.c Log: even more room for t38 Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Tue Oct 21 14:04:20 2008 @@ -1275,7 +1275,7 @@ return_cng_frame(); } - if (bytes && bytes < 8) { + if (bytes && bytes < 5) { continue; }

1 0

[commit] r10093 - freeswitch/trunk/src/mod/applications/mod_commands
by Freeswitch SVN 21 Oct '08

21 Oct '08

Author: anthm Date: Tue Oct 21 13:41:55 2008 New Revision: 10093 Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Log: add all modifier to break command Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c (original) +++ freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Tue Oct 21 13:41:55 2008 @@ -1604,11 +1604,12 @@ return SWITCH_STATUS_SUCCESS; } -#define BREAK_SYNTAX "<uuid>" +#define BREAK_SYNTAX "<uuid> [all]" SWITCH_STANDARD_API(break_function) { switch_core_session_t *psession = NULL; - + char *mycmd, *flag; + if (session) { return SWITCH_STATUS_FALSE; } @@ -1618,11 +1619,22 @@ return SWITCH_STATUS_SUCCESS; } - if (!(psession = switch_core_session_locate(cmd))) { + mycmd = strdup(cmd); + switch_assert(mycmd); + + if ((flag = strchr(mycmd, ' '))) { + *flag++ = '\0'; + } + + if (!(psession = switch_core_session_locate(mycmd))) { stream->write_function(stream, "-ERR No Such Channel!\n"); return SWITCH_STATUS_SUCCESS; } + if (flag && !strcasecmp(flag, "all")) { + switch_core_session_flush_private_events(session); + } + switch_channel_set_flag(switch_core_session_get_channel(psession), CF_BREAK); switch_core_session_rwunlock(psession);

1 0

[commit] r10092 - freeswitch/trunk/src
by Freeswitch SVN 21 Oct '08

21 Oct '08

Author: anthm Date: Tue Oct 21 13:16:39 2008 New Revision: 10092 Modified: freeswitch/trunk/src/switch_rtp.c Log: make room for t38 packets Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Tue Oct 21 13:16:39 2008 @@ -980,7 +980,7 @@ switch_set_flag(rtp_session, SWITCH_RTP_FLAG_BREAK); if (rtp_session->sock_input) { - char o[8] = "PING..."; + char o[4] = "DOH"; switch_size_t len = sizeof(o); switch_socket_sendto(rtp_session->sock_input, rtp_session->local_addr, 0, (void *) o, &len); @@ -1275,7 +1275,7 @@ return_cng_frame(); } - if (bytes && bytes <= 12) { + if (bytes && bytes < 8) { continue; }

1 0