Commit Graph

16341 Commits

Author SHA1 Message Date
Mark Michelson
b814413ab3 Blocked revisions 139525 via svnmerge
................
r139525 | mmichelson | 2008-08-22 14:24:26 -0500 (Fri, 22 Aug 2008) | 15 lines

Blocked revisions 139521 via svnmerge

........
r139521 | mmichelson | 2008-08-22 14:23:02 -0500 (Fri, 22 Aug 2008) | 8 lines

Remove show_frame_stats_deprecated since it is not
used anywhere and causes build errors if building under
dev-mode with TRACE_FRAMES selected in menuselect.

(closes issue #13362)
Reported by: snuffy


........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@139531 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-22 19:25:31 +00:00
Mark Michelson
2b05a594fa Merged revisions 139469 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r139469 | mmichelson | 2008-08-22 12:25:12 -0500 (Fri, 22 Aug 2008) | 11 lines

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

........
r139466 | mmichelson | 2008-08-22 12:24:47 -0500 (Fri, 22 Aug 2008) | 3 lines

Fix the build. Thanks, mvanbaak!


........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@139474 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-22 17:26:03 +00:00
Mark Michelson
9a3fe578f5 Merged revisions 139457 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r139457 | mmichelson | 2008-08-22 11:58:21 -0500 (Fri, 22 Aug 2008) | 15 lines

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

........
r139456 | mmichelson | 2008-08-22 11:57:38 -0500 (Fri, 22 Aug 2008) | 7 lines

Prevent a deadlock in chan_iax2 resulting from
incorrect locking order between iax2_pvt and
ast_channel structures.

AST-13


........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@139459 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-22 16:59:30 +00:00
Jeff Peeler
bff052c3ea Merged revisions 139391 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r139391 | jpeeler | 2008-08-21 18:41:50 -0500 (Thu, 21 Aug 2008) | 11 lines

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

........
r139387 | jpeeler | 2008-08-21 18:39:31 -0500 (Thu, 21 Aug 2008) | 3 lines

Fixes loop that could possibly never exit in the event of a channel never being able to be opened or specify after a restart.
(closes issue #11017)

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@139399 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-21 23:44:18 +00:00
Russell Bryant
de5301d4f6 Merged revisions 139215 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r139215 | russell | 2008-08-20 17:16:36 -0500 (Wed, 20 Aug 2008) | 19 lines

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

........
r139213 | russell | 2008-08-20 17:14:35 -0500 (Wed, 20 Aug 2008) | 11 lines

Fix a crash in the ChanSpy application.  The issue here is that if you call
ChanSpy and specify a spy group, and sit in the application long enough looping
through the channel list, you will eventually run out of stack space and the
application with exit with a seg fault.  The backtrace was always inside of
a harmless snprintf() call, so it was tricky to track down.  However, it turned
out that the call to snprintf() was just the biggest stack consumer in this
code path, so it would always be the first one to hit the boundary.

(closes issue #13338)
Reported by: ruddy

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@139217 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-20 22:19:33 +00:00
Jason Parker
925be65d2e Merged revisions 139210 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r139210 | qwell | 2008-08-20 17:06:40 -0500 (Wed, 20 Aug 2008) | 7 lines

Fix output of sipshowpeer manager response.

(closes issue #13346)
Reported by: srt
Patches:
      13346_malformed_sip_show_peer_response.diff uploaded by srt (license 378)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@139212 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-20 22:07:47 +00:00
Steve Murphy
7907def3f4 Merged revisions 139083 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r139083 | murf | 2008-08-20 11:25:07 -0600 (Wed, 20 Aug 2008) | 20 lines

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

........
r139074 | murf | 2008-08-20 11:14:55 -0600 (Wed, 20 Aug 2008) | 12 lines


(closes issue #13263)
Reported by: brainy
Tested by: murf

The specialized reset routine is tromping on the
flags field of the CDR. I made a change to not
reset the DISABLED bit. This should get rid of this
problem.



........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@139106 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-20 17:34:53 +00:00
Michiel van Baak
51f8cead0f Blocked revisions 139020 via svnmerge
........
r139020 | mvanbaak | 2008-08-20 18:16:53 +0200 (Wed, 20 Aug 2008) | 4 lines

fix unholding phones after hangup on older cisco phones.

Patch by wedhorn.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@139023 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-20 16:19:49 +00:00
Mark Michelson
3c0fbfd326 Merged revisions 139016 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r139016 | mmichelson | 2008-08-20 10:38:47 -0500 (Wed, 20 Aug 2008) | 14 lines

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

........
r139015 | mmichelson | 2008-08-20 10:37:56 -0500 (Wed, 20 Aug 2008) | 6 lines

sip_read should properly handle a NULL return from sip_rtp_read.

(closes issue #13257)
Reported by: travishein


........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@139018 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-20 15:39:39 +00:00
Mark Michelson
513a09dbcd Merged revisions 138943 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r138943 | mmichelson | 2008-08-19 18:19:40 -0500 (Tue, 19 Aug 2008) | 19 lines

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

........
r138942 | mmichelson | 2008-08-19 18:17:17 -0500 (Tue, 19 Aug 2008) | 11 lines

Reset agent_pvt variables back to the values in agents.conf
(from what the corresponding channel variables were set to)
when the agent logs out.

(closes issue #13098)
Reported by: davidw
Patches:
      20080731__issue13098_agent_ackcall_not_reset.diff uploaded by bbryant (license 36)
Tested by: davidw


........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@138945 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-19 23:21:20 +00:00
Mark Michelson
c4cd8ee947 Merged revisions 138887 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r138887 | mmichelson | 2008-08-19 13:52:04 -0500 (Tue, 19 Aug 2008) | 31 lines

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

........
r138886 | mmichelson | 2008-08-19 13:50:53 -0500 (Tue, 19 Aug 2008) | 23 lines

Add a lock and unlock prior to the destruction of the chanspy_ds
lock to ensure that no other threads still have it locked. While
this should not happen under normal circumstances, it appears that
if the spyer and spyee hang up at nearly the same time, the following
may occur.

1. ast_channel_free is called on the spyee's channel.
2. The chanspy datastore is removed from the spyee's channel in 
   ast_channel_free.
3. In the spyer's thread, the spyer attempts to remove and destroy the datastore
   from the spyee channel, but the datastore has already been removed in step 2, 
   so the spyer continues in the code.
4. The spyee's thread continues and calls the datastore's destroy callback, 
   chanspy_ds_destroy. This involves locking the chanspy_ds.
5. Now the spyer attempts to destroy the chanspy_ds lock. The problem is that in step 4, 
   the spyee has locked this lock, meaning that the spyer is attempting to destroy a lock 
   which is currently locked by another thread.

The backtrace provided in issue #12969 supports the idea that this is possible
(and has even occurred). This commit does not close the issue, but should help
in preventing one type of crash associated with the use of app_chanspy.


........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@138888 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-19 18:53:22 +00:00
Steve Murphy
e5fa8246e7 Merged revisions 138845 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r138845 | murf | 2008-08-19 10:31:24 -0600 (Tue, 19 Aug 2008) | 1 line

Oops. put a decl in a generated file. My bad, but fixed now.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@138855 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-19 17:01:43 +00:00
Michiel van Baak
fc3434d16d Blocked revisions 138851 via svnmerge
........
r138851 | mvanbaak | 2008-08-19 18:56:50 +0200 (Tue, 19 Aug 2008) | 8 lines

chan_skinny now respects callwaiting=no

(closes issue #12691)
Reported by: sbisker
Patches:
      callwaitingv1.diff uploaded by wedhorn (license 30)
Tested by: wedhorn on old skinny phones, mvanbaak on 7960 and 7905 with latest firmware

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@138854 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-19 17:00:31 +00:00
Steve Murphy
7af40ac1a1 Merged revisions 138815 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r138815 | murf | 2008-08-19 09:59:12 -0600 (Tue, 19 Aug 2008) | 19 lines

These changes are in regards to bug 13249, where users are being surprised by the changes made
to the Set app in trunk/1.6.x, as they come from the 1.4 world. They are only bitten if
they write their AEL dialplan in the 1.4 world, and then carry it over to a trunk/1.6.x 
installation where a "make samples" was executed, or where they hand-edited the 
asterisk.conf file and added the [compat] category with app_set = 1.6 (or higher).

(this commit does not totally solve 13249, at least not yet)

The change involves issueing a single warning while the AEL file is loading, if:
 1. app_set is present in the config file, and set to 1.6 or higher.
 2. there are double quotes in an assignment statement (eg x = "hi there";)
 3. the warning was not already issued.

The standalone app, aelparse, does not (yet) issue this warning. I'd have to
have it read in the asterisk.conf file, and that's a bit of hassle. I'll add
it if users request it, tho.



........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@138853 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-19 16:59:08 +00:00
Sean Bright
e68b9c8b56 Merged revisions 138778-138780 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r138778 | seanbright | 2008-08-18 20:08:27 -0400 (Mon, 18 Aug 2008) | 1 line

While we're at it, make this machine parseable too.
........
r138779 | seanbright | 2008-08-18 20:09:38 -0400 (Mon, 18 Aug 2008) | 1 line

And remove code we don't need anymore.
........
r138780 | seanbright | 2008-08-18 20:10:56 -0400 (Mon, 18 Aug 2008) | 1 line

Let it compile now, too (woops)
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@138782 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-19 00:17:11 +00:00
Sean Bright
e1298fd126 Merged revisions 138775 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r138775 | seanbright | 2008-08-18 19:42:36 -0400 (Mon, 18 Aug 2008) | 3 lines

Change event header to RegistrationTime to be more consistent (and avoid
breaking existing frameworks).  Pointed out by Laureano on #asterisk-dev.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@138777 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-18 23:44:38 +00:00
Mark Michelson
f362535dde Merged revisions 138694 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r138694 | mmichelson | 2008-08-18 15:23:11 -0500 (Mon, 18 Aug 2008) | 10 lines

Change the queue timeout priority logic into less ugly
and confusing code pieces. Clarify the logic within
queues.conf.sample.

(closes issue #12690)
Reported by: atis
Patches:
      queue_timeoutpriority.patch uploaded by atis (license 242)


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@138698 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-18 20:24:29 +00:00
Mark Michelson
cfe95ab57a Merged revisions 138687 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r138687 | mmichelson | 2008-08-18 15:04:10 -0500 (Mon, 18 Aug 2008) | 18 lines

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

........
r138685 | mmichelson | 2008-08-18 15:01:14 -0500 (Mon, 18 Aug 2008) | 10 lines

Change the inequalities used in app_queue with regards
to timeouts from being strict to non-strict for more
accuracy.

(closes issue #13239)
Reported by: atis
Patches:
      app_queue_timeouts_v2.patch uploaded by atis (license 242)


........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@138689 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-18 20:07:42 +00:00
Jason Parker
0725699828 Merged revisions 138631 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r138631 | qwell | 2008-08-18 10:54:07 -0500 (Mon, 18 Aug 2008) | 1 line

Remove option that isn't valid here.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@138633 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-18 15:55:01 +00:00
Jeff Peeler
9a3aa8dc8e Merged revisions 138518 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r138518 | jpeeler | 2008-08-17 21:13:04 -0500 (Sun, 17 Aug 2008) | 1 line

add missing define for SS7 in dahdi_restart
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@138520 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-18 02:14:38 +00:00
Sean Bright
c36bdfdf33 Merged revisions 138482 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r138482 | seanbright | 2008-08-17 10:12:11 -0400 (Sun, 17 Aug 2008) | 6 lines

Move Uniqueid to the end of the event for those that rely on the position
of the name/value pairs, pointed out by snuffy-home on #asterisk-commits.

For those of you who rely on the position of name/value pairs in manager
events... stop... that is why associative arrays were invented.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@138498 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-17 14:27:57 +00:00
Sean Bright
b41cc8891a Merged revisions 138479 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r138479 | seanbright | 2008-08-17 09:51:08 -0400 (Sun, 17 Aug 2008) | 7 lines

Add Uniqueid header to ParkedCall manager event.

(closes issue #13323)
Reported by: srt
Patches:
      13323_unique_id_for_parkedcalls_event.diff uploaded by srt (license 378)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@138481 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-17 14:07:42 +00:00
Sean Bright
9367e7b916 Merged revisions 138476 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r138476 | seanbright | 2008-08-17 09:40:36 -0400 (Sun, 17 Aug 2008) | 7 lines

Add missing colons to RTCPReceived and RTCPSent manager events.

(closes issue #13319)
Reported by: srt
Patches:
      13319_rtcp_manager_event_headers.diff uploaded by srt (license 378)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@138478 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-17 13:42:59 +00:00
Sean Bright
9fb19a971f Merged revisions 138473 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r138473 | seanbright | 2008-08-17 09:31:54 -0400 (Sun, 17 Aug 2008) | 7 lines

Fix the output of the JitterBufStats manager event.

(closes issue #13324)
Reported by: srt
Patches:
      13324_missing_nl_in_jitterbufstats_event_2.diff uploaded by srt (license 378)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@138475 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-17 13:34:16 +00:00
Sean Bright
19580da4e0 Merged revisions 138442 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r138442 | seanbright | 2008-08-16 12:40:43 -0400 (Sat, 16 Aug 2008) | 4 lines

Since it's introduction in revision 3497, cdr_tds has *never* read
the port configuration option from cdr_tds.conf.  So go ahead and
remove it from the sample config.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@138444 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-16 16:42:43 +00:00
Tilghman Lesher
2b11ad30d6 Merged revisions 138412 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r138412 | tilghman | 2008-08-16 08:07:08 -0500 (Sat, 16 Aug 2008) | 2 lines

Fix compilation warnings (found with dev-mode)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@138414 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-16 13:08:23 +00:00
Tilghman Lesher
88d23d712e Merged revisions 138409 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r138409 | tilghman | 2008-08-16 07:52:06 -0500 (Sat, 16 Aug 2008) | 3 lines

Also make sure hinting won't crash on reload.
(Closes issue #13312)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@138411 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-16 13:00:57 +00:00
Jeff Peeler
6484b49dc4 Merged revisions 138361 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r138361 | jpeeler | 2008-08-15 20:13:26 -0500 (Fri, 15 Aug 2008) | 9 lines

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

........
r138360 | jpeeler | 2008-08-15 20:12:18 -0500 (Fri, 15 Aug 2008) | 1 line

fixes use count to properly decrement if an active dahdi channel is destroyed allowing module to be unloaded
........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@138363 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-16 01:14:34 +00:00
Jeff Peeler
54092611a8 Merged revisions 138311 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r138311 | jpeeler | 2008-08-15 18:46:09 -0500 (Fri, 15 Aug 2008) | 20 lines

Merged revisions 138119,138151,138238 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r138119 | jpeeler | 2008-08-15 14:21:51 -0500 (Fri, 15 Aug 2008) | 4 lines

Fixes the dahdi restart functionality. Dahdi restart allows one to restart all DAHDI channels, even if they are currently in use. This is different from unloading and then loading the module since unloading requires the use count to be zero. Reloading the module is different in that the signalling is not changed from what it was originally configured. Also, this fixes not closing all the file descriptors for D-channels upon module unload (which would prevent loading the module afterwards).

(closes issue #11017)

........
r138151 | jpeeler | 2008-08-15 14:41:29 -0500 (Fri, 15 Aug 2008) | 1 line

declared static mutexes using AST_MUTEX_DEFINE_STATIC macro
........
r138238 | jpeeler | 2008-08-15 16:28:26 -0500 (Fri, 15 Aug 2008) | 1 line

initialize condition variable ss_thread_complete using ast_cond_init
........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@138359 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-16 00:38:21 +00:00
Tilghman Lesher
fcafa8cb49 Merged revisions 138260 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r138260 | tilghman | 2008-08-15 17:54:57 -0500 (Fri, 15 Aug 2008) | 16 lines

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

........
r138258 | tilghman | 2008-08-15 17:33:42 -0500 (Fri, 15 Aug 2008) | 8 lines

More fixes for realtime peers.
(closes issue #12921)
 Reported by: Nuitari
 Patches: 
       20080804__bug12921.diff.txt uploaded by Corydon76 (license 14)
       20080815__bug12921.diff.txt uploaded by Corydon76 (license 14)
 Tested by: Corydon76

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@138261 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-15 22:56:18 +00:00
Tilghman Lesher
aad266af22 Merged revisions 138207 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@138208 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-15 20:37:20 +00:00
Jeff Peeler
4b83217511 Merged revisions 138155 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r138155 | jpeeler | 2008-08-15 15:12:19 -0500 (Fri, 15 Aug 2008) | 1 line

rename all zfd instances in chan_dahdi to dfd to match 1.4 (left over from DAHDI transition)
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@138184 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-15 20:28:20 +00:00
Russell Bryant
cd60aadb5e Merged revisions 138028 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r138028 | russell | 2008-08-15 10:09:46 -0500 (Fri, 15 Aug 2008) | 17 lines

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

........
r138027 | russell | 2008-08-15 10:07:16 -0500 (Fri, 15 Aug 2008) | 9 lines

Ensure that when a hangup occurs in autoservice, that a hangup frame gets
properly deferred to be read from the channel owner when it gets taken out
of autoservice.

(closes issue #12874)
Reported by: dimas
Patches: 
      v1-12874.patch uploaded by dimas (license 88)

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@138158 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-15 20:21:38 +00:00
Tilghman Lesher
f42b756512 Merged revisions 138148 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r138148 | tilghman | 2008-08-15 14:36:11 -0500 (Fri, 15 Aug 2008) | 2 lines

Change free to ast_free_ptr, too

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@138150 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-15 19:37:22 +00:00
Tilghman Lesher
0ffc03dffc Merged revisions 138124 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r138124 | tilghman | 2008-08-15 14:22:48 -0500 (Fri, 15 Aug 2008) | 4 lines

e->data can be NULL, so use the safe version of ast_strdup()
(closes issue #13312)
 Reported by: pj

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@138133 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-15 19:24:27 +00:00
Tilghman Lesher
1cac97b8f8 Merged revisions 138086 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r138086 | tilghman | 2008-08-15 13:02:15 -0500 (Fri, 15 Aug 2008) | 2 lines

regseconds is actually stored as the epoch time, not registration length

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@138088 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-15 18:03:44 +00:00
Tilghman Lesher
e0b60bc92c Merged revisions 138024 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r138024 | tilghman | 2008-08-15 10:03:32 -0500 (Fri, 15 Aug 2008) | 16 lines

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

........
r138023 | tilghman | 2008-08-15 09:51:12 -0500 (Fri, 15 Aug 2008) | 8 lines

Additional check for more string specifiers than arguments.
(closes issue #13299)
 Reported by: adomjan
 Patches: 
       20080813__bug13299.diff.txt uploaded by Corydon76 (license 14)
       func_strings.c-sprintf.patch uploaded by adomjan (license 487)
 Tested by: adomjan

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@138026 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-15 15:04:53 +00:00
Russell Bryant
f7db6b56dd Merged revisions 137987 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r137987 | russell | 2008-08-14 17:43:15 -0500 (Thu, 14 Aug 2008) | 2 lines

Fix a bashism that causes an error when trying to build the pdf on ubuntu

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@137989 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-14 22:43:50 +00:00
Sean Bright
6bb2c37336 Merged revisions 137933 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r137933 | seanbright | 2008-08-14 14:47:28 -0400 (Thu, 14 Aug 2008) | 8 lines

Fix memory leak in cdr_sqlite3_custom.

(closes issue #13304)
Reported by: eliel
Patches:
      sqlite.patch uploaded by eliel (license 64)
      (Slightly modified by me)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@137935 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-14 18:50:09 +00:00
Tilghman Lesher
fb6959baae Merged revisions 137848 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r137848 | tilghman | 2008-08-14 11:52:43 -0500 (Thu, 14 Aug 2008) | 17 lines

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

........
r137847 | tilghman | 2008-08-14 11:47:30 -0500 (Thu, 14 Aug 2008) | 9 lines

When creating the secondary subchannel name, it is necessary to compare to
the existing channel name without the "Zap/" or "DAHDI/" prefix, since our
test string is also without that prefix.
(closes issue #13027)
 Reported by: dferrer
 Patches: 
       chan_zap-1.4.21.1_fix2.patch uploaded by dferrer (license 525)
       (Slightly modified by me, to compensate for both names)

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@137904 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-14 18:15:35 +00:00
Russell Bryant
ab0653ed1c Blocked revisions 137901 via svnmerge
........
r137901 | russell | 2008-08-14 13:12:16 -0500 (Thu, 14 Aug 2008) | 1 line

Prepare for adding 1.6.2 changes
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@137903 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-14 18:12:46 +00:00
Jason Parker
b757f3247c Merged revisions 137812 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r137812 | qwell | 2008-08-14 10:32:16 -0500 (Thu, 14 Aug 2008) | 8 lines

Make sure we set the socket port, so we don't try to use <ip address>:0.

(closes issue #13255)
Reported by: falves11
Patches:
      13255-socketport.diff uploaded by qwell (license 4)
Tested by: falves11

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@137815 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-14 15:39:24 +00:00
Russell Bryant
baa115665e Merged revisions 137732 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r137732 | russell | 2008-08-14 09:15:50 -0500 (Thu, 14 Aug 2008) | 12 lines

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

........
r137731 | russell | 2008-08-14 09:05:23 -0500 (Thu, 14 Aug 2008) | 4 lines

Comments in this config file were aligned only if your tab size was set to 8.
So, convert tabs to spaces so that things should be aligned regardless of what
tab size you use in your editor.

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@137813 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-14 15:35:32 +00:00
Sean Bright
87f0047a3a Merged revisions 137780 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r137780 | seanbright | 2008-08-14 11:03:03 -0400 (Thu, 14 Aug 2008) | 8 lines

If we detect that we are no longer connected, try to reconnect a few times
before giving up.  This relies on the timeout settings in the freetds.conf
file and, unfortunately, on a recent version of FreeTDS (0.82 or newer).

I either need to change the current execs to be non-blocking (which I do
not want to do) or we have to force people to run with the latest and
greatest of FreeTDS.  I'm on the fence...

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@137782 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-14 15:06:49 +00:00
Kevin P. Fleming
d3adb4a6e5 Merged revisions 137680 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r137680 | kpfleming | 2008-08-13 21:03:47 -0500 (Wed, 13 Aug 2008) | 9 lines

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

........
r137679 | kpfleming | 2008-08-13 21:03:04 -0500 (Wed, 13 Aug 2008) | 1 line

forgot one module name that changed
........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@137683 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-14 02:08:56 +00:00
Kevin P. Fleming
8e58424220 configure for merging from trunk
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@137682 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-14 02:08:36 +00:00
Kevin P. Fleming
98a8f57348 now that 1.6.0 has reached the 'release candidate' stage, it's time to branch 1.6.1
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@137648 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-13 23:08:50 +00:00
Kevin P. Fleming
62efd337c1 make this script actually work
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@137640 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-13 23:00:37 +00:00
Kevin P. Fleming
47ea5a01b4 Merged revisions 137530 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r137530 | kpfleming | 2008-08-13 15:46:19 -0500 (Wed, 13 Aug 2008) | 1 line

add document describing what users will need to be aware of when upgrading to this version and using DAHDI
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@137627 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-13 22:33:32 +00:00
Jeff Peeler
81c3d0cfe4 Blocked revisions 137580 via svnmerge
........
r137580 | jpeeler | 2008-08-13 16:35:37 -0500 (Wed, 13 Aug 2008) | 3 lines

Register DAHDISendKeypadFacility application if dahdi_chan_mode is set to DAHDI + Zap. Mark ZapSendKeypadFacility application as deprecated on usage.


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@137582 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-13 21:49:11 +00:00