Commit Graph

6030 Commits

Author SHA1 Message Date
Olle Johansson
fc7517d76e Set tls setting to default in reload_config.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@128274 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-05 21:25:04 +00:00
Michiel van Baak
bf848cc694 fix compiling of chan_sip.c
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@128254 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-05 21:20:09 +00:00
Joshua Colp
eff212635c I like it when the tree is not broken.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@128247 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-05 21:11:04 +00:00
Olle Johansson
318fd4186b KILL THE USER!
Actually, kill the in-memory structure for type=user and start using the sip_peer 
structure for every object. Have only one in-memory list and use them different
ways depending on type=user, type=peer and type=friend - like always.

The idea with this first patch is that configurations should work as before.

Some additional features for realtime peers. By adding a type= field, you
can now have multiple functions.

Let's test this for a while. Won't be integrated in 1.6.0, only in trunk,
for testing.

There's propably more to clean up and simplify here. Help is welcome
and encouraged!


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@128242 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-05 20:59:49 +00:00
Olle Johansson
b04d101ee5 Stop cli command completion with tabs
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@128201 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-05 20:04:50 +00:00
Olle Johansson
0a52297cf0 Add new SIP cli command "sip show channelstats" that displays some QoS data (if we have RTCP reports
and not use the p2p rtp bridge). I could not find a way to detect us using the p2p bridge, which
would be nice.



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@128197 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-05 19:27:42 +00:00
Matthew Fredrickson
268ca4a5bb It would help if we actually parsed the ss7_explicitacm option in the config file...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@128125 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-05 03:39:07 +00:00
Matthew Fredrickson
199067da4f Add option to wait to be able to explicitly send ACM via the Proceeding() application in the dialplan. Also minor documentation update explaining how to setup multiple signalling links within a linkset
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@128122 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-05 03:26:42 +00:00
Tilghman Lesher
1d0637521a Fullcontact needs more than 20 characters, even for the simplest case
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@128082 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-04 16:41:03 +00:00
Olle Johansson
6f621e6205 - reorganize SIP extensions alphabetically, to make it easier to synch with the IANA list
- add a few new registered and well-known extension names


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@127995 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-04 14:36:28 +00:00
Brett Bryant
10f0255389 Fix one more file that got changed.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@127934 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-03 22:47:48 +00:00
Brett Bryant
022a157bd8 Remove commit that somehow got mergeed into trunk.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@127933 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-03 22:44:39 +00:00
Brett Bryant
10fdf344ed Update these files with transfer code.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@127931 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-03 22:36:02 +00:00
Steve Murphy
bc2cfb3e81 Merged revisions 127663 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r127663 | murf | 2008-07-02 18:16:25 -0600 (Wed, 02 Jul 2008) | 30 lines

The CDRfix4/5/6 omnibus cdr fixes.

(closes issue #10927)
Reported by: murf
Tested by: murf, deeperror

(closes issue #12907)
Reported by: falves11
Tested by: murf, falves11


(closes issue #11849)
Reported by: greyvoip

As to 11849, I think these changes fix the core problems 
brought up in that bug, but perhaps not the more global
problems created by the limitations of CDR's themselves
not being oriented around transfers.

Reopen if necc, but bug reports are not the best
medium for enhancement discussions. We need to start
a second-generation CDR standardization effort to cover
transfers.

(closes issue #11093)
Reported by: rossbeer
Tested by: greyvoip, murf



........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@127793 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-03 17:16:44 +00:00
Olle Johansson
f99a310219 Make sure we stop session timers as soon as we start hanging up an active call.
May fix issue 12919.



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@127791 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-03 16:48:23 +00:00
Olle Johansson
2491cc6e65 Revert some logic for session timers. We do send in-dialog requests that should not have session-timer
require headers, like MESSAGE and REFER. So in the future, only add them on requests and responses
that are related to INVITEs and re-INVITEs.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@127779 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-03 16:25:59 +00:00
Olle Johansson
b423a939b0 Fix bad formatting in a very confusing function. Who added the sipdb sql output?
It's mixing peers and users in a strange way and should really not be a CLI command,
since it's not meant for human output. It should be done with an app connecting to
manager.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@127685 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-03 09:59:12 +00:00
Brett Bryant
6aa9419cfe Update transport= in sip so that the option is not broken from a recent commit.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@127621 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-02 22:16:29 +00:00
Tilghman Lesher
885d17506b Keep ast_app_inboxcount API compatible with 1.6.0.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@127609 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-02 21:27:53 +00:00
Mark Michelson
1d6573e8ef Merged revisions 127560 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r127560 | mmichelson | 2008-07-02 15:47:38 -0500 (Wed, 02 Jul 2008) | 3 lines

Fix thread-safety of some of the pbx_builtin_getvar_helper calls


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@127562 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-02 20:49:08 +00:00
Mark Michelson
953947b70b The ackcall and endcall options in agents.conf now have supplemental options
acceptdtmf and enddtmf. These allow for the DTMF pressed to be configurable
instead of being hardcoded to '#' and '*'.

(AST-86)



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@127558 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-02 20:43:55 +00:00
Brett Bryant
b30ed551e0 Fix to sip_parse_host so that it passes the correct information to sip_registry.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@127434 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-02 17:27:36 +00:00
Luigi Rizzo
8cd40e3950 plug another panic when the gui cannot be started.
We can still send video, just don't try to use what is not available.



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@127362 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-02 12:06:48 +00:00
Luigi Rizzo
f26e7b97cb prevent a segfault when trying to start the gui without any
specific configuration in oss.conf
(reported by Klaus Darillion on the -video mailing list).



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@127330 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-02 09:16:29 +00:00
Tilghman Lesher
cce1ec5463 Change the global timer B to be dependent on the value of the T1 timer, as
recommended in RFC 3261, instead of being hardcoded to 32 seconds.  This is
important for LANs, as it allows autocongestion to occur much more quickly, if
desired by the local PBX administrator.  It also corrects a bug: if the T1
timer was increased beyond 500ms, then timer B would have been set at a much
lower value than recommended.
(closes issue #12544)
 Reported by: kactus
 Patches: 
       20080616__bug12544.diff.txt uploaded by Corydon76 (license 14)
 Tested by: kactus


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@127297 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-02 02:48:43 +00:00
Brett Bryant
1b07e87538 Add a configuration option so the global outboundproxy can use tcptls without it being defined by each sip user.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@127154 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-01 21:03:52 +00:00
Tilghman Lesher
e347f8bc70 Merged revisions 127133 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r127133 | tilghman | 2008-07-01 15:25:37 -0500 (Tue, 01 Jul 2008) | 2 lines

Disable the old, slow search for matching callno in chan_iax2 (but allow it to be reenabled for debugging)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@127143 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-01 20:28:54 +00:00
Tilghman Lesher
3217aed39c Merged revisions 127068 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r127068 | tilghman | 2008-07-01 13:52:53 -0500 (Tue, 01 Jul 2008) | 8 lines

Change around how we schedule pings and lagrqs, and fix a reason why the
jobs were not getting properly cancelled.
(closes issue #12903)
 Reported by: stevedavies
 Patches: 
       20080620__bug12903__2.diff.txt uploaded by Corydon76 (license 14)
 Tested by: stevedavies

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@127074 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-01 19:20:25 +00:00
Tilghman Lesher
6fa1dab33d Merged revisions 126999 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r126999 | tilghman | 2008-07-01 11:50:46 -0500 (Tue, 01 Jul 2008) | 2 lines

Suppress annoying warning by finding the remaining cases where the callno is not in the hash.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@127000 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-01 16:52:29 +00:00
Olle Johansson
b6b5525347 Merged revisions 126902 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r126902 | oej | 2008-07-01 16:59:31 +0200 (Tis, 01 Jul 2008) | 7 lines

Use domain part of SIP uri in register= configuration as fromdomain.

Reported by: one47
Patches: 
      sip-reg-fromdom2.dpatch uploaded by one47 (license 23)
(closes issue #12474)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@126903 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-01 15:03:59 +00:00
Olle Johansson
f3170a4946 Merged revisions 126899 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r126899 | oej | 2008-07-01 16:27:33 +0200 (Tis, 01 Jul 2008) | 8 lines

Handle escaped URI's in call pickups. Patch by oej and IgorG.

Reported by: IgorG
Patches: 
      bug12299-11062-v2.patch uploaded by IgorG (license 20)
Tested by: IgorG, oej
(closes issue #12299)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@126900 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-01 14:32:15 +00:00
Olle Johansson
42bed356d1 Merged revisions 126789 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r126789 | oej | 2008-07-01 13:51:38 +0200 (Tis, 01 Jul 2008) | 6 lines

Report 200 OK to all in-dialog OPTIONs requests (to confirm that the dialog
exist). Don't bother checking the request URI.

(closes issue #11264)
Reported by: ibc

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@126790 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-01 11:58:17 +00:00
Olle Johansson
983b851e3b Merged revisions 126735 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r126735 | oej | 2008-07-01 09:49:15 +0200 (Tis, 01 Jul 2008) | 7 lines

Fix bad XML for hold notification.
Reported by: gowen72
Patches: 
      hold.patch uploaded by gowen72 (license 432)
(closes issue #12942)


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@126755 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-01 09:51:22 +00:00
Matthew Fredrickson
5862f66c88 Add support to see MTP2 down events when the link layer drops in SS7
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@126637 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-06-30 20:25:46 +00:00
Luigi Rizzo
ff8ad6b497 implement the 'freeze' function for incoming frames;
fix a bug which caused a crash when a videodevice was
specified after startgui=1 in the config file. This also
involves a slightly different method to determine if the
gui is active or not.



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@126572 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-06-30 15:45:15 +00:00
Olle Johansson
33a54ee23b The following patch with some changes for trunk...
Merged revisions 126516 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r126516 | oej | 2008-06-30 14:50:55 +0200 (MÃ¥n, 30 Jun 2008) | 10 lines

Send all responses to an INVITE reliably, so that we retransmit if we don't get an ACK and
also fail if we don't get the very same precious ACK. Based on patch by tsearle, with
my own additions.

(closes issue #12951)

Reported by: tsearle
Patches: 
      busy_retransmit.patch uploaded by tsearle (license 373)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@126517 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-06-30 13:03:53 +00:00
Luigi Rizzo
1f7a4fb63d import the recent additions for video console into trunk,
giving you support for up to 9 video sources (e.g. webcams,
or X11 grabbers, etc.) active at once, displaying thumbnails for
each of them in the main GUI window, and with the ability to switch
between them on the fly during a conversation.

The code also implements a 'Picture in Picture' feature,
allowing you to select any source as primary or secondary,
and move the PiP window by just dragging it with the mouse.

The window looks like this:
 ________________________________________________________________
|  ______   ______   ______   ______   ______   ______   ______  |
| | tn.1 | | tn.2 | | tn.3 | | tn.4 | | tn.5 | | tn.6 | | tn.7 | |
| |______| |______| |______| |______| |______| |______| |______| |
|  ______   ______   ______   ______   ______   ______   ______  |
| |______| |______| |______| |______| |______| |______| |______| |
|  _________________    __________________    _________________  |
| |                 |  |                  |  |                 | |
| |                 |  |                  |  |                 | |
| |                 |  |                  |  |                 | |
| |   remote video  |  |                  |  |   local video   | |
| |                 |  |                  |  |          ______ | |
| |                 |  |      keypad      |  |         |  PIP || |
| |                 |  |                  |  |         |______|| |
| |_________________|  |                  |  |_________________| |
|                      |                  |                      |
|                      |                  |                      |
|                      |__________________|                      |
|________________________________________________________________|



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@126480 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-06-29 21:17:14 +00:00
Luigi Rizzo
dc4c6733ac fix wrong argument in checking boundaries for a rectangle
some whitespace fixes


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@126448 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-06-29 18:50:20 +00:00
Luigi Rizzo
a768ae2122 implement a 'toggle' option for 'console mute' and 'console unmute'
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@126311 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-06-29 13:02:54 +00:00
Luigi Rizzo
f03a2b158a add some defines and fields in preparation for the import of
the video source switching support



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@126310 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-06-29 12:59:26 +00:00
Luigi Rizzo
03e7978a1a accept any name starting with X11 for X11 grabbers - this lets
you have multiple active instances of this grabber;

require v4l device names to start with '/dev/' - prevents some useless
attempt to open a file as a device.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@126309 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-06-29 12:53:45 +00:00
Luigi Rizzo
e6f17e50c4 make this compile after ast_frame's data field changed to a union
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@126308 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-06-29 12:45:59 +00:00
Tilghman Lesher
1503ea7128 Merged revisions 126056 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r126056 | tilghman | 2008-06-27 17:01:09 -0500 (Fri, 27 Jun 2008) | 4 lines

When we get a 408 Timeout, don't stop trying to re-register.
(closes issue #12863)
 Reported by: ricvil

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@126057 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-06-27 22:10:34 +00:00
Matthew Fredrickson
512a022a95 Revert this part of the fix. We'll fix it in libss7
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@125984 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-06-27 19:05:40 +00:00
Matthew Fredrickson
a68a212f53 Obviously somebody didn't compile with libss7 support when doing the DAHDI conversion.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@125982 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-06-27 19:00:44 +00:00
Matthew Fredrickson
1b9d5d96e3 Add support for new commands to block/unblock all CICs on a linkset
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@125980 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-06-27 18:32:17 +00:00
Brett Bryant
4ebadd6d21 Small error in the function that converts peer transports to a string.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@125947 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-06-27 17:35:41 +00:00
Brett Bryant
12d5cebea2 Change the way that the transport option works for sip users. transport will now take multiple arguments, the first one listed will be the one used
for new dialogs, and the rest listed will be acceptable ways for that peer to contact us. This fixes a minor bug where, because SIP TCP/UDP run on 
the same port, could cause a TCP peer to be saved in the ast_db. There will also be warnings when a transport is changed for an unexpected reason.

(issue #12799)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@125891 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-06-27 16:28:06 +00:00
Tilghman Lesher
ed8698e493 Revert half of the fix, as this part may have been unnecessary (related to issue #12914)
Requested here: http://lists.digium.com/pipermail/asterisk-dev/2008-June/033658.html


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@125853 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-06-27 16:00:05 +00:00
Tilghman Lesher
2dc4597f79 Merged revisions 125740 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r125740 | tilghman | 2008-06-27 07:19:39 -0500 (Fri, 27 Jun 2008) | 7 lines

Add proper deadlock avoidance.
(closes issue #12914)
 Reported by: ozan
 Patches: 
       20080625__bug12914.diff.txt uploaded by Corydon76 (license 14)
 Tested by: ozan

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@125741 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-06-27 12:28:38 +00:00