[asterisk-commits] phsultan: branch phsultan/res_jabber-openssl r85512 - in /team/phsultan/res_j...
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Fri Oct 12 05:31:13 CDT 2007
Author: phsultan
Date: Fri Oct 12 05:31:12 2007
New Revision: 85512
URL: http://svn.digium.com/view/asterisk?view=rev&rev=85512
Log:
Merged revisions 84671,84691,84693,84726,84743,84784,84819,84852,84891-84892,84918,84939,84958,84991,85024-85025,85058,85094,85097-85098,85140,85176-85177,85196-85197,85234,85254,85278-85279,85281,85317,85357,85398,85431,85444,85460,85474,85485,85496-85499 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r84671 | tilghman | 2007-10-04 18:56:00 +0200 (Thu, 04 Oct 2007) | 2 lines
Update to current coding standards, also changing the argument delimiter to ',' (Closes issue #10876)
................
r84691 | kpfleming | 2007-10-04 23:38:22 +0200 (Thu, 04 Oct 2007) | 10 lines
Merged revisions 84690 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r84690 | kpfleming | 2007-10-04 16:36:56 -0500 (Thu, 04 Oct 2007) | 2 lines
callers of sig2str already add the word 'signalling' in the appropriate place, so don't duplicate it
........
................
r84693 | mmichelson | 2007-10-05 00:00:10 +0200 (Fri, 05 Oct 2007) | 13 lines
Merged revisions 84692 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r84692 | mmichelson | 2007-10-04 16:57:03 -0500 (Thu, 04 Oct 2007) | 5 lines
Don't allocate space for queue members unless it's needed. You end up deleting dynamic members on a reload. Not good.
closes issue (#10879, reported by dazza76, patched by me)
........
................
r84726 | mmichelson | 2007-10-05 00:58:26 +0200 (Fri, 05 Oct 2007) | 8 lines
A two-in-one patch from the bugtracker
1) Fix some bad logic in the counting of statistics for QueueSummary manager event. Variables were not being
reset for each additional queue, so cumulative totals were reported on each successive queue.
2) Add a longest hold time stat to QueueSummary manager event.
................
r84743 | russell | 2007-10-05 03:40:20 +0200 (Fri, 05 Oct 2007) | 11 lines
Merged revisions 84742 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r84742 | russell | 2007-10-04 20:39:07 -0500 (Thu, 04 Oct 2007) | 3 lines
Fix a copy/paste error in the description of UpdateConfig that was pointed
out by JerJer on #asterisk-dev
........
................
r84784 | russell | 2007-10-05 18:49:16 +0200 (Fri, 05 Oct 2007) | 12 lines
Merged revisions 84783 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r84783 | russell | 2007-10-05 11:44:21 -0500 (Fri, 05 Oct 2007) | 4 lines
Do deadlock avoidance in a couple more places. You can't lock two channels
at the same time without doing extra work to make sure it succeeds.
(closes issue #10895, patch by me)
........
................
r84819 | file | 2007-10-05 20:57:26 +0200 (Fri, 05 Oct 2007) | 12 lines
Merged revisions 84818 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r84818 | file | 2007-10-05 15:55:36 -0300 (Fri, 05 Oct 2007) | 4 lines
Update the remembered RTP peer information when putting an endpoint on hold or taking it off hold so that the RTP stack does not initiate a needless reinvite.
(closes issue #10868)
Reported by: mavince
........
................
r84852 | tilghman | 2007-10-05 21:48:10 +0200 (Fri, 05 Oct 2007) | 10 lines
Merged revisions 84851 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r84851 | tilghman | 2007-10-05 14:42:21 -0500 (Fri, 05 Oct 2007) | 2 lines
Log exactly why we can't open the database, if we fail (closes issue #10887)
........
................
r84891 | phsultan | 2007-10-07 17:54:48 +0200 (Sun, 07 Oct 2007) | 13 lines
Merged revisions 84890 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r84890 | phsultan | 2007-10-07 17:52:44 +0200 (Sun, 07 Oct 2007) | 5 lines
Prevent Asterisk from crashing when receiving a presence packet
without resource from a buddy that is known to have a resource list.
Revert a change I previously made, where Asterisk could point to a
freed memory location.
........
................
r84892 | phsultan | 2007-10-07 17:56:22 +0200 (Sun, 07 Oct 2007) | 1 line
Fix indentation
................
r84918 | phsultan | 2007-10-07 18:18:49 +0200 (Sun, 07 Oct 2007) | 13 lines
Merged revisions 84902 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r84902 | phsultan | 2007-10-07 18:15:39 +0200 (Sun, 07 Oct 2007) | 5 lines
Presence packets from a client who's connected with our Jabber ID are
valid, therefore, those clients must be considered as buddies. The resource
string helps us make the distinction between clients.
Closes issue #10707, reported by yusufmotiwala.
........
................
r84939 | phsultan | 2007-10-07 18:28:25 +0200 (Sun, 07 Oct 2007) | 3 lines
Make the status and priority configurable.
Closes issue #10785, patch by Luke-Jr, thanks!
................
r84958 | russell | 2007-10-08 05:29:38 +0200 (Mon, 08 Oct 2007) | 14 lines
Merged revisions 84957 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r84957 | russell | 2007-10-07 22:28:34 -0500 (Sun, 07 Oct 2007) | 6 lines
Enable file dependency tracking for _all_ builds, and not just for builds with
dev-mode enabled. I have seen enough problems caused by this that I don't think
it's worth keeping. I want to continue to encourage anybody that is interested
to continue to run Asterisk from svn. Furthermore, I do not want their systems
to break when we change a structure definition in a header file. :)
........
................
r84991 | file | 2007-10-08 17:05:05 +0200 (Mon, 08 Oct 2007) | 12 lines
Merged revisions 84990 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r84990 | file | 2007-10-08 12:03:07 -0300 (Mon, 08 Oct 2007) | 4 lines
Don't keep trying to native bridge if either of the channels are involved in a masquerade operation to be done.
(closes issue #10696)
Reported by: tbelder
........
................
r85024 | file | 2007-10-08 17:39:23 +0200 (Mon, 08 Oct 2007) | 12 lines
Merged revisions 85023 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r85023 | file | 2007-10-08 12:37:46 -0300 (Mon, 08 Oct 2007) | 4 lines
Update codec information as well as address when doing hold reinvites.
(issue #10868)
Reported by: mavince
........
................
r85025 | file | 2007-10-08 18:12:21 +0200 (Mon, 08 Oct 2007) | 6 lines
Fix up tree so that it compiles when MTX Profiling is enabled.
(closes issue #10898)
Reported by: snuffy
Patches:
10898-mtx_prof.diff uploaded by qwell (license 4)
................
r85058 | file | 2007-10-08 22:09:02 +0200 (Mon, 08 Oct 2007) | 12 lines
Merged revisions 85057 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r85057 | file | 2007-10-08 17:06:33 -0300 (Mon, 08 Oct 2007) | 4 lines
Only update codec information if the channel has a technology private structure.
(issue #10915)
Reported by: ramonpeek
........
................
r85094 | file | 2007-10-09 16:31:27 +0200 (Tue, 09 Oct 2007) | 12 lines
Merged revisions 85093 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r85093 | file | 2007-10-09 11:30:16 -0300 (Tue, 09 Oct 2007) | 4 lines
Don't perform a reinvite if a transfer is in progress.
(issue #10915)
Reported by: ramonpeek
........
................
r85097 | russell | 2007-10-09 17:10:14 +0200 (Tue, 09 Oct 2007) | 8 lines
Add jitterbuffer support for chan_local. To enable it, you use the 'j' option
in the Dial command. The 'j' option _must_ be used in conjunction with the 'n'
option.
This feature will allow you to use the existing jitterbuffer implementation to
put a jitterbuffer on incoming SIP calls connecting to Asterisk applications by
putting a local channel in the middle.
................
r85098 | russell | 2007-10-09 17:12:59 +0200 (Tue, 09 Oct 2007) | 2 lines
Note jitterbuffer support for chan_local in CHANGES
................
r85140 | tilghman | 2007-10-09 18:04:41 +0200 (Tue, 09 Oct 2007) | 2 lines
Remove redundant includes (patch by snuffy) (Closes issue #10922)
................
r85176 | tilghman | 2007-10-10 00:21:49 +0200 (Wed, 10 Oct 2007) | 13 lines
Merged revisions 85158 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r85158 | tilghman | 2007-10-09 16:55:06 -0500 (Tue, 09 Oct 2007) | 5 lines
This commit fixes the following issues:
- Deadlock in ast_write (issue #10406)
- Deadlock in ast_read (issue #10406)
- Possible mutex initialization error in lock.h (issue #10571)
........
................
r85177 | mmichelson | 2007-10-10 00:35:11 +0200 (Wed, 10 Oct 2007) | 5 lines
Patch to add one-touch parking for queues.
(closes issue #10869, reported and patched by bluecrow76)
................
r85196 | kpfleming | 2007-10-10 08:41:51 +0200 (Wed, 10 Oct 2007) | 10 lines
Merged revisions 85195 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r85195 | kpfleming | 2007-10-10 08:24:41 +0200 (Wed, 10 Oct 2007) | 2 lines
use a macro instead of an inline function, so that backtraces will report the caller of ast_frame_free() properly
........
................
r85197 | rizzo | 2007-10-10 08:48:50 +0200 (Wed, 10 Oct 2007) | 4 lines
Adapt the autotools names to different versions of FreeBSD
(and open the way to better adaptation for other platforms as well).
................
r85234 | file | 2007-10-10 15:46:57 +0200 (Wed, 10 Oct 2007) | 4 lines
Process outstanding log messages before shutting down the logger thread.
(closes issue #10933)
Reported by: sperreault
................
r85254 | file | 2007-10-10 16:17:08 +0200 (Wed, 10 Oct 2007) | 14 lines
Merged revisions 85242 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r85242 | file | 2007-10-10 11:14:56 -0300 (Wed, 10 Oct 2007) | 6 lines
Close voicemail message description file if duration did not meet the minimum, or else we will eventually run out of file descriptors.
(closes issue #10918)
Reported by: brak2718
Patches:
vm1.4.12.1.patch uploaded by brak2718 (license 279)
........
................
r85278 | file | 2007-10-10 16:30:05 +0200 (Wed, 10 Oct 2007) | 14 lines
Merged revisions 85277 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r85277 | file | 2007-10-10 11:28:18 -0300 (Wed, 10 Oct 2007) | 6 lines
Add support for handling a 182 Queued response.
(closes issue #10924)
Reported by: ramonpeek
Patches:
queued-182.diff uploaded by ramonpeek (license 266)
........
................
r85279 | mmichelson | 2007-10-10 16:38:15 +0200 (Wed, 10 Oct 2007) | 13 lines
Merged revisions 85276 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r85276 | mmichelson | 2007-10-10 09:26:31 -0500 (Wed, 10 Oct 2007) | 5 lines
A bunch of changes from sprintf to snprintf.
See security advisory AST-2002-022
........
................
r85281 | file | 2007-10-10 16:43:37 +0200 (Wed, 10 Oct 2007) | 12 lines
Merged revisions 85280 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r85280 | file | 2007-10-10 11:42:00 -0300 (Wed, 10 Oct 2007) | 4 lines
If devicestate is passed a port number strip it out.
(closes issue #10930)
Reported by: ibc
........
................
r85317 | russell | 2007-10-10 18:01:31 +0200 (Wed, 10 Oct 2007) | 14 lines
Merged revisions 85316 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r85316 | russell | 2007-10-10 10:56:23 -0500 (Wed, 10 Oct 2007) | 6 lines
I introduced a new member to the ast_filestream struct in 1.4.12, but put it
in the middle of the struct, instead of at the end. One of the Debian folks,
paravoid, pointed out that this breaks binary compatability with modules
compiled against older headers. So, I'm moving the new member to the end
of the struct to resolve the situation.
........
................
r85357 | tilghman | 2007-10-11 06:40:56 +0200 (Thu, 11 Oct 2007) | 10 lines
Merged revisions 85356 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r85356 | tilghman | 2007-10-10 23:35:33 -0500 (Wed, 10 Oct 2007) | 2 lines
A dollar sign by itself, not indicating a start of a variable or expression prematurely ends substitution (closes issue #10939)
........
................
r85398 | file | 2007-10-11 17:29:14 +0200 (Thu, 11 Oct 2007) | 13 lines
Blocked revisions 85397 via svnmerge
........
r85397 | file | 2007-10-11 12:26:20 -0300 (Thu, 11 Oct 2007) | 6 lines
When creating a new packet don't try to stop retransmission of it. It was just allocated/created so it's impossible for it to have already been scheduled.
(closes issue #10945)
Reported by: flefoll
Patches:
chan_sip.c.br14.85280.xmit_reliable-patch uploaded by flefoll (license 244)
........
................
r85431 | mattf | 2007-10-11 19:09:31 +0200 (Thu, 11 Oct 2007) | 1 line
Make sure we are clean to build without libpri
................
r85444 | mattf | 2007-10-11 19:17:58 +0200 (Thu, 11 Oct 2007) | 1 line
Let's hard code this until I fix it
................
r85460 | russell | 2007-10-11 21:03:06 +0200 (Thu, 11 Oct 2007) | 33 lines
Merge a ton of NEW_CLI conversions. Thanks to everyone that helped out! :)
(closes issue #10724)
Reported by: eliel
Patches:
chan_skinny.c.patch uploaded by eliel (license 64)
chan_oss.c.patch uploaded by eliel (license 64)
chan_mgcp.c.patch2 uploaded by eliel (license 64)
pbx_config.c.patch uploaded by seanbright (license 71)
iax2-provision.c.patch uploaded by eliel (license 64)
chan_gtalk.c.patch uploaded by eliel (license 64)
pbx_ael.c.patch uploaded by seanbright (license 71)
file.c.patch uploaded by seanbright (license 71)
image.c.patch uploaded by seanbright (license 71)
cli.c.patch uploaded by moy (license 222)
astobj2.c.patch uploaded by moy (license 222)
asterisk.c.patch uploaded by moy (license 222)
res_limit.c.patch uploaded by seanbright (license 71)
res_convert.c.patch uploaded by seanbright (license 71)
res_crypto.c.patch uploaded by seanbright (license 71)
app_osplookup.c.patch uploaded by seanbright (license 71)
app_rpt.c.patch uploaded by seanbright (license 71)
app_mixmonitor.c.patch uploaded by seanbright (license 71)
channel.c.patch uploaded by seanbright (license 71)
translate.c.patch uploaded by seanbright (license 71)
udptl.c.patch uploaded by seanbright (license 71)
threadstorage.c.patch uploaded by seanbright (license 71)
db.c.patch uploaded by seanbright (license 71)
cdr.c.patch uploaded by moy (license 222)
pbd_dundi.c.patch uploaded by moy (license 222)
app_osplookup-rev83558.patch uploaded by moy (license 222)
res_clioriginate.c.patch uploaded by moy (license 222)
................
r85474 | mattf | 2007-10-11 22:49:04 +0200 (Thu, 11 Oct 2007) | 1 line
Add CCR test support #10916
................
r85485 | mattf | 2007-10-11 23:57:26 +0200 (Thu, 11 Oct 2007) | 1 line
Add SS7 ANI2 support tx and rx. #10916
................
r85496 | mattf | 2007-10-12 00:20:02 +0200 (Fri, 12 Oct 2007) | 1 line
Add ANI2 support to func_callerid
................
r85497 | mattf | 2007-10-12 00:27:32 +0200 (Fri, 12 Oct 2007) | 1 line
Make sure we set the ANI2 field for PRI
................
r85498 | mattf | 2007-10-12 00:33:57 +0200 (Fri, 12 Oct 2007) | 1 line
See if I can fix this borked ANI2 code I added
................
r85499 | mattf | 2007-10-12 00:42:44 +0200 (Fri, 12 Oct 2007) | 1 line
Make sure we propogate ANI2 to the outbound channel
................
Modified:
team/phsultan/res_jabber-openssl/ (props changed)
team/phsultan/res_jabber-openssl/CHANGES
team/phsultan/res_jabber-openssl/Makefile.rules
team/phsultan/res_jabber-openssl/apps/app_adsiprog.c
team/phsultan/res_jabber-openssl/apps/app_dial.c
team/phsultan/res_jabber-openssl/apps/app_festival.c
team/phsultan/res_jabber-openssl/apps/app_minivm.c
team/phsultan/res_jabber-openssl/apps/app_mixmonitor.c
team/phsultan/res_jabber-openssl/apps/app_osplookup.c
team/phsultan/res_jabber-openssl/apps/app_queue.c
team/phsultan/res_jabber-openssl/apps/app_rpt.c
team/phsultan/res_jabber-openssl/apps/app_voicemail.c
team/phsultan/res_jabber-openssl/apps/app_zapras.c
team/phsultan/res_jabber-openssl/bootstrap.sh
team/phsultan/res_jabber-openssl/channels/chan_gtalk.c
team/phsultan/res_jabber-openssl/channels/chan_jingle.c
team/phsultan/res_jabber-openssl/channels/chan_local.c
team/phsultan/res_jabber-openssl/channels/chan_mgcp.c
team/phsultan/res_jabber-openssl/channels/chan_misdn.c
team/phsultan/res_jabber-openssl/channels/chan_oss.c
team/phsultan/res_jabber-openssl/channels/chan_sip.c
team/phsultan/res_jabber-openssl/channels/chan_skinny.c
team/phsultan/res_jabber-openssl/channels/chan_zap.c
team/phsultan/res_jabber-openssl/channels/iax2-provision.c
team/phsultan/res_jabber-openssl/configs/jabber.conf.sample
team/phsultan/res_jabber-openssl/doc/tex/localchannel.tex
team/phsultan/res_jabber-openssl/funcs/func_callerid.c
team/phsultan/res_jabber-openssl/include/asterisk/file.h
team/phsultan/res_jabber-openssl/include/asterisk/frame.h
team/phsultan/res_jabber-openssl/include/asterisk/jabber.h
team/phsultan/res_jabber-openssl/include/asterisk/lock.h
team/phsultan/res_jabber-openssl/main/ast_expr2.c
team/phsultan/res_jabber-openssl/main/asterisk.c
team/phsultan/res_jabber-openssl/main/astobj2.c
team/phsultan/res_jabber-openssl/main/cdr.c
team/phsultan/res_jabber-openssl/main/channel.c
team/phsultan/res_jabber-openssl/main/cli.c
team/phsultan/res_jabber-openssl/main/db.c
team/phsultan/res_jabber-openssl/main/file.c
team/phsultan/res_jabber-openssl/main/image.c
team/phsultan/res_jabber-openssl/main/logger.c
team/phsultan/res_jabber-openssl/main/manager.c
team/phsultan/res_jabber-openssl/main/pbx.c
team/phsultan/res_jabber-openssl/main/rtp.c
team/phsultan/res_jabber-openssl/main/threadstorage.c
team/phsultan/res_jabber-openssl/main/translate.c
team/phsultan/res_jabber-openssl/main/udptl.c
team/phsultan/res_jabber-openssl/main/utils.c
team/phsultan/res_jabber-openssl/pbx/pbx_ael.c
team/phsultan/res_jabber-openssl/pbx/pbx_config.c
team/phsultan/res_jabber-openssl/pbx/pbx_dundi.c
team/phsultan/res_jabber-openssl/res/res_clioriginate.c
team/phsultan/res_jabber-openssl/res/res_convert.c
team/phsultan/res_jabber-openssl/res/res_crypto.c
team/phsultan/res_jabber-openssl/res/res_jabber.c
team/phsultan/res_jabber-openssl/res/res_limit.c
team/phsultan/res_jabber-openssl/utils/astman.c
team/phsultan/res_jabber-openssl/utils/check_expr.c
team/phsultan/res_jabber-openssl/utils/conf2ael.c
team/phsultan/res_jabber-openssl/utils/hashtest2.c
Propchange: team/phsultan/res_jabber-openssl/
------------------------------------------------------------------------------
Binary property 'branch-1.4-blocked' - no diff available.
Propchange: team/phsultan/res_jabber-openssl/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.
Propchange: team/phsultan/res_jabber-openssl/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Oct 12 05:31:12 2007
@@ -1,1 +1,1 @@
-/trunk:1-84661
+/trunk:1-85511
Modified: team/phsultan/res_jabber-openssl/CHANGES
URL: http://svn.digium.com/view/asterisk/team/phsultan/res_jabber-openssl/CHANGES?view=diff&rev=85512&r1=85511&r2=85512
==============================================================================
--- team/phsultan/res_jabber-openssl/CHANGES (original)
+++ team/phsultan/res_jabber-openssl/CHANGES Fri Oct 12 05:31:12 2007
@@ -141,9 +141,9 @@
* SMDI is now enabled in voicemail using the smdienable option.
* A "lockmode" option has been added to asterisk.conf to configure the file
locking method used for voicemail, and potentially other things in the
- future. The default is the old behavior, lockfile. However, there is a
- new method, "flock", that uses a different method for situations where the
- lockfile will not work, such as on SMB/CIFS mounts.
+ future. The default is the old behavior, lockfile. However, there is a
+ new method, "flock", that uses a different method for situations where the
+ lockfile will not work, such as on SMB/CIFS mounts.
Queue changes
-------------
@@ -289,3 +289,9 @@
to just UNKNOWN if the extension exists.
* When originating a call using AMI or pbx_spool that fails the reason for failure
will now be available in the failed extension using the REASON dialplan variable.
+ * Added jitterbuffer support for chan_local. This allows you to use the
+ generic jitterbuffer on incoming calls going to Asterisk applications.
+ For example, this would allow you to use a jitterbuffer for an incoming
+ SIP call to Voicemail by putting a Local channel in the middle. This
+ feature is enabled by using the 'j' option in the Dial string to the Local
+ channel in conjunction with the existing 'n' option for local channels.
Modified: team/phsultan/res_jabber-openssl/Makefile.rules
URL: http://svn.digium.com/view/asterisk/team/phsultan/res_jabber-openssl/Makefile.rules?view=diff&rev=85512&r1=85511&r2=85512
==============================================================================
--- team/phsultan/res_jabber-openssl/Makefile.rules (original)
+++ team/phsultan/res_jabber-openssl/Makefile.rules Fri Oct 12 05:31:12 2007
@@ -40,11 +40,7 @@
%.o: %.c
$(ECHO_PREFIX) echo " [CC] $< -> $@"
-ifeq ($(AST_DEVMODE),yes)
$(CMD_PREFIX) $(CC) -o $@ -c $< $(PTHREAD_CFLAGS) $(ASTCFLAGS) -MMD -MT $@ -MF .$(subst /,_,$@).d -MP
-else
- $(CMD_PREFIX) $(CC) -o $@ -c $< $(PTHREAD_CFLAGS) $(ASTCFLAGS)
-endif
%.o: %.i
$(ECHO_PREFIX) echo " [CC] $< -> $@"
@@ -64,19 +60,11 @@
%.o: %.s
$(ECHO_PREFIX) echo " [AS] $< -> $@"
-ifeq ($(AST_DEVMODE),yes)
$(CMD_PREFIX) $(CC) -o $@ -c $< $(PTHREAD_CFLAGS) $(ASTCFLAGS) -MMD -MT $@ -MF .$(subst /,_,$@).d -MP
-else
- $(CMD_PREFIX) $(CC) -o $@ -c $< $(PTHREAD_CFLAGS) $(ASTCFLAGS)
-endif
%.oo: %.cc
$(ECHO_PREFIX) echo " [CXX] $< -> $@"
-ifeq ($(AST_DEVMODE),yes)
$(CMD_PREFIX) $(CXX) -o $@ -c $< $(PTHREAD_CFLAGS) $(filter-out -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations,$(ASTCFLAGS)) -MMD -MT $@ -MF .$(subst /,_,$@).d -MP
-else
- $(CMD_PREFIX) $(CXX) -o $@ -c $< $(PTHREAD_CFLAGS) $(filter-out -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations,$(ASTCFLAGS))
-endif
%.c: %.y
$(ECHO_PREFIX) echo " [BISON] $< -> $@"
Modified: team/phsultan/res_jabber-openssl/apps/app_adsiprog.c
URL: http://svn.digium.com/view/asterisk/team/phsultan/res_jabber-openssl/apps/app_adsiprog.c?view=diff&rev=85512&r1=85511&r2=85512
==============================================================================
--- team/phsultan/res_jabber-openssl/apps/app_adsiprog.c (original)
+++ team/phsultan/res_jabber-openssl/apps/app_adsiprog.c Fri Oct 12 05:31:12 2007
@@ -38,7 +38,6 @@
#include <stdlib.h>
#include <unistd.h>
#include <string.h>
-#include <stdlib.h>
#include <ctype.h>
#include <stdio.h>
#include <errno.h>
Modified: team/phsultan/res_jabber-openssl/apps/app_dial.c
URL: http://svn.digium.com/view/asterisk/team/phsultan/res_jabber-openssl/apps/app_dial.c?view=diff&rev=85512&r1=85511&r2=85512
==============================================================================
--- team/phsultan/res_jabber-openssl/apps/app_dial.c (original)
+++ team/phsultan/res_jabber-openssl/apps/app_dial.c Fri Oct 12 05:31:12 2007
@@ -33,7 +33,6 @@
#include <errno.h>
#include <unistd.h>
#include <string.h>
-#include <stdlib.h>
#include <stdio.h>
#include <sys/time.h>
#include <sys/signal.h>
@@ -1406,6 +1405,7 @@
tc->cid.cid_pres = chan->cid.cid_pres;
tc->cid.cid_ton = chan->cid.cid_ton;
tc->cid.cid_tns = chan->cid.cid_tns;
+ tc->cid.cid_ani2 = chan->cid.cid_ani2;
tc->adsicpe = chan->adsicpe;
tc->transfercapability = chan->transfercapability;
Modified: team/phsultan/res_jabber-openssl/apps/app_festival.c
URL: http://svn.digium.com/view/asterisk/team/phsultan/res_jabber-openssl/apps/app_festival.c?view=diff&rev=85512&r1=85511&r2=85512
==============================================================================
--- team/phsultan/res_jabber-openssl/apps/app_festival.c (original)
+++ team/phsultan/res_jabber-openssl/apps/app_festival.c Fri Oct 12 05:31:12 2007
@@ -36,15 +36,12 @@
#include <unistd.h>
#include <string.h>
#include <stdlib.h>
-#include <sys/types.h>
#include <sys/socket.h>
#include <netdb.h>
#include <netinet/in.h>
#include <arpa/inet.h>
#include <stdio.h>
#include <signal.h>
-#include <stdlib.h>
-#include <unistd.h>
#include <fcntl.h>
#include <ctype.h>
Modified: team/phsultan/res_jabber-openssl/apps/app_minivm.c
URL: http://svn.digium.com/view/asterisk/team/phsultan/res_jabber-openssl/apps/app_minivm.c?view=diff&rev=85512&r1=85511&r2=85512
==============================================================================
--- team/phsultan/res_jabber-openssl/apps/app_minivm.c (original)
+++ team/phsultan/res_jabber-openssl/apps/app_minivm.c Fri Oct 12 05:31:12 2007
@@ -145,7 +145,6 @@
#include <errno.h>
#include <unistd.h>
#include <string.h>
-#include <stdlib.h>
#include <stdio.h>
#include <ctype.h>
#include <sys/time.h>
Modified: team/phsultan/res_jabber-openssl/apps/app_mixmonitor.c
URL: http://svn.digium.com/view/asterisk/team/phsultan/res_jabber-openssl/apps/app_mixmonitor.c?view=diff&rev=85512&r1=85511&r2=85512
==============================================================================
--- team/phsultan/res_jabber-openssl/apps/app_mixmonitor.c (original)
+++ team/phsultan/res_jabber-openssl/apps/app_mixmonitor.c Fri Oct 12 05:31:12 2007
@@ -362,46 +362,44 @@
return 0;
}
-static int mixmonitor_cli(int fd, int argc, char **argv)
+static char *handle_cli_mixmonitor(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
{
struct ast_channel *chan;
- if (argc < 3)
- return RESULT_SHOWUSAGE;
-
- if (!(chan = ast_get_channel_by_name_prefix_locked(argv[2], strlen(argv[2])))) {
- ast_cli(fd, "No channel matching '%s' found.\n", argv[2]);
- return RESULT_SUCCESS;
- }
-
- if (!strcasecmp(argv[1], "start")) {
- mixmonitor_exec(chan, argv[3]);
+ switch (cmd) {
+ case CLI_INIT:
+ e->command = "mixmonitor [start|stop]";
+ e->usage =
+ "Usage: mixmonitor <start|stop> <chan_name> [args]\n"
+ " The optional arguments are passed to the MixMonitor\n"
+ " application when the 'start' command is used.\n";
+ return NULL;
+ case CLI_GENERATE:
+ return ast_complete_channels(a->line, a->word, a->pos, a->n, 2);
+ }
+
+ if (a->argc < 3)
+ return CLI_SHOWUSAGE;
+
+ if (!(chan = ast_get_channel_by_name_prefix_locked(a->argv[2], strlen(a->argv[2])))) {
+ ast_cli(a->fd, "No channel matching '%s' found.\n", a->argv[2]);
+ /* Technically this is a failure, but we don't want 2 errors printing out */
+ return CLI_SUCCESS;
+ }
+
+ if (!strcasecmp(a->argv[1], "start")) {
+ mixmonitor_exec(chan, a->argv[3]);
ast_channel_unlock(chan);
} else {
ast_channel_unlock(chan);
ast_audiohook_detach_source(chan, mixmonitor_spy_type);
}
- return RESULT_SUCCESS;
-}
-
-static char *complete_mixmonitor_cli(const char *line, const char *word, int pos, int state)
-{
- char *options[] = {"start", "stop", NULL};
-
- if (pos == 1)
- return ast_cli_complete (word, options, state);
-
- return ast_complete_channels(line, word, pos, state, 2);
+ return CLI_SUCCESS;
}
static struct ast_cli_entry cli_mixmonitor[] = {
- { { "mixmonitor", NULL, NULL },
- mixmonitor_cli, "Execute a MixMonitor command.",
- "mixmonitor <start|stop> <chan_name> [args]\n\n"
- "The optional arguments are passed to the\n"
- "MixMonitor application when the 'start' command is used.\n",
- complete_mixmonitor_cli },
+ NEW_CLI(handle_cli_mixmonitor, "Execute a MixMonitor command")
};
static int unload_module(void)
Modified: team/phsultan/res_jabber-openssl/apps/app_osplookup.c
URL: http://svn.digium.com/view/asterisk/team/phsultan/res_jabber-openssl/apps/app_osplookup.c?view=diff&rev=85512&r1=85511&r2=85512
==============================================================================
--- team/phsultan/res_jabber-openssl/apps/app_osplookup.c (original)
+++ team/phsultan/res_jabber-openssl/apps/app_osplookup.c Fri Oct 12 05:31:12 2007
@@ -1861,10 +1861,7 @@
return 0;
}
-static int osp_show(
- int fd,
- int argc,
- char* argv[])
+static char *handle_cli_osp_show(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
{
int i;
int found = 0;
@@ -1872,12 +1869,21 @@
const char* provider = NULL;
const char* tokenalgo;
- if ((argc < 2) || (argc > 3)) {
- return RESULT_SHOWUSAGE;
- }
- if (argc > 2) {
- provider = argv[2];
- }
+ switch (cmd) {
+ case CLI_INIT:
+ e->command = "osp show";
+ e->usage =
+ "Usage: osp show\n"
+ " Displays information on Open Settlement Protocol support\n";
+ return NULL;
+ case CLI_GENERATE:
+ return NULL;
+ }
+
+ if ((a->argc < 2) || (a->argc > 3))
+ return CLI_SHOWUSAGE;
+ if (a->argc > 2)
+ provider = a->argv[2];
if (!provider) {
switch (osp_tokenformat) {
case TOKEN_ALGO_BOTH:
@@ -1891,7 +1897,7 @@
tokenalgo = "Signed";
break;
}
- ast_cli(fd, "OSP: %s %s %s\n",
+ ast_cli(a->fd, "OSP: %s %s %s\n",
osp_initialized ? "Initialized" : "Uninitialized", osp_hardware ? "Accelerated" : "Normal", tokenalgo);
}
@@ -1900,25 +1906,25 @@
while(p) {
if (!provider || !strcasecmp(p->name, provider)) {
if (found) {
- ast_cli(fd, "\n");
- }
- ast_cli(fd, " == OSP Provider '%s' == \n", p->name);
- ast_cli(fd, "Local Private Key: %s\n", p->privatekey);
- ast_cli(fd, "Local Certificate: %s\n", p->localcert);
+ ast_cli(a->fd, "\n");
+ }
+ ast_cli(a->fd, " == OSP Provider '%s' == \n", p->name);
+ ast_cli(a->fd, "Local Private Key: %s\n", p->privatekey);
+ ast_cli(a->fd, "Local Certificate: %s\n", p->localcert);
for (i = 0; i < p->cacount; i++) {
- ast_cli(fd, "CA Certificate %d: %s\n", i + 1, p->cacerts[i]);
+ ast_cli(a->fd, "CA Certificate %d: %s\n", i + 1, p->cacerts[i]);
}
for (i = 0; i < p->spcount; i++) {
- ast_cli(fd, "Service Point %d: %s\n", i + 1, p->srvpoints[i]);
- }
- ast_cli(fd, "Max Connections: %d\n", p->maxconnections);
- ast_cli(fd, "Retry Delay: %d seconds\n", p->retrydelay);
- ast_cli(fd, "Retry Limit: %d\n", p->retrylimit);
- ast_cli(fd, "Timeout: %d milliseconds\n", p->timeout);
- ast_cli(fd, "Source: %s\n", strlen(p->source) ? p->source : "<unspecified>");
- ast_cli(fd, "Auth Policy %d\n", p->authpolicy);
- ast_cli(fd, "Default protocol %s\n", p->defaultprotocol);
- ast_cli(fd, "OSP Handle: %d\n", p->handle);
+ ast_cli(a->fd, "Service Point %d: %s\n", i + 1, p->srvpoints[i]);
+ }
+ ast_cli(a->fd, "Max Connections: %d\n", p->maxconnections);
+ ast_cli(a->fd, "Retry Delay: %d seconds\n", p->retrydelay);
+ ast_cli(a->fd, "Retry Limit: %d\n", p->retrylimit);
+ ast_cli(a->fd, "Timeout: %d milliseconds\n", p->timeout);
+ ast_cli(a->fd, "Source: %s\n", strlen(p->source) ? p->source : "<unspecified>");
+ ast_cli(a->fd, "Auth Policy %d\n", p->authpolicy);
+ ast_cli(a->fd, "Default protocol %s\n", p->defaultprotocol);
+ ast_cli(a->fd, "OSP Handle: %d\n", p->handle);
found++;
}
p = p->next;
@@ -1927,12 +1933,12 @@
if (!found) {
if (provider) {
- ast_cli(fd, "Unable to find OSP provider '%s'\n", provider);
+ ast_cli(a->fd, "Unable to find OSP provider '%s'\n", provider);
} else {
- ast_cli(fd, "No OSP providers configured\n");
- }
- }
- return RESULT_SUCCESS;
+ ast_cli(a->fd, "No OSP providers configured\n");
+ }
+ }
+ return CLI_SUCCESS;
}
static const char* app1= "OSPAuth";
@@ -1993,14 +1999,8 @@
" OSPFINISHSTATUS The status of the OSP Finish attempt as a text string, one of\n"
" SUCCESS | FAILED | ERROR \n";
-static const char osp_usage[] =
-"Usage: osp show\n"
-" Displays information on Open Settlement Protocol support\n";
-
static struct ast_cli_entry cli_osp[] = {
- { {"osp", "show", NULL},
- osp_show, "Displays OSP information",
- osp_usage },
+ NEW_CLI(handle_cli_osp_show, "Displays OSF information")
};
static int load_module(void)
Modified: team/phsultan/res_jabber-openssl/apps/app_queue.c
URL: http://svn.digium.com/view/asterisk/team/phsultan/res_jabber-openssl/apps/app_queue.c?view=diff&rev=85512&r1=85511&r2=85512
==============================================================================
--- team/phsultan/res_jabber-openssl/apps/app_queue.c (original)
+++ team/phsultan/res_jabber-openssl/apps/app_queue.c Fri Oct 12 05:31:12 2007
@@ -150,6 +150,10 @@
" 'T' -- allow the calling user to transfer the call.\n"
" 'w' -- allow the called user to write the conversation to disk via Monitor.\n"
" 'W' -- allow the calling user to write the conversation to disk via Monitor.\n"
+" 'k' -- Allow the called party to enable parking of the call by sending\n"
+" the DTMF sequence defined for call parking in features.conf.\n"
+" 'K' -- Allow the calling party to enable parking of the call by sending\n"
+" the DTMF sequence defined for call parking in features.conf.\n"
" In addition to transferring the call, a call may be parked and then picked\n"
"up by another user.\n"
" The optional URL will be sent to the called party if the channel supports\n"
@@ -815,7 +819,8 @@
q->monfmt[0] = '\0';
q->periodicannouncefrequency = 0;
q->sound_callerannounce[0] = '\0'; /* Default, don't announce the caller that he has been answered */
- q->members = ao2_container_alloc(37, member_hash_fn, member_cmp_fn);
+ if(!q->members)
+ q->members = ao2_container_alloc(37, member_hash_fn, member_cmp_fn);
q->membercount = 0;
q->found = 1;
ast_copy_string(q->sound_next, "queue-youarenext", sizeof(q->sound_next));
@@ -2635,6 +2640,12 @@
case 'H':
ast_set_flag(&(bridge_config.features_caller), AST_FEATURE_DISCONNECT);
break;
+ case 'k':
+ ast_set_flag(&(bridge_config.features_callee), AST_FEATURE_PARKCALL);
+ break;
+ case 'K':
+ ast_set_flag(&(bridge_config.features_caller), AST_FEATURE_PARKCALL);
+ break;
case 'n':
if (qe->parent->strategy == QUEUE_STRATEGY_RRMEMORY)
(*tries)++;
@@ -4425,6 +4436,7 @@
int qmemcount = 0;
int qmemavail = 0;
int qchancount = 0;
+ int qlongestholdtime = 0;
const char *id = astman_get_header(m, "ActionID");
const char *queuefilter = astman_get_header(m, "Queue");
char idText[256] = "";
@@ -4444,6 +4456,12 @@
/* List queue properties */
if (ast_strlen_zero(queuefilter) || !strcmp(q->name, queuefilter)) {
+ /* Reset the necessary local variables if no queuefilter is set*/
+ qmemcount = 0;
+ qmemavail = 0;
+ qchancount = 0;
+ qlongestholdtime = 0;
+
/* List Queue Members */
mem_iter = ao2_iterator_init(q->members, 0);
while ((mem = ao2_iterator_next(&mem_iter))) {
@@ -4456,6 +4474,9 @@
ao2_ref(mem, -1);
}
for (qe = q->head; qe; qe = qe->next) {
+ if ((now - qe->start) > qlongestholdtime) {
+ qlongestholdtime = now - qe->start;
+ }
++qchancount;
}
astman_append(s, "Event: QueueSummary\r\n"
@@ -4464,9 +4485,10 @@
"Available: %d\r\n"
"Callers: %d\r\n"
"HoldTime: %d\r\n"
+ "LongestHoldTime: %d\r\n"
"%s"
"\r\n",
- q->name, qmemcount, qmemavail, qchancount, q->holdtime, idText);
+ q->name, qmemcount, qmemavail, qchancount, q->holdtime, qlongestholdtime, idText);
}
ao2_unlock(q);
queue_unref(q);
Modified: team/phsultan/res_jabber-openssl/apps/app_rpt.c
URL: http://svn.digium.com/view/asterisk/team/phsultan/res_jabber-openssl/apps/app_rpt.c?view=diff&rev=85512&r1=85511&r2=85512
==============================================================================
--- team/phsultan/res_jabber-openssl/apps/app_rpt.c (original)
+++ team/phsultan/res_jabber-openssl/apps/app_rpt.c Fri Oct 12 05:31:12 2007
@@ -299,7 +299,6 @@
#ifdef OLD_ASTERISK
STANDARD_LOCAL_USER;
#endif
-
#define MSWAIT 200
#define HANGTIME 5000
@@ -699,60 +698,20 @@
*/
/* Debug mode */
-static int rpt_do_debug(int fd, int argc, char *argv[]);
-static int rpt_do_dump(int fd, int argc, char *argv[]);
-static int rpt_do_stats(int fd, int argc, char *argv[]);
-static int rpt_do_lstats(int fd, int argc, char *argv[]);
-static int rpt_do_reload(int fd, int argc, char *argv[]);
-static int rpt_do_restart(int fd, int argc, char *argv[]);
-
-static char debug_usage[] =
-"Usage: rpt debug level {0-7}\n"
-" Enables debug messages in app_rpt\n";
-
-static char dump_usage[] =
-"Usage: rpt dump <nodename>\n"
-" Dumps struct debug info to log\n";
-
-static char dump_stats[] =
-"Usage: rpt stats <nodename>\n"
-" Dumps node statistics to console\n";
-
-static char dump_lstats[] =
-"Usage: rpt lstats <nodename>\n"
-" Dumps link statistics to console\n";
-
-static char reload_usage[] =
-"Usage: rpt reload\n"
-" Reloads app_rpt running config parameters\n";
-
-static char restart_usage[] =
-"Usage: rpt restart\n"
-" Restarts app_rpt\n";
+static char *handle_cli_rpt_debug_level(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a);
+static char *handle_cli_rpt_dump(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a);
+static char *handle_cli_rpt_stats(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a);
+static char *handle_cli_rpt_lstats(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a);
+static char *handle_cli_rpt_reload(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a);
+static char *handle_cli_rpt_restart(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a);
static struct ast_cli_entry cli_rpt[] = {
- { { "rpt", "debug", "level" },
- rpt_do_debug, "Enable app_rpt debugging",
- debug_usage },
-
- { { "rpt", "dump" },
- rpt_do_dump, "Dump app_rpt structs for debugging",
- dump_usage },
-
- { { "rpt", "stats" },
- rpt_do_stats, "Dump node statistics",
- dump_stats },
- { { "rpt", "lstats" },
- rpt_do_lstats, "Dump link statistics",
- dump_lstats },
-
- { { "rpt", "reload" },
- rpt_do_reload, "Reload app_rpt config",
- reload_usage },
-
- { { "rpt", "restart" },
- rpt_do_restart, "Restart app_rpt",
- restart_usage },
+ NEW_CLI(handle_cli_rpt_debug_level, "Enable app_rpt debuggin"),
+ NEW_CLI(handle_cli_rpt_dump, "Dump app_rpt structs for debugging"),
+ NEW_CLI(handle_cli_rpt_stats, "Dump node statistics"),
+ NEW_CLI(handle_cli_rpt_lstats, "Dump link statistics"),
+ NEW_CLI(handle_cli_rpt_reload, "Reload app_rpt config"),
+ NEW_CLI(handle_cli_rpt_restart, "Restart app_rpt")
};
/*
@@ -1130,48 +1089,70 @@
/*
* Enable or disable debug output at a given level at the console
*/
-static int rpt_do_debug(int fd, int argc, char *argv[])
+static char *handle_cli_rpt_debug_level(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
{
int newlevel;
- if (argc != 4)
- return RESULT_SHOWUSAGE;
- newlevel = myatoi(argv[3]);
+ switch (cmd) {
+ case CLI_INIT:
+ e->command = "rpt debug level";
+ e->usage =
+ "Usage: rpt debug level {0-7}\n"
+ " Enables debug messages in app_rpt\n";
+ return NULL;
+ case CLI_GENERATE:
+ return NULL;
+ }
[... 9101 lines stripped ...]
More information about the asterisk-commits
mailing list