mirror of
https://github.com/asterisk/asterisk.git
synced 2025-10-24 21:50:53 +00:00
This code was in team/murf/bug8684-trunk; it should fix bug 8684 in trunk. I didn't add it to 1.4 yet, because it's not entirely clear to me if this is a bug fix or an enhancement. A lot of files were affected by small changes like ast_variable_new getting an added arg, for the file name the var was defined in; ast_category_new gets added args of filename and lineno; ast_category and ast_variable structures now record file and lineno for each entry; a list of all #include and #execs in a config file (or any of its inclusions are now kept in the ast_config struct; at save time, each entry is put back into its proper file of origin, in order. #include and #exec directives are folded in properly. Headers indicating that the file was generated, are generated also for each included file. Some changes to main/manager.c to take care of file renaming, via the UpdateConfig command. Multiple inclusions of the same file are handled by exploding these into multiple include files, uniquely named. There's probably more, but I can't remember it right now.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@81361 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -917,7 +917,7 @@ int iax_parse_ies(struct iax_ies *ies, unsigned char *data, int datalen)
|
||||
int len = strlen(var2->value) + strlen(tmp2) + 1;
|
||||
char *tmp3 = alloca(len);
|
||||
snprintf(tmp3, len, "%s%s", var2->value, tmp2);
|
||||
var = ast_variable_new(tmp, tmp3);
|
||||
var = ast_variable_new(tmp, tmp3, var2->file);
|
||||
var->next = var2->next;
|
||||
if (prev)
|
||||
prev->next = var;
|
||||
@@ -928,7 +928,7 @@ int iax_parse_ies(struct iax_ies *ies, unsigned char *data, int datalen)
|
||||
}
|
||||
}
|
||||
if (!var2) {
|
||||
var = ast_variable_new(tmp, tmp2);
|
||||
var = ast_variable_new(tmp, tmp2, "");
|
||||
var->next = ies->vars;
|
||||
ies->vars = var;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user