Archived
14
0
Fork 0
Commit graph

15127 commits

Author SHA1 Message Date
file
450035f0f4 A 'b' option has been added which causes chan_local to return the actual channel that is behind it when queried. This is useful for transfer scenarios as the actual channel will be transferred, not the Local channel. If you have been using Local channels as queue members and having issues when the agent did a blind transfer this option may solve the issue.
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@114049 f38db490-d61c-443f-a65b-d21fe96a405b
2008-04-10 20:28:40 +00:00
mmichelson
f14e1eb6c9 Merged revisions 114045 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r114045 | mmichelson | 2008-04-10 14:55:33 -0500 (Thu, 10 Apr 2008) | 6 lines

Be sure that we're not about to set bridgepvt NULL prior to dereferencing it.

(closes issue #11775)
Reported by: fujin


........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@114046 f38db490-d61c-443f-a65b-d21fe96a405b
2008-04-10 19:58:36 +00:00
tilghman
b64b1c5987 The hydra grows yet another head...
(closes issue #12401)
 Reported by: davevg
 Patches: 
       astcli.diff2 uploaded by davevg (license 209)
 Tested by: davevg, Corydon76


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@114042 f38db490-d61c-443f-a65b-d21fe96a405b
2008-04-10 19:04:29 +00:00
qwell
76c6b35508 Merged revisions 114035 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r114035 | qwell | 2008-04-10 12:26:10 -0500 (Thu, 10 Apr 2008) | 10 lines

Only try to prefix language if we are not using an absolute path (suffix it otherwise).

en/var/lib/asterisk/sounds/blah.gsm is a very silly path.

(closes issue #12379)
Reported by: kuj
Patches:
      12379-absolutepath.diff uploaded by qwell (license 4)
Tested by: kuj, qwell

........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@114036 f38db490-d61c-443f-a65b-d21fe96a405b
2008-04-10 17:27:16 +00:00
file
c18817ccf8 Blocked revisions 114032 via svnmerge
........
r114032 | file | 2008-04-10 12:58:39 -0300 (Thu, 10 Apr 2008) | 6 lines

Forgot the 1.4 branch for russian language fix.
(closes issue #12404)
Reported by: IgorG
Patches:
      voicemail_ru_hardcoded-v1.patch uploaded by IgorG (license 20)

........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@114033 f38db490-d61c-443f-a65b-d21fe96a405b
2008-04-10 15:59:13 +00:00
file
20457e162e Merged revisions 114029 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r114029 | file | 2008-04-10 12:09:04 -0300 (Thu, 10 Apr 2008) | 6 lines

Create the directory where name recordings will go if it does not exist.
(closes issue #12311)
Reported by: rkeene
Patches:
      12311-mkdir.diff uploaded by qwell (license 4)

........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@114030 f38db490-d61c-443f-a65b-d21fe96a405b
2008-04-10 15:10:47 +00:00
file
ca26469ac3 Don't hardcode ru into the digits filename so that languageprefix can work.
(closes issue #12404)
Reported by: IgorG
Patches:
      voicemail_ru_hardcoded-v1.patch uploaded by IgorG (license 20)


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@114027 f38db490-d61c-443f-a65b-d21fe96a405b
2008-04-10 14:53:19 +00:00
file
72d780d114 Fix spelling of existent in a few places.
(closes issue #12409)
Reported by: candlerb


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@114024 f38db490-d61c-443f-a65b-d21fe96a405b
2008-04-10 13:45:45 +00:00
file
c60e277f23 Merged revisions 114021 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r114021 | file | 2008-04-10 10:27:11 -0300 (Thu, 10 Apr 2008) | 6 lines

Don't add custom URI options if they don't exist OR they are empty.
(closes issue #12407)
Reported by: homesick
Patches:
      uri_options-1.4.diff uploaded by homesick (license 91)

........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@114022 f38db490-d61c-443f-a65b-d21fe96a405b
2008-04-10 13:28:30 +00:00
mmichelson
adc41f0e5b Fix a crash that happened due to accessing free'd memory
(closes issue #12396)
Reported by: tcalosi
Patches:
      12396.patch uploaded by putnopvut (license 60)
	  Tested by: tcalosi


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@113980 f38db490-d61c-443f-a65b-d21fe96a405b
2008-04-09 22:32:32 +00:00
mmichelson
1cc6a28928 Merged revisions 113927 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r113927 | mmichelson | 2008-04-09 15:54:31 -0500 (Wed, 09 Apr 2008) | 8 lines

We need to set the persistant_route [sic] parameter for the sip_pvt
during the initial INVITE, no matter if we're building the route set from
an INVITE request or response.

(closes issue #12391)
Reported by: benjaminbohlmann
Tested by: benjaminbohlmann

........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@113928 f38db490-d61c-443f-a65b-d21fe96a405b
2008-04-09 20:56:14 +00:00
tilghman
d3c8cbf15a Merged revisions 113874 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r113874 | tilghman | 2008-04-09 13:57:33 -0500 (Wed, 09 Apr 2008) | 4 lines

If the [csv] section does not exist in cdr.conf, then an unload/load sequence
is needed to correct the problem.  Track whether the load succeeded with a
variable, so we can fix this with a simple reload event, instead.

........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@113875 f38db490-d61c-443f-a65b-d21fe96a405b
2008-04-09 19:00:40 +00:00
file
57edc654e1 Enable enough RTP bridging to allow P2P to work.
(closes issue #11901)
Reported by: pj


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@113840 f38db490-d61c-443f-a65b-d21fe96a405b
2008-04-09 18:05:40 +00:00
qwell
96bf7bb27a Fix a small file handle "leak" pointed out by jjshoe on #asterisk.
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@113838 f38db490-d61c-443f-a65b-d21fe96a405b
2008-04-09 17:56:07 +00:00
mmichelson
c4bcafc2fe There was a subtle logical difference between 1.4 and trunk with regards to how timeouts
were handled. In 1.4, if the absolute timeout were reached on a call, no matter what
the return value of ast_spawn_extension was, the pbx would attempt to go to the 'T'
extension or hangup otherwise. The rearrangement of this function in trunk made this check
only happen in the case that ast_spawn_extension returned 0. If ast_spawn_extension returned
1, then the fact that the timeout expired resulted in a no-op, and would cause an infinite
loop to occur in __ast_pbx_run. This change fixes this problem. Now timeouts will
behave as they did in 1.4

(closes issue #11550)
Reported by: pj
Tested by: putnopvut



git-svn-id: http://svn.digium.com/svn/asterisk/trunk@113836 f38db490-d61c-443f-a65b-d21fe96a405b
2008-04-09 17:48:33 +00:00
qwell
09f79a4f7a Move all messages wrapped in skinnydebug from debug to verbose.
(closes issue #12224)
Reported by: DEA
Patches:
      chan_skinny-debug-log.txt uploaded by DEA (license 3)


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@113834 f38db490-d61c-443f-a65b-d21fe96a405b
2008-04-09 17:41:09 +00:00
file
6f47ee028b Merged revisions 113784 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r113784 | file | 2008-04-09 13:50:45 -0300 (Wed, 09 Apr 2008) | 4 lines

If we receive an AUTHREQ from the remote server and we are unable to reply (for example they have a secret configured, but we do not) then queue a hangup frame on the Asterisk channel. This will cause the channel to hangup and a HANGUP to be sent via IAX2 to the remote side which is the proper thing to do in this scenario.
(closes issue #12385)
Reported by: viraptor

........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@113785 f38db490-d61c-443f-a65b-d21fe96a405b
2008-04-09 16:52:04 +00:00
tilghman
cbf32a3bec Mark recent additions from #11954 and #12254
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@113752 f38db490-d61c-443f-a65b-d21fe96a405b
2008-04-09 16:23:30 +00:00
tilghman
3fcaccaf83 Permit message wrap-around during message retrieval.
(closes issue #12254)
 Reported by: andrew
 Patches: 
       bug-12253.diff uploaded by snuffy (license 35)


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@113731 f38db490-d61c-443f-a65b-d21fe96a405b
2008-04-09 16:16:44 +00:00
mmichelson
7aeede0831 Merged revisions 113681 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r113681 | mmichelson | 2008-04-09 09:40:05 -0500 (Wed, 09 Apr 2008) | 9 lines

If Asterisk receives a 488 on an INVITE (not a reinvite), then
we should not send a BYE.

(closes issue #12392)
Reported by: fnordian
Patches:
      chan_sip.patch uploaded by fnordian (license 110) with small modification from me


........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@113682 f38db490-d61c-443f-a65b-d21fe96a405b
2008-04-09 14:41:58 +00:00
tilghman
ca1b11d1c8 Permit callee to continue in the dialplan, after caller has hung up.
(closes issue #11954)
 Reported by: johan
 Patches: 
       app_dial_rev104031.patch uploaded by johan (license 334)


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@113649 f38db490-d61c-443f-a65b-d21fe96a405b
2008-04-09 13:55:28 +00:00
tilghman
606eb171f4 Additional enhancements
(closes issue #12390)
 Reported by: tzafrir
 Patches: 
       astcli_fixes.diff uploaded by tzafrir (license 46)


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@113647 f38db490-d61c-443f-a65b-d21fe96a405b
2008-04-09 13:23:44 +00:00
twilson
1e764122a2 Merged revisions 113596 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r113596 | twilson | 2008-04-08 20:34:25 -0500 (Tue, 08 Apr 2008) | 2 lines

Initialize fr->cacheable to make valgrind happy

........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@113597 f38db490-d61c-443f-a65b-d21fe96a405b
2008-04-09 01:36:58 +00:00
tilghman
16d9984210 Add commandline tool for doing CLI commands through AMI (instead of using asterisk -rx)
(closes issue #12389)
 Reported by: davevg
 Patches: 
       astcli uploaded by davevg (license 209)


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@113559 f38db490-d61c-443f-a65b-d21fe96a405b
2008-04-08 21:33:11 +00:00
mmichelson
71bf72dc93 Blocked revisions 113507 via svnmerge
........
r113507 | mmichelson | 2008-04-08 14:07:38 -0500 (Tue, 08 Apr 2008) | 8 lines

Fix potential buffer overflow that could happen if more than 100 announce files
were specified when calling ParkAndAnnounce. This overflow is not exploitable remotely
and so there is no need for a security advisory.

(closes issue #12386)
Reported by: davidw


........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@113508 f38db490-d61c-443f-a65b-d21fe96a405b
2008-04-08 19:09:16 +00:00
qwell
de80e66e3a Merged revisions 113504 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r113504 | qwell | 2008-04-08 13:48:55 -0500 (Tue, 08 Apr 2008) | 1 line

Add a little more that is required for previously added devices.
........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@113505 f38db490-d61c-443f-a65b-d21fe96a405b
2008-04-08 18:49:21 +00:00
qwell
3f611459a0 Merged revisions 113454 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r113454 | qwell | 2008-04-08 13:07:49 -0500 (Tue, 08 Apr 2008) | 4 lines

Add support for several new(ish) devices - most notably, 7942/7945, 7962/7965, 7975.

Thanks to Greg Oliver for providing me the required information.

........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@113455 f38db490-d61c-443f-a65b-d21fe96a405b
2008-04-08 18:08:35 +00:00
qwell
e0c0f6e0c7 Move AST_FEATURE_FLAG_* and FEATURE_RETURN_* to features.h so that they can be used by modules.
(closes issue #12384)
Reported by: fnordian
Patches:
      features.patch uploaded by fnordian (license 110)

(patch modified by me, to give FEATURE_RETURN_* an AST_ prefix)


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@113452 f38db490-d61c-443f-a65b-d21fe96a405b
2008-04-08 17:32:42 +00:00
qwell
3553757daa Merged revisions 113402 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r113402 | qwell | 2008-04-08 11:56:52 -0500 (Tue, 08 Apr 2008) | 1 line

Work around some silliness caused by sys/capability.h - this should fix compile errors a number of users have been experiencing.
........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@113403 f38db490-d61c-443f-a65b-d21fe96a405b
2008-04-08 17:00:55 +00:00
tilghman
66ae197ec5 Merged revisions 113399 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r113399 | tilghman | 2008-04-08 11:51:28 -0500 (Tue, 08 Apr 2008) | 6 lines

Add security note on astgenkey's manpage.
(closes issue #12373)
 Reported by: lmamane
 Patches: 
       20080406__bug12373.diff.txt uploaded by Corydon76 (license 14)

........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@113400 f38db490-d61c-443f-a65b-d21fe96a405b
2008-04-08 16:54:21 +00:00
tilghman
ea4ffbc5c6 Merged revisions 113348 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r113348 | tilghman | 2008-04-08 10:39:16 -0500 (Tue, 08 Apr 2008) | 7 lines

Move check for still-bridged channels out a little further, to avoid possible
deadlocks.  (Closes issue #12252)
Reported by: callguy
 Patches: 
       20080319__bug12252.diff.txt uploaded by Corydon76 (license 14)
 Tested by: callguy

........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@113349 f38db490-d61c-443f-a65b-d21fe96a405b
2008-04-08 15:48:58 +00:00
file
96b9e55121 Merged revisions 113296 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r113296 | file | 2008-04-08 12:03:43 -0300 (Tue, 08 Apr 2008) | 4 lines

If audio suddenly gets fed into one side of a channel after a lapse of frames flush the other factory so that old audio does not remain in the factory causing the sync code to not execute.
(closes issue #12296)
Reported by: jvandal

........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@113297 f38db490-d61c-443f-a65b-d21fe96a405b
2008-04-08 15:05:35 +00:00
tilghman
5a75485670 Additional note
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@113245 f38db490-d61c-443f-a65b-d21fe96a405b
2008-04-07 22:16:46 +00:00
qwell
97b948a2bd Document 'originate' permission in manager sample config.
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@113243 f38db490-d61c-443f-a65b-d21fe96a405b
2008-04-07 21:49:27 +00:00
jpeeler
03f6e1b57f Merged revisions 113013 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r113013 | jpeeler | 2008-04-07 10:18:10 -0500 (Mon, 07 Apr 2008) | 15 lines

Merged revisions 113012 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r113012 | jpeeler | 2008-04-07 10:16:44 -0500 (Mon, 07 Apr 2008) | 7 lines

(closes issue #12362)
(closes issue #12372)
Reported by: vinsik
Tested by: tecnoxarxa

This one line change makes an if inside a for loop (in realtime_peer) check all the ast_variables the loop was intending to test rather than just the first one.

........

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


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@113241 f38db490-d61c-443f-a65b-d21fe96a405b
2008-04-07 21:35:48 +00:00
mmichelson
723b4e8bdf This is a "fix" for something that's been bugging the crap out of me for a while.
The variable name "flag" to distinguish between whether a message is being forwarded or
is new is not a helpful name. The newly added doxygen documentation to app_voicemail is
tremendously helpful, but I still just...hate this variable name. I think is_new_message
is more indicative of what its purpose is.



git-svn-id: http://svn.digium.com/svn/asterisk/trunk@113207 f38db490-d61c-443f-a65b-d21fe96a405b
2008-04-07 20:22:06 +00:00
tilghman
e7c5b61dbe Merged revisions 113117 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r113117 | tilghman | 2008-04-07 12:51:49 -0500 (Mon, 07 Apr 2008) | 3 lines

Force ast_mktime() to check for DST, since strptime(3) does not.
(Closes issue #12374)

........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@113172 f38db490-d61c-443f-a65b-d21fe96a405b
2008-04-07 19:06:46 +00:00
twilson
e786f36ebf atoi(NULL) is bad
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@113170 f38db490-d61c-443f-a65b-d21fe96a405b
2008-04-07 18:57:21 +00:00
qwell
3bc71165d9 Merged revisions 113118 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r113118 | qwell | 2008-04-07 13:00:09 -0500 (Mon, 07 Apr 2008) | 8 lines

Allow playback with noanswer (and add earlyrtp option).

(closes issue #9077)
Reported by: pj
Patches:
      earlyrtp.diff uploaded by wedhorn (license 30)
Tested by: pj, qwell, DEA, wedhorn

........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@113119 f38db490-d61c-443f-a65b-d21fe96a405b
2008-04-07 18:02:51 +00:00
mmichelson
1f187572a8 Merged revisions 113065 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r113065 | mmichelson | 2008-04-07 11:08:45 -0500 (Mon, 07 Apr 2008) | 13 lines

This fix prevents a deadlock that was experienced in chan_local. There was
deadlock prevention in place in chan_local, but it would not work in a specific
case because the channel was recursively locked. By unlocking the channel prior
to calling the generator's generate callback in ast_read_generator_actions(), we
prevent the recursive locking, and therefore the deadlock.

(closes issue #12307)
Reported by: callguy
Patches:
      12307.patch uploaded by putnopvut (license 60)
Tested by: callguy


........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@113066 f38db490-d61c-443f-a65b-d21fe96a405b
2008-04-07 16:12:30 +00:00
jpeeler
b442d66a6e Merged revisions 113012 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r113012 | jpeeler | 2008-04-07 10:16:44 -0500 (Mon, 07 Apr 2008) | 7 lines

(closes issue #12362)
(closes issue #12372)
Reported by: vinsik
Tested by: tecnoxarxa

This one line change makes an if inside a for loop (in realtime_peer) check all the ast_variables the loop was intending to test rather than just the first one.

........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@113013 f38db490-d61c-443f-a65b-d21fe96a405b
2008-04-07 15:18:10 +00:00
file
0559737a4b Put my slinfactory changes back in.
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@113009 f38db490-d61c-443f-a65b-d21fe96a405b
2008-04-07 14:54:42 +00:00
tilghman
b741bc6c36 AsyncAGI should not close the manager session on error.
(closes issue #12370)
 Reported by: srt
 Patches: 
       asterisk-12370.diff uploaded by srt (license 378)


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@112972 f38db490-d61c-443f-a65b-d21fe96a405b
2008-04-05 13:24:12 +00:00
twilson
dd4ab250b1 Clean up some memory leak/ref counting issues
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@112939 f38db490-d61c-443f-a65b-d21fe96a405b
2008-04-05 07:58:42 +00:00
twilson
f103c6d199 Multi-line support for phoneprov
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@112906 f38db490-d61c-443f-a65b-d21fe96a405b
2008-04-05 04:59:25 +00:00
murf
c7dcc10a2d Found a little problem with the sip request handling that could lead to a quick crash of asterisk, and a road to a DOS attack if left unfixed.
Attaching to a running asterisk with "telnet hostname 5060", I would input "something", then hit return three times, and asterisk crashes.

I traced it to handle_request_do(), which zeroes out the data (an ast_str ptr) if the string is too short. 
Instead of freeing the struct and nulling the pointer, it now just resets it, because this 
ast_str is expected by the calling routine to still be there after handle_request_do() returns.

This appears to fix the crash. I assume that it was introduced with ast_str's being adopted.  It's a subtle and easy-to-miss sort of problem.

I also found all the places where the req.data is freed, and made sure the ptr is Nulled out as well; 
no good leaving bad ptrs laying around-- I didn't need to do this, but it seemed a good thing to do...




git-svn-id: http://svn.digium.com/svn/asterisk/trunk@112874 f38db490-d61c-443f-a65b-d21fe96a405b
2008-04-05 01:33:13 +00:00
phsultan
f3fb6465c2 Merged revisions 112820 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r112820 | phsultan | 2008-04-04 21:26:15 +0200 (Fri, 04 Apr 2008) | 1 line

Free newly allocated channel before returning
........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@112821 f38db490-d61c-443f-a65b-d21fe96a405b
2008-04-04 19:28:49 +00:00
phsultan
6e064a3ce3 Merged revisions 112766 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r112766 | phsultan | 2008-04-04 19:16:59 +0200 (Fri, 04 Apr 2008) | 7 lines

Prevent call connections when codecs don't match.

(closes issue #10604)
Reported by: keepitcool
Patches:
      branch-1.4-10604-2.diff uploaded by phsultan (license 73)
Tested by: phsultan
........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@112785 f38db490-d61c-443f-a65b-d21fe96a405b
2008-04-04 17:32:46 +00:00
dhubbard
901f663ff4 sleep long enough for the zaptel timer error message to display before exit
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@112714 f38db490-d61c-443f-a65b-d21fe96a405b
2008-04-04 00:57:33 +00:00
file
1f228323c4 Merged revisions 112711 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r112711 | file | 2008-04-03 21:52:36 -0300 (Thu, 03 Apr 2008) | 2 lines

Pass in the path to Zaptel for systems that install Zaptel headers in a separate location.

........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@112712 f38db490-d61c-443f-a65b-d21fe96a405b
2008-04-04 00:53:19 +00:00