Commit Graph

14845 Commits

Author SHA1 Message Date
Russell Bryant
9a6ac737ae Merged revisions 106684 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r106684 | russell | 2008-03-07 10:31:48 -0600 (Fri, 07 Mar 2008) | 2 lines

fix example usage

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@106686 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-07 16:32:13 +00:00
Tilghman Lesher
061a42ab6f Merged revisions 106654 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r106654 | tilghman | 2008-03-07 10:26:07 -0600 (Fri, 07 Mar 2008) | 11 lines

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

........
r106635 | tilghman | 2008-03-07 10:22:11 -0600 (Fri, 07 Mar 2008) | 3 lines

Warn the user when a temporary greeting exists
(Closes issue #11409)

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@106662 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-07 16:27:22 +00:00
Tilghman Lesher
d334a88e36 Merged revisions 106607 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r106607 | tilghman | 2008-03-07 09:22:34 -0600 (Fri, 07 Mar 2008) | 11 lines

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

........
r106606 | tilghman | 2008-03-07 09:20:52 -0600 (Fri, 07 Mar 2008) | 3 lines

Properly initialize rtp->schedid
(Closes issue #12154)

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@106608 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-07 15:24:00 +00:00
Tilghman Lesher
fd382738e3 Merged revisions 106553 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r106553 | tilghman | 2008-03-07 00:54:47 -0600 (Fri, 07 Mar 2008) | 14 lines

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

........
r106552 | tilghman | 2008-03-07 00:36:33 -0600 (Fri, 07 Mar 2008) | 6 lines

Safely use the strncat() function.
(closes issue #11958)
 Reported by: norman
 Patches: 
       20080209__bug11958.diff.txt uploaded by Corydon76 (license 14)

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@106554 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-07 06:57:44 +00:00
Russell Bryant
591f6c5012 Merged revisions 106518 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r106518 | russell | 2008-03-06 19:19:02 -0600 (Thu, 06 Mar 2008) | 1 line

minor text changes
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@106520 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-07 01:19:22 +00:00
Russell Bryant
ef1ad01921 Merged revisions 106507 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r106507 | russell | 2008-03-06 19:15:36 -0600 (Thu, 06 Mar 2008) | 2 lines

Add updated SMDI documentation that I had only sitting in my email ... oops

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@106508 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-07 01:15:50 +00:00
Russell Bryant
ccf90e8186 Merged revisions 106501 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r106501 | russell | 2008-03-06 18:24:58 -0600 (Thu, 06 Mar 2008) | 28 lines

Merge changes from team/russell/g722-sillyness ...

Fix a number of other places where the number of samples in a G722 frame was
not properly handled because of various reasons.

main/rtp.c:
 - When a G722 frame is read from the smoother, the number of samples in the
   frame must be divided by 2 before being sent out over the network.  Even
   though G722 is 16 kHz, an error in some previous spec has made it so that
   we have to list the number of samples such as if it was 8 kHz.

main/file.c:
 - When scheduling the next time to expect a frame, take into account that the
   format of the file we're reading from may not be 8 kHz.

codecs/codec_g722.c:
 - When converting from G722 to slinear, g722_decode() expects its samples
   parameter to be in the silly (real samples / 2) format.  Make it so.
 - When converting from slinear to G722, properly set the number of samples in
   the frame to be the number of bytes of output * 2.

formats/format_pcm.c:
 - This format module handles G722, among a number of other formats.  However,
   the read() and seek() functions did not account for the fact that G722 has
   2 samples per byte.

(closes issue #12130, reported by rickross, patched by me)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@106502 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-07 00:25:48 +00:00
Mark Michelson
29e469fabc Merged revisions 106438 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r106438 | mmichelson | 2008-03-06 16:11:26 -0600 (Thu, 06 Mar 2008) | 16 lines

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

........
r106437 | mmichelson | 2008-03-06 16:10:07 -0600 (Thu, 06 Mar 2008) | 8 lines

Quell an annoying message that is likely to print every single time that 
ast_pbx_outgoing_app is called. The reason is that __ast_request_and_dial
allocates the cdr for the channel, so it should be expected that the channel
will have a cdr on it.

Thanks to joetester on IRC for pointing this out


........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@106442 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-06 22:16:55 +00:00
Jason Parker
3b548ed386 Merged revisions 106439 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r106439 | qwell | 2008-03-06 16:11:30 -0600 (Thu, 06 Mar 2008) | 8 lines

Fix file playback in many cases.

(closes issue #12115)
Reported by: pj
Patches:
      v2-fileexists.patch uploaded by dimas (license 88) (with modifications by me)
Tested by: dimas, qwell, russell

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@106440 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-06 22:15:03 +00:00
Donny Kavanagh
69b6111450 Merged revisions 106399 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r106399 | juggie | 2008-03-06 14:31:50 -0500 (Thu, 06 Mar 2008) | 9 lines

trivial fix for an agi error when attempting to use EAGI on a dead/hungup channel, we now print an error that makes sense 
given our removal of deadagi as an actual application.

(closes issue #12161)
Reported by: explidous
Patches:
      res_agi_12161.patch uploaded by juggie (license 24)
Tested by: juggie

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@106433 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-06 20:39:49 +00:00
Tilghman Lesher
8abd853f7f Merged revisions 106346 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r106346 | tilghman | 2008-03-05 23:21:39 -0600 (Wed, 05 Mar 2008) | 7 lines

Missing braces, fix parsing
(closes issue #12112)
 Reported by: cyrenity
 Patches: 
       res_config_ldap.patch-03-03-2008 uploaded by cyrenity (license 416)
 Tested by: cyrenity, Corydon76

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@106359 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-06 05:25:05 +00:00
Tilghman Lesher
dff3671f09 Merged revisions 106329 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r106329 | tilghman | 2008-03-05 22:45:16 -0600 (Wed, 05 Mar 2008) | 10 lines

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

........
r106328 | tilghman | 2008-03-05 22:40:06 -0600 (Wed, 05 Mar 2008) | 2 lines

Upgrade to the next release of sounds

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@106330 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-06 04:46:17 +00:00
Russell Bryant
3969f432af Blocked revisions 106250 via svnmerge
........
r106250 | qwell | 2008-03-05 17:21:52 -0600 (Wed, 05 Mar 2008) | 1 line

Add a cmenuselect/cmenuconfig, to force curses.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@106320 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-06 00:23:05 +00:00
Russell Bryant
b4088e0fef Blocked revisions 106240 via svnmerge
........
r106240 | russell | 2008-03-05 16:50:00 -0600 (Wed, 05 Mar 2008) | 5 lines

Add the nmenuselect makefile targets.  This is a newt menuselect interface which
is much sexier than the curses one that was written by seanbright.  :)

(issue #12139)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@106319 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-06 00:22:44 +00:00
Russell Bryant
90046983f7 Merged revisions 106239 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r106239 | file | 2008-03-05 16:43:22 -0600 (Wed, 05 Mar 2008) | 12 lines

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

........
r106235 | file | 2008-03-05 18:32:10 -0400 (Wed, 05 Mar 2008) | 4 lines

Add a control frame to indicate the source of media has changed. Depending on the underlying technology it may need to change some things.
(closes issue #12148)
Reported by: jcomellas

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@106318 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-06 00:22:20 +00:00
Russell Bryant
16456f61f6 Merged revisions 106238 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r106238 | russell | 2008-03-05 16:40:58 -0600 (Wed, 05 Mar 2008) | 11 lines

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

........
r106237 | russell | 2008-03-05 16:37:09 -0600 (Wed, 05 Mar 2008) | 3 lines

Fix a potential deadlock and a few different potential crashes.
(closes issue #12145, reported by thiagarcia, patched by me)

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@106317 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-06 00:21:24 +00:00
Russell Bryant
3f996ba1b3 Blocked revisions 106236 via svnmerge
........
r106236 | mmichelson | 2008-03-05 16:33:05 -0600 (Wed, 05 Mar 2008) | 11 lines

Adding the Atxfer manager command. With this, you may initiate
an attended transfer over AMI

(closes issue #10585)
Reported by: ornati
Patches:
      atxfer-trunk-r90428.diff uploaded by ornati (license 210)
	  (with modifications from me)
Tested by: putnopvut


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@106316 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-06 00:20:55 +00:00
Russell Bryant
a3a7672808 Merged revisions 106186 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r106186 | mvanbaak | 2008-03-05 15:19:06 -0600 (Wed, 05 Mar 2008) | 7 lines

document var_metric usage to prevent bugreports that are actually configuration issues

(closes issue #12151)
Reported by: caio1982
Patches:
      DB_metric3.diff uploaded by caio1982 (license 22)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@106315 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-06 00:20:35 +00:00
Russell Bryant
0fe91ba8d9 Blocked revisions 106179 via svnmerge
................
r106179 | mvanbaak | 2008-03-05 15:15:57 -0600 (Wed, 05 Mar 2008) | 12 lines

Blocked revisions 106178 via svnmerge

........
r106178 | mvanbaak | 2008-03-05 22:12:36 +0100 (Wed, 05 Mar 2008) | 5 lines

document var_metric so no bugreports will come in when it's actually a configuration issue.
(issue #12151)
Reported and patched by: caio1982
1.4 patch by me

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@106314 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-06 00:20:00 +00:00
Russell Bryant
717e0179cf Blocked revisions 106110 via svnmerge
........
r106110 | file | 2008-03-05 10:39:22 -0600 (Wed, 05 Mar 2008) | 2 lines

Fix code up to what it was meant to be.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@106313 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-06 00:18:05 +00:00
Russell Bryant
24d1a5334f Blocked revisions 106072 via svnmerge
........
r106072 | tilghman | 2008-03-05 10:23:44 -0600 (Wed, 05 Mar 2008) | 7 lines

Create a centralized configuration option for silencethreshold
(closes issue #11236)
 Reported by: philipps
 Patches: 
       20080218__bug11236.diff.txt uploaded by Corydon76 (license 14)
 Tested by: philipps

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@106312 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-06 00:17:33 +00:00
Russell Bryant
3e8a42c9c3 Blocked revisions 105984 via svnmerge
........
r105984 | russell | 2008-03-04 22:34:29 -0600 (Tue, 04 Mar 2008) | 3 lines

 - simplify a few statements with ARRAY_LEN()
 - constify the stregy int to string mappings array

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@106311 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-06 00:16:57 +00:00
Russell Bryant
78393c6698 Merged revisions 105933 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r105933 | russell | 2008-03-04 19:54:16 -0600 (Tue, 04 Mar 2008) | 13 lines

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

........
r105932 | russell | 2008-03-04 19:52:18 -0600 (Tue, 04 Mar 2008) | 5 lines

Fix a bug that I just noticed in the RTP code.  The calculation for setting the
len field in an ast_frame of audio was wrong when G.722 is in use.  The len field
represents the number of ms of audio that the frame contains.  It would have
set the value to be twice what it should be.

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@106310 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-06 00:16:30 +00:00
Russell Bryant
51f5f4470a Merged revisions 105899 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r105899 | russell | 2008-03-04 18:45:39 -0600 (Tue, 04 Mar 2008) | 3 lines

Fix the SHARED() read callback to properly unlock the channel.  This function
could not have worked, as it left the channel locked in all cases.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@106309 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-06 00:15:54 +00:00
Russell Bryant
b66de7ac7b Merged revisions 105864 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r105864 | mmichelson | 2008-03-04 17:24:56 -0600 (Tue, 04 Mar 2008) | 5 lines

There are several places in manager.c where BUFSIZ is used for a buffer
which will contain nowhere near that amount of data. This makes these buffers
more reasonably sized.


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@106308 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-06 00:15:30 +00:00
Russell Bryant
e09e677a81 Merged revisions 105841 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r105841 | tilghman | 2008-03-04 17:10:45 -0600 (Tue, 04 Mar 2008) | 2 lines

Fix minor misuses of snprintf

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@106307 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-06 00:15:02 +00:00
Russell Bryant
9c09333526 Merged revisions 105840 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r105840 | tilghman | 2008-03-04 17:04:29 -0600 (Tue, 04 Mar 2008) | 2 lines

Whitespace changes only

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@106306 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-06 00:14:32 +00:00
Russell Bryant
908eddfe58 Merged revisions 105804 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r105804 | russell | 2008-03-04 16:28:03 -0600 (Tue, 04 Mar 2008) | 2 lines

add a destroy API call for a server instance

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@106305 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-06 00:13:54 +00:00
Russell Bryant
36f5261290 Merged revisions 105785 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r105785 | russell | 2008-03-04 16:23:21 -0600 (Tue, 04 Mar 2008) | 2 lines

More public API name changes to use an appropriate ast_ prefix

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@106304 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-06 00:13:10 +00:00
Russell Bryant
78a863b9a2 Merged revisions 105773 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r105773 | russell | 2008-03-04 16:15:18 -0600 (Tue, 04 Mar 2008) | 2 lines

Rename public object server_instance to ast_tcptls_server_instance

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@106303 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-06 00:11:09 +00:00
Russell Bryant
c6f570d433 Merged revisions 105734 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r105734 | russell | 2008-03-04 14:36:16 -0600 (Tue, 04 Mar 2008) | 6 lines

Fix some bugs in the SIP tcp helper thread.
 - fix a spot where a lock wouldn't get unlocked in an error condition
 - call ast_mutex_destroy() on the lock before freeing its memory

(related to issue #11972)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@106302 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-06 00:10:33 +00:00
Russell Bryant
28f18301fd Merged revisions 105733 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r105733 | twilson | 2008-03-04 14:32:55 -0600 (Tue, 04 Mar 2008) | 2 lines

Set username to default to the category name if it isn't overridden by a usernmae= setting in users.conf

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@106301 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-06 00:10:08 +00:00
Russell Bryant
83942c273a Merged revisions 105677 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r105677 | file | 2008-03-04 12:11:38 -0600 (Tue, 04 Mar 2008) | 10 lines

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

........
r105676 | file | 2008-03-04 14:10:34 -0400 (Tue, 04 Mar 2008) | 2 lines

In addition to setting the marker bit let's change our ssrc so they know for sure it is a different source.

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@106300 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-06 00:08:11 +00:00
Russell Bryant
b11caafd7e Merged revisions 105675 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r105675 | file | 2008-03-04 12:08:42 -0600 (Tue, 04 Mar 2008) | 16 lines

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

........
r105674 | file | 2008-03-04 14:05:28 -0400 (Tue, 04 Mar 2008) | 8 lines

When a new source of audio comes in (such as music on hold) make sure the marker bit gets set.
(closes issue #10355)
Reported by: wdecarne
Patches:
      10355.diff uploaded by file (license 11)
(closes issue #11491)
Reported by: kanderson

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@106299 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-06 00:07:09 +00:00
Tilghman Lesher
12b513fe48 Merged revisions 106139 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r106139 | tilghman | 2008-03-05 11:40:42 -0600 (Wed, 05 Mar 2008) | 3 lines

Should check these values for non-NULL before scanning.
(Closes issue #12147)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@106140 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-05 17:42:36 +00:00
Kevin P. Fleming
e6e2862eb8 Merged revisions 106040 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r106040 | kpfleming | 2008-03-05 09:40:40 -0600 (Wed, 05 Mar 2008) | 15 lines

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

........
r106038 | kpfleming | 2008-03-05 09:32:35 -0600 (Wed, 05 Mar 2008) | 7 lines

when a PRI call must be moved to a different B channel at the request of the other endpoint, ensure that any DSP active on the original channel is moved to the new one

(closes issue #11917)
Reported by: mavetju
Tested by: mavetju


........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@106041 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-05 15:43:11 +00:00
Tilghman Lesher
b7201beb50 Merged revisions 106036 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r106036 | tilghman | 2008-03-05 09:23:32 -0600 (Wed, 05 Mar 2008) | 15 lines

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

........
r106015 | tilghman | 2008-03-05 09:17:16 -0600 (Wed, 05 Mar 2008) | 7 lines

Correctly initialize retransid in SIP, and ensure that the warning when failing to delete a schedule entry can actually hit the log.
(closes issue #12140)
 Reported by: slavon
 Patches: 
       sch2.patch uploaded by slavon (license 288)
(Patch slightly modified by me)

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@106037 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-05 15:31:37 +00:00
Russell Bryant
764077c366 change the versions in the heading
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@105600 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-04 17:00:01 +00:00
Russell Bryant
107c67a6f4 Blocked revisions 105597 via svnmerge
........
r105597 | russell | 2008-03-04 10:55:17 -0600 (Tue, 04 Mar 2008) | 2 lines

Update CHANGES heading

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@105599 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-04 16:57:30 +00:00
Russell Bryant
4d49cdf23e set up trunk-merged property
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@105598 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-04 16:56:37 +00:00
Russell Bryant
39244fb614 Create 1.6.0 branch (email to asterisk-dev coming soon to explain)
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@105596 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-04 16:53:42 +00:00
Russell Bryant
3b483f80d6 Simplify a trivial snprintf() with ast_copy_string()
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@105595 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-04 04:57:29 +00:00
Russell Bryant
7205c1f23c Make it so you don't have to cast away const in a couple places
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@105594 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-04 04:47:32 +00:00
Russell Bryant
83002989a9 remove unnecessary casts
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@105593 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-04 04:44:28 +00:00
Russell Bryant
d37ad16803 Blocked revisions 105591 via svnmerge
........
r105591 | russell | 2008-03-03 22:31:29 -0600 (Mon, 03 Mar 2008) | 4 lines

Backport a minor bug fix from trunk that I found while doing random code
cleanup.  Properly break out of the loop when a context isn't found when
verify that includes are valid.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@105592 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-04 04:31:53 +00:00
Russell Bryant
6d3b251588 - Add curly braces around the while loop
- Properly break out of the loop on error when an included context is not found


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@105590 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-04 04:28:48 +00:00
Russell Bryant
71173779dc Use ast_copy_string() instead of strncpy(), and use sizeof() instead of
a magic number


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@105589 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-04 04:26:39 +00:00
Russell Bryant
0db8a98efe Fix some code that was improperly changed in revision 104866 from issue #12079.
(closes issue #12129, reported by elguero, patched by me)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@105574 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-03 18:49:34 +00:00
Jason Parker
3c594ab9fa Merged revisions 105572 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r105572 | qwell | 2008-03-03 12:06:52 -0600 (Mon, 03 Mar 2008) | 7 lines

Fix types for astNumChannels and astConfigCallsProcessed.

(closes issue #12114)
Reported by: jeffg
Patches:
      12114.patch uploaded by jeffg (license 192)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@105573 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-03 18:08:05 +00:00
Russell Bryant
a584b51dd9 Merged revisions 105570 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r105570 | russell | 2008-03-03 11:16:53 -0600 (Mon, 03 Mar 2008) | 3 lines

In the case of an ast_channel allocation failure, take the local_pvt out of the
pvt list before destroying it.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@105571 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-03 17:17:27 +00:00