diff options
| author | Steve Murphy <murf@digium.com> | 2007-08-29 20:55:40 +0000 |
|---|---|---|
| committer | Steve Murphy <murf@digium.com> | 2007-08-29 20:55:40 +0000 |
| commit | b5cd67adc3af2c42f39cfe01a2f2d318f47103f4 (patch) | |
| tree | d08154c0eafb287f12d6b28ce99eea6938c21ce8 /channels/chan_iax2.c | |
| parent | 8a6c04a0a97cdfcbe6c7d577601c697f7ba0b4c9 (diff) | |
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
Diffstat (limited to 'channels/chan_iax2.c')
| -rw-r--r-- | channels/chan_iax2.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index 73bac9101..bc6f68661 100644 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -5225,7 +5225,7 @@ static int check_access(int callno, struct sockaddr_in *sin, struct iax_ies *ies /* We found our match (use the first) */ /* copy vars */ for (v = user->vars ; v ; v = v->next) { - if((tmpvar = ast_variable_new(v->name, v->value))) { + if((tmpvar = ast_variable_new(v->name, v->value, v->file))) { tmpvar->next = iaxs[callno]->vars; iaxs[callno]->vars = tmpvar; } @@ -9741,7 +9741,7 @@ static struct iax2_user *build_user(const char *name, struct ast_variable *v, st if (varname && (varval = strchr(varname,'='))) { *varval = '\0'; varval++; - if((tmpvar = ast_variable_new(varname, varval))) { + if((tmpvar = ast_variable_new(varname, varval, ""))) { tmpvar->next = user->vars; user->vars = tmpvar; } |