Commit Graph

16084 Commits

Author SHA1 Message Date
Steve Murphy
76be7d91a9 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.0@139104 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-20 17:30:58 +00:00
Michiel van Baak
e2a327e2cc 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.0@139021 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-20 16:18:05 +00:00
Mark Michelson
f084b49eed 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.0@139017 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-20 15:39:19 +00:00
Mark Michelson
c6c11dd423 Blocked revisions 138943 via svnmerge
................
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.0@138944 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-19 23:20:50 +00:00
Mark Michelson
a63274bf29 Manually add revision 138887 from trunk to the 1.6.0
branch. I had misunderstood the policy for when to merge
to 1.6.0 since it moved to rc status.



git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@138890 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-19 19:08:51 +00:00
Mark Michelson
502fede002 Blocked revisions 138887 via svnmerge
................
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.0@138889 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-19 18:54:19 +00:00
Michiel van Baak
b65c53337c 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.0@138852 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-19 16:58:06 +00:00
Steve Murphy
1ea8431ada 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.0@138847 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-19 16:38:21 +00:00
Steve Murphy
1f651e547e 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.0@138846 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-19 16:36:22 +00:00
Sean Bright
fe6ed321c8 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.0@138781 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-19 00:15:28 +00:00
Sean Bright
b688efae65 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.0@138776 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-18 23:43:54 +00:00
Mark Michelson
1633490379 Blocked revisions 138694 via svnmerge
........
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.0@138695 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-18 20:23:53 +00:00
Mark Michelson
ac72baa7b5 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.0@138688 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-18 20:05:09 +00:00
Jason Parker
133e628462 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.0@138632 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-18 15:54:40 +00:00
Jeff Peeler
108df903c9 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.0@138519 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-18 02:14:02 +00:00
Sean Bright
8dcca4a2b0 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.0@138483 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-17 14:14:46 +00:00
Sean Bright
141673d440 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.0@138480 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-17 14:00:54 +00:00
Sean Bright
e509e5b79f 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.0@138477 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-17 13:41:56 +00:00
Sean Bright
2ebec214f2 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.0@138474 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-17 13:33:21 +00:00
Sean Bright
fe274af25b 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.0@138443 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-16 16:41:52 +00:00
Tilghman Lesher
8a31f07fe5 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.0@138413 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-16 13:07:52 +00:00
Tilghman Lesher
a45a011655 Blocked revisions 138409 via svnmerge
........
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.0@138410 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-16 12:53:12 +00:00
Jeff Peeler
f23919f30b 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.0@138362 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-16 01:14:11 +00:00
Jeff Peeler
47a7ff76f7 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.0@138333 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-16 00:27:27 +00:00
Tilghman Lesher
eec03bcf40 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.0@138262 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-15 23:03:06 +00:00
Tilghman Lesher
f37a7ab9eb Merged revisions 138206 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r138206 | tilghman | 2008-08-15 15:35:24 -0500 (Fri, 15 Aug 2008) | 4 lines

Remove deprecated syntax from sample config file
(closes issue #13314)
 Reported by: kue

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@138207 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-15 20:36:35 +00:00
Jeff Peeler
ffff97ded1 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.0@138157 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-15 20:20:30 +00:00
Jeff Peeler
907dd0a233 Blocked revisions 138155 via svnmerge
........
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.0@138156 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-15 20:15:11 +00:00
Tilghman Lesher
de20b37b1a Blocked revisions 138148 via svnmerge
........
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.0@138149 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-15 19:36:46 +00:00
Tilghman Lesher
a9f2bcff0a Blocked revisions 138124 via svnmerge
........
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.0@138136 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-15 19:24:57 +00:00
Tilghman Lesher
b98996479c Blocked revisions 138086 via svnmerge
........
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.0@138087 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-15 18:03:04 +00:00
Russell Bryant
43b54c74ec 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.0@138029 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-15 15:12:08 +00:00
Tilghman Lesher
2a1ba6191e 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.0@138025 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-15 15:04:14 +00:00
Russell Bryant
74c4b84e73 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.0@137988 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-14 22:43:36 +00:00
Sean Bright
2bc89083d9 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.0@137934 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-14 18:48:39 +00:00
Russell Bryant
586653b2c5 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.0@137902 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-14 18:12:33 +00:00
Tilghman Lesher
6f80e827c7 Blocked revisions 137851 via svnmerge
................
r137851 | tilghman | 2008-08-14 12:01:00 -0500 (Thu, 14 Aug 2008) | 9 lines

Blocked revisions 137850 via svnmerge

........
r137850 | tilghman | 2008-08-14 11:55:20 -0500 (Thu, 14 Aug 2008) | 2 lines

Oops, wrong direction

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@137852 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-14 17:01:35 +00:00
Tilghman Lesher
af9f8bf291 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.0@137849 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-14 16:54:22 +00:00
Jason Parker
17f520666d 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.0@137814 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-14 15:37:35 +00:00
Russell Bryant
42d49d655d 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.0@137783 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-14 15:20:37 +00:00
Sean Bright
9968e9a09b 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.0@137781 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-14 15:05:00 +00:00
Kevin P. Fleming
5aa7e82924 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.0@137681 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-14 02:04:05 +00:00
Kevin P. Fleming
666ca122e8 Merged revisions 137640 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r137640 | kpfleming | 2008-08-13 18:00:37 -0500 (Wed, 13 Aug 2008) | 1 line

make this script actually work
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@137641 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-13 23:00:55 +00:00
Kevin P. Fleming
d0c3c48a54 Merged revisions 137627 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r137627 | kpfleming | 2008-08-13 17:33:32 -0500 (Wed, 13 Aug 2008) | 9 lines

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/branches/1.6.0@137631 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-13 22:34:25 +00:00
Jason Parker
c6681ec41d Merged revisions 137532 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r137532 | qwell | 2008-08-13 16:08:58 -0500 (Wed, 13 Aug 2008) | 8 lines

Correctly end locally ended calls.

(closes issue #12170)
Reported by: pj
Patches:
      20080702__issue12170_clear_pendinginvite.diff uploaded by bbryant (license 36)
Tested by: bbryant, pabelanger

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@137533 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-13 21:09:36 +00:00
Jason Parker
84d0f2de87 Merged revisions 137496 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r137496 | qwell | 2008-08-13 15:05:50 -0500 (Wed, 13 Aug 2008) | 6 lines

Add FAXMODE variable with what fax transport was used.

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

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@137497 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-13 20:06:33 +00:00
Tilghman Lesher
54f95d4596 Blocked revisions 137456 via svnmerge
........
r137456 | tilghman | 2008-08-13 12:36:15 -0500 (Wed, 13 Aug 2008) | 6 lines

Convert deprecated routines to the new names.
(closes issue #13297)
 Reported by: snuffy
 Patches: 
       bug13297_20080814.diff uploaded by snuffy (license 35)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@137457 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-13 17:37:26 +00:00
Sean Bright
c4cf3534a5 Merged revisions 137406 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r137406 | seanbright | 2008-08-13 10:41:49 -0400 (Wed, 13 Aug 2008) | 9 lines

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

........
r137405 | seanbright | 2008-08-13 10:33:49 -0400 (Wed, 13 Aug 2008) | 1 line

Update docs to reflect the change to cdr_tds
........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@137407 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-13 14:47:43 +00:00
Sean Bright
c5cd445b7a Merged revisions 137403 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r137403 | seanbright | 2008-08-13 10:22:47 -0400 (Wed, 13 Aug 2008) | 1 line

Use the ast_vasprintf macro instead of vasprintf directly.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@137404 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-13 14:24:14 +00:00
Sean Bright
4430462543 Blocked revisions 137349 via svnmerge
................
r137349 | seanbright | 2008-08-12 20:11:13 -0400 (Tue, 12 Aug 2008) | 15 lines

Blocked revisions 137348 via svnmerge

........
r137348 | seanbright | 2008-08-12 20:10:35 -0400 (Tue, 12 Aug 2008) | 8 lines

Bring cdr_tds in line with the other CDR backends and have it try to store
CDR(userfield) if it is set.  The new behavior is to check for the userfield
column on module load, and if it exists, we will store CDR(userfield) when
CDRs are written.  A similar patch already went into trunk and 1.6.0.

(closes issue #13290)
Reported by: falves11

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@137350 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-13 00:12:03 +00:00