kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-19 19:52:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify the definition of http_uri_redirect such that only one allocation is

Browse Source 
done for exactly how much memory is needed.  This was suggested by Luigi on
the asterisk-dev mailing list.  Thanks!


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48933 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2006-12-24 03:29:42 +00:00
parent 0e266fbfb9
commit 5d5cc243c6
1 changed files with 15 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
main/http.c
View File

@@ -126,11 +126,9 @@ static struct {
}; };
struct http_uri_redirect { struct http_uri_redirect {
AST_DECLARE_STRING_FIELDS(
AST_STRING_FIELD(target);
AST_STRING_FIELD(dest);
);
AST_LIST_ENTRY(http_uri_redirect) entry; AST_LIST_ENTRY(http_uri_redirect) entry;
char *dest;
char target[0];
}; };
static AST_LIST_HEAD_STATIC(uri_redirects, http_uri_redirect); static AST_LIST_HEAD_STATIC(uri_redirects, http_uri_redirect);
@@ -815,7 +813,8 @@ static void add_redirect(const char *value)
{ {
char *target, *dest; char *target, *dest;
struct http_uri_redirect *redirect, *cur; struct http_uri_redirect *redirect, *cur;
unsigned int len; unsigned int target_len;
unsigned int total_len;
dest = ast_strdupa(value); dest = ast_strdupa(value);
target = strsep(&dest, "="); target = strsep(&dest, "=");
@@ -825,22 +824,21 @@ static void add_redirect(const char *value)
return; return;
} }
if (!(redirect = ast_calloc(1, sizeof(*redirect)))) target_len = strlen(target) + 1;
total_len = sizeof(*redirect) + target_len + strlen(dest) + 1;
if (!(redirect = ast_calloc(1, total_len)))
return; return;
if (ast_string_field_init(redirect, 32)) { redirect->dest = redirect->target + target_len;
free(redirect); strcpy(redirect->target, target);
return; strcpy(redirect->dest, dest);
}
ast_string_field_set(redirect, target, target);
ast_string_field_set(redirect, dest, dest);
AST_LIST_LOCK(&uri_redirects); AST_LIST_LOCK(&uri_redirects);
len = strlen(target); target_len--; /* So we can compare directly with strlen() */
if ( AST_LIST_EMPTY(&uri_redirects) if ( AST_LIST_EMPTY(&uri_redirects)
|| strlen(AST_LIST_FIRST(&uri_redirects)->target) <= len ) { || strlen(AST_LIST_FIRST(&uri_redirects)->target) <= target_len ) {
AST_LIST_INSERT_HEAD(&uri_redirects, redirect, entry); AST_LIST_INSERT_HEAD(&uri_redirects, redirect, entry);
AST_LIST_UNLOCK(&uri_redirects); AST_LIST_UNLOCK(&uri_redirects);
return; return;
@@ -848,7 +846,7 @@ static void add_redirect(const char *value)
AST_LIST_TRAVERSE(&uri_redirects, cur, entry) { AST_LIST_TRAVERSE(&uri_redirects, cur, entry) {
if ( AST_LIST_NEXT(cur, entry) if ( AST_LIST_NEXT(cur, entry)
&& strlen(AST_LIST_NEXT(cur, entry)->target) <= len ) { && strlen(AST_LIST_NEXT(cur, entry)->target) <= target_len ) {
AST_LIST_INSERT_AFTER(&uri_redirects, cur, redirect, entry); AST_LIST_INSERT_AFTER(&uri_redirects, cur, redirect, entry);
AST_LIST_UNLOCK(&uri_redirects); AST_LIST_UNLOCK(&uri_redirects);
return; return;
@@ -860,12 +858,6 @@ static void add_redirect(const char *value)
AST_LIST_UNLOCK(&uri_redirects); AST_LIST_UNLOCK(&uri_redirects);
} }
static void destroy_redirect(struct http_uri_redirect *redirect)
{
ast_string_field_free_all(redirect);
free(redirect);
}
static int __ast_http_load(int reload) static int __ast_http_load(int reload)
{ {
struct ast_config *cfg; struct ast_config *cfg;
@@ -896,7 +888,7 @@ static int __ast_http_load(int reload)
AST_LIST_LOCK(&uri_redirects); AST_LIST_LOCK(&uri_redirects);
while ((redirect = AST_LIST_REMOVE_HEAD(&uri_redirects, entry))) while ((redirect = AST_LIST_REMOVE_HEAD(&uri_redirects, entry)))
destroy_redirect(redirect); free(redirect);
AST_LIST_UNLOCK(&uri_redirects); AST_LIST_UNLOCK(&uri_redirects);
cfg = ast_config_load("http.conf"); cfg = ast_config_load("http.conf");