Commit Graph

14989 Commits

Author SHA1 Message Date
Joshua Colp
be093c0508 Merged revisions 110629 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r110629 | file | 2008-03-25 11:39:45 -0300 (Tue, 25 Mar 2008) | 12 lines

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

........
r110628 | file | 2008-03-25 11:37:35 -0300 (Tue, 25 Mar 2008) | 4 lines

Add an option (transmit_silence) which transmits silence during both Record() and DTMF generation. The reason this is an option is that in order to transmit silence we have to setup a translation path. This may not be needed/wanted in all cases.
(closes issue #10058)
Reported by: tracinet

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@110630 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-25 14:42:35 +00:00
Mark Michelson
4b6fe33940 Blocked revisions 110621 via svnmerge
........
r110621 | mmichelson | 2008-03-24 15:14:07 -0500 (Mon, 24 Mar 2008) | 11 lines

Remove the "Event: registration" header from Asterisk-generated
SIP REGISTER requests. rjain points out that RFC 3265 specifies
that the Event: header is not a valid header for REGISTER requests
and that the "registration" value is not defined at IANA.

(closes issue #12279)
Reported by: rjain
Patches:
      chan_sip.c.diff uploaded by rjain (license 226)


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@110622 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-24 20:14:28 +00:00
Mark Michelson
1a433add7a Merged revisions 110619 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r110619 | mmichelson | 2008-03-24 14:19:37 -0500 (Mon, 24 Mar 2008) | 23 lines

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

........
r110618 | mmichelson | 2008-03-24 14:17:41 -0500 (Mon, 24 Mar 2008) | 15 lines

This is a revert for revision 108288. The reason is that that revision
was not for an actual bug fix per se, and so it really should not have been in 1.4 in
the first place. Plus, people who compile with DO_CRASH are more likely
to encounter a crash due to this change. While I think the usage of DO_CRASH
in ast_sched_del is a bit absurd, this sort of change is beyond the scope of 1.4
and should be done instead in a developer branch based on trunk 
so that all scheduler functions are fixed at once.

I also am reverting the change to trunk and 1.6 since they also suffer from
the DO_CRASH potential.

(closes issue #12272)
Reported by: qq12345


........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@110620 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-24 19:20:30 +00:00
Russell Bryant
1ed7dc48f3 Merged revisions 110615 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r110615 | russell | 2008-03-24 12:36:04 -0500 (Mon, 24 Mar 2008) | 10 lines

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

........
r110614 | russell | 2008-03-24 12:34:56 -0500 (Mon, 24 Mar 2008) | 2 lines

Turn a NOTICE into a DEBUG message.

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@110616 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-24 17:36:23 +00:00
Joshua Colp
00bf34e216 Merged revisions 110610 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r110610 | file | 2008-03-24 12:28:25 -0300 (Mon, 24 Mar 2008) | 6 lines

Only print out the set_address_from_contact host verbose message if debugging is enabled on the dialog.
(closes issue #12280)
Reported by: rjain
Patches:
      chan_sip.c.diff uploaded by rjain (license 226)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@110611 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-24 15:29:38 +00:00
Jason Parker
5519fd72b9 Merged revisions 110578 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r110578 | qwell | 2008-03-21 16:52:06 -0500 (Fri, 21 Mar 2008) | 1 line

Update to 1.4.11 core sounds.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@110579 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-21 21:52:47 +00:00
Joshua Colp
dbd1692779 Blocked revisions 110542 via svnmerge
........
r110542 | file | 2008-03-21 14:58:59 -0300 (Fri, 21 Mar 2008) | 2 lines

Merge over ast_audiohook_volume branch. This adds API calls for use by developers to adjust the volume on a channel.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@110543 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-21 18:00:06 +00:00
Russell Bryant
6aa9c04ee9 Merged revisions 110499 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r110499 | russell | 2008-03-21 10:24:43 -0500 (Fri, 21 Mar 2008) | 3 lines

Note that the TCP and TLS support is currently considered experimental and
is subject to change while we work out the remaining issues.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@110501 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-21 15:25:06 +00:00
Jason Parker
57d3a27f1b Merged revisions 110475 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r110475 | qwell | 2008-03-21 09:36:17 -0500 (Fri, 21 Mar 2008) | 15 lines

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

........
r110474 | qwell | 2008-03-21 09:32:52 -0500 (Fri, 21 Mar 2008) | 7 lines

Don't attempt to do optimizations of gsm on mips platforms either.

(closes issue #12270)
Reported by: zandbelt
Patches:
      026-gsm-mips.patch uploaded by zandbelt (license 33)

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@110476 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-21 14:36:43 +00:00
Russell Bryant
4cc349589c Merged revisions 110396 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r110396 | russell | 2008-03-20 18:14:13 -0500 (Thu, 20 Mar 2008) | 17 lines

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

........
r110395 | russell | 2008-03-20 18:13:56 -0500 (Thu, 20 Mar 2008) | 9 lines

Shorten the ast_waitfor() timeout from 500 ms to 50 ms in the autoservice thread.
This really should not make a difference except in very rare cases.  That case would
be that all of the channels in autoservice are not generating any frames.  In that
case, this change reduces the potential amount of time that a thread waits in
ast_autoservice_stop() for the autoservice thread to wrap back around to the beginning
of its loop.

(closes issue #12266, reported by dimas)

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@110397 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-20 23:14:26 +00:00
Russell Bryant
2adbae37a8 Merged revisions 110339 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r110339 | russell | 2008-03-20 17:02:20 -0500 (Thu, 20 Mar 2008) | 3 lines

Use the correct buffer for g722tolin16_sample.  This shouldn't have caused any
problems, but Qwell noticed the typo here.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@110340 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-20 22:02:46 +00:00
Russell Bryant
573e35bba1 Merged revisions 110337 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r110337 | russell | 2008-03-20 16:55:50 -0500 (Thu, 20 Mar 2008) | 22 lines

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

................
r110336 | russell | 2008-03-20 16:54:58 -0500 (Thu, 20 Mar 2008) | 14 lines

Merged revisions 110335 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r110335 | russell | 2008-03-20 16:53:27 -0500 (Thu, 20 Mar 2008) | 6 lines

Fix some very broken code that was introduced in 1.2.26 as a part of the security
fix.  The dnsmgr is not appropriate here.  The dnsmgr takes a pointer to an address
structure that a background thread continuously updates.  However, in these cases,
a stack variable was passed.  That means that the dnsmgr thread would be continuously
writing to bogus memory.

........

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

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@110338 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-20 21:56:22 +00:00
Russell Bryant
5f3c8c12e6 Merged revisions 110303 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r110303 | russell | 2008-03-20 15:08:26 -0500 (Thu, 20 Mar 2008) | 8 lines

Fix a bug when using zaptel timing for playing back files that have a sample rate
other than 8 kHz.  The issue here is that format modules give a "whennext" sample
value, which is used to calculate when to set a timer for to retrieve the next
frame.  However, the zaptel timer operates on 8 kHz samples, so this must be taken
into account.

(another part of issue #12164, reported by milazzo and jsmith, patch by me)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@110304 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-20 20:10:27 +00:00
Mark Michelson
f56d9c2483 Merged revisions 110272 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r110272 | mmichelson | 2008-03-20 13:01:36 -0500 (Thu, 20 Mar 2008) | 3 lines

Add missing unlock


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@110273 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-20 18:02:42 +00:00
Russell Bryant
951a25d277 Blocked revisions 110270 via svnmerge
........
r110270 | russell | 2008-03-20 12:45:29 -0500 (Thu, 20 Mar 2008) | 2 lines

Remove astobj.h from some places where it wasn't needed

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@110271 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-20 17:45:57 +00:00
Russell Bryant
30f7c61f66 Merged revisions 110268 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r110268 | russell | 2008-03-20 12:41:22 -0500 (Thu, 20 Mar 2008) | 27 lines

Add some fixes that I made in regards to wideband codec handling to get
G.722 music on hold working for me.

(issue #12164, reported by milazzo and jsmith, patches by me)

res/res_musiconhold.c:
 - I moved a single line so that the sample queue update happened before
   ast_write().  The reason that this was a bug is that the G.722 frame
   originally says it has 320 samples in it (which is correct).  However,
   when the frame is written to a channel that uses RTP, main/rtp.c modifies
   the frame to cut the number of samples in half before it sends it on
   the wire.  This is to account for the stupid incorrect G.722 spec that
   makes it so we have to lie about the number of samples with RTP.  I should
   probably go and re-work the RTP code so it doesn't modify the frame so
   that a bug like this won't happen in the future.  However, this change to
   MOH is harmless.

main/channel.c:
 - I made two fixes in regards to generator timing.  Generators use samples
   for timing.  However, this code assumed 8 kHz samples.  In one case, it was
   a hard coded 160 samples, that is now written as the sample rate / 50.  The
   other place was dealing with timing a generator based on frames coming from
   the other direction.  However, that would have only worked if the sample
   rates for the formats in both directions were the same.  The code now takes
   into account that the sample rates may differ, and scales the generator
   samples accordingly.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@110269 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-20 17:41:45 +00:00
Tilghman Lesher
386038d8d0 Blocked revisions 110237 via svnmerge
........
r110237 | tilghman | 2008-03-20 00:06:12 -0500 (Thu, 20 Mar 2008) | 2 lines

Upgrade the sounds version, and add several directory enhancements

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@110264 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-20 05:45:34 +00:00
Tilghman Lesher
1bd1dddfb6 Blocked revisions 110211 via svnmerge
........
r110211 | tilghman | 2008-03-19 22:14:59 -0500 (Wed, 19 Mar 2008) | 2 lines

Fix recent trunk breakage

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@110217 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-20 03:19:49 +00:00
Russell Bryant
631b48efba Merged revisions 110164 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r110164 | russell | 2008-03-19 17:58:33 -0500 (Wed, 19 Mar 2008) | 13 lines

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

........
r110163 | russell | 2008-03-19 17:57:59 -0500 (Wed, 19 Mar 2008) | 5 lines

Fix a bug where when calls on the trunk side hang up while on hold, the state
is not properly reflected.

(closes issue #11990, reported by anakaoka, patched by me)

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@110165 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-19 23:00:23 +00:00
Jason Parker
e740375bb7 Blocked revisions 110161 via svnmerge
........
r110161 | qwell | 2008-03-19 17:25:34 -0500 (Wed, 19 Mar 2008) | 5 lines

Rename DSP_FEATURE_DTMF_DETECT, because we are *NOT* only detecting DTMF digits.
This was very misleading.

Early cleanup for issue #11968

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@110162 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-19 22:27:44 +00:00
Jason Parker
780688bc19 Blocked revisions 110132 via svnmerge
........
r110132 | qwell | 2008-03-19 16:56:15 -0500 (Wed, 19 Mar 2008) | 1 line

Rename very poorly named function to reflect what it actually does.  This was causing quite a bit of confusion for me...
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@110133 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-19 21:57:58 +00:00
Jeff Peeler
851dde73ac marking rev 110087 from trunk as not applying
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@110088 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-19 21:06:46 +00:00
Mark Michelson
a2a08286fc Merged revisions 110084 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r110084 | mmichelson | 2008-03-19 15:34:13 -0500 (Wed, 19 Mar 2008) | 12 lines

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

........
r110083 | mmichelson | 2008-03-19 15:33:03 -0500 (Wed, 19 Mar 2008) | 4 lines

Add a missing unlock in the case that memory allocation fails in app_chanspy.
Thanks to Russell for confirming that this was an issue.


........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@110085 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-19 20:37:18 +00:00
Joshua Colp
38a75f1b82 Merged revisions 110036 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r110036 | file | 2008-03-19 16:13:39 -0300 (Wed, 19 Mar 2008) | 12 lines

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

........
r110035 | file | 2008-03-19 16:11:33 -0300 (Wed, 19 Mar 2008) | 4 lines

Add sanity checking for position resuming. We *have* to make sure that the position does not exceed the total number of files present, and we have to make sure that the position's filename is the same as previous. These values can change if a music class is reloaded and give unpredictable behavior.
(closes issue #11663)
Reported by: junky

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@110037 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-19 19:14:56 +00:00
Russell Bryant
02471f21dd Blocked revisions 110023 via svnmerge
........
r110023 | russell | 2008-03-19 13:57:16 -0500 (Wed, 19 Mar 2008) | 2 lines

remove svnmerge-blocked property that is not supposed to be here

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@110032 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-19 19:00:29 +00:00
Russell Bryant
06f978bd58 Merged revisions 109974 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r109974 | qwell | 2008-03-19 12:15:14 -0500 (Wed, 19 Mar 2008) | 13 lines

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

........
r109973 | qwell | 2008-03-19 12:12:52 -0500 (Wed, 19 Mar 2008) | 5 lines

People report bugs about Asterisk crashing with DO_CRASH enabled was getting a little silly...

Now we only show certain cflags when you run configure with --enable-dev-mode
(corresponding menuselect change to follow)

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@110031 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-19 19:00:11 +00:00
Russell Bryant
17710ede58 Blocked revisions 109926 via svnmerge
........
r109926 | kpfleming | 2008-03-19 11:21:36 -0500 (Wed, 19 Mar 2008) | 2 lines

ensure that res_phoneprov's HTTP handler tells the dispatcher what method it can handle

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@110030 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-19 18:59:48 +00:00
Russell Bryant
28beb7c71f Blocked revisions 109912 via svnmerge
........
r109912 | kpfleming | 2008-03-19 11:18:29 -0500 (Wed, 19 Mar 2008) | 2 lines

actually implement HTTP request dispatching based on both URI and method; reduce duplication of data when generating responses using ast_http_error()

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@110029 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-19 18:59:32 +00:00
Russell Bryant
a4ef06e955 Blocked revisions 109910 via svnmerge
........
r109910 | russell | 2008-03-19 10:45:49 -0500 (Wed, 19 Mar 2008) | 2 lines

Fix some more breakage that I introduced when changing extension state callbacks to the list macros.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@110028 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-19 18:59:17 +00:00
Russell Bryant
c0d64c79c3 Blocked revisions 109909 via svnmerge
........
r109909 | kpfleming | 2008-03-19 10:41:54 -0500 (Wed, 19 Mar 2008) | 2 lines

clean up code to conform to coding guidelines

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@110027 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-19 18:59:00 +00:00
Russell Bryant
2db2038706 Blocked revisions 109907 via svnmerge
........
r109907 | russell | 2008-03-19 10:22:13 -0500 (Wed, 19 Mar 2008) | 3 lines

Remove an unneeded variable.  This compiled, but I missed the uninitialized warning
because I always compile without optimizations turned on.  Sorry!

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@110026 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-19 18:58:43 +00:00
Russell Bryant
0183961a5a Blocked revisions 109883 via svnmerge
........
r109883 | russell | 2008-03-18 23:32:13 -0500 (Tue, 18 Mar 2008) | 2 lines

Convert handling of extension state callbacks to the list macros.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@110025 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-19 18:58:28 +00:00
Russell Bryant
7caac77e86 Blocked revisions 109841-109842 via svnmerge
........
r109841 | russell | 2008-03-18 23:09:55 -0500 (Tue, 18 Mar 2008) | 2 lines

Minor change to use Asterisk macros

........
r109842 | russell | 2008-03-18 23:14:12 -0500 (Tue, 18 Mar 2008) | 2 lines

Minor coding style changes, including adding handling for memory allocation failure

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@110024 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-19 18:58:08 +00:00
Joshua Colp
aaf6b67e5c Merged revisions 110020 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r110020 | file | 2008-03-19 15:25:33 -0300 (Wed, 19 Mar 2008) | 14 lines

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

........
r110019 | file | 2008-03-19 15:20:28 -0300 (Wed, 19 Mar 2008) | 6 lines

Make sure that the mark bit does not incorrectly cause video frame timestamps to be calculated as if they are audio frames.
(closes issue #11429)
Reported by: sperreault
Patches:
      11429-frametype.diff uploaded by qwell (license 4)

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@110021 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-19 18:26:24 +00:00
Joshua Colp
0a31c19fd7 Blocked revisions 109970 via svnmerge
........
r109970 | file | 2008-03-19 13:54:12 -0300 (Wed, 19 Mar 2008) | 7 lines

Add the ability to use a pattern match for a hint.
(closes issue #7767)
Reported by: Corydon76
Patches:
      20070314__simple_hint_lookup.diff.txt uploaded by Corydon76
      pbx-trunk-98436.diff uploaded by plack (license 365)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@109971 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-19 16:55:00 +00:00
Steve Murphy
301b8b156a Merged revisions 109942 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r109942 | murf | 2008-03-19 10:24:51 -0600 (Wed, 19 Mar 2008) | 80 lines

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

........
r109908 | murf | 2008-03-19 09:41:13 -0600 (Wed, 19 Mar 2008) | 72 lines

(closes issue #11442)
Reported by: tzafrir
Patches:
      11442.patch uploaded by murf (license 17)
Tested by: murf

I didn't give tzafrir very much time to test this, but if he does 
still have remaining issues, he is welcome to 
re-open this bug, and we'll do what is called for.

I reproduced the problem, and tested the fix, so I hope I
am not jumping by just going ahead and committing the fix.

The problem was with what file_save does with templates; 
firstly, it tended to print out multiple options:

[my_category](!)(templateref)

instead of 

[my_category](!,templateref)

which is fixed by this patch.


Nextly, the code to suppress output of duplicate declarations
that would occur because the reader copies inherited declarations
down the hierarchy, was not working. Thus:


 [master-template](!)
 mastervar = bar


 [template](!,master-template)
 tvar = value


 [cat](template)
 catvar = val


would be rewritten as:

 ;!
 ;! Automatically generated configuration file
 ;! Filename: experiment.conf (/etc/asterisk/experiment.conf)
 ;! Generator: Manager
 ;! Creation Date: Tue Mar 18 23:17:46 2008
 ;!
 
 [master-template](!)
 mastervar = bar

 
 [template](!,master-template)
 mastervar = bar
 tvar = value

 
 [cat](template)
 mastervar = bar
 tvar = value
 catvar = val

This has been fixed. Since the config reader 'explodes' inherited
vars into the category, users may, in certain circumstances, see
output different from what they originally entered, but it should
be both correct and equivalent.



........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@109969 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-19 16:46:12 +00:00
Russell Bryant
cf0f0d5971 Merged revisions 109839 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r109839 | russell | 2008-03-18 23:06:31 -0500 (Tue, 18 Mar 2008) | 10 lines

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

........
r109838 | russell | 2008-03-18 23:06:05 -0500 (Tue, 18 Mar 2008) | 2 lines

Tweak spacing in a recent change because I'm very picky.

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@109840 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-19 04:06:56 +00:00
Russell Bryant
8da200be71 Merged revisions 109764 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r109764 | russell | 2008-03-18 17:36:02 -0500 (Tue, 18 Mar 2008) | 11 lines

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

........
r109763 | russell | 2008-03-18 17:34:42 -0500 (Tue, 18 Mar 2008) | 3 lines

Fix one place where the chanspy datastore isn't removed from a channel.
(issue #12243, reported by atis, patch by me)

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@109837 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-19 04:04:13 +00:00
Russell Bryant
5b528ad229 Blocked revisions 109762 via svnmerge
........
r109762 | kpfleming | 2008-03-18 17:32:26 -0500 (Tue, 18 Mar 2008) | 2 lines

start the process of changing HTTP request dispatching to do it based on *both* URI and method, so that POST support can move into a module; move http.c's private function prototypes into _private.h

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@109836 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-19 04:03:37 +00:00
Russell Bryant
c7b86f005b Blocked revisions 109680 via svnmerge
........
r109680 | tilghman | 2008-03-18 14:53:02 -0500 (Tue, 18 Mar 2008) | 2 lines

Comment debug

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@109835 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-19 04:02:48 +00:00
Russell Bryant
84cc3e6449 Blocked revisions 109833 via svnmerge
........
r109833 | russell | 2008-03-18 22:51:06 -0500 (Tue, 18 Mar 2008) | 3 lines

Set req->data to NULL after free'ing to ensure that it never gets accidentally
double free'd.  (reported by dhubbard directly to me)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@109834 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-19 04:02:22 +00:00
Mark Michelson
4783a79cce Blocked revisions 109802 via svnmerge
........
r109802 | mmichelson | 2008-03-18 18:32:58 -0500 (Tue, 18 Mar 2008) | 5 lines

Fix a typo which caused a double free in chan_zap. This was discovered
by Juggie while attempting to load chan_zap. Apparently this would happen
if an error were encountered while trying to process zapata.conf.


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@109809 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-18 23:35:53 +00:00
Tilghman Lesher
276e3411c6 Merged revisions 109775 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r109775 | tilghman | 2008-03-18 18:22:25 -0500 (Tue, 18 Mar 2008) | 3 lines

Change back to using ldap_initialize() and let the user specify a URL directly,
instead of trying to piece it together, badly.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@109779 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-18 23:23:37 +00:00
Mark Michelson
3431f1483a Merged revisions 109714 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r109714 | mmichelson | 2008-03-18 15:59:02 -0500 (Tue, 18 Mar 2008) | 20 lines

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

........
r109713 | mmichelson | 2008-03-18 15:52:15 -0500 (Tue, 18 Mar 2008) | 12 lines

This patch makes it so that all queue member status changes are handled through device state
code. This removes several problems people were seeing where their queue members would get into
an "unknown" state. Huge props go to atis on this one since he was the one who found the code
section that was causing the problem and proposed the solution. I just wrote what he suggested :)

(closes issue #12127)
Reported by: atis
Patches:
      12127v3.patch uploaded by putnopvut (license 60)
Tested by: atis, jvandal


........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@109716 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-18 21:03:52 +00:00
Tilghman Lesher
39b162b00c Merged revisions 109683 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r109683 | tilghman | 2008-03-18 15:13:40 -0500 (Tue, 18 Mar 2008) | 4 lines

Set protocol version, port number correctly.
(closes issue #12211, closes issue #12209)
 Reported by: sylvain

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@109684 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-18 20:14:44 +00:00
Mark Michelson
0aa3619019 Blocked revisions 109681 via svnmerge
........
r109681 | mmichelson | 2008-03-18 15:02:26 -0500 (Tue, 18 Mar 2008) | 7 lines

Since a sip request's data field is now a stringfield, we not only have to check
if the string is zero-length, but also if the data field is non-null.

(closes issue #12250)
Reported by: caio1982


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@109682 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-18 20:03:04 +00:00
Jason Parker
4f2ec37cbd Merged revisions 109651 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r109651 | qwell | 2008-03-18 14:24:15 -0500 (Tue, 18 Mar 2008) | 15 lines

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

........
r109648 | qwell | 2008-03-18 14:23:44 -0500 (Tue, 18 Mar 2008) | 7 lines

Allow codecs that use log2comp (g726) to compile correctly on x86 with gcc4 optimizations.

(closes issue #12253)
Reported by: fossil
Patches:
      log2comp.patch uploaded by fossil (license 140)

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@109654 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-18 19:24:45 +00:00
Mark Michelson
81019b3690 Blocked revisions 109621 via svnmerge
........
r109621 | mmichelson | 2008-03-18 13:58:42 -0500 (Tue, 18 Mar 2008) | 9 lines

Add option 'randomperiodicannounce' to queues.conf. Setting this will
allow the list of periodic announcments specified to be played in a random
order instead of being played sequentially.

(closes issue #6681)
Reported by: alt_phil
Tested by: putnopvut


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@109622 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-18 19:00:30 +00:00
Mark Michelson
7783cbdafa Merged revisions 109576 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r109576 | mmichelson | 2008-03-18 12:59:18 -0500 (Tue, 18 Mar 2008) | 14 lines

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

........
r109575 | mmichelson | 2008-03-18 12:58:11 -0500 (Tue, 18 Mar 2008) | 6 lines

Make sure an agent doesn't try to send dtmf to a NULL channel

closes issue #12242
Reported by Yourname


........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@109577 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-18 17:59:49 +00:00
Mark Michelson
2bac84986e Merged revisions 109545 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r109545 | mmichelson | 2008-03-18 12:00:53 -0500 (Tue, 18 Mar 2008) | 3 lines

Add format attribute to printf-style functions in astmm.h


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@109546 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-18 17:01:36 +00:00