Summary: | ASTERISK-09137: [patch] zaptel.init 1.2 and 1.4 to support zaphpec_enable | ||
Reporter: | Chris Hozian (chozian) | Labels: | |
Date Opened: | 2007-03-28 16:43:38 | Date Closed: | 2008-06-07 12:50:56 |
Priority: | Major | Regression? | No |
Status: | Closed/Complete | Components: | Core/General |
Versions: | Frequency of Occurrence | ||
Related Issues: | |||
Environment: | Attachments: | ( 0) README.hpec ( 1) zaptel-init-1.2.v2.diff ( 2) zaptel-init-1.4.v2.diff | |
Description: | I have attached patches for zaptel.init 1.2 and 1.4 which will run zaphpec_install if it is installed in the /usr/sbin directory and an HPEC license exists in the /var/lib/digium/licenses directory. In addition, I have attached a modified version of the HPEC README listed at ftp://ftp.digium.com/pub/telephony/hpec/README which reflects these changes . The HPEC README will need to be updated to the one I've attached once this patch has been committed for zaptel 1.2 and 1.4. | ||
Comments: | By: Tzafrir Cohen (tzafrir) 2007-03-29 08:05:15 This code is run in any case. Even for a "stop" or "status". Please put it inside a function and run it from the "start" alone. Something of the sort of: start_hpec() { if ! echo /var/lib/digium/licenses/*.lic | grep -v '\*' | grep -q .; then # no licenses found return fi if [ ! -x /usr/sbin/zaphpec_enable ]; then echo -n "Running zaphpec_enable: Failed" echo -n "." echo " /usr/sbin/zaphpec_enable is not set executable." return fi # ... etc. } By: Tzafrir Cohen (tzafrir) 2007-03-29 08:07:14 hmm.. I haven't noticed that it is run in the "start" part. Sorry. The style comment still stands (IMHO), though. By: Chris Hozian (chozian) 2007-03-29 08:56:18 I have attached zaptel-init-1.2.v2.diff and zaptel-init-1.4.v2.diff which include comments as requested. By: Russell Bryant (russell) 2007-03-29 11:06:56 This has been added to 1.2 and 1.4 in revisions 2347 and 2348. Thanks! By: Digium Subversion (svnbot) 2008-06-07 12:46:37 Repository: dahdi Revision: 2347 A branches/1.2/README.hpec U branches/1.2/zaptel.init ------------------------------------------------------------------------ r2347 | russell | 2008-06-07 12:46:36 -0500 (Sat, 07 Jun 2008) | 3 lines Add a README for HPEC, and add support for HPEC in the init script. (issue ASTERISK-9137, chozian) ------------------------------------------------------------------------ http://svn.digium.com/view/dahdi?view=rev&revision=2347 By: Digium Subversion (svnbot) 2008-06-07 12:46:41 Repository: dahdi Revision: 2348 _U branches/1.4/ A branches/1.4/README.hpec U branches/1.4/zaptel.init ------------------------------------------------------------------------ r2348 | russell | 2008-06-07 12:46:41 -0500 (Sat, 07 Jun 2008) | 11 lines Merged revisions 2347 via svnmerge from https://origsvn.digium.com/svn/zaptel/branches/1.2 ........ r2347 | russell | 2007-03-29 11:05:32 -0500 (Thu, 29 Mar 2007) | 3 lines Add a README for HPEC, and add support for HPEC in the init script. (issue ASTERISK-9137, chozian) ........ ------------------------------------------------------------------------ http://svn.digium.com/view/dahdi?view=rev&revision=2348 By: Digium Subversion (svnbot) 2008-06-07 12:46:46 Repository: dahdi Revision: 2349 _U trunk/ ------------------------------------------------------------------------ r2349 | russell | 2008-06-07 12:46:45 -0500 (Sat, 07 Jun 2008) | 18 lines Blocked revisions 2348 via svnmerge ................ r2348 | russell | 2007-03-29 11:06:28 -0500 (Thu, 29 Mar 2007) | 11 lines Merged revisions 2347 via svnmerge from https://origsvn.digium.com/svn/zaptel/branches/1.2 ........ r2347 | russell | 2007-03-29 11:05:32 -0500 (Thu, 29 Mar 2007) | 3 lines Add a README for HPEC, and add support for HPEC in the init script. (issue ASTERISK-9137, chozian) ........ ................ ------------------------------------------------------------------------ http://svn.digium.com/view/dahdi?view=rev&revision=2349 By: Digium Subversion (svnbot) 2008-06-07 12:49:39 Repository: dahdi Revision: 2390 _U team/mattf/zaptel-hotwct4xxp/ U team/mattf/zaptel-hotwct4xxp/README.Linux26 U team/mattf/zaptel-hotwct4xxp/wct4xxp/base.c U team/mattf/zaptel-hotwct4xxp/xpp/utils/genzaptelconf U team/mattf/zaptel-hotwct4xxp/xpp/utils/genzaptelconf.8 U team/mattf/zaptel-hotwct4xxp/zaptel.c U team/mattf/zaptel-hotwct4xxp/zaptel.init U team/mattf/zaptel-hotwct4xxp/zaptel.xml ------------------------------------------------------------------------ r2390 | mattf | 2008-06-07 12:49:34 -0500 (Sat, 07 Jun 2008) | 186 lines Merged revisions 2309,2324,2332,2344,2349,2355-2357,2360,2382-2384 via svnmerge from https://origsvn.digium.com/svn/zaptel/trunk ................ r2309 | mattf | 2007-03-14 10:11:22 -0600 (Wed, 14 Mar 2007) | 18 lines Merged revisions 2308 via svnmerge from https://origsvn.digium.com/svn/zaptel/branches/1.4 ................ r2308 | mattf | 2007-03-14 10:08:55 -0600 (Wed, 14 Mar 2007) | 10 lines Merged revisions 2307 via svnmerge from https://origsvn.digium.com/svn/zaptel/branches/1.2 ........ r2307 | mattf | 2007-03-14 10:03:18 -0600 (Wed, 14 Mar 2007) | 2 lines Fix bug in J1 mode configuration. ........ ................ ................ r2324 | file | 2007-03-19 10:32:03 -0600 (Mon, 19 Mar 2007) | 18 lines Merged revisions 2323 via svnmerge from https://origsvn.digium.com/svn/zaptel/branches/1.4 ................ r2323 | file | 2007-03-19 12:30:37 -0400 (Mon, 19 Mar 2007) | 10 lines Merged revisions 2322 via svnmerge from https://origsvn.digium.com/svn/zaptel/branches/1.2 ........ r2322 | file | 2007-03-19 12:28:58 -0400 (Mon, 19 Mar 2007) | 2 lines Update documentation to match current Makefile. linux26 is no longer a valid target. (issue ASTERISK-9025 reported by valley) ........ ................ ................ r2332 | tzafrir | 2007-03-22 01:01:21 -0600 (Thu, 22 Mar 2007) | 8 lines * genzaptelconf -z will also generate the output of zapscan (The additional /etc/asterisk/zapscan.conf the asterisk gui needs). * Also put every digital span N in group 10+N (in addition to 0 / 5). * Removed useless fxs/fxo-s lists, and other unused code. * Add wcte12xp to the modules list. Prefer vzaphfc to zaphfc. * Default to ptmp for zapbri signalling. * Should be more readable. ................ r2344 | russell | 2007-03-27 12:50:56 -0600 (Tue, 27 Mar 2007) | 21 lines Merged revisions 2343 via svnmerge from https://origsvn.digium.com/svn/zaptel/branches/1.4 ................ r2343 | russell | 2007-03-27 13:49:01 -0500 (Tue, 27 Mar 2007) | 13 lines Merged revisions 2342 via svnmerge from https://origsvn.digium.com/svn/zaptel/branches/1.2 ........ r2342 | russell | 2007-03-27 13:48:23 -0500 (Tue, 27 Mar 2007) | 5 lines When debug is enabled, ensure that "debug=1" gets passed to the zaptel module, and not just the hardware modules. Also, run "ztcfg -s" at the beginning of the "stop" action of the script. (issue ASTERISK-7215, PCadach and tzafrir) ........ ................ ................ r2349 | russell | 2007-03-29 10:07:03 -0600 (Thu, 29 Mar 2007) | 18 lines Blocked revisions 2348 via svnmerge ................ r2348 | russell | 2007-03-29 11:06:28 -0500 (Thu, 29 Mar 2007) | 11 lines Merged revisions 2347 via svnmerge from https://origsvn.digium.com/svn/zaptel/branches/1.2 ........ r2347 | russell | 2007-03-29 11:05:32 -0500 (Thu, 29 Mar 2007) | 3 lines Add a README for HPEC, and add support for HPEC in the init script. (issue ASTERISK-9137, chozian) ........ ................ ................ r2355 | qwell | 2007-03-30 13:00:28 -0600 (Fri, 30 Mar 2007) | 20 lines Merged revisions 2354 via svnmerge from https://origsvn.digium.com/svn/zaptel/branches/1.4 ................ r2354 | qwell | 2007-03-30 13:57:48 -0500 (Fri, 30 Mar 2007) | 12 lines Merged revisions 2353 via svnmerge from https://origsvn.digium.com/svn/zaptel/branches/1.2 ........ r2353 | qwell | 2007-03-30 13:56:46 -0500 (Fri, 30 Mar 2007) | 4 lines Fix an issue where an echo can was freed incorrectly in certain circumstances. Issue 9292, fix suggested by ddv2005. ........ ................ ................ r2356 | qwell | 2007-03-30 13:18:40 -0600 (Fri, 30 Mar 2007) | 2 lines Need to revert this last change. trunk doesn't yet have all the right stuff in place. ................ r2357 | qwell | 2007-03-30 13:19:13 -0600 (Fri, 30 Mar 2007) | 19 lines Blocked revisions 2354 via svnmerge ................ r2354 | qwell | 2007-03-30 13:57:48 -0500 (Fri, 30 Mar 2007) | 12 lines Merged revisions 2353 via svnmerge from https://origsvn.digium.com/svn/zaptel/branches/1.2 ........ r2353 | qwell | 2007-03-30 13:56:46 -0500 (Fri, 30 Mar 2007) | 4 lines Fix an issue where an echo can was freed incorrectly in certain circumstances. Issue 9292, fix suggested by ddv2005. ........ ................ ................ r2360 | mattf | 2007-03-30 15:07:03 -0600 (Fri, 30 Mar 2007) | 10 lines Merged revisions 2359 via svnmerge from https://origsvn.digium.com/svn/zaptel/branches/1.4 ........ r2359 | mattf | 2007-03-30 15:03:19 -0600 (Fri, 30 Mar 2007) | 2 lines Fix potential spinlock recursion issue. ........ ................ r2382 | russell | 2007-04-03 13:28:17 -0500 (Tue, 03 Apr 2007) | 2 lines Improve the descriptions for things shown in menuselect. (issue ASTERISK-9174, caio1982) ................ r2383 | qwell | 2007-04-03 14:08:30 -0500 (Tue, 03 Apr 2007) | 4 lines Fix a couple of typos, and fix a small bug with remove_on_change for wct4xxp driver. Try to get a little closer to the 1.4 version. ................ r2384 | russell | 2007-04-03 18:39:58 -0500 (Tue, 03 Apr 2007) | 5 lines The ZT_CHANDIAG ioctl was disabled by default because the large zt_chan struct that was being allocated on the stack is too big for some systems (those with 4k stacks). So, change the code to allocate the struct on the heap, and let the ioctl be always enabled. (issue ZAP-173, patch by tzafrir, with minor mods) ................ ------------------------------------------------------------------------ http://svn.digium.com/view/dahdi?view=rev&revision=2390 By: Digium Subversion (svnbot) 2008-06-07 12:50:56 Repository: dahdi Revision: 2458 _U be/branches/B.2/ U be/branches/B.2/Makefile U be/branches/B.2/README U be/branches/B.2/README.Linux26 A be/branches/B.2/README.hpec U be/branches/B.2/build_tools/make_firmware_object U be/branches/B.2/hpec/hpec_zaptel.h A be/branches/B.2/jpah.h U be/branches/B.2/wct1xxp.c U be/branches/B.2/wct4xxp/base.c U be/branches/B.2/wct4xxp/vpm450m.c U be/branches/B.2/wcte12xp.c A be/branches/B.2/xpp/.version U be/branches/B.2/xpp/Makefile A be/branches/B.2/xpp/card_bri.c A be/branches/B.2/xpp/card_bri.h U be/branches/B.2/xpp/card_fxo.c U be/branches/B.2/xpp/card_fxs.c U be/branches/B.2/xpp/card_global.c U be/branches/B.2/xpp/firmwares/FPGA_1141.hex U be/branches/B.2/xpp/firmwares/FPGA_1151.hex U be/branches/B.2/xpp/firmwares/FPGA_FXS.hex U be/branches/B.2/xpp/firmwares/USB_1140.hex U be/branches/B.2/xpp/firmwares/USB_1150.hex U be/branches/B.2/xpp/utils/Makefile U be/branches/B.2/xpp/utils/fpga_load.c U be/branches/B.2/xpp/utils/genzaptelconf U be/branches/B.2/xpp/utils/hexfile.c U be/branches/B.2/xpp/utils/hexfile.h U be/branches/B.2/xpp/utils/test_parse.c U be/branches/B.2/xpp/utils/xpp_fxloader U be/branches/B.2/xpp/utils/zconf/Zaptel/Xpp/Xbus.pm U be/branches/B.2/xpp/xbus-core.c U be/branches/B.2/xpp/xbus-core.h U be/branches/B.2/xpp/xpd.h U be/branches/B.2/xpp/xpp_usb.c U be/branches/B.2/xpp/xpp_zap.c U be/branches/B.2/xpp/xpp_zap.h U be/branches/B.2/xpp/xproto.c U be/branches/B.2/xpp/xproto.h U be/branches/B.2/zaptel-base.c U be/branches/B.2/zaptel.h U be/branches/B.2/zaptel.init U be/branches/B.2/zconfig.h U be/branches/B.2/ztmonitor.c ------------------------------------------------------------------------ r2458 | qwell | 2008-06-07 12:50:49 -0500 (Sat, 07 Jun 2008) | 203 lines Merged revisions 2239,2243,2250-2252,2257,2266,2274-2276,2280-2282,2286,2290,2296,2301,2307,2310-2311,2322,2342,2347,2350,2353,2398,2405,2422,2434,2443,2451 via svnmerge from https://origsvn.digium.com/svn/zaptel/branches/1.2 ........ r2239 | tzafrir | 2007-02-27 00:14:18 -0600 (Tue, 27 Feb 2007) | 18 lines Xorcom rev. 3491: * Version of xpp modules is set from xpp/.version, rather than "unknown". * Astribank devices are now initialized in parallel: faster startup when there are multiple Astribanks. * Re-added support for the old format of /proc/xpp/sync write: (echo N 0 > /proc/xpp/sync ) . The new format (SYNC=NN) is preffered. * Firmware update to fix a PCM issue. * Fixed a build issue with kernel 2.6.8 . * Fixed missing initialization in Zaptel::Xpp::Xbus . * genzaptelconf will now set FXS ports as LS by default. To set them as KS, use fxs_default_start=ks in /etc/default/zaptel / /etc/sysconfig/zaptel (Also a workaround for ASTERISK-7551 ). * Groundwork for sync from zaptel master span: if zaptel is built with ZAPTEL_SYNC_TIC (see zaptel/team/tzafrir/sync ), xpp will report its drift from the zaptel sync master. * USB firmware update: had bad lines checksums (and fxload did not report). * fpga_load can now better report bad hex file checksum ;-) . ........ r2243 | tzafrir | 2007-02-27 18:05:59 -0600 (Tue, 27 Feb 2007) | 4 lines * xpp rev. 3495: fix a race in the FXO driver of recent weeks. * Add the Astribank BRI driver (though still needs bristuffed zaptel to build and thus will not build by default) ........ r2250 | kpfleming | 2007-02-28 14:43:42 -0600 (Wed, 28 Feb 2007) | 2 lines correct comment, and set module installation directory before it is needed ........ r2251 | kpfleming | 2007-02-28 14:44:28 -0600 (Wed, 28 Feb 2007) | 2 lines allow the HPEC to work even if echotraining has been requested (the HPEC doesn't do echotraining, but it shouldn't fail just because the user asked for it) ........ r2252 | tzafrir | 2007-02-28 14:57:52 -0600 (Wed, 28 Feb 2007) | 3 lines Make the xpp/utils/Makefile in 1.2 closer to the one in 1.4 (and actually work, this tine). ........ r2257 | tzafrir | 2007-03-01 13:29:12 -0600 (Thu, 01 Mar 2007) | 2 lines SLAB_KERNEL is an obsolete alias of GFP_KERNEL. Fix build on Vanilla 2.6.20 . ........ r2266 | tzafrir | 2007-03-02 14:40:06 -0600 (Fri, 02 Mar 2007) | 2 lines Clarify a cyptic build message. ........ r2274 | tzafrir | 2007-03-02 16:23:45 -0600 (Fri, 02 Mar 2007) | 2 lines Proper initialization of the Astribank (xpp). ........ r2275 | tzafrir | 2007-03-02 16:25:01 -0600 (Fri, 02 Mar 2007) | 2 lines Proper initialization of the Astribank (xpp) at zaptel startup. ........ r2276 | tzafrir | 2007-03-02 16:29:04 -0600 (Fri, 02 Mar 2007) | 2 lines Revert the bogus changeset 2274. ........ r2280 | kpfleming | 2007-03-04 23:34:43 -0600 (Sun, 04 Mar 2007) | 2 lines ensure that we run objdump in the most generic language possible to avoid complications on non-English systems (issue ASTERISK-8930) ........ r2281 | kpfleming | 2007-03-04 23:40:37 -0600 (Sun, 04 Mar 2007) | 2 lines remove stray character that my editor decided to add ........ r2282 | kpfleming | 2007-03-04 23:41:30 -0600 (Sun, 04 Mar 2007) | 2 lines this driver does not use workqueues, so does not need this header (issue ASTERISK-8930) ........ r2286 | tzafrir | 2007-03-05 10:14:11 -0600 (Mon, 05 Mar 2007) | 2 lines Found a proper "marker" for the gfp_t typedef. Now every 2.6.9 is supported. ........ r2290 | tzafrir | 2007-03-07 13:14:30 -0600 (Wed, 07 Mar 2007) | 3 lines Don't die when there is no udev rules dir (on an installtion with INSTALL_PREFIX explicitly set). ........ r2296 | file | 2007-03-08 09:56:05 -0600 (Thu, 08 Mar 2007) | 2 lines vprintk is only available on 2.6.9+ (issue ASTERISK-8965 reported by baconbuttie) ........ r2301 | mattf | 2007-03-09 13:59:43 -0600 (Fri, 09 Mar 2007) | 2 lines Make sure we don't allocate as GFP_KERNEL in atomic context ........ r2307 | mattf | 2007-03-14 11:03:18 -0500 (Wed, 14 Mar 2007) | 2 lines Fix bug in J1 mode configuration. ........ r2310 | tzafrir | 2007-03-16 00:07:33 -0500 (Fri, 16 Mar 2007) | 2 lines Ignoring Module.symvers ........ r2311 | tzafrir | 2007-03-16 00:45:55 -0500 (Fri, 16 Mar 2007) | 5 lines Update the README: * Update modules list * Add a basic list of utilities. * Clarify the location of the kernel source tree. ........ r2322 | file | 2007-03-19 11:28:58 -0500 (Mon, 19 Mar 2007) | 2 lines Update documentation to match current Makefile. linux26 is no longer a valid target. (issue ASTERISK-9025 reported by valley) ........ r2342 | russell | 2007-03-27 13:48:23 -0500 (Tue, 27 Mar 2007) | 5 lines When debug is enabled, ensure that "debug=1" gets passed to the zaptel module, and not just the hardware modules. Also, run "ztcfg -s" at the beginning of the "stop" action of the script. (issue ASTERISK-7215, PCadach and tzafrir) ........ r2347 | russell | 2007-03-29 11:05:32 -0500 (Thu, 29 Mar 2007) | 3 lines Add a README for HPEC, and add support for HPEC in the init script. (issue ASTERISK-9137, chozian) ........ r2350 | russell | 2007-03-29 11:35:37 -0500 (Thu, 29 Mar 2007) | 4 lines Trim the HPEC readme that is included in zaptel to only include basic information as the one on the FTP site will always be the one that contains the full up to date information. Also, tweak some grammar in the additions to the init script. ........ r2353 | qwell | 2007-03-30 13:56:46 -0500 (Fri, 30 Mar 2007) | 4 lines Fix an issue where an echo can was freed incorrectly in certain circumstances. Issue 9292, fix suggested by ddv2005. ........ r2398 | mattf | 2007-04-07 11:49:46 -0500 (Sat, 07 Apr 2007) | 2 lines Fix for ASTERISK-8940. Thanks adomo and Tzafrir! ........ r2405 | mattf | 2007-04-11 14:01:21 -0500 (Wed, 11 Apr 2007) | 4 lines Fix buglet in memory corruption fix. ........ r2422 | qwell | 2007-04-13 18:12:23 -0500 (Fri, 13 Apr 2007) | 14 lines Fix several places where we treat confmode as a bitmask. It is a bitmask...sort of.. I'll explain.. confmode is used for 2 different things. It defines both the "mode" and the "flags" of the conference. The "mode" part is in 0x00FF and is NOT bitwise. The "flag" part is in 0xFF00 and *IS* bitwise. Confused yet? Good. So, when we want to check the "mode" of the conference, we need to check only within 0xFF. There were several places where this was not happening - but due to luck, it worked (...sort of). That's what this patch fixes. ........ r2434 | qwell | 2007-04-24 13:33:29 -0500 (Tue, 24 Apr 2007) | 1 line Backport pre-echocan debugging for ztmonitor ........ r2443 | qwell | 2007-04-25 10:35:34 -0500 (Wed, 25 Apr 2007) | 2 lines Don't try to reference a variable on a channel that may not exist. ........ r2451 | mattf | 2007-04-25 11:26:18 -0500 (Wed, 25 Apr 2007) | 1 line Start fixing potential deadlock between device driver and zaptel ........ ------------------------------------------------------------------------ http://svn.digium.com/view/dahdi?view=rev&revision=2458 |