diff options
| author | tzafrir <tzafrir@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2007-12-19 21:15:04 +0000 |
|---|---|---|
| committer | tzafrir <tzafrir@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2007-12-19 21:15:04 +0000 |
| commit | 47c37e8fb66d3f61956efcc6154828e311f1f40f (patch) | |
| tree | 40d1cce58f8b2a3b8be0ec3ae0207985e909ff14 /xpp/utils/genzaptelconf | |
| parent | 0525730accbcf75ce41cd30f3bc36a6392763c3b (diff) | |
* A few more fixes to card_pri.
* Do use "crc4" for E1 by default when generating zaptel.conf .
git-svn-id: http://svn.digium.com/svn/zaptel/branches/1.2@3540 5390a7c7-147a-4af0-8ec9-7488f05a26cb
Diffstat (limited to 'xpp/utils/genzaptelconf')
| -rwxr-xr-x | xpp/utils/genzaptelconf | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/xpp/utils/genzaptelconf b/xpp/utils/genzaptelconf index 8cbf3ed..1435e9f 100755 --- a/xpp/utils/genzaptelconf +++ b/xpp/utils/genzaptelconf @@ -699,7 +699,7 @@ detect_digital_channel() { echo 'gsm' >$tmp_dir/span_signalling ;; *TE[24]/* | *WCT1/* | *Tor2/* | *TorISA/* | *WP[TE]1/* | \ - *R[124]T1/* | *XPP_PRI*) + *R[124]T1/* | *XPP_[TEJ]1_*) # FIXME: handle cwain around here. # name: *cwain[12]/* . Always E1. @@ -755,7 +755,6 @@ write_digital_config() { eval span_$suffix=`cat $tmp_dir/span_$suffix 2>/dev/null` done - if [ "$span_yellow" != '' ]; then span_yellow=",$span_yellow"; fi # exactly the same logic is used in asterisk's chan_zap.c. # also not that $(( )) is bash-specific case "$((1+ $span_end - $span_begin))" in @@ -771,9 +770,11 @@ write_digital_config() { span_framing=ccs span_coding=hdb3 span_switchtype=euroisdn + span_yellow=crc4 fi ;; esac + if [ "$span_yellow" != '' ]; then span_yellow=",$span_yellow"; fi # Let's assume that a TE span should get the clock from the remote unit, # and NT spans should provide timing. Just as a sane default. # If we have several TE spans, the first will have priority 1, @@ -933,7 +934,7 @@ EOF echo '-1' >$tmp_dir/span_begin echo '-1' >$tmp_dir/span_end echo '0' >$tmp_dir/span_timing - echo '1' >$tmp_dir/span_lbo + echo '0' >$tmp_dir/span_lbo echo '' >$tmp_dir/span_framing echo 'ami' >$tmp_dir/span_coding echo '' >$tmp_dir/span_switchtype @@ -944,10 +945,10 @@ EOF fi # Check if ZapBRI cards are in TE or NT mode - if echo $title | egrep -q '((quad|octo)BRI PCI ISDN Card.* \[NT\]\ |octoBRI \[NT\] |HFC-S PCI A ISDN.* \[NT\] |Xorcom .* [PB]RI_NT)' + if echo $title | egrep -q '((quad|octo)BRI PCI ISDN Card.* \[NT\]\ |octoBRI \[NT\] |HFC-S PCI A ISDN.* \[NT\] |Xorcom .* (BRI|T1|E1)_NT)' then echo 'nt' >$tmp_dir/span_termtype - elif echo $title | egrep -q '((quad|octo)BRI PCI ISDN Card.* \[TE\]\ |octoBRI \[TE\] |HFC-S PCI A ISDN.* \[TE\] |Xorcom .* [PB]RI_TE)' + elif echo $title | egrep -q '((quad|octo)BRI PCI ISDN Card.* \[TE\]\ |octoBRI \[TE\] |HFC-S PCI A ISDN.* \[TE\] |Xorcom .* (BRI|T1|E1)_TE)' then echo 'te' >$tmp_dir/span_termtype fi @@ -1018,7 +1019,7 @@ EOF *ZTHFC*/* | *ztqoz*/* |*ztgsm/* |*TE[24]/* | \ *WCT1/*|*Tor2/* | *TorISA/* | \ *XPP_BRI_*/* | *WP[TE]1/* | *R[124]T1/* | \ - *XPP_[PB]RI*) + *XPP_[TE]1*/* ) detect_digital_channel "$line" "$chan_num" "$span_num" ;; '') ;; # Empty line (after span header) |