dect
/
asterisk
Archived
13
0
Fork 0
Commit Graph

1689 Commits

Author SHA1 Message Date
russell 6195ff1afd Merge another big set of changes from team/russell/events
This commit merges in the rest of the code needed to support distributed device
state.  There are two main parts to this commit.

Core changes:
 - The device state handling in the core has been updated to understand device
   state across a cluster of Asterisk servers.  Every time the state of a device
   changes, it looks at all of the device states on each node, and determines the
   aggregate device state.  That resulting device state is what is provided to
   modules in Asterisk that take actions based on the state of a device.

New module, res_ais:
 - A module has been written to facilitate the communication of events between
   nodes in a cluster of Asterisk servers.  This module uses the SAForum AIS
   (Service Availability Forum Application Interface Specification) CLM and EVT
   services (Cluster Management and Event) to handle this task.  This module
   currently supports sharing Voicemail MWI (Message Waiting Indication) and
   device state events between servers.  It has been tested with openais, though
   other implementations of the spec do exist.

For more information on testing distributed device state, see the following doc:
  - doc/distributed_devstate.txt


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@121559 f38db490-d61c-443f-a65b-d21fe96a405b
2008-06-10 15:12:17 +00:00
russell 639a4bf7e4 Merge some more changes from team/russell/events
This commit pulls in a batch of improvements and additions to the event API.
Changes include:
 - the ability to dynamically build a subscription.  This is useful if you're
    building a subscription based on something you receive from the network,
    or from options in a configuration file.
 - Add tables of event types and IE types and the corresponding string
    representation for implementing text based protocols that use these
	events, for showing events on the CLI, reading configuration that
	references event information, among other things.
 - Add a table that maps IE types and the corresponding payload type.
 - an API call to get the total size of an event
 - an API call to get all events from the cache that match a subscription
 - a new IE payload type, raw, which I used for transporting the Entity ID in
    my code for handling distributed device state.
 - Code improvements to reduce code duplication
 - Include the Entity ID of the server that originated the event in every event
 - an additional event type, DEVICE_STATE_CHANGE, to help facilitate distributed
    device state.  DEVICE_STATE is a state change on one server, DEVICE_STATE_CHANGE
	is the aggregate device state change across all servers.


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@121555 f38db490-d61c-443f-a65b-d21fe96a405b
2008-06-10 14:53:40 +00:00
russell dd57dea04e Merge another change from team/russell/events
This commit breaks out some logic from pbx.c into a simple API.  The hint
processing code had logic for taking the state from multiple devices and
turning that into the state for a single extension.  So, I broke this out
and made an API that lets you take multiple device states and determine
the aggregate device state.  I needed this for some core device state changes
to support distributed device state.


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@121501 f38db490-d61c-443f-a65b-d21fe96a405b
2008-06-10 14:06:29 +00:00
file 54f9c86dc5 Merged revisions 121442 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r121442 | file | 2008-06-10 09:52:06 -0300 (Tue, 10 Jun 2008) | 4 lines

Update BRIDGEPEER variable before we do a generic bridge in case we just broke out of a native bridge and fell through to generic.
(closes issue #12815)
Reported by: ramonpeek

........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@121444 f38db490-d61c-443f-a65b-d21fe96a405b
2008-06-10 12:54:39 +00:00
russell 5262d4ab16 Merge another change from team/russell/events ...
DUNDi uses a concept called the Entity ID for unique server identifiers.  I have
pulled out the handling of EIDs and made it something available to all of Asterisk.
There is now a global Entity ID that can be used for other purposes as well, such
as code providing distributed device state, which is why I did this.  The global
Entity ID is set automatically, just like it was done in DUNDi, but it can also be
set in asterisk.conf.  DUNDi will now use this global EID unless one is specified
in dundi.conf.

The current EID for the system can be seen in the "core show settings" CLI command.
It is also available in the dialplan via the ENTITYID variable.


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@121439 f38db490-d61c-443f-a65b-d21fe96a405b
2008-06-10 12:48:50 +00:00
russell 5892ffdfdd Properly initialize the cli_ping condition and lock
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@121402 f38db490-d61c-443f-a65b-d21fe96a405b
2008-06-10 00:31:30 +00:00
russell c4fd7f3320 Change system header includes to be like how it is done in other files
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@121401 f38db490-d61c-443f-a65b-d21fe96a405b
2008-06-10 00:29:01 +00:00
tilghman e8556a10e2 Expand RQ_INTEGER type out to multiple types, one for each precision
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@121367 f38db490-d61c-443f-a65b-d21fe96a405b
2008-06-09 22:51:59 +00:00
twilson 3f654c0868 Initialize the lock and destroy lock and cond in the destructor (thanks, mmichelson)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@121365 f38db490-d61c-443f-a65b-d21fe96a405b
2008-06-09 22:42:08 +00:00
russell 138235a099 arbitrary formatting change to test mantis change
(closes issue #12824)


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@121286 f38db490-d61c-443f-a65b-d21fe96a405b
2008-06-09 16:55:15 +00:00
russell 7df57fb2ab arbitrary formatting change to test a mantis change
(closes issue #12824)


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@121285 f38db490-d61c-443f-a65b-d21fe96a405b
2008-06-09 16:53:26 +00:00
russell a9c9333461 Minor formatting change to test a mantis change ...
(closes issue #12824)


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@121284 f38db490-d61c-443f-a65b-d21fe96a405b
2008-06-09 16:48:26 +00:00
russell 043bbef5b2 Merged revisions 121280 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r121280 | russell | 2008-06-09 11:35:40 -0500 (Mon, 09 Jun 2008) | 10 lines

Do not attempt to do emulation if an END digit is received and the length is
less than the defined minimum digit length, and the other end only wants END
digits (SIP INFO, for example).

(closes issue #12778)
Reported by: tsearle
Patches:
      12778.rev1.txt uploaded by russell (license 2)
Tested by: tsearle

........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@121282 f38db490-d61c-443f-a65b-d21fe96a405b
2008-06-09 16:37:08 +00:00
tilghman 50660eb42e Implement FINDLABEL matching for the new extension matching engine.
(closes issue #12800)
 Reported by: chris-mac
 Patches: 
       20080608__bug12800.diff.txt uploaded by Corydon76 (license 14)


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@121279 f38db490-d61c-443f-a65b-d21fe96a405b
2008-06-09 16:35:06 +00:00
tilghman 9229799e60 Make extension match characters case-insensitive.
(closes issue #12777)
 Reported by: jsmith
 Patches: 
       lower_case_patterns-trunk-v1.patch uploaded by jsmith (license 15)


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@121010 f38db490-d61c-443f-a65b-d21fe96a405b
2008-06-06 19:55:08 +00:00
jpeeler 60bf6d123a Merged revisions 120863,120885 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r120863 | jpeeler | 2008-06-06 10:33:15 -0500 (Fri, 06 Jun 2008) | 3 lines

This fixes a crash when LOW_MEMORY is turned on. Two allocations of the ast_rtp struct that were previously allocated on the stack have been modified to use thread local storage instead.


........
r120885 | jpeeler | 2008-06-06 11:39:20 -0500 (Fri, 06 Jun 2008) | 2 lines

Correction to commmit 120863, make sure proper destructor function is called as well define two thread storage local variables.

........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@120906 f38db490-d61c-443f-a65b-d21fe96a405b
2008-06-06 17:50:05 +00:00
murf 92a68fd2a8 a small fix for a crash that occurs when compiling AEL with global vars
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@120828 f38db490-d61c-443f-a65b-d21fe96a405b
2008-06-05 21:34:42 +00:00
tilghman 13366a3a41 Merge the adaptive realtime branch, which will make adding new required fields
to realtime less painful in the future.


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@120789 f38db490-d61c-443f-a65b-d21fe96a405b
2008-06-05 19:07:27 +00:00
bbryant 68dea9b6d6 This patch adds more detailed statistics for RTP channels, and provides an API call to access it, including maximums, minimums, standard deviatinos,
and normal deviations. Currently this is implemented for chan_sip, but could be added to the func_channel_read callbacks for the CHANNEL function 
for any channel that uses RTP.

(closes issue #10590)
Reported by: gasparz
Patches:
      chan_sip_c.diff uploaded by gasparz (license 219)
      rtp_c.diff uploaded by gasparz (license 219)
      rtp_h.diff uploaded by gasparz (license 219)
      audioqos-trunk.diff uploaded by snuffy (license 35)
      rtpqos-trunk-r119891.diff uploaded by sergee (license 138)
Tested by: jsmith, gasparz, snuffy, marsosa, chappell, sergee


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@120635 f38db490-d61c-443f-a65b-d21fe96a405b
2008-06-05 16:24:19 +00:00
tilghman e387c61e4f Conditionally load the AGI command gosub, depending on whether or not res_agi
has been loaded, fix a return value in the loader, and ensure that the help
workhorse header does not print on load.


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@120602 f38db490-d61c-443f-a65b-d21fe96a405b
2008-06-05 15:58:11 +00:00
tilghman bf80148186 MSet doesn't necessarily need chan to be set
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@120477 f38db490-d61c-443f-a65b-d21fe96a405b
2008-06-04 20:34:52 +00:00
jpeeler b401642050 Merged revisions 120173 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r120173 | jpeeler | 2008-06-03 17:15:33 -0500 (Tue, 03 Jun 2008) | 6 lines

(closes issue #11594)
Reported by: yem
Tested by: yem

This change decreases the buffer size allocated on the stack substantially in config_text_file_load when LOW_MEMORY is turned on. This change combined with the fix from revision 117462 (making mkintf not copy the zt_chan_conf structure) was enough to prevent the crash.

........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@120174 f38db490-d61c-443f-a65b-d21fe96a405b
2008-06-03 22:17:07 +00:00
tilghman 0a568addd8 Move compatibility options into asterisk.conf, default them to on for upgrades,
and off for new installations.  This includes the translation from pipes to commas
for pbx_realtime and the EXEC command for AGI, as well as the change to the Set
application not to support multiple variables at once.


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@120171 f38db490-d61c-443f-a65b-d21fe96a405b
2008-06-03 22:05:16 +00:00
russell 869f8f9573 Add lock tracking for rwlocks. Previously, lock.h only had the ability to
hold tracking information for mutexes.  Now, the "core show locks" output
will output information about who is holding a rwlock when a thread is
waiting on it.

(closes issue #11279)
Reported by: ys
Patches:
      trunk_lock_utils.v8.diff uploaded by ys (license 281)


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@120064 f38db490-d61c-443f-a65b-d21fe96a405b
2008-06-03 18:26:51 +00:00
russell 8c9d668c8d Do a deep copy of file and function strings to avoid a potential crash when
modules are unloaded.

(closes issue #12780)
Reported by: ys
Patches:
      logger.diff uploaded by ys (license 281)
	  -- modified by me for coding guidelines


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@119892 f38db490-d61c-443f-a65b-d21fe96a405b
2008-06-03 13:29:16 +00:00
russell 999c5b4af6 Merged revisions 119742 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r119742 | russell | 2008-06-02 09:39:45 -0500 (Mon, 02 Jun 2008) | 5 lines

Improve CLI command blacklist checking for the command manager action.  Previously,
it did not handle case or whitespace properly.  This made it possible for blacklisted
commands to get executed anyway.
(closes issue #12765)

........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@119744 f38db490-d61c-443f-a65b-d21fe96a405b
2008-06-02 14:41:55 +00:00
russell 7c67640f40 Fix a minor merge issue that caused a function to not get compiled in with
DEBUG_THREADS like it was supposed to


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@119423 f38db490-d61c-443f-a65b-d21fe96a405b
2008-05-30 21:51:17 +00:00
file f3fabf95b8 Merged revisions 119354 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r119354 | file | 2008-05-30 16:46:37 -0300 (Fri, 30 May 2008) | 2 lines

Fix a bug I found while testing for another issue.

........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@119355 f38db490-d61c-443f-a65b-d21fe96a405b
2008-05-30 19:47:30 +00:00
russell 74a6304935 Merged revisions 119156 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r119156 | russell | 2008-05-29 17:24:29 -0500 (Thu, 29 May 2008) | 10 lines

Fix a race condition in channel autoservice.  There was still a small window of opportunity
for a DTMF frame, or some other deferred frame type, to come in and get dropped.

(closes issue #12656)
(closes issue #12656)
Reported by: dimas
Patches:
      v3-12656.patch uploaded by dimas (license 88)
	  -- with some modifications by me

........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@119157 f38db490-d61c-443f-a65b-d21fe96a405b
2008-05-29 22:28:50 +00:00
bbryant 15874e67c7 Adds support for changing logger settingss on remote consoles with a
new command "logger set level". 

i.e. "logger set level debug off"

(closes issue #10891)


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@119126 f38db490-d61c-443f-a65b-d21fe96a405b
2008-05-29 21:30:37 +00:00
murf cc6f95cd28 Had to move the ASTERISK_FILE_VERSION decl to just after the include of "asterisk.h"
or you get undefined variable errors when you are compiling under the influence
of MTX_PROFILE



git-svn-id: http://svn.digium.com/svn/asterisk/trunk@119074 f38db490-d61c-443f-a65b-d21fe96a405b
2008-05-29 20:26:42 +00:00
mvanbaak 653f5c9794 Make sure the nrfds and nefds are reset to NULL
before we enter manage_parkinglot.
This will get rid of CLI warnings like:
__ast_read: Exception flag set on 'SIP/<NUMBER>-<ID>', but no exception handler

(closes issue #12748)
Reported by: nreinartz
Patches:
      asterisk-multiparking_initialize_filedescr_sets-0.0.1.patch uploaded by nreinartz (license 452)


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@119015 f38db490-d61c-443f-a65b-d21fe96a405b
2008-05-29 19:10:31 +00:00
tilghman 3db76e85a4 Merged revisions 118953 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r118953 | tilghman | 2008-05-29 12:20:16 -0500 (Thu, 29 May 2008) | 3 lines

Add some debugging code that ensures that when we do deadlock avoidance, we
don't lose the information about how a lock was originally acquired.

........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@118955 f38db490-d61c-443f-a65b-d21fe96a405b
2008-05-29 17:35:19 +00:00
murf e99b6bfc85 Merged revisions 118858 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r118858 | murf | 2008-05-28 18:25:28 -0600 (Wed, 28 May 2008) | 46 lines

(closes issue #10668)
(closes issue #11721)
(closes issue #12726)
Reported by: arkadia
Tested by: murf

These changes:

1. revert the changes made via bug 10668; 
   I should have known that such changes,
   even tho they made sense at the time,
   seemed like an omission, etc, were actually
   integral to the CDR system via forkCDR.
   It makes sense to me now that forkCDR didn't
   natively end any CDR's, but rather depended
   on natively closing them all at hangup time
   via traversing and closing them all, whether
   locked or not. I still don't completely 
   understand the benefits of setvar and answer
   operating on locked cdrs, but I've seen 
   enough to revert those changes also, and
   stop messing up users who depended on that
   behavior. bug 12726 found reverting the changes
   fixed his changes, and after a long review
   and working on forkCDR, I can see why.
2. Apply the suggested enhancements proposed
   in 10668, but in a completely compatible
   way. ForkCDR will behave exactly as before,
   but now has new options that will allow some
   actions to be taken that will slightly 
   modify the outcome and side-effects of
   forkCDR. Based on conversations I've had 
   with various people, these small tweaks
   will allow some users to get the behavior
   they need. For instance, users executing
   forkCDR in an AGI script will find the
   answer time set, and DISPOSITION set, 
   a situation not covered when the routines
  were first written.
3. A small problem in the cdr serializer
   would output answer and end times even
   when they were not set. This is now 
   fixed.



........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@118880 f38db490-d61c-443f-a65b-d21fe96a405b
2008-05-29 01:29:09 +00:00
tilghman 3707e8c13e Merged revisions 118551 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r118551 | tilghman | 2008-05-27 14:15:27 -0500 (Tue, 27 May 2008) | 6 lines

When showing an error message for a command, don't shorten the command output,
as it tends to confuse the user (it's fine for suggesting other commands,
however).
 Reported by: seanbright (on #asterisk-dev)
 Fixed by: me

........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@118554 f38db490-d61c-443f-a65b-d21fe96a405b
2008-05-27 19:21:03 +00:00
tilghman 84444179ec Merged revisions 118465 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r118465 | tilghman | 2008-05-27 13:58:09 -0500 (Tue, 27 May 2008) | 8 lines

NULL character should terminate only commands back to the core, not log
messages to the console.
(closes issue #12731)
 Reported by: seanbright
 Patches: 
       20080527__bug12731.diff.txt uploaded by Corydon76 (license 14)
 Tested by: seanbright

........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@118466 f38db490-d61c-443f-a65b-d21fe96a405b
2008-05-27 18:59:06 +00:00
tilghman 30298a3d74 Change space-zero to now evaluate to false, as is expected by a great many.
(Inspired by a post on the -users list)


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@118223 f38db490-d61c-443f-a65b-d21fe96a405b
2008-05-25 14:31:29 +00:00
jpeeler bfe1f28357 Fixes segfault in parking, patch submitted by bmd.
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@118176 f38db490-d61c-443f-a65b-d21fe96a405b
2008-05-24 00:37:01 +00:00
mmichelson c0ca2a427b A new feature thanks to the fine folks at Switchvox!
If a deadlock is detected, then the typical lock information will be
printed along with a backtrace of the stack for the offending threads.
Use of this requires compiling with DETECT_DEADLOCKS and having glibc
installed.

Furthermore, issuing the "core show locks" CLI command will print the
normal lock information as well as a backtraces for each lock. This
requires that DEBUG_THREADS is enabled and that glibc is installed.

All the backtrace features may be disabled by running the configure
script with --without-execinfo as an argument



git-svn-id: http://svn.digium.com/svn/asterisk/trunk@118173 f38db490-d61c-443f-a65b-d21fe96a405b
2008-05-23 22:35:50 +00:00
bbryant 3342d99a30 Add new functionality to http server that requires manager authentication for any path that includes a directory named 'private'. This patch also
requires manager authentication for any POST's being sent to the server as well to help secure uploads.


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@118161 f38db490-d61c-443f-a65b-d21fe96a405b
2008-05-23 21:19:42 +00:00
russell af1225cb40 Merged revisions 118048 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r118048 | russell | 2008-05-23 07:30:53 -0500 (Fri, 23 May 2008) | 9 lines

Don't declare a function that takes variable arguments as inline, because it's
not valid, and on some compilers, will emit a warning.

http://gcc.gnu.org/onlinedocs/gcc/Inline.html#Inline

(closes issue #12289)
Reported by: francesco_r
Patches by Tilghman, final patch by me

........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@118049 f38db490-d61c-443f-a65b-d21fe96a405b
2008-05-23 12:37:31 +00:00
tilghman b9f8e799b4 Merged revisions 117899 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r117899 | tilghman | 2008-05-22 13:53:53 -0500 (Thu, 22 May 2008) | 2 lines

Also remove preamble from asynchronous events (reported by jsmith on #asterisk-dev)

........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@117900 f38db490-d61c-443f-a65b-d21fe96a405b
2008-05-22 18:54:41 +00:00
mvanbaak c1210321e7 - revert change to ast_queue_hangup and create ast_queue_hangup_with_cause
- make data member of the ast_frame struct a named union instead of a void

Recently the ast_queue_hangup function got a new parameter, the hangupcause
Feedback came in that this is no good and that instead a new function should be created.
This I did.

The hangupcause was stored in the seqno member of the ast_frame struct. This is not very
elegant, and since there's already a data member that one should be used.
Problem is, this member was a void *.
Now it's a named union so it can hold a pointer, an uint32 and there's a padding in case someone
wants to store another type in there in the future.

This commit is so massive, because all ast_frame.data uses have to be
altered to ast_frame.data.data

Thanks russellb and kpfleming for the feedback.

(closes issue #12674)
Reported by: mvanbaak


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@117802 f38db490-d61c-443f-a65b-d21fe96a405b
2008-05-22 16:29:54 +00:00
russell b0a1f90960 Store build-time options as a string in AST_BUILDOPTS in buildopts.h. Also,
display this information in the "core show settings" CLI command.  This is
useful if you want to verify that you're running a build with DONT_OPTIMIZE,
DEBUG_THREADS, etc.


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@117756 f38db490-d61c-443f-a65b-d21fe96a405b
2008-05-22 13:40:52 +00:00
mmichelson 549f37623b This change makes it so that logs will report the correct source of verbose messages.
Until this change, all verbose messages in Asterisk's log files reported logger.c
as the source of the message.



git-svn-id: http://svn.digium.com/svn/asterisk/trunk@117693 f38db490-d61c-443f-a65b-d21fe96a405b
2008-05-21 22:34:27 +00:00
tilghman ce80ba991f Merged revisions 117519 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r117519 | tilghman | 2008-05-21 13:40:14 -0500 (Wed, 21 May 2008) | 3 lines

Strip the preamble from the output also when -rx is not being used
(Related to issue #12702)

........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@117520 f38db490-d61c-443f-a65b-d21fe96a405b
2008-05-21 18:43:26 +00:00
russell b854ddc899 Merged revisions 117514 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r117514 | russell | 2008-05-21 13:28:46 -0500 (Wed, 21 May 2008) | 4 lines

Don't filter the magic character in the network verboser.  It gets filtered
once it reaches the client.
(related to issue #12702, pointed out by tilghman)

........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@117515 f38db490-d61c-443f-a65b-d21fe96a405b
2008-05-21 18:29:05 +00:00
russell c77577be0c Merged revisions 117507 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r117507 | russell | 2008-05-21 13:19:34 -0500 (Wed, 21 May 2008) | 7 lines

1) Don't print the verbose marker in front of every message from ast_verbose()
   being sent to remote consoles.

2) Fix pbx_gtkconsole to filter out the verbose marker.

(related to issue #12702)

........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@117508 f38db490-d61c-443f-a65b-d21fe96a405b
2008-05-21 18:20:11 +00:00
russell 8dbcfb636d Merged revisions 117479 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r117479 | russell | 2008-05-21 13:11:51 -0500 (Wed, 21 May 2008) | 6 lines

Don't display the verbose marker for calls to ast_verbose() that do not include
a VERBOSE_PREFIX in front of the message.
(closes issue #12702)
Reported by: johnlange
Patched by me

........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@117481 f38db490-d61c-443f-a65b-d21fe96a405b
2008-05-21 18:12:19 +00:00
mmichelson 1c9b0da173 Be sure that we cache included files for each source file which loads
a configuration file.  As it was, only the first did so. This led to 
a problem if the included file was changed (but not the configuration 
file which includes it) and the second source file attempted to reload 
the configuration. It would not see that the included file had changed.

In this particular example, res_phoneprov and chan_sip both loaded
sip.conf, which included a file call sip.peers.conf. Since res_phoneprov
was the first to load sip.conf, only it cached the fact that sip.conf
included sip.peers.conf. If sip.peers.conf were changed and sip.conf were
not and a sip reload were issued (meaning that chan_sip attempts to 
reload sip.conf only if it and its included files have changed) the changes
made to sip.peers.conf would not be seen and therefore no action would be
taken.

(closes issue #12693)
Reported by: marsosa



git-svn-id: http://svn.digium.com/svn/asterisk/trunk@117367 f38db490-d61c-443f-a65b-d21fe96a405b
2008-05-21 02:20:31 +00:00