projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
improve wholesale SS UI, RT10883
[freeside.git]
/
FS
/
bin
/
freeside-cdrrewrited
diff --git
a/FS/bin/freeside-cdrrewrited
b/FS/bin/freeside-cdrrewrited
index
d827ef7
..
0b7f688
100644
(file)
--- a/
FS/bin/freeside-cdrrewrited
+++ b/
FS/bin/freeside-cdrrewrited
@@
-24,13
+24,12
@@
daemonize2();
$conf = new FS::Conf;
$conf = new FS::Conf;
-die "not running; cdr-asterisk_forward_rewrite conf is off\n"
+die "not running; cdr-asterisk_forward_rewrite and cdr-charged_party_rewrite ".
+ " conf options are both off\n"
unless _shouldrun();
#--
unless _shouldrun();
#--
-my $domestic_prefix = 1; #hmm, global config?
-
while (1) {
#hmm... don't want to do an expensive search with an ever-growing bunch
while (1) {
#hmm... don't want to do an expensive search with an ever-growing bunch
@@
-51,13
+50,14
@@
while (1) {
) {
$found = 1;
) {
$found = 1;
+ my @status = ();
- if ( $c
dr->dstchannel =~ /^Local\/($domestic_prefix)?(\d+)/i
- && $
2
ne $cdr->dst
+ if ( $c
onf->exists('cdr-asterisk_forward_rewrite')
+ && $
cdr->dstchannel =~ /^Local\/(\d+)/i && $1
ne $cdr->dst
)
{
)
{
- my $dst = $
2
;
+ my $dst = $
1
;
warn "dst ". $cdr->dst. " does not match dstchannel $dst ".
"(". $cdr->dstchannel. "); rewriting CDR as a forwarded call";
warn "dst ". $cdr->dst. " does not match dstchannel $dst ".
"(". $cdr->dstchannel. "); rewriting CDR as a forwarded call";
@@
-66,12
+66,21
@@
while (1) {
$cdr->dst($dst);
$cdr->amaflags(2);
$cdr->dst($dst);
$cdr->amaflags(2);
- $cdr->freesiderewritestatus('asterisk_forward');
+ push @status, 'asterisk_forward';
+
+ }
+
+ if ( $conf->exists('cdr-charged_party_rewrite') && ! $cdr->charged_party ) {
+
+ $cdr->set_charged_party;
+ push @status, 'charged_party';
- } else {
- $cdr->freesiderewritestatus('skipped')
}
}
+ $cdr->freesiderewritestatus(
+ scalar(@status) ? join('/', @status) : 'skipped'
+ );
+
my $error = $cdr->replace;
if ( $error ) {
my $error = $cdr->replace;
if ( $error ) {
@@
-91,7
+100,8
@@
while (1) {
#--
sub _shouldrun {
#--
sub _shouldrun {
- $conf->exists('cdr-asterisk_forward_rewrite');
+ $conf->exists('cdr-asterisk_forward_rewrite')
+ || $conf->exists('cdr-charged_party_rewrite');
}
sub usage {
}
sub usage {
@@
-108,8
+118,9
@@
freeside-cdrrewrited - Real-time daemon for CDR rewriting
=head1 DESCRIPTION
=head1 DESCRIPTION
-Runs continuously, searches for CDRs and does forwarded-call rewriting if
-the "cdr-asterisk_forward_rewrite" option is enabled.
+Runs continuously, searches for CDRs and does forwarded-call rewriting if the
+"cdr-asterisk_forward_rewrite" or "cdr-charged_party_rewrite" config option is
+enabled.
=head1 SEE ALSO
=head1 SEE ALSO