sysmocom
/
asterisk
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix compiling with LOW_MEMORY. 

Modified handle_verbose to be LOW_MEMORY aware, removed old RTP related code
in chan_sip.

(closes issue #16381)
Reported by: michael_iedema
Patches: 
      ast_complete_source_filename.patch uploaded by michael iedema (license 942)
      modified by me


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@236893 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Jeff Peeler 2009-12-30 20:34:41 +00:00
parent d344d8d947
commit 1a219ad725
2 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
channels/chan_sip.c
View File

@ -2306,14 +2306,6 @@ static void temp_pvt_cleanup(void *);
/*! \brief A per-thread temporary pvt structure */
AST_THREADSTORAGE_CUSTOM(ts_temp_pvt, temp_pvt_init, temp_pvt_cleanup);
#ifdef LOW_MEMORY
static void ts_ast_rtp_destroy(void *);
AST_THREADSTORAGE_CUSTOM(ts_audio_rtp, NULL, ts_ast_rtp_destroy);
AST_THREADSTORAGE_CUSTOM(ts_video_rtp, NULL, ts_ast_rtp_destroy);
AST_THREADSTORAGE_CUSTOM(ts_text_rtp, NULL, ts_ast_rtp_destroy);
#endif
/*! \brief Authentication list for realm authentication
* \todo Move the sip_auth list to AST_LIST */
static struct sip_auth *authl = NULL;
@ -9309,15 +9301,6 @@ static int process_sdp_a_image(const char *a, struct sip_pvt *p)
return found;
}
#ifdef LOW_MEMORY
static void ts_ast_rtp_destroy(void *data)
{
struct ast_rtp *tmp = data;
ast_rtp_destroy(tmp);
}
#endif
/*! \brief Add header to SIP message */
static int add_header(struct sip_request *req, const char *var, const char *value)
{

10
main/cli.c
View File

@ -377,10 +377,18 @@ static char *handle_verbose(struct ast_cli_entry *e, int cmd, struct ast_cli_arg
case CLI_INIT:
e->command = "core set {debug|verbose}";
e->usage =
#if !defined(LOW_MEMORY)
"Usage: core set {debug|verbose} [atleast] <level> [filename]\n"
#else
"Usage: core set {debug|verbose} [atleast] <level>\n"
#endif
" core set {debug|verbose} off\n"
#if !defined(LOW_MEMORY)
" Sets level of debug or verbose messages to be displayed or \n"
" sets a filename to display debug messages from.\n"
#else
" Sets level of debug or verbose messages to be displayed.\n"
#endif
" 0 or off means no messages should be displayed.\n"
" Equivalent to -d[d[...]] or -v[v[v...]] on startup\n";
return NULL;
@ -406,8 +414,10 @@ static char *handle_verbose(struct ast_cli_entry *e, int cmd, struct ast_cli_arg
} else if (a->n == (22 - numbermatch) && a->pos == 3 && ast_strlen_zero(argv3)) {
return ast_strdup("atleast");
}
#if !defined(LOW_MEMORY)
} else if (a->pos == 4 || (a->pos == 5 && !strcasecmp(argv3, "atleast"))) {
return ast_complete_source_filename(a->pos == 4 ? S_OR(a->argv[4], "") : S_OR(a->argv[5], ""), a->n);
#endif
}
return NULL;
}