Commit Graph

11576 Commits

Author SHA1 Message Date
Steve Murphy
eda33c8b31 Merged revisions 61658 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r61658 | murf | 2007-04-13 15:17:20 -0600 (Fri, 13 Apr 2007) | 1 line

This is a fix to the way CDR merge handles the data that results from ForkCDR.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@61659 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-04-13 21:22:01 +00:00
Joshua Colp
e2871220e2 Merged revisions 61656 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r61656 | file | 2007-04-13 15:17:08 -0400 (Fri, 13 Apr 2007) | 10 lines

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

........
r61655 | file | 2007-04-13 15:15:12 -0400 (Fri, 13 Apr 2007) | 2 lines

Add OUTBOUND_GROUP_ONCE variable to app_dial. This behaves the same as OUTBOUND_GROUP except it will get unset after use so it won't get accidentally inherited. (issue #BE-140)

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@61657 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-04-13 19:18:46 +00:00
Joshua Colp
67302c5411 Merged revisions 61651 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r61651 | file | 2007-04-13 14:08:02 -0400 (Fri, 13 Apr 2007) | 2 lines

Do not bother looking for a result if none are present.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@61652 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-04-13 18:09:29 +00:00
Joshua Colp
4f04ff8597 Merged revisions 61648 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r61648 | file | 2007-04-13 13:19:53 -0400 (Fri, 13 Apr 2007) | 2 lines

For those very verbose SIP implementations that attach tons of info to the Contact header... let's increase our variable sizes. (issue #9535 reported by jeffg)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@61649 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-04-13 17:21:53 +00:00
Russell Bryant
710a2e8ea6 Merged revisions 61645 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r61645 | russell | 2007-04-13 12:10:19 -0500 (Fri, 13 Apr 2007) | 3 lines

Eliminate a compiler warning with ODBC_STORAGE enabled so that it will build
under dev-mode.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@61647 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-04-13 17:15:45 +00:00
Steve Murphy
901413c76c Merged revisions 61644 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r61644 | murf | 2007-04-13 11:01:02 -0600 (Fri, 13 Apr 2007) | 1 line

A fix for chan_oss that resulted from the CDR changes; it helps to use the right info.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@61646 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-04-13 17:11:53 +00:00
Joshua Colp
80ec0b13ba Merged revisions 61641 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r61641 | file | 2007-04-13 12:32:03 -0400 (Fri, 13 Apr 2007) | 2 lines

Don't assume the callid of a dialog will be set, as in some circumstances it may not. (issue #9534 reported by tecnoxarxa)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@61642 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-04-13 16:35:33 +00:00
Joshua Colp
c4c2def716 Don't treat a host lookup as failed if sipregs is not in use when doing a realtime lookup. (issue #9255 reported by sergee)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@61618 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-04-12 19:32:00 +00:00
Dwayne M. Hubbard
cc2aa89fa9 clarified 'minmemfree' description in doc/asterisk-conf.tex
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@61599 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-04-11 22:19:14 +00:00
Dwayne M. Hubbard
9fc6cf1ac3 fixed the '-e' command line option for minmemfree. updated doc/asterisk-conf.tex
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@61597 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-04-11 22:10:26 +00:00
Dwayne M. Hubbard
2151e532fe changed #if HAVE_SYSINFO to #if defined(HAVE_SYSINFO)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@61576 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-04-11 21:13:44 +00:00
Dwayne M. Hubbard
6a5f3599bb added HAVE_SYSINFO preprocessor directives for portability and general happiness
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@61575 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-04-11 20:59:08 +00:00
Joshua Colp
97d93d091b Add a configure script check for sysinfo support.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@61557 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-04-11 20:21:18 +00:00
Dwayne M. Hubbard
62256ee410 added option_minmemfree for use in asterisk.conf to specify the amount of minimum free memory prior to accepting calls. added CLI 'core show sysinfo' to display system information
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@61539 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-04-11 19:11:32 +00:00
Joshua Colp
6fc5c73f78 Output verbose messages to the normal logger as well. (issue #9476 reported by gdalgliesh)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@61522 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-04-11 17:07:17 +00:00
Russell Bryant
3c0b24bda8 Merged revisions 61477 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r61477 | russell | 2007-04-11 11:05:29 -0500 (Wed, 11 Apr 2007) | 13 lines

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

........
r61476 | russell | 2007-04-11 11:01:25 -0500 (Wed, 11 Apr 2007) | 5 lines

If someone sets the "useragent" option in sip.conf to be empty, then don't add
the User-Agent header at all.  It is an optional header, anyway.  Also, the bug
report says that some of Japan's SIP providers don't allow it for some weird
reason.  (issue #9488, reported by makoto, fixed by me)

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@61478 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-04-11 16:06:37 +00:00
Nadi Sarrar
9978dc647b Merged revisions 61342,61372-61373,61443 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r61342 | nadi | 2007-04-11 12:52:28 +0200 (Mi, 11 Apr 2007) | 2 lines

AOCD's are now exported to asterisk channel variables.

........
r61372 | nadi | 2007-04-11 15:33:30 +0200 (Mi, 11 Apr 2007) | 2 lines

Ignore facility messages in case we don't have a corresponding channel object.

........
r61373 | nadi | 2007-04-11 15:40:26 +0200 (Mi, 11 Apr 2007) | 2 lines

Export AOCD variables on misdn_hangup.

........
r61443 | nadi | 2007-04-11 17:39:14 +0200 (Mi, 11 Apr 2007) | 2 lines

Don't export AOCD variables on misdn_hangup anymore, this was mainly a fix for trunk..

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@61460 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-04-11 15:48:54 +00:00
Russell Bryant
0df4004ee5 Add a minor loop optimization to the custom device state callback. Once the
correct device is found, it should just break out of the loop ...


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@61429 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-04-11 15:25:43 +00:00
Russell Bryant
6b033eea04 Merged revisions 61427 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r61427 | russell | 2007-04-11 10:09:39 -0500 (Wed, 11 Apr 2007) | 14 lines

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

........
r61426 | russell | 2007-04-11 10:05:36 -0500 (Wed, 11 Apr 2007) | 6 lines

Fix a bug with switching between host=dynamic and using specific hosts for
peers.  The code would only reset the peer's address when it is dynamic if
it was a new peer structure.  Now, it will also reset the address if it was
already in the peer list, but before the reload, it was not dynamic.
(issue #9515, reported by caio1982, fixed by me)

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@61428 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-04-11 15:13:12 +00:00
Russell Bryant
2047feb97e Merged revisions 61407 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r61407 | russell | 2007-04-11 09:48:01 -0500 (Wed, 11 Apr 2007) | 4 lines

Add "svgz" to the mimetypes table.  (issue #9510, bkruse)

In passing, constify the elements of the mimetypes table.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@61410 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-04-11 14:49:07 +00:00
Russell Bryant
e34c67d308 Merged revisions 61377 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r61377 | russell | 2007-04-11 09:04:44 -0500 (Wed, 11 Apr 2007) | 13 lines

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

........
r61376 | russell | 2007-04-11 09:02:54 -0500 (Wed, 11 Apr 2007) | 5 lines

Remove the attempt at reporting configuration errors in sip.conf.  This can
cause a bunch of improper messages when using realtime.  I give up.  As oej
tried to convince me when I put this in, there is just no easy way to do it.
(inspired by a message on the -dev list)

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@61379 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-04-11 14:13:08 +00:00
Steve Murphy
13d44de57e via 8119, a patch to allow voicemail data to be stored in RealTime.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@61378 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-04-11 14:09:26 +00:00
Joshua Colp
9fff461080 Remove duplicate prototype declaration. (issue #9517 reported by junky)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@61375 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-04-11 14:01:53 +00:00
Steve Murphy
69bb679e14 via 8118, a RealTime upgrade to make RT a complete storage abstraction. The store/destroy mechanisms needed these missing peices.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@61374 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-04-11 13:41:17 +00:00
Tilghman Lesher
47dd5a15af Issue 6082 - New DTMF event for manager
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@61324 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-04-10 23:55:26 +00:00
Doug Bailey
7c9e46507b Added zapata.conf parameter "cid_rxgain" to allow the user to adjust the gain bump used during CID acquisition.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@61303 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-04-10 22:02:53 +00:00
Russell Bryant
74221823af Note the bridge manager action and application in the CHANGES file.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@61283 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-04-10 20:50:27 +00:00
Russell Bryant
9c8c9c5fa1 Merge changes from team/russell/issue_5841:
This patch adds a "Bridge" Manager action, as well as a "Bridge" dialplan
application.  The manager action will allow you to steal two active channels
in the system and bridge them together.  Then, the one that did not hang up
will continue in the dialplan.  Using the application will bridge the calling
channel to an arbitrary channel in the system.  Whichever channel does not
hang up here will continue in the dialplan, as well.

This patch has been touched by a bunch of people over the course of a couple
years.  Please forgive me if I have missed your name in the history of things.
The most recent patch came from issue #5841, but there is also a reference to
an earlier version of this patch from issue #4297.  The people involved in writing
and/or reviewing the code include at least: twisted, mflorrel, heath1444, davetroy, 
tim_ringenbach, moy, tmancill, serge-v, and me.  There are also positive test
reports from many people.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@61281 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-04-10 20:44:44 +00:00
Russell Bryant
ab31bec392 Add an option to the dial API for playing music instead of ringing to the caller.
I started this for use with SLA but ended up deciding not to use it.  However,
there is no reason not to put this part in, anyway.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@61259 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-04-10 19:16:24 +00:00
Russell Bryant
9255f350cf Blocked revisions 61220 via svnmerge
........
r61220 | russell | 2007-04-10 11:05:55 -0500 (Tue, 10 Apr 2007) | 5 lines

File upload support was added to solve some needs for the Asterisk GUI.
However, after much discussion, it has been decided that adding this to 1.4 is
not in the best interests of the project.  It has been removed here, but will
remain in trunk.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@61222 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-04-10 16:08:16 +00:00
Steve Murphy
28b5fb02bd updated ast_channel_alloc() call to include the 4 extra args everyone got. Not much info there, as the config file evidently does not allow amaflags, or accountcode settings; and the pvt's exten doesn't sound like what we need in the cdr, either.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@61221 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-04-10 16:07:10 +00:00
Nadi Sarrar
0220ec0511 Merged revisions 61183 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r61183 | nadi | 2007-04-10 14:43:40 +0200 (Di, 10 Apr 2007) | 10 lines

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

........
r61170 | nadi | 2007-04-10 14:31:45 +0200 (Di, 10 Apr 2007) | 2 lines

msns config parameter defaults to '*'

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@61184 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-04-10 12:47:57 +00:00
Steve Murphy
ecaf781933 Merged revisions 60989 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r60989 | murf | 2007-04-09 12:32:07 -0600 (Mon, 09 Apr 2007) | 1 line

This is a big improvement over the current CDR fixes. It may still need refinement, but this won't have as many folks bothered.
This also adds the mods from 1.4/r.61136;
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@61152 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-04-10 05:41:34 +00:00
Russell Bryant
be874b92d3 Remove unused instances of unnamed enums.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@61116 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-04-09 22:49:32 +00:00
Olle Johansson
b52f774850 Merged revisions 61072 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r61072 | oej | 2007-04-09 21:58:17 +0200 (Mon, 09 Apr 2007) | 11 lines

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

........
r61038 | oej | 2007-04-09 21:38:59 +0200 (Mon, 09 Apr 2007) | 3 lines

- Don't send ActionID before Response: header. 
- Don't use a blank in an AMI header

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@61073 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-04-09 20:01:28 +00:00
Kevin P. Fleming
480685fda5 Merged revisions 61070 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r61070 | kpfleming | 2007-04-09 14:55:14 -0500 (Mon, 09 Apr 2007) | 2 lines

fix up some warnings found using --enable-dev-mode

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@61071 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-04-09 19:57:21 +00:00
Kevin P. Fleming
14a2b3bf6e Merged revisions 61062 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r61062 | kpfleming | 2007-04-09 14:49:09 -0500 (Mon, 09 Apr 2007) | 2 lines

remove some more stuff we don't need

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@61065 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-04-09 19:50:20 +00:00
Russell Bryant
73b8fbd1cb Blocked revisions 61042,61044 via svnmerge
........
r61042 | russell | 2007-04-09 14:40:29 -0500 (Mon, 09 Apr 2007) | 2 lines

Remove various files that I thought I already removed.

........
r61044 | russell | 2007-04-09 14:41:04 -0500 (Mon, 09 Apr 2007) | 2 lines

Remove another directory that should no longer be there

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@61048 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-04-09 19:42:43 +00:00
Jason Parker
0cb6714ce8 Merged revisions 61022 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r61022 | qwell | 2007-04-09 14:05:48 -0500 (Mon, 09 Apr 2007) | 4 lines

Use the appropriate interface name with COMPLETECALLER.

Issue 9395.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@61023 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-04-09 19:06:36 +00:00
Olle Johansson
c1d8971831 Add hint to ExtensionStatus AMI event in manager
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@61021 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-04-09 19:05:40 +00:00
Olle Johansson
4aef0155d6 use "ChannelType" in events to indicate which channel driver that generates the event. This replaces
"ChannelDriver" and "Channel", previously used to indicate channel driver. ChannelType is more
in line with "core show channeltypes"


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@60987 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-04-09 18:22:43 +00:00
Olle Johansson
6ec9260e9f Fix JabberEvents
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@60986 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-04-09 18:13:30 +00:00
Olle Johansson
ae6587ac8f Fix missing newline in JabberEvent
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@60985 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-04-09 18:09:31 +00:00
Jason Parker
a84ca79445 Merged revisions 60936 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r60936 | qwell | 2007-04-09 12:22:59 -0500 (Mon, 09 Apr 2007) | 13 lines

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

........
r60935 | qwell | 2007-04-09 12:22:15 -0500 (Mon, 09 Apr 2007) | 5 lines

Allow matching on names shorter than 3 chars.
This also fixes the case where somebody wants to match on less then 3 chars.

Issue 9071

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@60937 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-04-09 17:23:55 +00:00
Dwayne M. Hubbard
c3ae939ddc updated UPGRADE.txt to include format_wav changes
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@60917 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-04-09 16:30:04 +00:00
Joshua Colp
a4bef3bb3a Make RTP session ID and session version generation random. (issue #9456 reported by tjardick)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@60898 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-04-09 12:33:49 +00:00
Tilghman Lesher
5ecaea3d0a Merged revisions 60850 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r60850 | tilghman | 2007-04-08 22:01:12 -0500 (Sun, 08 Apr 2007) | 10 lines

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

........
r60849 | tilghman | 2007-04-08 21:49:06 -0500 (Sun, 08 Apr 2007) | 2 lines

Don't check for error when lowering priority (according to the manpage, it should never happen anyway).  It might could happen, though, if another thread messed with the priority, so safeguard against that (reported via -dev list).

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@60851 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-04-09 03:04:07 +00:00
Tilghman Lesher
c6c64af72d Merged revisions 60847 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r60847 | tilghman | 2007-04-08 21:42:48 -0500 (Sun, 08 Apr 2007) | 10 lines

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

........
r60846 | tilghman | 2007-04-08 21:37:18 -0500 (Sun, 08 Apr 2007) | 2 lines

Bug 9505 - If the return value for local_queue_frame is set, then p->lock is no longer valid.

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@60848 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-04-09 02:44:37 +00:00
Joshua Colp
840f1e61e0 Merged revisions 60798 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r60798 | file | 2007-04-08 21:03:14 -0400 (Sun, 08 Apr 2007) | 10 lines

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

........
r60797 | file | 2007-04-08 20:59:29 -0400 (Sun, 08 Apr 2007) | 2 lines

When calling a device that then forwards us elsewhere... we have to make our channels compatible if it is the only channel being dialed. (issue #9445 reported by marcelbarbulescu)

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@60799 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-04-09 01:06:56 +00:00
Joshua Colp
ed75ded048 Add counter for sip show registry CLI command. (issue #9352 reported by junky)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@60796 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-04-09 00:47:06 +00:00