aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2009-09-11Merged revisions 217990 via svnmerge from tilghman1-4/+21
https://origsvn.digium.com/svn/asterisk/trunk ................ r217990 | tilghman | 2009-09-10 18:54:51 -0500 (Thu, 10 Sep 2009) | 10 lines Merged revisions 217989 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r217989 | tilghman | 2009-09-10 18:52:22 -0500 (Thu, 10 Sep 2009) | 3 lines Don't ring another channel, if there's not enough time for a queue member to answer. (Fixes AST-228) ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@218051 f38db490-d61c-443f-a65b-d21fe96a405b
2009-09-10Merged revisions 217916 via svnmerge from tilghman3-47/+55
https://origsvn.digium.com/svn/asterisk/trunk ........ r217916 | tilghman | 2009-09-10 18:12:16 -0500 (Thu, 10 Sep 2009) | 2 lines Make calltoken support work with realtime users and peers. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@217920 f38db490-d61c-443f-a65b-d21fe96a405b
2009-09-10sip peer matching by address only with TCP/TLSdvossel1-41/+41
This patch removes the contact header matching logic and adds logic to match all tcp/tls connections by ip only. Thanks to oej for finding the issue and suggesting solutions. Review: https://reviewboard.asterisk.org/r/355/ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@217913 f38db490-d61c-443f-a65b-d21fe96a405b
2009-09-10Merged revisions 217807 via svnmerge from dvossel1-4/+25
https://origsvn.digium.com/svn/asterisk/trunk ................ r217807 | dvossel | 2009-09-10 16:07:47 -0500 (Thu, 10 Sep 2009) | 28 lines Merged revisions 217806 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r217806 | dvossel | 2009-09-10 16:06:07 -0500 (Thu, 10 Sep 2009) | 22 lines IAX2 encryption regression The IAX2 Call Token security patch inadvertently broke the use of encryption due to the reorganization of code in the socket_process() function. When encryption is used, an incoming full frame must first be decrypted before the information elements can be parsed. The security release mistakenly moved IE parsing before decryption in order to process the new Call Token IE. To resolve this, decryption of full frames is once again done before looking into the frame. This involves searching for an existing callno, checking the pvt to see if encryption is turned on, and decrypting the packet before the internal fields of the full frame are accessed. (closes issue #15834) Reported by: karesmakro Patches: iax2_encryption_fix_1.4.diff uploaded by dvossel (license 671) Tested by: dvossel, karesmakro Review: https://reviewboard.asterisk.org/r/355/ ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@217858 f38db490-d61c-443f-a65b-d21fe96a405b
2009-09-10Merged revisions 217730 via svnmerge from mnick1-7/+3
https://origsvn.digium.com/svn/asterisk/trunk ........ r217730 | mnick | 2009-09-10 14:39:41 -0500 (Thu, 10 Sep 2009) | 17 lines Sets the correct musicclass after an announcement (closes issue #15279) Reported by: mbeckwell Patches: patch.txt uploaded by mnick (license ) Tested by: mnick (closes issue #15832) Reported by: mbeckwell Patches: patch.txt uploaded by mnick (license 874) Tested by: mnick ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@217736 f38db490-d61c-443f-a65b-d21fe96a405b
2009-09-10Merged revisions 217593 via svnmerge from oej1-1/+2
https://origsvn.digium.com/svn/asterisk/trunk ........ r217593 | oej | 2009-09-10 14:06:55 +0200 (Tor, 10 Sep 2009) | 8 lines Include ActionID in all events that are responsed to AMI Action SIPShowRegistry (closes issue #15868) Reported by: nic_bellamy Patches: manager_SIPshowregistry_actionid.patch uploaded by nic bellamy (license 299) ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@217596 f38db490-d61c-443f-a65b-d21fe96a405b
2009-09-09gcc 4.4 fix: union instead of casttzafrir1-3/+7
gcc 4.4 has more strict rules for aliasing. It doesn't like a struct sockaddr_in pointer pointing to a struct sockaddr. So we make it a union. Merged revisions 217445 via svnmerge from http://svn.digium.com/svn/asterisk/trunk git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@217484 f38db490-d61c-443f-a65b-d21fe96a405b
2009-09-09Merged revisions 217368 via svnmerge from oej1-0/+1
https://origsvn.digium.com/svn/asterisk/trunk ........ r217368 | oej | 2009-09-09 12:39:43 +0200 (Ons, 09 Sep 2009) | 2 lines Not having any TLS session to write to is a serious XMIT_ERROR. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@217405 f38db490-d61c-443f-a65b-d21fe96a405b
2009-09-08Commit regenerated configure script that I missed earlier.kpfleming1-8169/+8869
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@217281 f38db490-d61c-443f-a65b-d21fe96a405b
2009-09-08Merged revisions 217199 via svnmerge from tilghman1-9/+25
https://origsvn.digium.com/svn/asterisk/trunk ................ r217199 | tilghman | 2009-09-08 15:28:41 -0500 (Tue, 08 Sep 2009) | 14 lines Merged revisions 217156 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r217156 | tilghman | 2009-09-08 15:01:45 -0500 (Tue, 08 Sep 2009) | 7 lines When MOH is playing on the channel, announcements sent through the conference are not heard. (closes issue #14588) Reported by: voipas Patches: 20090716__issue14588__2.diff.txt uploaded by tilghman (license 14) Tested by: lmadsen, twisted, tilghman ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@217209 f38db490-d61c-443f-a65b-d21fe96a405b
2009-09-08Merged revisions 217074 via svnmerge from kpfleming2-34/+28
https://origsvn.digium.com/svn/asterisk/trunk ........ r217074 | kpfleming | 2009-09-08 11:37:28 -0500 (Tue, 08 Sep 2009) | 9 lines Ensure that the default autoconf CFLAGS are not used. A recent change to the configure script that allows the user to specify CFLAGS and/or LDFLAGS to the script had the unfortunate side effect of letting autoconf's default CFLAGS (-g -O2) feed in to the rest of the build system, thereby overriding the DONT_OPTIMIZE setting in menuselect. That problem is now corrected. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@217075 f38db490-d61c-443f-a65b-d21fe96a405b
2009-09-08Merged revisions 217033 via svnmerge from tilghman1-2/+0
https://origsvn.digium.com/svn/asterisk/trunk ........ r217033 | tilghman | 2009-09-08 10:30:18 -0500 (Tue, 08 Sep 2009) | 4 lines Remove what appears to be an unnecessary define. (closes issue #15851) Reported by: tzafrir ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@217034 f38db490-d61c-443f-a65b-d21fe96a405b
2009-09-08Merged revisions 216993 via svnmerge from dvossel1-4/+4
https://origsvn.digium.com/svn/asterisk/trunk ........ r216993 | dvossel | 2009-09-08 09:26:30 -0500 (Tue, 08 Sep 2009) | 14 lines caller id number empty parse_uri was not being given the correct scheme's, as a result, uri parsing did not parse the username correctly. One of the side effects of this is an empty caller id. (closes issue #15839) Reported by: ebroad Patches: blank_cidv2.patch uploaded by ebroad (license 878) parse_uri_fix.diff uploaded by dvossel (license 671) Tested by: ebroad, dvossel ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@216996 f38db490-d61c-443f-a65b-d21fe96a405b
2009-09-07Merged revisions 216842 via svnmerge from oej1-2/+3
https://origsvn.digium.com/svn/asterisk/trunk ........ r216842 | oej | 2009-09-07 18:35:12 +0200 (MÃ¥n, 07 Sep 2009) | 2 lines Make sure we reset global_exclude_static at channel reload ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@216843 f38db490-d61c-443f-a65b-d21fe96a405b
2009-09-07Merged revisions 216695 via svnmerge from oej1-1/+2
https://origsvn.digium.com/svn/asterisk/trunk ........ r216695 | oej | 2009-09-07 15:06:19 +0200 (MÃ¥n, 07 Sep 2009) | 8 lines If there is no session timer in the INVITE, set it to default value (not unset minimum = -1) Patch by oej closes issue #15621 Reported by: fnordian Tested by: atis ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@216696 f38db490-d61c-443f-a65b-d21fe96a405b
2009-09-07fix documentation so it agrees with codeoej1-1/+1
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@216656 f38db490-d61c-443f-a65b-d21fe96a405b
2009-09-07Add doc and turn off premature media filter by defaultoej2-1/+7
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@216654 f38db490-d61c-443f-a65b-d21fe96a405b
2009-09-07Merged revisions 216438 via svnmerge from oej5-5/+30
https://origsvn.digium.com/svn/asterisk/trunk ................ r216438 | oej | 2009-09-04 16:02:34 +0200 (Fre, 04 Sep 2009) | 35 lines Merged revisions 216430 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r216430 | oej | 2009-09-04 15:45:48 +0200 (Fre, 04 Sep 2009) | 27 lines Make apps send PROGRESS control frame for early media and fix too early media issue in SIP The issue at hand is that some legacy (dying) PBX systems send empty media frames on PRI links *before* any call progress. The SIP channel receives these frames and by default signals 183 Session progress and starts sending media. This will cause phones to play silence and ignore the later 180 ringing message. A bad user experience. The fix is twofold: - We discovered that asterisk apps that support early media ("noanswer") did not send any PROGRESS frame to indicate early media. Fixed. - We introduce a setting in chan_sip so that users can disable any relay of media frames before the outbound channel actually indicates any sort of call progress. In 1.4, 1.6.0 and 1.6.1, this will be disabled for backward compatibility. In later versions of Asterisk, this will be enabled. We don't assume that it will change your Asterisk phone experience - only for the better. We encourage third-party application developers to make sure that if they have applications that wants to send early media, add a PROGRESS control frame transmission to make sure that all channel drivers actually will start sending early media. This has not been the default in Asterisk previous to this patch, so if you got inspiration from our code, you need to update accordingly. Sorry for the trouble and thanks for your support. This code has been running for a few months in a large scale installation (over 250 servers with PRI and/or BRI links to old PBX systems). That's no proof that this is an excellent patch, but, well, it's tested :-) ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@216645 f38db490-d61c-443f-a65b-d21fe96a405b
2009-09-04Blocked revisions 216594 via svnmergedvossel0-0/+0
........ r216594 | dvossel | 2009-09-04 14:32:07 -0500 (Fri, 04 Sep 2009) | 7 lines sip peer matching by address only with TCP/TLS This patch removes the contact header matching logic and adds logic to match all tcp/tls connections by ip only Review: https://reviewboard.asterisk.org/r/354/ ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@216600 f38db490-d61c-443f-a65b-d21fe96a405b
2009-09-04Merged revisions 216593 via svnmerge from seanbright1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ........ r216593 | seanbright | 2009-09-04 15:29:02 -0400 (Fri, 04 Sep 2009) | 1 line Use ast_free() instead of free(). ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@216595 f38db490-d61c-443f-a65b-d21fe96a405b
2009-09-04Merged revisions 216547 via svnmerge from tilghman2-1/+7
https://origsvn.digium.com/svn/asterisk/trunk ........ r216547 | tilghman | 2009-09-04 12:31:44 -0500 (Fri, 04 Sep 2009) | 3 lines Enable turning off the application delimiter warning with the 'dontwarn' option. Suggested on the -dev list, and implemented in an alternate way by me. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@216548 f38db490-d61c-443f-a65b-d21fe96a405b
2009-09-04Merged revisions 216506 via svnmerge from mvanbaak1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ................ r216506 | mvanbaak | 2009-09-04 17:05:05 +0200 (Fri, 04 Sep 2009) | 9 lines Merged revisions 216435 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r216435 | mvanbaak | 2009-09-04 15:56:10 +0200 (Fri, 04 Sep 2009) | 2 lines make asterisk compile under devmode with DEBUG_THREADS enabled on OpenBSD ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@216507 f38db490-d61c-443f-a65b-d21fe96a405b
2009-09-04Blocked revisions 216437 via svnmergemvanbaak0-0/+0
........ r216437 | mvanbaak | 2009-09-04 16:00:38 +0200 (Fri, 04 Sep 2009) | 2 lines make sure canlog is set so we can compile with DEBUG_THREADS enabled on OpenBSD ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@216439 f38db490-d61c-443f-a65b-d21fe96a405b
2009-09-04Merged revisions 216264 via svnmerge from russell1-0/+440
https://origsvn.digium.com/svn/asterisk/trunk ................ r216264 | russell | 2009-09-04 05:48:44 -0500 (Fri, 04 Sep 2009) | 16 lines Merged revisions 216263 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ................ r216263 | russell | 2009-09-04 05:48:00 -0500 (Fri, 04 Sep 2009) | 9 lines Merged revisions 216262 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r216262 | russell | 2009-09-04 05:47:37 -0500 (Fri, 04 Sep 2009) | 2 lines Add a plain text version of the IAX2 security document. ........ ................ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@216265 f38db490-d61c-443f-a65b-d21fe96a405b
2009-09-04Merged revisions 216222 via svnmerge from mvanbaak1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ........ r216222 | mvanbaak | 2009-09-04 08:08:33 +0200 (Fri, 04 Sep 2009) | 3 lines make sure 'start' is always initialized. Makes asterisk compile with --enable-dev-mode ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@216223 f38db490-d61c-443f-a65b-d21fe96a405b
2009-09-03tweakrussell1-1/+1
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@216097 f38db490-d61c-443f-a65b-d21fe96a405b
2009-09-03Merged revisions 216092 via svnmerge from russell1-0/+8
https://origsvn.digium.com/svn/asterisk/trunk ................ r216092 | russell | 2009-09-03 14:38:35 -0500 (Thu, 03 Sep 2009) | 16 lines Merged revisions 216085 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ................ r216085 | russell | 2009-09-03 14:36:46 -0500 (Thu, 03 Sep 2009) | 9 lines Merged revisions 216080 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r216080 | russell | 2009-09-03 14:35:23 -0500 (Thu, 03 Sep 2009) | 2 lines Add a note about IAX2 to UPGRADE.txt. ........ ................ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@216093 f38db490-d61c-443f-a65b-d21fe96a405b
2009-09-03Merged revisions 216009 via svnmerge from russell1-0/+0
https://origsvn.digium.com/svn/asterisk/trunk ................ r216009 | russell | 2009-09-03 13:45:54 -0500 (Thu, 03 Sep 2009) | 16 lines Merged revisions 216008 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ................ r216008 | russell | 2009-09-03 13:44:58 -0500 (Thu, 03 Sep 2009) | 9 lines Merged revisions 216005 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r216005 | russell | 2009-09-03 13:42:24 -0500 (Thu, 03 Sep 2009) | 2 lines Add IAX2 security document related to AST-2009-006. ........ ................ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@216011 f38db490-d61c-443f-a65b-d21fe96a405b
2009-09-03Merged revisions 215955 via svnmerge from dvossel9-149/+1317
https://origsvn.digium.com/svn/asterisk/trunk ........ r215955 | dvossel | 2009-09-03 11:31:54 -0500 (Thu, 03 Sep 2009) | 6 lines Merge code associated with AST-2009-006 (closes issue #12912) Reported by: rathaus Tested by: tilghman, russell, dvossel, dbrooks ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@216003 f38db490-d61c-443f-a65b-d21fe96a405b
2009-09-03Blocked revisions 215838 via svnmergemvanbaak0-0/+0
........ r215838 | mvanbaak | 2009-09-03 07:57:23 +0200 (Thu, 03 Sep 2009) | 5 lines Document that SIPshowpeer and SKINNYshowline now include the configured parkinglot in their response. Prodded by snuff-work on #asterisk-dev IRC channel ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@215839 f38db490-d61c-443f-a65b-d21fe96a405b
2009-09-03Merged revisions 215758 via svnmerge from twilson1-8/+73
https://origsvn.digium.com/svn/asterisk/trunk ................ r215758 | twilson | 2009-09-02 18:31:04 -0500 (Wed, 02 Sep 2009) | 25 lines Merged revisions 215682 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r215682 | twilson | 2009-09-02 16:41:22 -0500 (Wed, 02 Sep 2009) | 18 lines Re-send non-100 provisional responses to prevent cancellation From section 13.3.1.1 of RFC 3261: If the UAS desires an extended period of time to answer the INVITE, it will need to ask for an "extension" in order to prevent proxies from canceling the transaction. A proxy has the option of canceling a transaction when there is a gap of 3 minutes between responses in a transaction. To prevent cancellation, the UAS MUST send a non-100 provisional response at every minute, to handle the possibility of lost provisional responses. (closes issue #11157) Reported by: rjain Tested by: twilson Review: https://reviewboard.asterisk.org/r/315/ ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@215759 f38db490-d61c-443f-a65b-d21fe96a405b
2009-09-02Merged revisions 215681 via svnmerge from dvossel1-17/+28
https://origsvn.digium.com/svn/asterisk/trunk ........ r215681 | dvossel | 2009-09-02 16:39:31 -0500 (Wed, 02 Sep 2009) | 10 lines port string to int conversion using sscanf There are several instances where a port is parsed from a uri or some other source and converted to an int value using atoi(), if for some reason the port string is empty, then a standard port is used. This logic is used over and over, so I created a function to handle it in a safer way using sscanf(). ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@215687 f38db490-d61c-443f-a65b-d21fe96a405b
2009-09-02Blocked revisions 215665 via svnmergemvanbaak0-0/+0
........ r215665 | mvanbaak | 2009-09-02 23:23:17 +0200 (Wed, 02 Sep 2009) | 5 lines add Parkinglot info to sip show peer <foo> and skinny show line <foo> If we had this from the start, debugging the 'parking not using configured parkinglot' bug would have been easier. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@215668 f38db490-d61c-443f-a65b-d21fe96a405b
2009-09-02Blocked revisions 215622 via svnmergemvanbaak0-0/+0
........ r215622 | mvanbaak | 2009-09-02 22:21:51 +0200 (Wed, 02 Sep 2009) | 4 lines - lock channel before looking for a channel variable - Init the parkings list member of struct parkinglot. Thanks Sean for the explanation why this should be here. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@215645 f38db490-d61c-443f-a65b-d21fe96a405b
2009-09-02Merged revisions 215522 via svnmerge from dvossel1-43/+40
https://origsvn.digium.com/svn/asterisk/trunk ........ r215522 | dvossel | 2009-09-02 12:26:40 -0500 (Wed, 02 Sep 2009) | 11 lines SIP uri parsing cleanup Now, the scheme passed to parse_uri can either be a single scheme, or a list of schemes ',' delimited. This gets rid of the whole problem of having to create two buffers and calling parse_uri twice to check for separate schemes. Review: https://reviewboard.asterisk.org/r/343/ ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@215525 f38db490-d61c-443f-a65b-d21fe96a405b
2009-09-02Blocked revisions 215479 via svnmergemvanbaak0-0/+0
........ r215479 | mvanbaak | 2009-09-02 18:20:23 +0200 (Wed, 02 Sep 2009) | 3 lines like in chan_sip's sip_new skinny should copy the configured parkinglot from a line to the newly created channel. This makes callparking honor the configured parkinglot for skinny lines as well. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@215488 f38db490-d61c-443f-a65b-d21fe96a405b
2009-09-02Blocked revisions 215466 via svnmergedvossel0-0/+0
........ r215466 | dvossel | 2009-09-02 11:08:00 -0500 (Wed, 02 Sep 2009) | 16 lines SIP support for keep-alive event keep-alive events are used by Sipura/Linksys for NAT keepalive. There currently don't appear to be any problems with NAT, but everytime a keep-alive event is received, Asterisk responds with a "489 Bad event". This error may indicate to a user that NAT problems exist just because this even is not supported. Now, rather than respond with an error, the packet is consumed and a "200 ok" is sent just to indicate we received the packet. (issue #15084) Patches: chan_sip.keepalive.v1.diff uploaded by IgorG (license 20) ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@215469 f38db490-d61c-443f-a65b-d21fe96a405b
2009-09-02Blocked revisions 215462 via svnmergemvanbaak0-0/+0
........ r215462 | mvanbaak | 2009-09-02 17:56:46 +0200 (Wed, 02 Sep 2009) | 12 lines Honor configured parkinglot when parking and retrieving parked calls Thank oej for pointing out the fact that sip_new did not copy parkinglot from the peer into the newly created channel. (closes issue #15538) Reported by: gracedman Patches: 2009090100_sipnewparkinglot-161.diff.txt uploaded by mvanbaak (license 7) With mod by me to also fix callparking as well (this uploaded patch only fixed retrieving a parked call) Tested by: gracedman, mvanbaak ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@215463 f38db490-d61c-443f-a65b-d21fe96a405b
2009-09-02Blocked revisions 215419 via svnmergemvanbaak0-0/+0
........ r215419 | mvanbaak | 2009-09-02 12:50:49 +0200 (Wed, 02 Sep 2009) | 2 lines Let's compile again on OpenBSD ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@215420 f38db490-d61c-443f-a65b-d21fe96a405b
2009-09-02Merged revisions 215338 via svnmerge from dhubbard1-3/+5
https://origsvn.digium.com/svn/asterisk/trunk ................ r215338 | dhubbard | 2009-09-01 20:16:59 -0500 (Tue, 01 Sep 2009) | 18 lines Merged revisions 215270 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r215270 | dhubbard | 2009-09-01 18:04:52 -0500 (Tue, 01 Sep 2009) | 12 lines Use strrchr() so SoftHangup will correctly truncate multi-hyphen channel names In general channel names are in the form Foo/Bar-Z, but the channel name could have multiple hyphens and look like Foo/B-a-r-Z. Use strrchr to truncate the channel name at the last hyphen. (closes issue #15810) Reported by: dhubbard Patches: dw-softhangup-1.4.patch uploaded by dhubbard (license 733) ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@215352 f38db490-d61c-443f-a65b-d21fe96a405b
2009-09-01Merged revisions 215161 via svnmerge from kpfleming1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ........ r215161 | kpfleming | 2009-09-01 14:50:48 -0500 (Tue, 01 Sep 2009) | 3 lines Ensure that frame dumps of AST_CONTROL_T38_PARAMETERS frames are properly decoded. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@215162 f38db490-d61c-443f-a65b-d21fe96a405b
2009-08-31Merged revisions 214945 via svnmerge from tilghman1-0/+3
https://origsvn.digium.com/svn/asterisk/trunk ................ r214945 | tilghman | 2009-08-31 11:18:33 -0500 (Mon, 31 Aug 2009) | 14 lines Merged revisions 214940 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r214940 | tilghman | 2009-08-31 11:16:52 -0500 (Mon, 31 Aug 2009) | 7 lines Also unlock the "other" channel, when returning, due to glare. (closes issue #15787) Reported by: tim_ringenbach Patches: chan_local.diff uploaded by tim ringenbach (license 540) Tested by: tim_ringenbach ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@214957 f38db490-d61c-443f-a65b-d21fe96a405b
2009-08-30Merged revisions 214819 via svnmerge from tilghman4-8876/+8215
https://origsvn.digium.com/svn/asterisk/trunk ........ r214819 | tilghman | 2009-08-30 01:43:04 -0500 (Sun, 30 Aug 2009) | 4 lines If lua is detected with the lua5.1 prefix (or not), adjust the include path accordingly. Based upon feedback to a release announcement on the -users list. See http://lists.digium.com/pipermail/asterisk-users/2009-August/236954.html ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@214820 f38db490-d61c-443f-a65b-d21fe96a405b
2009-08-28Merged revisions 214702 via svnmerge from tilghman1-4/+4
https://origsvn.digium.com/svn/asterisk/trunk ................ r214702 | tilghman | 2009-08-28 15:14:39 -0500 (Fri, 28 Aug 2009) | 15 lines Merged revisions 214701 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r214701 | tilghman | 2009-08-28 15:13:32 -0500 (Fri, 28 Aug 2009) | 8 lines Modify comment to be a bit more accurate. We have kept this comment around long enough, that it's pretty clear that we're keeping the code, because changing the code would require a pretty fundamental architectural shift. We've also taken criticism in some quarters, because it was believed that it was referring to the code being nasty. No, the code isn't nasty, just the operation itself is rather odd. Fixed for eternity (probably not). ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@214703 f38db490-d61c-443f-a65b-d21fe96a405b
2009-08-28Merged revisions 214696 via svnmerge from kpfleming5-8193/+8901
https://origsvn.digium.com/svn/asterisk/trunk ........ r214696 | kpfleming | 2009-08-28 15:01:21 -0500 (Fri, 28 Aug 2009) | 9 lines Ensure that CFLAGS and/or LDFLAGS provided to configure script are preserved. Cross-compilation environments want to provide 'defaults' for compiler and linker options, and frequently do this by specifying CFLAGS and LDFLAGS in the environment or as command-line arguments to the configure script. This patch modifies the configure script and Makefile to preserve these settings and ensure they are used in the build process. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@214697 f38db490-d61c-443f-a65b-d21fe96a405b
2009-08-28Blocked revisions 214650 via svnmergemmichelson0-0/+0
........ r214650 | mmichelson | 2009-08-28 13:41:23 -0500 (Fri, 28 Aug 2009) | 3 lines Fix some incorrect documentation of sched_thread functions. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@214651 f38db490-d61c-443f-a65b-d21fe96a405b
2009-08-27Merged revisions 214518 via svnmerge from tilghman4-106/+700
https://origsvn.digium.com/svn/asterisk/trunk ................ r214518 | tilghman | 2009-08-27 16:46:46 -0500 (Thu, 27 Aug 2009) | 14 lines Merged revisions 214517 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r214517 | tilghman | 2009-08-27 16:45:34 -0500 (Thu, 27 Aug 2009) | 7 lines Use autoconf to detect libcurl, as this enables cross-compilation checks, something we didn't allow before. (closes issue #15714) Reported by: pprindeville Patches: 20090813__issue15714.diff.txt uploaded by tilghman (license 14) Tested by: pprindeville ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@214519 f38db490-d61c-443f-a65b-d21fe96a405b
2009-08-27Merged revisions 214466 via svnmerge from tilghman4-13516/+868
https://origsvn.digium.com/svn/asterisk/trunk ................ r214466 | tilghman | 2009-08-27 12:28:01 -0500 (Thu, 27 Aug 2009) | 9 lines Merged revisions 214436 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r214436 | tilghman | 2009-08-27 11:53:58 -0500 (Thu, 27 Aug 2009) | 2 lines One more build system change, to make the descriptions look better, if we have better information. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@214474 f38db490-d61c-443f-a65b-d21fe96a405b
2009-08-27Merged revisions 214360 via svnmerge from tilghman3-381/+1088
https://origsvn.digium.com/svn/asterisk/trunk ................ r214360 | tilghman | 2009-08-27 11:12:03 -0500 (Thu, 27 Aug 2009) | 10 lines Merged revisions 214357 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r214357 | tilghman | 2009-08-27 11:03:50 -0500 (Thu, 27 Aug 2009) | 3 lines Make autoheader descriptions render correctly in our autoconfig.h file. (Figured out while working with issue #14906) ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@214361 f38db490-d61c-443f-a65b-d21fe96a405b
2009-08-26Blocked revisions 214309 via svnmergejpeeler0-0/+0
........ r214309 | jpeeler | 2009-08-26 18:13:19 -0500 (Wed, 26 Aug 2009) | 12 lines Add two new dialplan variables when using features Added DYNAMIC_FEATURENAME which holds the last triggered dynamic feature. Added DYNAMIC_PEERNAME which holds the unique channel name on the other side and is set when a dynamic feature is triggered. (closes issue #14663) Reported by: tamiel Patches: 20090313_features.diff uploaded by tamiel (license 712) Tested by: tamiel ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@214310 f38db490-d61c-443f-a65b-d21fe96a405b