← Back to branch summary

~ubuntu-branches/ubuntu/saucy/dahdi-tools/saucy

« back to all changes in this revision

Viewing changes to dahdi_scan.c

  • Committer: Bazaar Package Importer
  • Author(s): Jean-Michel Dault, Tzafrir Cohen
  • Date: 2010-02-16 13:44:09 UTC
  • mfrom: (1.1.2 upstream) (2.1.1 squeeze)
  • Revision ID: james.westby@ubuntu.com-20100216134409-4y4k26mgzyra537o
Tags: 1:2.2.1-0ubuntu1
http://bugs.debian.org/536257
http://bugs.debian.org/564381
* Merge from Debian pkg-voip.
  * Changes from Debian:
  - debian/control: Change Maintainer
  - debian/control: Removed Uploaders field.
  - debian/control: Removed Debian Vcs-Svn entry and replaced with
      ubuntu-voip Vcs-Bzr, to reflect divergence in packages.
  - debian/control: Package dahdi Depends on  dahdi-dkms | dahdi-source

* From Debian pkg-voip:
[ Tzafrir Cohen ]
* New upstream release (Closes: #536257, #564381).
* Patch 'bashism' dropped: merged upstream. 
* Patch xpp_no_extra_at dropped: merged upstream. 
* Add an example genconf_parameters.
* Compat level 7.
* Bump standars version to 3.8.3.0 (no change needed)
* Udev rules are now in dahdi-linux.
* Patches perl_fix_noserial, perl_fix_transportdir: Fixes for some
  minor perl issues.
* Add the missing ${misc:Depends}, as per lintian. 
* Patch astribank_allow_ignoreend: an extra missing patch from upstream. 
* Patches init_unload_modules and init_unload_oslec: also unload OSLEC
  when unloading all modules.

Show diffs side-by-side

added added

removed removed

Lines of Context:
dahdi_scan.c
60
60
                        span_filter[filter_count++] = s;
61
61
                }
62
62
        }
63
 
        
 
63
 
64
64
        for (x = 1; x < DAHDI_MAX_SPANS; x++) {
 
65
 
 
66
                memset(&s, 0, sizeof(s));
 
67
                s.spanno = x;
 
68
                if (ioctl(ctl, DAHDI_SPANSTAT, &s))
 
69
                        continue;
 
70
 
65
71
                if (filter_count > 0) {
66
72
                        int match = 0;
67
73
                        for (z = 0; z < filter_count; z++) {
71
77
                                }
72
78
                        }
73
79
                        if (!match) {
 
80
                                basechan += s.totalchans;
74
81
                                continue;
75
82
                        }
76
83
                }
77
 
                memset(&s, 0, sizeof(s));
78
 
                s.spanno = x;
79
 
                if (ioctl(ctl, DAHDI_SPANSTAT, &s))
80
 
                        continue;
81
84
 
82
85
                alarms[0] = '\0';
83
86
                if (s.alarms) {