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

Span.pm: Process the /proc/dahdi/<x> files atomically.

Browse Source 
It is possible that the contents of the proc files can change while the
perl modules are in the processing of processing them.

Specifically, if lsdahdi is called on boot before the channels are
configured, the channel will be "probed" to determine if it's an FXO or
FXS channel and that can result in the output of proc changing. When the
size of proc changes, the script can get confused about where the
beginning of the next line is.

This patch reads in the proc file completely into memory first, and then
starts processing each of the lines.

This resolves the "Unrecognized garbage 'INACTIVE)' in -" that is
displayed on boot with the recent trunk of DAHDI.

Signed-off-by: Shaun Ruffell <sruffell@digium.com>
Signed-off-by: Tzafrir Cohen <tzafrir.cohen@xorcom.com>

git-svn-id: http://svn.astersk.org/svn/dahdi/tools/trunk@10040 17933a7a-c749-41c5-a318-cba88f637d49
This commit is contained in:
Shaun Ruffell 2011-07-12 23:01:02 +00:00
parent b4aa63049f
commit caa8c947b7
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
xpp/perl_modules/Dahdi/Span.pm
View File

@ -236,7 +236,8 @@ sub new($$) {
$self->{CHANS} = []; $self->{CHANS} = [];
my @channels; my @channels;
my $index = 0; my $index = 0;
while(<F>) { my @channel_lines = <F>;
foreach (@channel_lines) {
chomp; chomp;
s/^\s*//; s/^\s*//;
s/\s*$//; s/\s*$//;