summaryrefslogtreecommitdiff
path: root/res
diff options
context:
space:
mode:
authorMatthew Nicholson <mnicholson@digium.com>2011-03-18 16:03:51 +0000
committerMatthew Nicholson <mnicholson@digium.com>2011-03-18 16:03:51 +0000
commita4a7e95cd54ec808fefb9a2aa5ab2befc640a613 (patch)
tree8eb2cfd914f5bbab2bae578abcdfb49550b7bde8 /res
parentd000b76ebc240f10d8640b6db1202bb55f645ebb (diff)
Merged revisions 311342 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8 ........ r311342 | mnicholson | 2011-03-18 11:02:50 -0500 (Fri, 18 Mar 2011) | 2 lines Properly populate the LOCALSTATIONID channel variable. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@311343 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'res')
-rw-r--r--res/res_fax.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/res/res_fax.c b/res/res_fax.c
index 1191658ca..785b073ae 100644
--- a/res/res_fax.c
+++ b/res/res_fax.c
@@ -932,6 +932,7 @@ static void set_channel_variables(struct ast_channel *chan, struct ast_fax_sessi
pbx_builtin_setvar_helper(chan, "FAXERROR", S_OR(details->error, NULL));
pbx_builtin_setvar_helper(chan, "FAXSTATUSSTRING", S_OR(details->resultstr, NULL));
pbx_builtin_setvar_helper(chan, "REMOTESTATIONID", S_OR(details->remotestationid, NULL));
+ pbx_builtin_setvar_helper(chan, "LOCALSTATIONID", S_OR(details->localstationid, NULL));
pbx_builtin_setvar_helper(chan, "FAXBITRATE", S_OR(details->transfer_rate, NULL));
pbx_builtin_setvar_helper(chan, "FAXRESOLUTION", S_OR(details->resolution, NULL));
@@ -1513,6 +1514,7 @@ static int receivefax_exec(struct ast_channel *chan, const char *data)
/* initialize output channel variables */
pbx_builtin_setvar_helper(chan, "FAXSTATUS", "FAILED");
pbx_builtin_setvar_helper(chan, "REMOTESTATIONID", NULL);
+ pbx_builtin_setvar_helper(chan, "LOCALSTATIONID", NULL);
pbx_builtin_setvar_helper(chan, "FAXPAGES", "0");
pbx_builtin_setvar_helper(chan, "FAXBITRATE", NULL);
pbx_builtin_setvar_helper(chan, "FAXRESOLUTION", NULL);
@@ -1974,6 +1976,7 @@ static int sendfax_exec(struct ast_channel *chan, const char *data)
/* initialize output channel variables */
pbx_builtin_setvar_helper(chan, "FAXSTATUS", "FAILED");
pbx_builtin_setvar_helper(chan, "REMOTESTATIONID", NULL);
+ pbx_builtin_setvar_helper(chan, "LOCALSTATIONID", NULL);
pbx_builtin_setvar_helper(chan, "FAXPAGES", "0");
pbx_builtin_setvar_helper(chan, "FAXBITRATE", NULL);
pbx_builtin_setvar_helper(chan, "FAXRESOLUTION", NULL);