kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-22 13:25:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
7,300 Commits 150 Branches 1,597 Tags
ebf2a11bc20986ea2e7b4920e56ece91cd687cdf
Commit Graph

312 Commits

Author SHA1 Message Date
Automerge Script
bd82c72a14 automerge commit 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@73366 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2007-07-05 14:26:28 +00:00
Automerge Script
df950e24ee automerge commit 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@72303 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2007-06-27 21:27:00 +00:00
Automerge Script
aae179ee5f automerge commit 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@70061 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2007-06-19 18:12:44 +00:00
Automerge Script
dd4f8ab9bd automerge commit 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@70043 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2007-06-19 17:29:28 +00:00
Automerge Script
91a9884b7a automerge commit 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@69391 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2007-06-14 21:30:45 +00:00
Automerge Script
b1e34e49e1 automerge commit 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@68731 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2007-06-11 15:25:48 +00:00
Automerge Script
4a5df3824d automerge commit 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@67769 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2007-06-06 17:27:55 +00:00
Automerge Script
948f8837ce automerge commit 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@63328 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2007-05-07 22:18:20 +00:00
Automerge Script
969e276b1e automerge commit 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@61861 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2007-04-25 20:26:05 +00:00
Automerge Script
c31b4a6a2e automerge commit 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@56728 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2007-02-25 15:21:12 +00:00
Automerge Script
33ec4fecf5 automerge commit 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@56275 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2007-02-22 19:21:50 +00:00
Automerge Script
e9b9632fef automerge commit 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@52995 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2007-01-30 20:13:10 +00:00
Automerge Script
260eccbb03 automerge commit 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@51880 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2007-01-24 01:19:59 +00:00
Kevin P. Fleming
32ef26d652 manual update 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@48469 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2006-12-14 13:18:15 +00:00
Kevin P. Fleming
05f6188c69 manual update, since automerge is not running at this time 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@48421 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2006-12-12 22:58:49 +00:00
Automerge script
97834bbed9 automerge commit 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@43791 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2006-09-27 17:02:12 +00:00
Automerge script
c5056e1736 automerge commit 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@43516 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2006-09-22 22:01:20 +00:00
Automerge script
b2b2ea5901 automerge commit 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@42620 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2006-09-09 21:02:51 +00:00
Automerge script
380d8d80ba automerge commit 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@42470 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2006-09-08 19:02:43 +00:00
Joshua Colp
6480d28862 Merged revisions 41768,41827,41830,41880,41882,41989,42014,42054 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r41768 | file | 2006-09-01 18:49:07 -0400 (Fri, 01 Sep 2006) | 2 lines

Only wipe the redirected audio & video IP/port if it's specified, and trigger a reinvite.

........
r41827 | bweschke | 2006-09-03 10:16:08 -0400 (Sun, 03 Sep 2006) | 3 lines

 Setting a retry of 0 is generally not a good idea and shouldn't be allowed. (#7574 - reported by regin)


........
r41830 | bweschke | 2006-09-03 10:50:59 -0400 (Sun, 03 Sep 2006) | 3 lines

 Let's NOT spy on Zap/psuedo channels, mmmmmmmmk? 


........
r41880 | bweschke | 2006-09-03 13:13:38 -0400 (Sun, 03 Sep 2006) | 3 lines

 Don't keep trying the same member in certain strategies when members of the queue are unavailable (#7278 - diLLec reported and patched) - This should have been patched here first and then merged into /trunk. My bad!


........
r41882 | bweschke | 2006-09-03 13:38:22 -0400 (Sun, 03 Sep 2006) | 3 lines

 Make sure the forwarded channel inherits variables appropriately when we receive a call forward in the queue. (#7867 - raarts reported and patched)


........
r41989 | oej | 2006-09-04 11:46:07 -0400 (Mon, 04 Sep 2006) | 2 lines

Don't kill the pvt before we have sent ACK on CANCEL (needs more testing before making a release)

........
r42014 | qwell | 2006-09-05 12:27:46 -0400 (Tue, 05 Sep 2006) | 4 lines

Small typo in zapata.conf.sample

Reported by ppyy in 7881

........
r42054 | file | 2006-09-05 16:02:48 -0400 (Tue, 05 Sep 2006) | 2 lines

Merge in last round of spy fixes. This should hopefully eliminate all the issues people have been seeing by distinctly separating what each component (core/spy) is responsible for. Core is responsible for adding a spy to a channel, feeding frames to the spy, removing the spy from a channel, and telling the spy to stop. Spy is responsible for reading frames in, and cleaning up after itself.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@42081 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2006-09-05 23:48:48 +00:00
Automerge script
ecfce7b643 automerge commit 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@41714 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2006-09-01 17:03:18 +00:00
Automerge script
a8350ac22f automerge commit 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@41003 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2006-08-24 20:01:23 +00:00
Automerge script
1e38d97c40 automerge commit 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@40253 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2006-08-17 17:04:18 +00:00
Automerge script
3cafe77949 automerge commit 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@39080 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2006-08-07 01:03:45 +00:00
Automerge script
76f5300793 automerge commit 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@38995 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2006-08-05 09:03:31 +00:00
Automerge script
ee2918d783 automerge commit 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@38927 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2006-08-05 06:04:09 +00:00
Automerge script
561838ab6a automerge commit 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@38709 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2006-08-02 00:03:25 +00:00
Automerge script
109237c04f automerge commit 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@38364 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2006-07-27 16:02:48 +00:00
Automerge script
0375e58b2f automerge commit 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@38327 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2006-07-27 03:02:35 +00:00
Automerge script
36f56a5e9e automerge commit 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@37375 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2006-07-10 22:02:08 +00:00
Automerge script
a07938ea7e automerge commit 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@37253 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2006-07-06 22:04:42 +00:00
Automerge script
449c9c191f automerge commit 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@33750 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2006-06-12 22:04:00 +00:00
Automerge script
e5d6dfc0b9 automerge commit 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@31551 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2006-06-01 21:05:20 +00:00
Automerge script
fcdf61c4b3 automerge commit 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@27475 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2006-05-16 20:06:30 +00:00
Automerge script
27b633c817 automerge commit 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@19391 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2006-04-11 22:06:47 +00:00
Automerge script
0fcae43d36 automerge commit 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@12103 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2006-03-06 15:05:03 +00:00
Automerge script
8d808bd9d3 automerge commit 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@12040 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2006-03-06 11:04:25 +00:00
Automerge script
b7ad6d8c2d automerge commit 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@11275 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2006-02-27 03:04:02 +00:00
Automerge script
2719e0aa02 automerge commit 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@11088 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2006-02-25 05:04:25 +00:00
Automerge script
9bfab982fd automerge commit 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@9606 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2006-02-11 19:03:03 +00:00
Automerge script
edfe61308b automerge commit 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@8641 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2006-01-25 10:01:13 +00:00
Automerge script
d7812f6634 automerge commit 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@8607 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2006-01-24 23:00:59 +00:00
Automerge script
30c9cea332 automerge commit 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@8440 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2006-01-22 18:00:19 +00:00
Kevin P. Fleming
f16619507a updating to current 1.2 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@8046 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2006-01-13 03:52:45 +00:00
Kevin P. Fleming
2f4783a770 eliminate rounding errors that caused call time limits to be inaccurate (issue #5913) 
round 'time left' reported during call limit warnings up to sound more accurate


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@7825 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2006-01-05 23:49:50 +00:00
Kevin P. Fleming
229b778b0b make monitoring more tolerant of peers that deliver frames in bursts 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@7799 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2006-01-04 23:02:38 +00:00
Kevin P. Fleming
73ef559240 revert incorrect fix for bug #6048 from revision 7709 
put in correct (simpler) fix
add doxygen docs for channel spy 'state' values


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@7740 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2006-01-03 17:24:56 +00:00
Tilghman Lesher
89de6c9df6 Bug 6091 - Fix race condition around uniqueid 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@7677 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2005-12-30 14:54:19 +00:00
BJ Weschke
5a06af4d57 Bug #6003 - Don't free the channel structure until after having sent the manager event. 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@7482 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2005-12-15 02:51:54 +00:00
Kevin P. Fleming
0d3fc8d103 ensure channel's scheduling context is freed (issue #5788) 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@7268 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2005-12-01 23:34:58 +00:00