diff options
Diffstat (limited to 'kernel/xpp/utils/xpp_sync')
| -rwxr-xr-x | kernel/xpp/utils/xpp_sync | 26 |
1 files changed, 7 insertions, 19 deletions
diff --git a/kernel/xpp/utils/xpp_sync b/kernel/xpp/utils/xpp_sync index d5b340a..2840271 100755 --- a/kernel/xpp/utils/xpp_sync +++ b/kernel/xpp/utils/xpp_sync @@ -51,21 +51,9 @@ sub get_sorted_xpds() { push(@good_xpds, $xpd); } } - my @pri_nt_xpds = grep { $_->type =~ /(E1|T1|J1)_NT/; } @good_xpds; - my @pri_te_xpds = grep { $_->type =~ /(E1|T1|J1)_TE/; } @good_xpds; - my @bri_nt_xpds = grep { $_->type eq 'BRI_NT'; } @good_xpds; - my @bri_te_xpds = grep { $_->type eq 'BRI_TE'; } @good_xpds; - my @fxo_xpds = grep { $_->type eq 'FXO'; } @good_xpds; - my @fxs_xpds = grep { $_->type eq 'FXS'; } @good_xpds; - - # Sync Priority - return - @pri_te_xpds, - @bri_te_xpds, - @fxo_xpds, - @pri_nt_xpds, - @bri_nt_xpds, - @fxs_xpds; + my @xpd_prio = Zaptel::Xpp::Xpd::xpds_by_rank(@good_xpds); + #Zaptel::Xpp::Xpd::show_xpd_rank(@xpd_prio); + return @xpd_prio; } sub do_select(@) { @@ -108,7 +96,7 @@ sub show_sync() { my $xpdstr = '[ ' . $xbus->pretty_xpds . ' ]'; my $label = '[' . $xbus->label() . ']'; my $connector = '(' . $xbus->connector . ')'; - my $mark = ($curr_sync =~ /\d+/ and $xbus->num == $curr_sync)?"+":""; + my $mark = ($curr_sync =~ /^\d+$/ and $xbus->num == $curr_sync)?"+":""; my $padding = ' ' x (40 - length $xpdstr); printf " %1s %s %-25s %-14s %s\n", $mark, $xbus->name, $connector, $label, $xpdstr; } @@ -131,7 +119,7 @@ END } } -if($sync) { +if(defined $sync) { if($autoselect) { do_select(@sync_xpds); } else { @@ -207,8 +195,8 @@ In this example we see that the recommended xpp sync master is XBUS-02 - it is the first on the list. It is also the actual syncer, as we can see from the '+' beside it. -xpp_sync is normally called from both the zaptel init.d script and the -the Astribank udev script. The parameter it is called with defaults to +xpp_sync is normally called from the zaptel init.d script. +The parameter it is called with defaults to I<auto>, but it is possible to override that parameter (e.g: set it to I<zaptel>) through the value of XPP_SYNC in either /etc/defualt/zaptel or /etc/sysconfig/zaptel . |