[zaptel-commits] tzafrir: branch tzafrir/sysfs r3305 - in /team/tzafrir/sysfs: ./ build_tools/...

[SVN commits to the Zaptel project]

Author: tzafrir
Date: Tue Dec  4 16:37:11 2007
New Revision: 3305

URL: http://svn.digium.com/view/zaptel?view=rev&rev=3305
Log:
Merged revisions 3133,3139,3143,3147,3154,3158,3161,3170,3185,3189-3190,3195,3198,3202,3206,3211,3216,3218-3221,3223,3226,3233,3242,3244-3245,3259,3264,3267,3271,3278,3280-3281,3284-3285,3290-3291,3293-3294 via svnmerge from 
http//svn.digium.com/svn/zaptel/branches/1.4

................
r3133 | mattf | 2007-10-13 00:25:46 +0200 (Sat, 13 Oct 2007) | 9 lines

Merged revisions 3132 via svnmerge from 
http//svn.digium.com/svn/zaptel/branches/1.2

........
r3132 | mattf | 2007-10-12 17:19:58 -0500 (Fri, 12 Oct 2007) | 1 line

Fix for false power alarms, as well as a clock polarity issue
........

................
r3139 | kpfleming | 2007-10-16 18:40:28 +0200 (Tue, 16 Oct 2007) | 2 lines

use latest Octasic API release

................
r3143 | tzafrir | 2007-10-16 21:17:46 +0200 (Tue, 16 Oct 2007) | 17 lines

xpp r4892:
* Zaptel/Hardware perl modules:
  - Use sysfs directly. Don't rely on lspci/lsusb.
  - Each device has a description and driver name.
  - Zaptel::Hardware::drivers() to show the list of required drivers
    for this system (see zaptel_drivers).
  - zaptel_hardware shows a description and a (suggested?) driver.
* zt_registration sorts by Serial first and only then by connector.
* USB_FW.hex replaces all the USB_11x0.hex .
  - Separate USB interface for the management processor.
  - Hence fpga_load can now work even with drivers loaded.
* Fix firmware upgrading.
* Fix manual firmware loading while auto-loading.

Merged revisions 3142 via svnmerge from 
http://svn.digium.com/svn/zaptel/branches/1.2

................
r3147 | tzafrir | 2007-10-16 22:25:29 +0200 (Tue, 16 Oct 2007) | 2 lines

Update README yet again.

................
r3154 | tzafrir | 2007-10-18 20:21:02 +0200 (Thu, 18 Oct 2007) | 9 lines

* zaptel-perl should not panic when there is no /proc/bus/usb (Closes
  #11020).
* Don't build metering by default for now.
* And this is xpp rev 4900.
* Make opermode work again.

Merged revisions 3152-3153 via svnmerge from 
http://svn.digium.com/svn/zaptel/branches/1.2

................
r3158 | tzafrir | 2007-10-18 22:32:18 +0200 (Thu, 18 Oct 2007) | 5 lines

Fix zaptel_hardware's behaviour for unknown span types.

Merged revisions 3157 via svnmerge from 
http://svn.digium.com/svn/zaptel/branches/1.2

................
r3161 | mattf | 2007-10-18 22:53:40 +0200 (Thu, 18 Oct 2007) | 1 line

Make sure we only increment timingslips when there actually are timing slips, instead of everytime we service the framer
................
r3170 | qwell | 2007-10-19 00:56:59 +0200 (Fri, 19 Oct 2007) | 12 lines

Merged revisions 3169 via svnmerge from 
http//svn.digium.com/svn/zaptel/branches/1.2

........
r3169 | qwell | 2007-10-18 17:56:14 -0500 (Thu, 18 Oct 2007) | 4 lines

Correct the name of the wct4xxp driver.

Issue 11030

........

................
r3185 | tzafrir | 2007-10-26 15:34:04 +0200 (Fri, 26 Oct 2007) | 2 lines

Remove obsolete drivers (replaced by wcusb).

................
r3189 | mattf | 2007-10-26 17:12:24 +0200 (Fri, 26 Oct 2007) | 9 lines

Merged revisions 3188 via svnmerge from 
http//svn.digium.com/svn/zaptel/branches/1.2

........
r3188 | mattf | 2007-10-26 10:08:37 -0500 (Fri, 26 Oct 2007) | 1 line

Another clock polarity update.  To fix garbage audio on some systems with the wctdm24xxp driver and VPMADT032
........

................
r3190 | tzafrir | 2007-10-26 17:36:05 +0200 (Fri, 26 Oct 2007) | 4 lines

If you depend on anything that is not in /usr/include/zaptel , you must 
build with the local zaptel.h . Otherwise you may mix two versions of
Zaptel .

................
r3195 | tzafrir | 2007-10-27 18:33:48 +0200 (Sat, 27 Oct 2007) | 3 lines

Detect SELinux support (for install target) in autoconf.
Can be manually overriden in configure or make. 

................
r3198 | tzafrir | 2007-10-28 20:26:04 +0200 (Sun, 28 Oct 2007) | 6 lines

Firmware object file building does not depend anymore on another object
to be linked into the same module. 

That dependency existed solely for checking target binary properties in 
make_firmware_object . Those properties are now checked in autoconf.

................
r3202 | tzafrir | 2007-10-31 15:10:15 +0200 (Wed, 31 Oct 2007) | 2 lines

Blocking merge of r3201 which is a backport from 1.4 .

................
r3206 | mmichelson | 2007-10-31 23:09:21 +0200 (Wed, 31 Oct 2007) | 13 lines

Merged revisions 3205 via svnmerge from 
http//svn.digium.com/svn/zaptel/branches/1.2

........
r3205 | mmichelson | 2007-10-31 16:08:15 -0500 (Wed, 31 Oct 2007) | 5 lines

Fixed potential buffer overflow.

See AST-2007-024 for more details


........

................
r3211 | mattf | 2007-11-03 18:23:20 +0200 (Sat, 03 Nov 2007) | 1 line

Major update for tc4xxp driver.  Fixes many outstanding issues related to channel lockups, etc.  It also raises the maximum channel count for g.729 to 120 channels.
................
r3216 | mattf | 2007-11-06 23:14:12 +0200 (Tue, 06 Nov 2007) | 9 lines

Merged revisions 3215 via svnmerge from 
http//svn.digium.com/svn/zaptel/branches/1.2

........
r3215 | mattf | 2007-11-06 15:13:09 -0600 (Tue, 06 Nov 2007) | 1 line

Cross port fxo line voltage monitoring patch from wctdm to wctdm24xxp
........

................
r3218 | tzafrir | 2007-11-07 17:30:30 +0200 (Wed, 07 Nov 2007) | 7 lines

* zaptel-perl, genzaptelconf: Detect and list Rhino cards.
* zaptel-perl: Fix reporting of empty slots in analog Digium cards.
* genzaptelconf: More readable case-s.

Merged revisions 3217 via svnmerge from 
http://svn.digium.com/svn/zaptel/branches/1.2

................
r3219 | tzafrir | 2007-11-07 17:32:16 +0200 (Wed, 07 Nov 2007) | 2 lines

make_firmware_object is now generated. Ignore it.

................
r3220 | tzafrir | 2007-11-07 22:18:28 +0200 (Wed, 07 Nov 2007) | 3 lines

Don't try to generate bindir and mandir if there are no binaries to 
install (this causes an invalid install command).

................
r3221 | tilghman | 2007-11-08 23:48:03 +0200 (Thu, 08 Nov 2007) | 5 lines

Add dependency on newt
Reported by: dimas
Patch by: tilghman
Closes issue #11199

................
r3223 | tzafrir | 2007-11-10 13:40:00 +0200 (Sat, 10 Nov 2007) | 6 lines

ztmonitor: Get rid of a pointless static buffer and strcpy.
And also give a more useful conversion message.

Merged revisions 3222 via svnmerge from 
http://svn.digium.com/svn/zaptel/branches/1.2

................
r3226 | tzafrir | 2007-11-11 03:22:57 +0200 (Sun, 11 Nov 2007) | 2 lines

tor2ee doesn't build. Remove it. Closes #10278.

................
r3233 | tzafrir | 2007-11-14 17:22:59 +0200 (Wed, 14 Nov 2007) | 8 lines

xpp r5010:
* Fix a deadlock spotted on some SMP installations.
* Improve (reduce) signal attenuation on FXO ports.
* Increase FXS ring detect debounce interval.

Merged revisions 3229-3232 via svnmerge from 
http://svn.digium.com/svn/zaptel/branches/1.2

................
r3242 | mattf | 2007-11-22 00:51:25 +0200 (Thu, 22 Nov 2007) | 9 lines

Merged revisions 3241 via svnmerge from 
http//svn.digium.com/svn/zaptel/branches/1.2

........
r3241 | mattf | 2007-11-21 16:45:32 -0600 (Wed, 21 Nov 2007) | 1 line

Transcoder driver updates.  Fixes G.723 no audio issues with latest drivers
........

................
r3244 | mattf | 2007-11-22 01:52:50 +0200 (Thu, 22 Nov 2007) | 9 lines

Merged revisions 3243 via svnmerge from 
http//svn.digium.com/svn/zaptel/branches/1.2

........
r3243 | mattf | 2007-11-21 17:51:48 -0600 (Wed, 21 Nov 2007) | 1 line

Add new product support
........

................
r3245 | mattf | 2007-11-22 02:29:11 +0200 (Thu, 22 Nov 2007) | 1 line

Make sure that's disabled until I retest that
................
r3259 | file | 2007-11-29 00:53:54 +0200 (Thu, 29 Nov 2007) | 14 lines

Merged revisions 3258 via svnmerge from 
http//svn.digium.com/svn/zaptel/branches/1.2

........
r3258 | file | 2007-11-28 18:52:54 -0400 (Wed, 28 Nov 2007) | 6 lines

Pass the correct variable to sizeof when copying the driver name.
(closes issue #11352)
Reported by: brettcar
Patches:
      ztdynamic.c.patch uploaded by eliel (license 64)

........

................
r3264 | mattf | 2007-11-30 22:19:40 +0200 (Fri, 30 Nov 2007) | 9 lines

Merged revisions 3263 via svnmerge from 
http//svn.digium.com/svn/zaptel/branches/1.2

........
r3263 | mattf | 2007-11-30 14:17:42 -0600 (Fri, 30 Nov 2007) | 1 line

Make sure we only disable irqs during octasic firmware load only if we have 4K stacks
........

................
r3267 | kpfleming | 2007-11-30 23:54:31 +0200 (Fri, 30 Nov 2007) | 2 lines

populate the 'irq' member of the span structure since it is there

................
r3271 | sruffell | 2007-12-01 02:06:04 +0200 (Sat, 01 Dec 2007) | 4 lines

Delete the old kernel modules before installing the new ones.  
Prevents conflicts in case the location of the driver changes 
when upgrading from an older version of the driver.

................
r3278 | kpfleming | 2007-12-04 15:55:19 +0200 (Tue, 04 Dec 2007) | 19 lines

add a new Zaptel scanning tool, primarily for use by the Asterisk GUI, called 'ztscan'. this tool outputs an Asterisk-style
configuration file containing one context for each Zaptel span with all the details that can be learned about that span. to
enable this tool, the ZT_SPANSTAT ioctl gained a number of new elements to report information about the spans:
  - linecompat (available signaling modes for digital spans)
  - spantype (T1, E1 or J1 for digital spans)
  - location (PCI/PCI-Express location)
  - manufacturer
  - devicetype

Along the way I also found that the digital span drivers always set T1-style signaling bits in 'linecompat' even for E1 spans,
and that the ZT_SPANCONFIG ioctl did not properly check these bits when configuring E1 spans. The result of this is that it was
possible to configure T1-only coding/framing (AMI/B8Zs, D4/ESF) on E1 spans (but not the reverse); this has been corrected and
any attempt to use T1-only coding/framing on E1 spans will now result in an error from ztcfg.

Also did some minor simplification of the Makefile rules that build the userspace tools.

(the basics of ztscan were written by Brandon Kruse then reworked and fleshed out by me)


................
r3280 | kpfleming | 2007-12-04 16:01:17 +0200 (Tue, 04 Dec 2007) | 2 lines

forgot to add 'ztscan' to the menuselect tree

................
r3281 | kpfleming | 2007-12-04 16:48:23 +0200 (Tue, 04 Dec 2007) | 4 lines

use a buffer for the span's device type instead of a string pointer, so each spans can have dynamically set device types instead of constant strings

also fix up some string creation and copying to be safe against buffer overflows

................
r3284 | kpfleming | 2007-12-04 17:01:51 +0200 (Tue, 04 Dec 2007) | 2 lines

when reporting devicetype for TE2xx and TE4xx cards, include the presence or absence of a VPM in the result

................
r3285 | kpfleming | 2007-12-04 17:05:50 +0200 (Tue, 04 Dec 2007) | 2 lines

when reporting devicetype for all cards supported by the wctdm24xxp, including the presence of a VPM in the result

................
r3290 | kpfleming | 2007-12-04 19:41:52 +0200 (Tue, 04 Dec 2007) | 2 lines

fix a bunch of silly bugs and do some code cleanup

................
r3291 | kpfleming | 2007-12-04 19:53:40 +0200 (Tue, 04 Dec 2007) | 2 lines

eliminate the 'general' section from the ztscan output, as it doesn't contain anything the GUI needs and one user is concerned about the 'totalspans' number having to be kept in sync if the output is edited

................
r3293 | tzafrir | 2007-12-04 20:01:23 +0200 (Tue, 04 Dec 2007) | 2 lines

Fix the case of: make zttool.o zttool

................
r3294 | kpfleming | 2007-12-04 20:13:04 +0200 (Tue, 04 Dec 2007) | 2 lines

the analog card drivers can now mark failed modules as 'broken', and ztscan can output that information

................

Added:
    team/tzafrir/sysfs/build_tools/make_firmware_object.in
      - copied unchanged from r3304, branches/1.4/build_tools/make_firmware_object.in
    team/tzafrir/sysfs/xpp/Changelog_xpp
      - copied unchanged from r3304, branches/1.4/xpp/Changelog_xpp
    team/tzafrir/sysfs/xpp/firmwares/USB_FW.hex
      - copied unchanged from r3304, branches/1.4/xpp/firmwares/USB_FW.hex
    team/tzafrir/sysfs/xpp/utils/zaptel_drivers
      - copied unchanged from r3304, branches/1.4/xpp/utils/zaptel_drivers
    team/tzafrir/sysfs/ztscan.c
      - copied unchanged from r3302, branches/1.4/ztscan.c
Removed:
    team/tzafrir/sysfs/build_tools/make_firmware_object
    team/tzafrir/sysfs/tor2ee.c
    team/tzafrir/sysfs/wcfxsusb.c
    team/tzafrir/sysfs/wcfxsusb.h
    team/tzafrir/sysfs/xpp/ChangeLog
    team/tzafrir/sysfs/xpp/firmwares/USB_1130.hex
    team/tzafrir/sysfs/xpp/firmwares/USB_1140.hex
    team/tzafrir/sysfs/xpp/firmwares/USB_1150.hex
Modified:
    team/tzafrir/sysfs/   (props changed)
    team/tzafrir/sysfs/Makefile
    team/tzafrir/sysfs/README
    team/tzafrir/sysfs/build_tools/   (props changed)
    team/tzafrir/sysfs/configure
    team/tzafrir/sysfs/configure.ac
    team/tzafrir/sysfs/firmware/Makefile
    team/tzafrir/sysfs/makeopts.in
    team/tzafrir/sysfs/sethdlc-new.c
    team/tzafrir/sysfs/sethdlc.c
    team/tzafrir/sysfs/tor2.c
    team/tzafrir/sysfs/torisa.c
    team/tzafrir/sysfs/wcfxo.c
    team/tzafrir/sysfs/wct1xxp.c
    team/tzafrir/sysfs/wct4xxp/base.c
    team/tzafrir/sysfs/wct4xxp/vpm450m.c
    team/tzafrir/sysfs/wctc4xxp/base.c
    team/tzafrir/sysfs/wctdm.c
    team/tzafrir/sysfs/wctdm24xxp/base.c
    team/tzafrir/sysfs/wctdm24xxp/wctdm24xxp.h
    team/tzafrir/sysfs/wcte11xp.c
    team/tzafrir/sysfs/wcte12xp.c
    team/tzafrir/sysfs/wcusb.c
    team/tzafrir/sysfs/wcusb.h
    team/tzafrir/sysfs/xpp/.version
    team/tzafrir/sysfs/xpp/Makefile
    team/tzafrir/sysfs/xpp/README.Astribank
    team/tzafrir/sysfs/xpp/card_fxo.c
    team/tzafrir/sysfs/xpp/card_fxs.c
    team/tzafrir/sysfs/xpp/card_pri.c
    team/tzafrir/sysfs/xpp/init_card_3_29
    team/tzafrir/sysfs/xpp/init_card_4_29
    team/tzafrir/sysfs/xpp/utils/fpga_load.c
    team/tzafrir/sysfs/xpp/utils/genzaptelconf
    team/tzafrir/sysfs/xpp/utils/print_modes.c
    team/tzafrir/sysfs/xpp/utils/xpp_fxloader
    team/tzafrir/sysfs/xpp/utils/zaptel_hardware
    team/tzafrir/sysfs/xpp/utils/zconf/Zaptel/Chans.pm
    team/tzafrir/sysfs/xpp/utils/zconf/Zaptel/Hardware.pm
    team/tzafrir/sysfs/xpp/utils/zconf/Zaptel/Hardware/PCI.pm
    team/tzafrir/sysfs/xpp/utils/zconf/Zaptel/Hardware/USB.pm
    team/tzafrir/sysfs/xpp/utils/zconf/Zaptel/Xpp.pm
    team/tzafrir/sysfs/xpp/utils/zconf/Zaptel/Xpp/Xbus.pm
    team/tzafrir/sysfs/xpp/utils/zt_registration
    team/tzafrir/sysfs/xpp/xbus-core.c
    team/tzafrir/sysfs/xpp/xdefs.h
    team/tzafrir/sysfs/xpp/xpd.h
    team/tzafrir/sysfs/xpp/xpp_usb.c
    team/tzafrir/sysfs/xpp/xpp_zap.c
    team/tzafrir/sysfs/xpp/xproto.c
    team/tzafrir/sysfs/xpp/xproto.h
    team/tzafrir/sysfs/zaptel-base.c
    team/tzafrir/sysfs/zaptel.h
    team/tzafrir/sysfs/zaptel.init
    team/tzafrir/sysfs/zaptel.xml
    team/tzafrir/sysfs/zconfig.h
    team/tzafrir/sysfs/ztdummy.c
    team/tzafrir/sysfs/ztdynamic.c
    team/tzafrir/sysfs/ztmonitor.c
    team/tzafrir/sysfs/zttool.c

Propchange: team/tzafrir/sysfs/
------------------------------------------------------------------------------
--- branch-1.2-blocked (original)
+++ branch-1.2-blocked Tue Dec  4 16:37:11 2007
@@ -1,1 +1,1 @@
-/branches/1.2:917,937,1073,1206,1613,2018,2434,2583,2668,2750,2789,2868,2871,2878,3083,3098-3099
+/branches/1.2:917,937,1073,1206,1613,2018,2434,2583,2668,2750,2789,2868,2871,2878,3083,3098-3099,3201

Propchange: team/tzafrir/sysfs/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Propchange: team/tzafrir/sysfs/
------------------------------------------------------------------------------
--- svn:externals (original)
+++ svn:externals Tue Dec  4 16:37:11 2007
@@ -1,2 +1,2 @@
 menuselect https://origsvn.digium.com/svn/menuselect/branches/1.0
-oct612x http://svn.digium.com/svn/octasic_api/oct612x/tags/PR47-00/software
+oct612x http://svn.digium.com/svn/octasic_api/oct612x/tags/PR49-00/software

Propchange: team/tzafrir/sysfs/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Dec  4 16:37:11 2007
@@ -46,3 +46,4 @@
 Modules.symvers
 Module.symvers
 README.html
+ztscan

Propchange: team/tzafrir/sysfs/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Dec  4 16:37:11 2007
@@ -1,1 +1,1 @@
-/branches/1.4:1-3129
+/branches/1.4:1-3297

Modified: team/tzafrir/sysfs/Makefile
URL: http://svn.digium.com/view/zaptel/team/tzafrir/sysfs/Makefile?view=diff&rev=3305&r1=3304&r2=3305
==============================================================================
--- team/tzafrir/sysfs/Makefile (original)
+++ team/tzafrir/sysfs/Makefile Tue Dec  4 16:37:11 2007
@@ -162,8 +162,6 @@
     KFLAGS+=-mcmodel=kernel
   endif
 endif
-
-SELINUX_COND=[ -x /usr/sbin/sestatus ] && (/usr/sbin/sestatus | grep "SELinux status:" | grep -q "enabled")
 
 #
 # Features are now configured in zconfig.h
@@ -236,8 +234,9 @@
 MOD_DIR:=$(DESTDIR)/lib/modules/$(KVERS)/misc
 
 # Utilities we build with a standard build procedure:
-UTILS		= tor2ee zttool zttest ztmonitor ztspeed sethdlc-new ztcfg \
-		  ztcfg-dude usbfxstest fxstest fxotune ztdiag torisatool
+UTILS		= zttool zttest ztmonitor ztspeed sethdlc-new ztcfg \
+		  ztcfg-dude usbfxstest fxstest fxotune ztdiag torisatool \
+		  ztscan
 
 
 # Makefile mentions them. Source is not included (anynore?)
@@ -249,7 +248,7 @@
 
 UTILSO		= $(UTILS:%=%.o)
 
-BINS:=fxotune fxstest sethdlc-new ztcfg ztdiag ztmonitor ztspeed zttest zttool
+BINS:=fxotune fxstest sethdlc-new ztcfg ztdiag ztmonitor ztspeed zttest zttool ztscan
 BINS:=$(filter-out $(MENUSELECT_UTILS),$(BINS))
 MAN_PAGES:=$(wildcard $(BINS:%=doc/%.8))
 
@@ -299,10 +298,6 @@
 
 tests: patgen pattest patlooptest hdlcstress hdlctest hdlcgen hdlcverify timertest
 
-tor2ee.o: tor2-hw.h
-
-tor2ee: LDLIBS+=-lpci
-
 zonedata.lo: zonedata.c
 	$(CC) -c $(CFLAGS) -o $@ $^
 
@@ -326,17 +321,19 @@
 
 prereq: config.status tones.h tor2fw.h radfw.h version.h
 
-zttool.o: zttool.c zaptel.h
+zttool.o: zaptel.h
 zttool.o: CFLAGS+=$(NEWT_INCLUDE)
-
-ztprovision.o: ztprovision.c zaptel.h
-
-ztmonitor.o: ztmonitor.c zaptel.h
+zttool: LDLIBS+=$(NEWT_LIB)
+
+ztscan.o: zaptel.h
+
+ztprovision.o: zaptel.h
+
+ztmonitor.o: zaptel.h
 
 ztspeed: CFLAGS=
-ztspeed.o: CFLAGS=
-zttool: LDLIBS+=$(NEWT_LIB)
-sethdlc-new.o: CFLAGS+=-I$(KINCLUDES)
+
+sethdlc-new: CFLAGS+=-I$(KINCLUDES)
 
 $(LTZ_A): $(LTZ_A_OBJS)
 	ar rcs $@ $^
@@ -345,19 +342,18 @@
 $(LTZ_SO): $(LTZ_SO_OBJS)
 	$(CC) $(CFLAGS) -shared -Wl,-soname,$(LTZ_SO).$(LTZ_SO_MAJOR_VER).$(LTZ_SO_MINOR_VER) -o $@ $^ $(LDFLAGS) $(LDLIBS) -lm
 
-ztcfg.c: ztcfg.h
+ztcfg.o: ztcfg.h zaptel.h
+ztcfg: ztcfg.o $(LTZ_A)
+ztcfg: LDLIBS+=-lm
 
 ztcfg-shared: ztcfg.o $(LTZ_SO)
 	$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(LDLIBS) -lm
 
+ztcfg-dude: ztcfg-dude.o mknotch.o complex.o $(LTZ_SO)
+ztcfg-dude: LDLIBS+=-lm -lstdc++
+
 data:
 	$(MAKE) -C datamods datamods
-
-ztcfg: ztcfg.o $(LTZ_A)
-ztcfg: LDLIBS+=-lm
-
-ztcfg-dude: ztcfg-dude.o mknotch.o complex.o $(LTZ_SO)
-ztcfg-dude: LDLIBS+=-lm -lstdc++
 
 # FIXME: we assume CC can build the C++ modules:
 complex.o mknotch.o: %.o: %.cc
@@ -369,8 +365,6 @@
 fxotune: LDLIBS+=-lm
 fxsdump: LDLIBS+=-lm
 
-devel: tor2ee 
-
 ifeq ($(BUILDVER),linux24)
 wct4xxp/wct4xxp.o:
 	$(MAKE) -C wct4xxp KFLAGS="$(KFLAGS) -I.." CFLAGS="$(CFLAGS) -I.."
@@ -380,8 +374,6 @@
 zaptel-base.o: digits.h arith.h sec.h mec.h sec-2.h mec2.h mec3.h zconfig.h
 
 wcusb.o: wcusb.h
-
-wcfxsusb.o: wcfxsusb.h
 
 wctdm.o: wctdm.h
 
@@ -451,10 +443,12 @@
 install-programs: install-utils install-libs install-include
 
 install-utils: utils install-xpp
+ifneq (,$(BINS))
 	install -d $(DESTDIR)$(BIN_DIR)
 	install  $(BINS) $(DESTDIR)$(BIN_DIR)/
 	install -d $(DESTDIR)$(MAN_DIR)
 	install -m 644 $(MAN_PAGES) $(DESTDIR)$(MAN_DIR)/
+endif
 ifeq (,$(wildcard $(DESTDIR)$(CONFIG_FILE)))
 	$(INSTALL) -D -m 644 zaptel.conf.sample $(DESTDIR)$(CONFIG_FILE)
 endif
@@ -484,8 +478,10 @@
 		$(DESTDIR)$(LIB_DIR)/$(LTZ_SO).$(LTZ_SO_MAJOR_VER)
 	$(LN) -sf $(LTZ_SO).$(LTZ_SO_MAJOR_VER).$(LTZ_SO_MINOR_VER) \
 		$(DESTDIR)$(LIB_DIR)/$(LTZ_SO)
-ifeq (,$(DESTDIR))
-	if $(SELINUX_COND); then /sbin/restorecon -v $(DESTDIR)$(LIB_DIR)/$(LTZ_SO); fi
+ifneq (no,$(USE_SELINUX))
+  ifeq (,$(DESTDIR))
+	/sbin/restorecon -v $(DESTDIR)$(LIB_DIR)/$(LTZ_SO)
+  endif
 endif
 	$(INSTALL) -D -m 644 tonezone.h $(DESTDIR)$(INC_DIR)/tonezone.h
 
@@ -549,6 +545,15 @@
 	$(INSTALL) -d $(DESTDIR)$(MOD_DIR)
 	$(INSTALL) -m 644 $(INSTALL_MODULES) $(DESTDIR)$(MOD_DIR)
 else
+	@# Delete any existing drivers before installing the new ones.  This
+	@# prevents problems when upgrading from a previous version of zaptel 
+	@# where the drivers may have been in a different location. In this
+	@# case, when depmod is run, the old drivers may be found and used
+	@# before the new drivers.
+	@for mod in $(INSTALL_MODULES); do \
+		rm -f `cat $(DESTDIR)/lib/modules/$(KVERS)/modules.dep | \
+			cut -d : -f 1 | grep -m 1 $$mod`; \
+	done;
 	$(KMAKE_INST)
   ifneq (,$(wildcard datamods/syncppp.ko))
 	$(MAKE) -C datamods install
@@ -613,7 +618,6 @@
 	rm -rf .tmp_versions
 	rm -f gendigits tones.h
 	rm -f libtonezone*
-	rm -f tor2ee
 	rm -f fxotune
 	rm -f core
 	rm -f ztcfg-shared fxstest

Modified: team/tzafrir/sysfs/README
URL: http://svn.digium.com/view/zaptel/team/tzafrir/sysfs/README?view=diff&rev=3305&r1=3304&r2=3305
==============================================================================
--- team/tzafrir/sysfs/README (original)
+++ team/tzafrir/sysfs/README Tue Dec  4 16:37:11 2007
@@ -10,13 +10,13 @@
 Digital Cards
 ~~~~~~~~~~~~~
 - wct4xxp: 
-  - Digium newer quad-span T1/E1/J1 cards: Wildcard TE420P/TE410P/TE405P 
-  - Digium newer dual-span T1/E1/J1 cards: Wildcard TE220P/TE210P/TE205P 
+  * Digium newer quad-span T1/E1/J1 cards: Wildcard TE420P/TE410P/TE405P 
+  * Digium newer dual-span T1/E1/J1 cards: Wildcard TE220P/TE210P/TE205P 
 - wcte12xp: Digium Wildcard TE120P and the TE122P single-span T1/E1/J1 card
 - wcte11xp: Digium Wildcard TE110P T1/E1/J1
 - wct1xxp: 
-  - Wildcard T100P (old single-span T1)
-  - Wildcard E100P (old single-span E1)
+  * Wildcard T100P (old single-span T1)
+  * Wildcard E100P (old single-span E1)
 - tor2: Tormenta quad-span T1/E1 card from the Zapata Telephony project
 - torisa: The old dual-span ISA T1 card from Zapata Telephony
 
@@ -24,8 +24,8 @@
 Analog Cards
 ~~~~~~~~~~~~
 - wctdm24xxp: 
-  - Digium TDM2400P card: up to 24 analog ports
-  - Digium TDM800P card: up to 8 analog ports
+  * Digium TDM2400P card: up to 24 analog ports
+  * Digium TDM800P card: up to 8 analog ports
 - wctdm: Digium TDM400P card: up to 4 analog ports
 - xpp: Xorcom Astribank: a USB connected unit of up to 32 ports
   (also BRI)
@@ -74,7 +74,7 @@
   kernel image.
   * On Debian Etch and above and any Ubuntu this is
     +++ linux-headers-`uname -r` +++
-  * On Fedora RHEL and compatibles (e.g. CentOS) this is the
+  * On Fedora, RHEL and compatibles (e.g. CentOS) this is the
     kernel-devel package. Or if you run kernel-smp or kernel-xen, you
     need kernel-smp-devel or kernel-xen-devel, respectively.
   * On SUSE you seem to need the package kernel-source .
@@ -139,7 +139,7 @@
   yum install gcc newt-devel libusb-devel
 
 If the following command produces an error, you need to install
-ithe kernel devel package:
+the kernel devel package:
 
   ls /lib/modules/`uname -r`/build/.config
 
@@ -194,7 +194,6 @@
 
 Note that those names are not guaranteed to continue to work on newer
 versions. Hopefully there will be no need for such extra configuration.
-
 
 Partial Build/Install
 ^^^^^^^^^^^^^^^^^^^^^
@@ -218,7 +217,6 @@
     * make install-include: install zaptel.h
   - make config: should be run once to configure 
 
-
 Building to a Subtree
 ^^^^^^^^^^^^^^^^^^^^^
 The following may be useful when testing the package or when preparing a
@@ -260,6 +258,8 @@
   ./ocnfig.status --recheck
 
 
+Configuration
+-------------
 zaptel.conf
 ~~~~~~~~~~~
 The main method to configure Zaptel devices is using the utility
@@ -270,6 +270,22 @@
 installed by default to /etc/zaptel.conf . Edit it to suit your
 configuration. Alternatively use the script genzaptelconf to generate
 one that should work with your system.
+
+
+sysconfig/default
+~~~~~~~~~~~~~~~~~
+The configuration file of the zaptel init.d script is either
+/etc/default/zaptel (Debian systems) or /etc/sysconfig/zaptel (most
+others). That file is used to override defaults that are set at the
+beginning of the init.d script.
+
+For instance, to define for the init.d script to load the modules wctdm
+and xpp_usb (in that order) add the following line to that file:
+
+  MODULES="wctdm xpp_usb"
+
+Currently that file must set "TELEPHONY=yes" for the zaptel init.d to
+work.
 
 
 Zaptel PERL modules
@@ -297,14 +313,30 @@
 (sometimes provided in a package separate from perl itself). For
 instance:
 
-  perldoc ./xpp/utils/xpp_blink
-
-zapconf is currently experimental and intended to eventually replace
-genzaptelconf by a more maintainable code.
-
-
+  perldoc ./xpp/utils/lszaptel
+
+Some of them are specific for the Xorcom Astribank and described in its
+docuemntation. the others are:
+
+lszaptel:: 
+  A somewhat glorified `cat /proc/zaptel/*`.
+zapconf:: 
+  An currently experimental and intended to eventually replace
+  genzaptelconf by a more maintainable code.
+zaptel_drivers::
+  A two-liner script (not installed by default) that simply returns the
+  modules that should be modprobed on this system.
+zaptel_hardware:: 
+  Uses the information from sysfs and its own knowledge to show
+  what PCI/USB Zaptel hardware is connected and if it is currently used
+  by a driver. Shows also some more information for Astrobanks from
+  /proc/xpp .
+
+
+Internals
+---------
 Zaptel Device Files
--------------------
+~~~~~~~~~~~~~~~~~~~
 Userspace programs will usually interact with Zaptel through device
 files under the /dev/zap directory (pedantically: characted device files 
 with major number 196) . Those device files can be generated statically
@@ -328,7 +360,7 @@
 
 
 Zaptel Timing
--------------
+~~~~~~~~~~~~~
 A PBX system should generally have a single clock. If you are connected
 to a telephony provider via a digital interface (e.g: E1, T1) you should
 also typically use the provider's clock (as you get through the
@@ -368,7 +400,7 @@
 
 
 Spans and Channels
-------------------
+~~~~~~~~~~~~~~~~~~
 Zaptel provides telephony *channels* to the userspace applications. 
 Those channels are channels are incoreperated into logical units called
 *spans*.
@@ -418,7 +450,6 @@
 
            2 XPP_FXS/0/0/1 FXOLS (In use)
 
-[[ppp]]
 PPP Support
 -----------
 Zaptel digital cards can provide data channels through ppp as
@@ -465,7 +496,7 @@
 -----
 - http://asterisk.org/[] - The Asterisk PBX
 - http://voip-info.org/[]
-- http://voip-info.org/wiki/view/Asterisk+Zaptel+Installation
-- http://www.zapatatelephony.org/ - A historical site.
+- http://voip-info.org/wiki/view/Asterisk+Zaptel+Installation[]
+- http://www.zapatatelephony.org/[] - A historical site.
 - http://rapid.tzafrir.org.il/docs/README.html[Up-to-date HTML version
   of this file]

Propchange: team/tzafrir/sysfs/build_tools/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Dec  4 16:37:11 2007
@@ -1,1 +1,2 @@
 menuselect-deps
+make_firmware_object

Modified: team/tzafrir/sysfs/configure
URL: http://svn.digium.com/view/zaptel/team/tzafrir/sysfs/configure?view=diff&rev=3305&r1=3304&r2=3305
==============================================================================
--- team/tzafrir/sysfs/configure (original)
+++ team/tzafrir/sysfs/configure Tue Dec  4 16:37:11 2007
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Revision: 2990 .
+# From configure.ac Revision: 3195 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61.
 #
@@ -667,6 +667,8 @@
 INSTALL_DATA
 LN_S
 GNU_MAKE
+BDFNAME
+BDFARCH
 HOSTCC
 GREP
 LN
@@ -686,6 +688,7 @@
 USB_LIB
 USB_INCLUDE
 PBX_LIBUSB
+USE_SELINUX
 ASCIIDOC
 PPPD_VERSION
 LIBOBJS
@@ -1272,6 +1275,7 @@
   --with-ncurses=PATH     use ncurses files in PATH
   --with-newt=PATH        use newt files in PATH
   --with-usb=PATH         use libusb files in PATH
+  --with-selinux          enable (with) / disable (without) SELinux
   --with-ppp=PATH         Use ppp support from PATH
 
 Some influential environment variables:
@@ -3032,6 +3036,48 @@
 
 
 
+test_obj=conftest.o
+
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+
+	BDFNAME=`LANG=C objdump -f $test_obj | grep -e "$test_obj:" | sed "s/.*file format \(.*\)/\1/"`
+	BDFARCH=`LANG=C objdump -f $test_obj | grep -e "architecture:" | sed "s/.*ture: \(.*\),.*/\1/"`
+
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+
+
 # Set the default value of HOSTCC from CC if --host was not provided:
 HOSTCC=${HOSTCC:=${CC}}
 
@@ -3254,7 +3300,6 @@
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
 
 
 
@@ -5328,6 +5373,24 @@
 
 
 
+
+# Check whether --with-selinux was given.
+if test "${with_selinux+set}" = set; then
+  withval=$with_selinux; USE_SELINUX=$withval
+else
+   if test ! -x /usr/sbin/sestatus; then
+	   	USE_SELINUX=no;
+	  elif /usr/sbin/sestatus | grep "SELinux status:" | grep -q "enabled"; then
+		USE_SELINUX=yes
+	  fi
+
+
+fi
+
+
+
+
+
 # for asciidoc before ver. 7, the backend must be stated explicitly:
 ASCIIDOC='asciidoc'
 asciidoc_ver=`asciidoc --version 2>&1 | awk '/^asciidoc /{print $2}' | cut -d. -f 1 | head -n 1`
@@ -5375,7 +5438,7 @@
 
 
 
-ac_config_files="$ac_config_files build_tools/menuselect-deps makeopts"
+ac_config_files="$ac_config_files build_tools/menuselect-deps makeopts build_tools/make_firmware_object"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -5947,6 +6010,7 @@
   case $ac_config_target in
     "build_tools/menuselect-deps") CONFIG_FILES="$CONFIG_FILES build_tools/menuselect-deps" ;;
     "makeopts") CONFIG_FILES="$CONFIG_FILES makeopts" ;;
+    "build_tools/make_firmware_object") CONFIG_FILES="$CONFIG_FILES build_tools/make_firmware_object" ;;
 
   *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
@@ -6057,6 +6121,8 @@
 INSTALL_DATA!$INSTALL_DATA$ac_delim
 LN_S!$LN_S$ac_delim
 GNU_MAKE!$GNU_MAKE$ac_delim
+BDFNAME!$BDFNAME$ac_delim
+BDFARCH!$BDFARCH$ac_delim
 HOSTCC!$HOSTCC$ac_delim
 GREP!$GREP$ac_delim
 LN!$LN$ac_delim
@@ -6076,13 +6142,14 @@
 USB_LIB!$USB_LIB$ac_delim
 USB_INCLUDE!$USB_INCLUDE$ac_delim
 PBX_LIBUSB!$PBX_LIBUSB$ac_delim
+USE_SELINUX!$USE_SELINUX$ac_delim
 ASCIIDOC!$ASCIIDOC$ac_delim
 PPPD_VERSION!$PPPD_VERSION$ac_delim
 LIBOBJS!$LIBOBJS$ac_delim
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 73; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 76; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
@@ -6414,6 +6481,7 @@
   $ac_cs_success || { (exit 1); exit 1; }
 fi
 
+chmod a+x  build_tools/make_firmware_object
 
 { echo "$as_me:$LINENO: *** Zaptel build successfully configured ***" >&5
 echo "$as_me: *** Zaptel build successfully configured ***" >&6;}

Modified: team/tzafrir/sysfs/configure.ac
URL: http://svn.digium.com/view/zaptel/team/tzafrir/sysfs/configure.ac?view=diff&rev=3305&r1=3304&r2=3305
==============================================================================
--- team/tzafrir/sysfs/configure.ac (original)
+++ team/tzafrir/sysfs/configure.ac Tue Dec  4 16:37:11 2007
@@ -36,6 +36,14 @@
 AC_PROG_LN_S
 AST_CHECK_GNU_MAKE
 
+test_obj=conftest.o
+AC_COMPILE_IFELSE(AC_LANG_SOURCE(),[
+	BDFNAME=`LANG=C objdump -f $test_obj | grep -e "$test_obj:" | sed "s/.*file format \(.*\)/\1/"`
+	BDFARCH=`LANG=C objdump -f $test_obj | grep -e "architecture:" | sed "s/.*ture: \(.*\),.*/\1/"`	   
+],[])
+AC_SUBST(BDFNAME)
+AC_SUBST(BDFARCH)
+
 # Set the default value of HOSTCC from CC if --host was not provided:
 HOSTCC=${HOSTCC:=${CC}}
 AC_SUBST(HOSTCC)
@@ -59,6 +67,21 @@
 AST_EXT_LIB([ncurses], [initscr], [curses.h], [NCURSES], [ncurses], [])
 AST_EXT_LIB([newt], [newtBell], [newt.h], [NEWT], [newt])
 AST_EXT_LIB([usb], [usb_init], [usb.h], [USB], [libusb])
+
+AC_ARG_WITH(selinux,
+	[AS_HELP_STRING([--with-selinux],
+			[enable (with) / disable (without) SELinux])],
+	[USE_SELINUX=$withval],
+	[ if test ! -x /usr/sbin/sestatus; then 
+	   	USE_SELINUX=no;
+	  elif /usr/sbin/sestatus | grep "SELinux status:" | grep -q "enabled"; then
+		USE_SELINUX=yes
+	  fi
+	]
+)
+
+
+AC_SUBST(USE_SELINUX)
 
 # for asciidoc before ver. 7, the backend must be stated explicitly:
 ASCIIDOC='asciidoc'
@@ -101,8 +124,9 @@
 
 AC_SUBST(PPPD_VERSION)
 
-AC_CONFIG_FILES([build_tools/menuselect-deps makeopts])
+AC_CONFIG_FILES([build_tools/menuselect-deps makeopts build_tools/make_firmware_object])
 AC_OUTPUT
+chmod a+x  build_tools/make_firmware_object
 
 AC_MSG_NOTICE(*** Zaptel build successfully configured ***)
 

Modified: team/tzafrir/sysfs/firmware/Makefile
URL: http://svn.digium.com/view/zaptel/team/tzafrir/sysfs/firmware/Makefile?view=diff&rev=3305&r1=3304&r2=3305
==============================================================================
--- team/tzafrir/sysfs/firmware/Makefile (original)
+++ team/tzafrir/sysfs/firmware/Makefile Tue Dec  4 16:37:11 2007
@@ -19,7 +19,7 @@
 
 OCT6114_064_VERSION:=1.05.01
 OCT6114_128_VERSION:=1.05.01
-TC400M_VERSION:=MR5.6
+TC400M_VERSION:=MR6.12
 VPMADT032_VERSION:=1.07
 
 FIRMWARE_URL:=http://downloads.digium.com/pub/telephony/firmware/releases
@@ -181,21 +181,21 @@
 	fi
 
 # Build object file of an oct6114 064 firmware image for linking
-zaptel-fw-oct6114-064.o: zaptel-fw-oct6114-064-$(OCT6114_064_VERSION).tar.gz ../wct4xxp/base.o zaptel-fw-oct6114-064.bin
+zaptel-fw-oct6114-064.o: zaptel-fw-oct6114-064-$(OCT6114_064_VERSION).tar.gz zaptel-fw-oct6114-064.bin
 	@echo Making firmware object file for zaptel-fw-oct6114-064.bin
-	../build_tools/make_firmware_object zaptel-fw-oct6114-064.bin $@ ../wct4xxp/base.o
+	../build_tools/make_firmware_object zaptel-fw-oct6114-064.bin $@
 
 # Build object file of an oct6114 128 firmware image for linking
-zaptel-fw-oct6114-128.o: zaptel-fw-oct6114-128-$(OCT6114_128_VERSION).tar.gz ../wct4xxp/base.o zaptel-fw-oct6114-128.bin
+zaptel-fw-oct6114-128.o: zaptel-fw-oct6114-128-$(OCT6114_128_VERSION).tar.gz zaptel-fw-oct6114-128.bin
 	@echo Making firmware object file for zaptel-fw-oct6114-128.bin
-	../build_tools/make_firmware_object zaptel-fw-oct6114-128.bin $@ ../wct4xxp/base.o
+	../build_tools/make_firmware_object zaptel-fw-oct6114-128.bin $@
 
 # Build object file of a TC400M firmware image for linking
-zaptel-fw-tc400m.o: zaptel-fw-tc400m-$(TC400M_VERSION).tar.gz ../wctc4xxp/base.o zaptel-fw-tc400m.bin
+zaptel-fw-tc400m.o: zaptel-fw-tc400m-$(TC400M_VERSION).tar.gz zaptel-fw-tc400m.bin
 	@echo Making firmware object file for zaptel-fw-tc400m.bin
-	../build_tools/make_firmware_object zaptel-fw-tc400m.bin $@ ../wctc4xxp/base.o
+	../build_tools/make_firmware_object zaptel-fw-tc400m.bin $@
 
 # Build object file of a VPMADT032 firmware image for linking
-zaptel-fw-vpmadt032.o: zaptel-fw-vpmadt032-$(VPMADT032_VERSION).tar.gz ../wctdm24xxp/base.o zaptel-fw-vpmadt032.bin
+zaptel-fw-vpmadt032.o: zaptel-fw-vpmadt032-$(VPMADT032_VERSION).tar.gz zaptel-fw-vpmadt032.bin
 	@echo Making firmware object file for zaptel-fw-vpmadt032.bin
-	../build_tools/make_firmware_object zaptel-fw-vpmadt032.bin $@ ../wctdm24xxp/base.o
+	../build_tools/make_firmware_object zaptel-fw-vpmadt032.bin $@

Modified: team/tzafrir/sysfs/makeopts.in
URL: http://svn.digium.com/view/zaptel/team/tzafrir/sysfs/makeopts.in?view=diff&rev=3305&r1=3304&r2=3305
==============================================================================
--- team/tzafrir/sysfs/makeopts.in (original)
+++ team/tzafrir/sysfs/makeopts.in Tue Dec  4 16:37:11 2007
@@ -39,6 +39,8 @@
 USB_LIB=@USB_LIB@
 USB_INCLUDE=@USB_INCLUDE@
 
+USE_SELINUX=@USE_SELINUX@
+
 PPPD_VERSION=@PPPD_VERSION@
 
 ASCIIDOC=@ASCIIDOC@

Modified: team/tzafrir/sysfs/sethdlc-new.c
URL: http://svn.digium.com/view/zaptel/team/tzafrir/sysfs/sethdlc-new.c?view=diff&rev=3305&r1=3304&r2=3305
==============================================================================
--- team/tzafrir/sysfs/sethdlc-new.c (original)
+++ team/tzafrir/sysfs/sethdlc-new.c Tue Dec  4 16:37:11 2007
@@ -673,7 +673,7 @@
 	if (sock < 0)
 		error("Unable to create socket: %s\n", strerror(errno));
   
-	strcpy(req.ifr_name, argv[1]); /* Device name */
+	strncpy(req.ifr_name, argv[1], sizeof(req.ifr_name) - 1); /* Device name */
 
 	if (argc == 2)
 		show_port();

Modified: team/tzafrir/sysfs/sethdlc.c
URL: http://svn.digium.com/view/zaptel/team/tzafrir/sysfs/sethdlc.c?view=diff&rev=3305&r1=3304&r2=3305
==============================================================================
--- team/tzafrir/sysfs/sethdlc.c (original)
+++ team/tzafrir/sysfs/sethdlc.c Tue Dec  4 16:37:11 2007
@@ -293,7 +293,7 @@
 	if (sock<0)
 		error("Unable to create socket: %s\n", strerror(errno));
   
-	strcpy(req.ifr_name, argv[1]); /* Device name */
+	strncpy(req.ifr_name, argv[1], sizeof(req.ifr_name) - 1); /* Device name */
 
 	if (argc == 2) {
 		show_port(sock);

Modified: team/tzafrir/sysfs/tor2.c
URL: http://svn.digium.com/view/zaptel/team/tzafrir/sysfs/tor2.c?view=diff&rev=3305&r1=3304&r2=3305
==============================================================================
--- team/tzafrir/sysfs/tor2.c (original)
+++ team/tzafrir/sysfs/tor2.c Tue Dec  4 16:37:11 2007
@@ -32,11 +32,7 @@
 #include <linux/init.h>
 #include <linux/sched.h>
 #include <linux/interrupt.h>
-#ifdef STANDALONE_ZAPATA
 #include "zaptel.h"
-#else
-#include <zaptel/zaptel.h>
-#endif
 #ifdef LINUX26
 #include <linux/moduleparam.h>
 #endif
@@ -273,15 +269,14 @@
 {
 	int x, y, c;
 	for (x = 0; x < SPANS_PER_CARD; x++) {
-		sprintf(tor->spans[x].name,
-                	"Tor2/%d/%d", 
-		        tor->num,
-                        x + 1);
-		sprintf(tor->spans[x].desc,
-                	"Tormenta 2 (PCI) Quad %s Card %d Span %d",
-                        (tor->cardtype == TYPE_T1)  ?  "T1"  :  "E1",
-                	tor->num,
-                        x + 1);
+		sprintf(tor->spans[x].name, "Tor2/%d/%d", tor->num, x + 1);
+		snprintf(tor->spans[x].desc, sizeof(tor->spans[x].desc) - 1,
+			 "Tormenta 2 (PCI) fQuad %s Card %d Span %d",
+			 (tor->cardtype == TYPE_T1)  ?  "T1"  :  "E1", tor->num, x + 1);
+		tor->spans[x].manufacturer = "Digium";
+		strncpy(tor->spans[x].devicetype, tor->type, sizeof(tor->spans[x].devicetype) - 1);

[... 3509 lines stripped ...]