Commit Graph

5607 Commits

Author SHA1 Message Date
Mark Michelson
8b5c762f83 Merged revisions 139456 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

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

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

AST-13


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@139457 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-22 16:58:21 +00:00
Jeff Peeler
a9af5a81c9 Merged revisions 139387 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

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

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

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@139391 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-21 23:41:50 +00:00
Philippe Sultan
6571a25767 Fix two memory leaks in chan_gtalk, thanks Eliel!
(closes issue #13310)
Reported by: eliel
Patches:
      chan_gtalk.c.patch uploaded by eliel (license 64)

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@139281 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-21 09:55:31 +00:00
Jason Parker
d22fe17322 Fix output of sipshowpeer manager response.
(closes issue #13346)
Reported by: srt
Patches:
      13346_malformed_sip_show_peer_response.diff uploaded by srt (license 378)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@139210 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-20 22:06:40 +00:00
Michiel van Baak
877549af70 fix unholding phones after hangup on older cisco phones.
Patch by wedhorn.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@139020 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-20 16:16:53 +00:00
Mark Michelson
c4b34ef45d 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/trunk@139016 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-20 15:38:47 +00:00
Mark Michelson
b11ecaf4d6 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/trunk@138943 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-19 23:19:40 +00:00
Michiel van Baak
3f3b1d4dad 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/trunk@138851 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-19 16:56:50 +00:00
Sean Bright
d8fc34c771 Let it compile now, too (woops)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@138780 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-19 00:10:56 +00:00
Sean Bright
0f396d9b8b And remove code we don't need anymore.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@138779 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-19 00:09:38 +00:00
Sean Bright
0e9bb93b87 While we're at it, make this machine parseable too.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@138778 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-19 00:08:27 +00:00
Sean Bright
711cc76722 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/trunk@138775 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-18 23:42:36 +00:00
Richard Mudgett
1678a005b6 channels/chan_misdn.c
*  Made bearer2str() use allowed_bearers_array[]
*  Made use the causes.h defines instead of hardcoded numbers.
*  Made use Asterisk presentation indicator values if either of the
mISDN presentation or screen options are negative.
*  Updated the misdn_set_opt application option descriptions.
*  Renamed the awkward Caller ID presentation misdn_set_opt
application option value not_screened to restricted.
Deprecated the not_screened option value.

channels/misdn/isdn_lib.c
*  Made use the causes.h defines instead of hardcoded numbers.
*  Fixed some spelling errors and typos.
*  Added all defined facility code strings to fac2str().

channels/misdn/isdn_lib.h
*  Added doxygen comments to struct misdn_bchannel.

channels/misdn/isdn_lib_intern.h
*  Added doxygen comments to struct misdn_stack.

channels/misdn_config.c
configs/misdn.conf.sample
*  Updated the mISDN presentation and screen parameter descriptions.

doc/tex/misdn.tex
*  Updated the misdn_set_opt application option descriptions.
*  Fixed some spelling errors and typos.



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@138738 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-18 21:07:28 +00:00
Jeff Peeler
f10e6dec36 add missing define for SS7 in dahdi_restart
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@138518 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-18 02:13:04 +00:00
Sean Bright
69c6dcba67 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/trunk@138473 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-17 13:31:54 +00:00
Tilghman Lesher
6d7ee132e3 Fix compilation warnings (found with dev-mode)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@138412 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-16 13:07:08 +00:00
Jeff Peeler
a4db659925 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/trunk@138361 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-16 01:13:26 +00:00
Jeff Peeler
729cb1d390 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/trunk@138311 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-15 23:46:09 +00:00
Tilghman Lesher
8b6dd2ad43 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/trunk@138260 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-15 22:54:57 +00:00
Jeff Peeler
7fb2ed4c53 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/trunk@138155 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-15 20:12:19 +00:00
Tilghman Lesher
2a3211f8dd regseconds is actually stored as the epoch time, not registration length
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@138086 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-15 18:02:15 +00:00
Tilghman Lesher
4a99c9e158 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/trunk@137848 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-14 16:52:43 +00:00
Jason Parker
3bcc8510b3 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/trunk@137812 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-14 15:32:16 +00:00
Jason Parker
84e049c075 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/trunk@137532 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-13 21:08:58 +00:00
Sean Bright
db1ed285c4 More RSW merges. This should do it for the channels/ dir.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@136917 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-09 14:12:34 +00:00
Sean Bright
5275342c5e Biggest offender? chan_dahdi.c! More RSW merging.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@136890 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-09 13:13:48 +00:00
Sean Bright
bea1644dc2 Merge more changes from the resolve-shadow-warnings branch (henceforth known
as RSW since i am too lazy to keep typing it all out).  This time a few of
the channels.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@136888 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-09 12:53:57 +00:00
Dwayne M. Hubbard
c096a6bee0 use ARRAY_LEN
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@136787 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-08 15:58:38 +00:00
Michiel van Baak
78a93bc386 show correct called party id and also store this to the 'placed calls' list once the call is connected.
(closes issue #13180)
Reported by: pj
Patches:
      2008080700_skinny_calledpartyid.diff uploaded by mvanbaak (license 7)
Tested by: mvanbaak, pj


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@136679 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-07 21:19:39 +00:00
Richard Mudgett
b92df4dc1e Merged revisions 136241 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r136241 | rmudgett | 2008-08-06 16:18:53 -0500 (Wed, 06 Aug 2008) | 5 lines

*  The allowed_bearers setting in misdn.conf misspelled one
of its options: digital_restricted.
*  Fixed some other spelling errors and typos.


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@136594 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-07 19:01:03 +00:00
Mark Michelson
b3970abc30 Merged revisions 136062 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r136062 | mmichelson | 2008-08-06 10:58:40 -0500 (Wed, 06 Aug 2008) | 16 lines

Since adding the AST_CONTROL_SRCUPDATE frame type,
there are places where ast_rtp_new_source may be called
where the tech_pvt of a channel may not yet have an
rtp structure allocated. This caused a crash in chan_skinny,
which was fixed earlier, but now the same crash has been 
reported against chan_h323 as well. It seems that the best 
solution is to modify ast_rtp_new_source to not attempt to 
set the marker bit if the rtp structure passed in is NULL.

This change to ast_rtp_new_source also allows the removal
of what is now a redundant pointer check from chan_skinny.

(closes issue #13247)
Reported by: pj


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@136063 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-06 15:59:29 +00:00
Tilghman Lesher
de582e1eb2 Merged revisions 135747 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r135747 | tilghman | 2008-08-05 16:34:46 -0500 (Tue, 05 Aug 2008) | 9 lines

In a conversion to use ast_strlen_zero, the meaning of the flag IAX_HASCALLERID
was perverted.  This change reverts IAX2 to the original meaning, which was,
that the callerid set on the client should be overridden on the server, even if
that means the resulting callerid is blank.  In other words, if you set
"callerid=" in the IAX config, then the callerid should be overridden to blank,
even if set on the client.  Note that there's a distinction, even on realtime,
between the field not existing (NULL in databases) and the field existing, but
set to blank (override callerid to blank).

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@135748 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-05 21:37:35 +00:00
Kevin P. Fleming
7df8b8b848 make datastore creation and destruction a generic API since it is not really channel related, and add the ability to add/find/remove datastores to manager sessions
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@135680 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-05 16:56:11 +00:00
Russell Bryant
bbf50cf072 Be explicit that we don't want a result from this callback. The callback would
never indicate a match, so nothing would have been returned anyway, but it was
still a poor example of proper usage.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@135439 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-04 15:02:12 +00:00
Michiel van Baak
340809a771 whitespace fixes only.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@135373 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-03 00:03:53 +00:00
Michiel van Baak
dc819e881e Dont coredump on register of non-configured devices
(closes issue #13224)
Reported by: mvanbaak
Patches:
      noncon.diff uploaded by wedhorn (license 30) with whitespace fixes by me
Tested by: wedhorn, mvanbaak


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@135371 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-03 00:00:06 +00:00
Michiel van Baak
0f1a3177dc make this work again, and not segfault on device registration
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@135332 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-02 13:56:00 +00:00
Kevin P. Fleming
bd28649280 --enable-dev-mode is your friend :-)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@135302 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-02 13:21:16 +00:00
Michiel van Baak
532c10551a pass device instead of session to transmit_ functions.
(closes issue #10396)
Reported by: wedhorn
Patches:
      transmit3a.diff uploaded by wedhorn (license 30)
Tested by: wedhorn, mvanbaak


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@135300 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-02 12:29:23 +00:00
Sean Bright
ca38a1a082 Remove some code that used to do something but does not anymore, mainly
to get rid of a shadow warning (but this seemed legitimate enough to fix
here instead of in my branch).

Thanks to putnopvut for taking a look as well.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@135197 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-01 19:29:26 +00:00
Russell Bryant
58291bcec9 Merge changes from team/bbryant/keyrotation
This set of changes enhances IAX2 encryption support by adding key rotation
to provide enhanced security.  The key used for encryption is rotated right 
after the call gets set up, and then again every few minutes.  This was
discussed at the last AstriDevCon.  For interoperability with older versions
of Asterisk, there is an option that disables key rotation.

(closes issue #13018)
Reported by: bbryant
Patches:
      07072008__iax2_key_rotation.diff uploaded by bbryant (license 36)
Tested by: russell, bbryant


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@135158 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-01 18:16:24 +00:00
Tilghman Lesher
62db05502f Picky, picky, buildbot
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@135128 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-01 17:09:50 +00:00
Tilghman Lesher
6cb6583475 SIP should use the transport type set in the Moved Temporarily for the next
invite.
(closes issue #11843)
 Reported by: pestermann
 Patches: 
       20080723__issue11843_302_ignores_transport_16branch.diff uploaded by bbryant (license 36)
       20080723__issue11843_302_ignores_transport_trunk.diff uploaded by bbryant (license 36)
 Tested by: pabelanger


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@135126 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-01 16:39:51 +00:00
Michiel van Baak
e9fc0e572c Merged revisions 135055 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r135055 | mvanbaak | 2008-08-01 12:55:27 +0200 (Fri, 01 Aug 2008) | 8 lines

fix some potential deadlocks in chan_skinny

(closes issue #13215)
Reported by: qwell
Patches:
      2008080100_bug13215.diff.txt uploaded by mvanbaak (license 7)
Tested by: mvanbaak

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@135056 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-01 11:00:13 +00:00
Russell Bryant
6d5979ff7e fix the potential use of an uninitialized variable
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@134916 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-31 19:39:25 +00:00
Tilghman Lesher
b89ecf2407 Optimize frame cache by realloc'ing the smallest frame when the cache is full.
This ensures that we don't just keep a cache of tiny frames, continually doing
an alloc/free for each data frame, thus negating the point of having a cache.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@134867 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-31 19:03:41 +00:00
Russell Bryant
8adc6fb4ea Merged revisions 134814 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r134814 | russell | 2008-07-31 11:45:31 -0500 (Thu, 31 Jul 2008) | 7 lines

In case we have some processing threads that free more frames than they allocate,
do not let the frame cache grow forever.

(closes issue #13160)
Reported by: tavius
Tested by: tavius, russell

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@134815 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-31 16:50:10 +00:00
Mark Michelson
560475ba74 Fix the parsing of the "reason" parameter in the
Diversion: header.

(closes issue #13195)
Reported by: woodsfsg



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@134556 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-30 20:24:40 +00:00
Tilghman Lesher
853f6a8b3e Move implementation of an attended-transfer-complete sound from one channel
driver into a common place for multiple channel drivers.
(closes issue #13152)
 Reported by: caio1982
 Patches: 
       atxfer_complete_sound3.diff uploaded by caio1982 (license 22)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@134401 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-30 16:40:43 +00:00
Kevin P. Fleming
0ce79e5a06 build against the now-typedef-free dahdi/user.h, and remove some #ifdefs for features that will always be present in DAHDI
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@134260 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-29 22:22:13 +00:00