FGCOM/dahdi-tools
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xpp: better dahdi_registration

Browse Source 
Improvements to the xpp tool dahdi_registration:

* Use the new xpp driver with support for dahdi_registration sysfs
  attribute in each device.

* Wait for UDEV to finish handling span assignments (via
  dahdi_waitfor_span_assignments).

* Still supports legacy drivers without this, by falling back
  to old style iterative "registration" on each xpd.

Signed-off-by: Tzafrir Cohen <tzafrir.cohen@xorcom.com>
This commit is contained in:
Oron Peled 2014-04-06 14:33:12 -04:00 committed by Tzafrir Cohen
parent b1d55683ae
commit ca09f327ed
2 changed files with 66 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
xpp/dahdi_registration
View File

@ -74,8 +74,6 @@ if(defined($on)) { # Translate to booleans
$should_output = 0 unless $verbose; $should_output = 0 unless $verbose;
} }
undef $on if $dahdi_autoreg and not $opts{'R'};
sub state2str($) { sub state2str($) {
return (shift)?"on":"off"; return (shift)?"on":"off";
} }
@ -84,38 +82,41 @@ sub myprintf {
printf @_ if $should_output; printf @_ if $should_output;
} }
my @spans = Dahdi::spans;
foreach my $xbus (Dahdi::Xpp::xbuses($sorter)) { foreach my $xbus (Dahdi::Xpp::xbuses($sorter)) {
myprintf "%-10s\t%3s-%s\t%s\n", my $prev = $xbus->dahdi_registration($on);
$xbus->name, $xbus->xpporder, $xbus->label, $xbus->connector; if(!defined($prev)) { # Failure
next unless $xbus->status eq 'CONNECTED'; printf STDERR "%s: Failed %s\n", $xbus->name, $!;
foreach my $xpd (Dahdi::Xpp::Xpd::telephony_devs($xbus->xpds())) { next;
my $prev = $xpd->dahdi_registration($on);
if(!defined($prev)) { # Failure
printf "%s: Failed %s\n", $xpd->fqn, $!;
next;
}
myprintf "\t%-10s: ", $xpd->fqn;
if(!defined($on)) { # Query only
my ($span) = grep { $_->name eq $xpd->fqn } @spans;
my $spanstr = ($span) ? ("Span " . $span->num) : "";
myprintf "%s %s\n", state2str($prev), $spanstr ;
next;
}
myprintf "%3s ==> %3s\n", state2str($prev), state2str($on);
} }
next unless defined($on) && $on; my $reg_str;
if (defined $on) {
$reg_str = ($on) ? "registering" : "unregistering";
} else {
$reg_str = ($prev) ? "registered" : "unregistered";
}
myprintf "%-10s\t%3s-%s\t%s (%s)\n",
$xbus->name, $xbus->xpporder, $xbus->label, $xbus->connector,
$reg_str;
next unless $xbus->status eq 'CONNECTED';
# Only assign if no default assignment, or forced by '-R' option # Only assign if no default assignment, or forced by '-R' option
if ($opts{'R'} || ! $default_auto_assign) { if (defined($on) && $on) {
# Emulate /etc/dahdi/assigned-spans.conf: if ($opts{'R'} || ! $default_auto_assign) {
# - We iterate over $xbus according to /etc/dahdi/xpp_order # Emulate /etc/dahdi/assigned-spans.conf:
# - We "auto" assign all spans of current $xbus # - We iterate over $xbus according to /etc/dahdi/xpp_order
my $devpath = sprintf "/sys/bus/dahdi_devices/devices/astribanks:xbus-%02d", $xbus->num; # - We "auto" assign all spans of current $xbus
myprintf "auto-assign $devpath\n"; my $devpath = sprintf "/sys/bus/dahdi_devices/devices/astribanks:xbus-%02d", $xbus->num;
my @cmd = ('dahdi_span_assignments', 'auto', $devpath); my @cmd = ('dahdi_span_assignments', 'auto', $devpath);
system @cmd; system @cmd;
warn "Failed '@cmd' (status=$?)\n" if $?; warn "Failed '@cmd' (status=$?)\n" if $?;
}
# wait for UDEV to do its stuff
system "dahdi_waitfor_span_assignments assigned";
}
foreach my $xpd (Dahdi::Xpp::Xpd::telephony_devs($xbus->xpds())) {
my $spanno = $xpd->xpd_getattr('span');
myprintf "\t%-10s: ", $xpd->fqn;
my $spanstr = ($spanno) ? ("Span " . $spanno) : "unassigned";
myprintf "%s\n", $spanstr ;
} }
} }
myprintf "# Sorted: $sort_order\n" if defined $sort_order; myprintf "# Sorted: $sort_order\n" if defined $sort_order;

34
xpp/perl_modules/Dahdi/Xpp/Xbus.pm
View File

@ -146,6 +146,40 @@ sub new($$) {
return $self; return $self;
} }
sub dahdi_registration($$) {
my $xbus = shift;
my $on = shift;
my $result;
my $file = sprintf("%s/dahdi_registration", $xbus->sysfs_dir);
# Handle old drivers without dahdi_registration xbus attribute
if (! -f $file) {
warn "Old xpp driver without dahdi_registration support. Emulating it using xpd/span support\n";
my @xpds = sort { $a->id <=> $b->id } $xbus->xpds();
my $prev;
foreach my $xpd (@xpds) {
$prev = $xpd->dahdi_registration($on);
}
return $prev;
}
# First query
open(F, "$file") or die "Failed to open $file for reading: $!";
$result = <F>;
chomp $result;
close F;
if(defined($on) and $on ne $result) { # Now change
open(F, ">$file") or die "Failed to open $file for writing: $!";
print F ($on)?"1":"0";
if(!close(F)) {
if($! == 17) { # EEXISTS
# good
} else {
undef $result;
}
}
}
return $result;
}
sub pretty_xpds($) { sub pretty_xpds($) {
my $xbus = shift; my $xbus = shift;
my @xpds = sort { $a->id <=> $b->id } $xbus->xpds(); my @xpds = sort { $a->id <=> $b->id } $xbus->xpds();