[svn-commits] tilghman: branch group/ast_storage r48658 - in /team/group/ast_storage: ./ ag...

svn-commits at lists.digium.com svn-commits at lists.digium.com
Wed Dec 20 14:03:05 MST 2006


Author: tilghman
Date: Wed Dec 20 15:03:03 2006
New Revision: 48658

URL: http://svn.digium.com/view/asterisk?view=rev&rev=48658
Log:
Merged revisions 48358-48360,48364-48365,48373,48376,48378,48380,48383-48384,48388-48390,48392,48397,48400,48402,48408-48410,48415-48417,48432-48433,48455,48458-48459,48462,48473,48476-48477,48479-48480,48485,48488,48491,48495,48497-48499,48501,48503,48505,48507-48510,48512,48514-48517,48520,48522,48526-48527,48529,48543,48549-48551,48553,48555,48558-48560,48562-48563,48565,48567-48568,48572-48575,48578,48580-48581,48587-48589,48591,48593,48595,48597-48599,48638-48639 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r48358 | russell | 2006-12-07 12:21:21 -0600 (Thu, 07 Dec 2006) | 19 lines

Merged revisions 48357 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r48357 | russell | 2006-12-07 13:17:28 -0500 (Thu, 07 Dec 2006) | 11 lines

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

........
r48356 | russell | 2006-12-07 13:14:13 -0500 (Thu, 07 Dec 2006) | 3 lines

Ensure that the file position is not incremented beyond the total number of
files available for playback.  (issue #8539, ulogic)

........

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

................
r48359 | russell | 2006-12-08 23:04:38 -0600 (Fri, 08 Dec 2006) | 6 lines

- Fix a few spelling mistakes
- Use sizeof() to pass an array size to a function
- Use a single bit for a variable in the chan_iax2_pvt stuct since that is all
  it needs.
- Add some comments about the iaxs, iaxl, and lastused arrays.

................
r48360 | russell | 2006-12-09 01:10:55 -0600 (Sat, 09 Dec 2006) | 11 lines

chan_iax2 has an extremely large function, socket_process(), to handle incoming
frames.  The function, before this commit, was roughly 1400 lines long.  So, I
am working on breaking this up into functions so that the code is easier to
follow and debug.  Also, I will be committing these changes in chunks as I do
them to ease tracking down any potentially introduced problems.

Break out roughly 150 lines from socket_process() and introduce a new function, 
socket_process_meta() which handles the parsing of an incoming meta frame.
Also, restructure some of this code a bit to reduce the deep nesting that was
in this code.

................
r48364 | russell | 2006-12-09 10:04:06 -0600 (Sat, 09 Dec 2006) | 16 lines

Merged revisions 48363 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r48363 | russell | 2006-12-09 10:59:42 -0500 (Sat, 09 Dec 2006) | 8 lines

Use locking when accessing the registrations list.  This list is not actually
used very often, so the likelihood of there being a problem is pretty small,
but still possible.  For example, if the CLI command to list the registrations
was called at the same time that a reload was occurring and the registrations
list was getting destroyed and rebuilt, a crash could occur.

In passing, go ahead and convert this list to use the linked list macros.

........

................
r48365 | russell | 2006-12-09 10:44:41 -0600 (Sat, 09 Dec 2006) | 2 lines

convert the thread IO state and type to use enums.

................
r48373 | murf | 2006-12-09 21:14:27 -0600 (Sat, 09 Dec 2006) | 17 lines

Merged revisions 48372 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r48372 | murf | 2006-12-09 20:04:18 -0700 (Sat, 09 Dec 2006) | 9 lines

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

........
r48371 | murf | 2006-12-09 19:14:13 -0700 (Sat, 09 Dec 2006) | 1 line

This version applies the patch suggested by stevens in bug 7836 (make inbound channel RINGING state consistent with other channels).
........

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

................
r48376 | tilghman | 2006-12-10 18:52:19 -0600 (Sun, 10 Dec 2006) | 21 lines

Merged revisions 48375 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r48375 | tilghman | 2006-12-10 18:47:21 -0600 (Sun, 10 Dec 2006) | 13 lines

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

........
r48374 | tilghman | 2006-12-10 18:33:59 -0600 (Sun, 10 Dec 2006) | 5 lines

When doing a fork() and exec(), two problems existed (Issue 8086):
1) Ignored signals stayed ignored after the exec().
2) Signals could possibly fire between the fork() and exec(), causing Asterisk
signal handlers within the child to execute, which caused nasty race conditions.

........

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

................
r48378 | file | 2006-12-10 23:01:37 -0600 (Sun, 10 Dec 2006) | 10 lines

Merged revisions 48377 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r48377 | file | 2006-12-10 23:57:38 -0500 (Sun, 10 Dec 2006) | 2 lines

Don't access the conference structure after it has been freed.

........

................
r48380 | file | 2006-12-10 23:34:53 -0600 (Sun, 10 Dec 2006) | 10 lines

Merged revisions 48379 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r48379 | file | 2006-12-11 00:30:01 -0500 (Mon, 11 Dec 2006) | 2 lines

Use the correct API call to say a device state changed. (Yes, I'm a nub.)

........

................
r48383 | file | 2006-12-10 23:38:57 -0600 (Sun, 10 Dec 2006) | 10 lines

Merged revisions 48381 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r48381 | file | 2006-12-11 00:36:45 -0500 (Mon, 11 Dec 2006) | 2 lines

Merge in my latest RTP changes. Break out RTP and RTCP callback functions so they no longer share a common one.

........

................
r48384 | tilghman | 2006-12-10 23:40:38 -0600 (Sun, 10 Dec 2006) | 10 lines

Merged revisions 48382 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r48382 | tilghman | 2006-12-10 23:37:09 -0600 (Sun, 10 Dec 2006) | 2 lines

STRFTIME() does not actually require an argument (issue 8540)

........

................
r48388 | murf | 2006-12-11 11:00:36 -0600 (Mon, 11 Dec 2006) | 1 line

This update fixes the problem reported in bug 8551; that ast_app_getdata() behaves differently in trunk for the case of a null prompt.
................
r48389 | rizzo | 2006-12-11 12:11:58 -0600 (Mon, 11 Dec 2006) | 13 lines

make sure the argument to ast_malloc() is > 0.

Long explaination:

The behaviour of the underlying malloc(0) differs depending on the
operating system.  Some return NULL (SysV behaviour); some still
allocate a small chunk of memory and return a valid pointer (e.g.
traditional BSD); some (e.g. FreeBSD 6.x) return a non-null pointer
that causes a memory fault if used, even just for reading.

Given the above variety, better never call malloc(0).


................
r48390 | mogorman | 2006-12-11 15:04:41 -0600 (Mon, 11 Dec 2006) | 3 lines

add support for dynamic channel creation and destruction, and
show transcoder to show number of channels in use.

................
r48392 | file | 2006-12-11 15:35:28 -0600 (Mon, 11 Dec 2006) | 10 lines

Merged revisions 48391 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r48391 | file | 2006-12-11 16:31:23 -0500 (Mon, 11 Dec 2006) | 2 lines

Return non-existant callerid handling to that which it was before. In 1.4 and trunk callerid can be allocated but not have any contents so we have to use ast_strlen_zero before passing it to the relevant functions. (issue #8567 reported by pabelanger)

........

................
r48397 | mogorman | 2006-12-11 16:31:20 -0600 (Mon, 11 Dec 2006) | 20 lines

Merged revisions 48396 via svnmerge from 
https://svn.digium.com/svn/asterisk/branches/1.4

................
r48396 | mogorman | 2006-12-11 16:11:35 -0600 (Mon, 11 Dec 2006) | 12 lines

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

........
r48394 | mogorman | 2006-12-11 15:55:43 -0600 (Mon, 11 Dec 2006) | 4 lines

app_externalivr needs a real silence file, and additional
changes to add silence files into core instead of extra
patch provided by bug 8177 with minor additions.

........

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

................
r48400 | mogorman | 2006-12-11 17:02:47 -0600 (Mon, 11 Dec 2006) | 10 lines

Merged revisions 48399 via svnmerge from 
https://svn.digium.com/svn/asterisk/branches/1.4

........
r48399 | mogorman | 2006-12-11 17:02:10 -0600 (Mon, 11 Dec 2006) | 2 lines

new sounds package with 100% more silence

........

................
r48402 | file | 2006-12-11 22:14:50 -0600 (Mon, 11 Dec 2006) | 10 lines

Merged revisions 48401 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r48401 | file | 2006-12-11 23:13:48 -0500 (Mon, 11 Dec 2006) | 2 lines

Use S_OR in my previous app_voicemail. This is the way it should have been done.

........

................
r48408 | rizzo | 2006-12-12 03:40:45 -0600 (Tue, 12 Dec 2006) | 10 lines

Make sure tab-completion works even when we have typed a fully
matching word (e.g. "sip<TAB>"); this is implemented by this one-line change

-               for (;; dst++, src += n) {
+               for (;src < argindex; dst++, src += n) {

However this code is not exactly trivial to understand, so
i am also adding some comments to help figuring out what it does.


................
r48409 | rizzo | 2006-12-12 04:35:10 -0600 (Tue, 12 Dec 2006) | 3 lines

normalize the scanning of "general" options in the config file.


................
r48410 | rizzo | 2006-12-12 04:36:15 -0600 (Tue, 12 Dec 2006) | 3 lines

properly initialize a malloc'ed buffer


................
r48415 | mogorman | 2006-12-12 13:55:39 -0600 (Tue, 12 Dec 2006) | 2 lines

fixed nubb error on my part, transcoder now unlocks and locks correctly, as well as counts in the correct direction.

................
r48416 | russell | 2006-12-12 16:27:22 -0600 (Tue, 12 Dec 2006) | 7 lines

Make chan_zap inform you that your version of zaptel is too old instead of
just failing to compile.

It seems like the proper way to do this would be in the configure script.
However, that wouldn't help existing checkouts unless we forced the configure
script to be executed after any code was changed.

................
r48417 | russell | 2006-12-12 16:32:20 -0600 (Tue, 12 Dec 2006) | 2 lines

Fix various spelling mistakes in comments.

................
r48432 | kpfleming | 2006-12-12 17:28:15 -0600 (Tue, 12 Dec 2006) | 10 lines

Merged revisions 48427 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r48427 | kpfleming | 2006-12-12 17:18:14 -0600 (Tue, 12 Dec 2006) | 2 lines

when making a release, we can always use wget and we can't run the configure script to find that out...

........

................
r48433 | russell | 2006-12-12 18:56:30 -0600 (Tue, 12 Dec 2006) | 3 lines

revert check for a zaptel transcoder related definition that was done in the
wrong module.

................
r48455 | mogorman | 2006-12-13 15:23:54 -0600 (Wed, 13 Dec 2006) | 4 lines

support for deactivating translation paths that are no longer available
and more descriptive show transcoder cli command.


................
r48458 | rizzo | 2006-12-13 16:54:41 -0600 (Wed, 13 Dec 2006) | 14 lines

clean up function manager_show_dialplan_helper()
reducing indentation and normalizing loops.

While doing this, remove some unused variables,
fix an uninitialized string (idaction), and mark
some places where the behaviour is not what we would expect
(e.g. an empty context is reported as an error same as
a non-existent one). Given that this function is
not in 1.4, the above can be changed without too many
backward compatibility concerns.

Not applicable to 1.4 or below.


................
r48459 | rizzo | 2006-12-13 17:08:02 -0600 (Wed, 13 Dec 2006) | 5 lines

make sure that showdialplan sends only one
'Response: Success ' message even in case of
a recursive call.


................
r48462 | file | 2006-12-13 21:39:39 -0600 (Wed, 13 Dec 2006) | 10 lines

Merged revisions 48461 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r48461 | file | 2006-12-13 22:33:30 -0500 (Wed, 13 Dec 2006) | 2 lines

Remove direct RTCP bridging. I've come to the conclusion that we should handle this through the core and not just forward it on. Should solve a few bugs.

........

................
r48473 | file | 2006-12-14 11:39:16 -0600 (Thu, 14 Dec 2006) | 10 lines

Merged revisions 48472 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r48472 | file | 2006-12-14 12:36:12 -0500 (Thu, 14 Dec 2006) | 2 lines

Payload values on the RTP structure can change AFTER a bridge has started. This comes from the packet handling of the SIP response when indication that it was answered has been sent. Therefore we need to protect this data with a lock when we read/write. (issue #8232 reported by tgrman)

........

................
r48476 | rizzo | 2006-12-14 21:59:31 -0600 (Thu, 14 Dec 2006) | 4 lines

remove the macro LOAD_OH and expand it inline in the only
place where it was used.


................
r48477 | rizzo | 2006-12-14 22:03:42 -0600 (Thu, 14 Dec 2006) | 3 lines

constify ast_state2str() and note it is not reentrant.


................
r48479 | file | 2006-12-15 00:31:26 -0600 (Fri, 15 Dec 2006) | 10 lines

Merged revisions 48478 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r48478 | file | 2006-12-15 01:28:05 -0500 (Fri, 15 Dec 2006) | 2 lines

Use a wakeup variable so that we don't wait on IO indefinitely if packets need to be retransmitted.

........

................
r48480 | file | 2006-12-15 00:34:29 -0600 (Fri, 15 Dec 2006) | 2 lines

Add support to see what holds the lock when doing trylock.

................
r48485 | oej | 2006-12-15 04:54:06 -0600 (Fri, 15 Dec 2006) | 2 lines

Update to latest IANA specs

................
r48488 | oej | 2006-12-15 04:58:36 -0600 (Fri, 15 Dec 2006) | 2 lines

Issue #8592 - treat 504 as congestion (imported from 1.2/1.4)

................
r48491 | oej | 2006-12-15 07:36:34 -0600 (Fri, 15 Dec 2006) | 2 lines

Doxygen changes

................
r48495 | rizzo | 2006-12-15 08:33:59 -0600 (Fri, 15 Dec 2006) | 3 lines

small documentation improvements.


................
r48497 | rizzo | 2006-12-15 09:39:29 -0600 (Fri, 15 Dec 2006) | 3 lines

replace ast_safe_string_alloc() with asprintf()


................
r48498 | rizzo | 2006-12-15 09:40:57 -0600 (Fri, 15 Dec 2006) | 3 lines

replace ast_safe_string_alloc() with asprintf()


................
r48499 | rizzo | 2006-12-15 09:44:59 -0600 (Fri, 15 Dec 2006) | 4 lines

remove ast_safe_string_alloc() - it is completely
equivalent to asprintf().


................
r48501 | rizzo | 2006-12-15 12:37:29 -0600 (Fri, 15 Dec 2006) | 7 lines

unbreak the output for http session.

Not long ago i replaced lseek() with fseek() but
forgot that filr FILE's you need ftell to
give you the current position.


................
r48503 | file | 2006-12-15 13:26:45 -0600 (Fri, 15 Dec 2006) | 10 lines

Merged revisions 48502 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r48502 | file | 2006-12-15 14:24:15 -0500 (Fri, 15 Dec 2006) | 2 lines

Lock network retransmission queue in all places that it is used.

........

................
r48505 | file | 2006-12-15 13:40:29 -0600 (Fri, 15 Dec 2006) | 10 lines

Merged revisions 48504 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r48504 | file | 2006-12-15 14:38:51 -0500 (Fri, 15 Dec 2006) | 2 lines

Hold call structure lock in places where a qualify or peer action can destroy it.

........

................
r48507 | file | 2006-12-15 13:57:04 -0600 (Fri, 15 Dec 2006) | 10 lines

Merged revisions 48506 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r48506 | file | 2006-12-15 14:55:28 -0500 (Fri, 15 Dec 2006) | 2 lines

Turn payload_lock into bridge_lock and make it encompass all RTP structure contents that may relate to bridge information, including who we are bridged to.

........

................
r48508 | rizzo | 2006-12-15 16:00:48 -0600 (Fri, 15 Dec 2006) | 3 lines

remove a duplicate include


................
r48509 | rizzo | 2006-12-15 16:08:46 -0600 (Fri, 15 Dec 2006) | 19 lines

move the dynamic string support in a better place i.e. string.h

While doing this, add a bit of documentation, and slightly
extend the functionality as follows:
 + a max_len of -1 means that we take whatever the current size
   is, and never try to extend the buffer;
 + add support for alloca()-ted dynamic strings, which is very
   useful for all cases where we do an ast_build_string() now.

Next step is to simplify the interface by using shorter names
(e.g. ast_str as a prefix) and removing the _thread variant
of the functions by saving the threadstorage reference into
the struct ast_str. This can be done by overloading the
'type' field.

Finally, I will do my best to remove the convoluted interface
that results from trying to support platforms without va_copy().


................
r48510 | rizzo | 2006-12-15 17:10:42 -0600 (Fri, 15 Dec 2006) | 10 lines

simplify the ast_dynamic_str_*.... routines by
renaming them to ast_str ... and putting the
struct ast_threadstorage pointer into the struct ast_str.

This makes the code a lot more readable.

At this point we can use these routines also to
replace ast_build_string().


................
r48512 | rizzo | 2006-12-15 20:42:53 -0600 (Fri, 15 Dec 2006) | 3 lines

prevent a compiler warning


................
r48514 | kpfleming | 2006-12-15 22:25:46 -0600 (Fri, 15 Dec 2006) | 10 lines

Merged revisions 48513 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r48513 | kpfleming | 2006-12-15 22:25:09 -0600 (Fri, 15 Dec 2006) | 2 lines

instead of initializing the curl library every time the CURL() function is invoked, do it only once per thread (this allows multiple calls to CURL() in the dialplan for a channel to run much more quickly, and also to re-use connections to the server) (thanks to JerJer for frequently complaining about this performance problem)

........

................
r48515 | rizzo | 2006-12-16 03:33:31 -0600 (Sat, 16 Dec 2006) | 5 lines

replace ast_build_string() with ast_str_*() functions.
This makes the code easier to follow and saves some
copies to intermediate buffers.


................
r48516 | rizzo | 2006-12-16 03:46:20 -0600 (Sat, 16 Dec 2006) | 3 lines

convert ast_build_str to ast_str_*


................
r48517 | rizzo | 2006-12-16 03:56:31 -0600 (Sat, 16 Dec 2006) | 3 lines

another conversion from ast_build_str to ast_str


................
r48520 | rizzo | 2006-12-16 05:23:07 -0600 (Sat, 16 Dec 2006) | 3 lines

forgot this part...


................
r48522 | kpfleming | 2006-12-16 14:19:19 -0600 (Sat, 16 Dec 2006) | 10 lines

Merged revisions 48521 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r48521 | kpfleming | 2006-12-16 14:12:41 -0600 (Sat, 16 Dec 2006) | 2 lines

since we really, really have to have autoconfig.h included before all other headers (especially system headers), the Makefile will now force it to happen (this will fix build problems with files like ast_expr2f.c, where we can't control the inclusion order in the file itself)

........

................
r48526 | kpfleming | 2006-12-16 15:24:08 -0600 (Sat, 16 Dec 2006) | 2 lines

update to use trunk's version of the threadstorage API

................
r48527 | kpfleming | 2006-12-16 15:24:52 -0600 (Sat, 16 Dec 2006) | 10 lines

Merged revisions 48525 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r48525 | kpfleming | 2006-12-16 15:14:34 -0600 (Sat, 16 Dec 2006) | 2 lines

simplify dependency tracking system, using the compiler's built-in method for generating them, and only doing dependency tracking if developer mode is enabled via the configure script

........

................
r48529 | kpfleming | 2006-12-16 15:38:10 -0600 (Sat, 16 Dec 2006) | 10 lines

Merged revisions 48528 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r48528 | kpfleming | 2006-12-16 15:34:41 -0600 (Sat, 16 Dec 2006) | 2 lines

use m4 quoting for AC_MSG_NOTICE calls, to keep these calls from thinking they have multiple arguments

........

................
r48543 | rizzo | 2006-12-17 06:47:08 -0600 (Sun, 17 Dec 2006) | 3 lines

define a mask SIP_INSECURE sam as for other sets of flags.


................
r48549 | kpfleming | 2006-12-17 12:33:53 -0600 (Sun, 17 Dec 2006) | 10 lines

Merged revisions 48548 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r48548 | kpfleming | 2006-12-17 12:33:24 -0600 (Sun, 17 Dec 2006) | 2 lines

need an additional argument here to make the downloads actually occur

........

................
r48550 | rizzo | 2006-12-17 16:47:30 -0600 (Sun, 17 Dec 2006) | 5 lines

replace ast_build_string() with ast_str_*();

simplify __queues_show()


................
r48551 | rizzo | 2006-12-17 16:57:46 -0600 (Sun, 17 Dec 2006) | 11 lines

replace ast_build_string() with ast_str_*().

Unless i am very mistaken, function_realtime_read() was
broken in that it would always return an empty string
(because ast_build_string() advanced the pointer to the
end of the string, and there was no reference to the
initial value.

This commit should fix this problem.


................
r48553 | rizzo | 2006-12-18 05:28:37 -0600 (Mon, 18 Dec 2006) | 13 lines

Replace ast_build_string with ast_str_*().

On passing remove presumably duplicate code to generate
the message for the manager_hooks:

in the previous version, the message was almost the same as the one sent
to regular sessions, with the exception of the empty line at the end, and
a few (presumably unintentional) differences e.g.  timestamps,
debugging, and lowercase headers for "event" and "privilege".

now we reuse the same message as before.


................
r48555 | kpfleming | 2006-12-18 05:59:48 -0600 (Mon, 18 Dec 2006) | 11 lines

Merged revisions 48554 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r48554 | kpfleming | 2006-12-18 05:59:24 -0600 (Mon, 18 Dec 2006) | 3 lines

remove some now-unnecessary explicit includes of autoconfig.h
clean up per-file dependencies during 'make clean'

........

................
r48558 | rizzo | 2006-12-18 09:36:31 -0600 (Mon, 18 Dec 2006) | 5 lines

debugging shows that we always need more than 128 bytes
for the verbose and logging messages so start with a
larger buffer from the beginning.


................
r48559 | rizzo | 2006-12-18 09:38:50 -0600 (Mon, 18 Dec 2006) | 5 lines

convert the final clients of ast_build_string to use ast_str_*()

Now the only module left using it is chan_sip.c


................
r48560 | rizzo | 2006-12-18 10:24:44 -0600 (Mon, 18 Dec 2006) | 11 lines

apply the proposed fix for bug 8602
http://bugs.digium.com/view.php?id=8602
(i am not sure if there is still missing cast in
front of the alloca() call - being a macro this is
probably triggered only when actually used).

Add function ast_str_reset() to reinitialize the
string to an empty string instead of playing with
the internal fields.


................
r48562 | qwell | 2006-12-18 10:56:44 -0600 (Mon, 18 Dec 2006) | 9 lines

Blocked revisions 48561 via svnmerge

........
r48561 | qwell | 2006-12-18 10:55:46 -0600 (Mon, 18 Dec 2006) | 2 lines

ctrl-w != w  (nano search)

........

................
r48563 | qwell | 2006-12-18 10:57:24 -0600 (Mon, 18 Dec 2006) | 2 lines

ctrl-w != w  (nano search)  (surprisingly, the fix was ever so slightly different in 1.4)

................
r48565 | file | 2006-12-18 11:18:18 -0600 (Mon, 18 Dec 2006) | 10 lines

Merged revisions 48564 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r48564 | file | 2006-12-18 12:15:49 -0500 (Mon, 18 Dec 2006) | 2 lines

Put thread into proper list if we abort handling due to an error, and also hold the lock while putting it back into the proper idle list so we don't prematurely get a signal. (issue #8604 reported by arkadia)

........

................
r48567 | file | 2006-12-18 11:30:53 -0600 (Mon, 18 Dec 2006) | 2 lines

Clean up find_idle_thread function and use atomic operations for dynamic thread count.

................
r48568 | rizzo | 2006-12-18 11:44:18 -0600 (Mon, 18 Dec 2006) | 9 lines

unbreak the macro used for incrementing the frame counters.

I don't know when the bug was introduced, but with the typical usage

	c->fin = FRAMECOUNT_INC(c->fin)

the frame counters stay to 0.


................
r48572 | file | 2006-12-18 21:47:44 -0600 (Mon, 18 Dec 2006) | 10 lines

Merged revisions 48571 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r48571 | file | 2006-12-18 22:46:12 -0500 (Mon, 18 Dec 2006) | 2 lines

Use env -i to start a fresh environment when going to build menuselect. This is more portable then using unset. (issue #8543 reported by jtodd)

........

................
r48573 | rizzo | 2006-12-19 03:15:23 -0600 (Tue, 19 Dec 2006) | 3 lines

move a large block related to privacy handling to a separate function.


................
r48574 | rizzo | 2006-12-19 03:33:57 -0600 (Tue, 19 Dec 2006) | 7 lines

stop what i think is a memory leak in case Dial fails to
connect to a channel.

Before committing to 1.4 i would like some other people to
review and test this fix - thanks.


................
r48575 | rizzo | 2006-12-19 03:58:40 -0600 (Tue, 19 Dec 2006) | 3 lines

introduce a temporary variable for tmp->chan to shorten expressions.


................
r48578 | kpfleming | 2006-12-19 08:57:45 -0600 (Tue, 19 Dec 2006) | 10 lines

Merged revisions 48577 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r48577 | kpfleming | 2006-12-19 08:57:09 -0600 (Tue, 19 Dec 2006) | 2 lines

use the proper variable type for these unixODBC API calls, eliminating warnings on 64-bit platforms that use the 'new' 64-bit types for ODBC API calls

........

................
r48580 | rizzo | 2006-12-19 10:35:49 -0600 (Tue, 19 Dec 2006) | 3 lines

remove now useless extern declarations.


................
r48581 | rizzo | 2006-12-19 10:36:45 -0600 (Tue, 19 Dec 2006) | 3 lines

better name for struct dial_localuser.


................
r48587 | kpfleming | 2006-12-19 15:28:43 -0600 (Tue, 19 Dec 2006) | 10 lines

Merged revisions 48586 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r48586 | kpfleming | 2006-12-19 15:28:04 -0600 (Tue, 19 Dec 2006) | 2 lines

suppress compiler warnings in this module until it can be improved

........

................
r48588 | rizzo | 2006-12-19 15:29:55 -0600 (Tue, 19 Dec 2006) | 5 lines

start documenting this code.
On passing, fix the bogus datalen on outgoing frames
just fixed in 1.4 rev.48583


................
r48589 | rizzo | 2006-12-19 15:32:31 -0600 (Tue, 19 Dec 2006) | 2 lines

block 48583

................
r48591 | file | 2006-12-19 15:59:33 -0600 (Tue, 19 Dec 2006) | 2 lines

OpenBSD does not have RLIMIT_AS or RLIMIT_VMEM so until someone finds the right rlimit to use then let's not support the -v option on OpenBSD. (issue #8543 reported by jtodd)

................
r48593 | file | 2006-12-19 16:02:27 -0600 (Tue, 19 Dec 2006) | 10 lines

Merged revisions 48592 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r48592 | file | 2006-12-19 17:00:57 -0500 (Tue, 19 Dec 2006) | 2 lines

find is not the same as bind when it comes to documentation. (issue #8626 reported by johann8384)

........

................
r48595 | file | 2006-12-19 16:55:26 -0600 (Tue, 19 Dec 2006) | 2 lines

Update res_snmp to use new API declaration of pbx_builtin_serialize_variables (issue #8627 reported by johann8384)

................
r48597 | file | 2006-12-19 17:05:57 -0600 (Tue, 19 Dec 2006) | 10 lines

Merged revisions 48596 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r48596 | file | 2006-12-19 18:04:30 -0500 (Tue, 19 Dec 2006) | 2 lines

Pass 'vms' pointer to record_and_review so it is then passed to the IMAP store file function. (issue #8614 reported by punknow)

........

................
r48598 | rizzo | 2006-12-19 17:56:08 -0600 (Tue, 19 Dec 2006) | 4 lines

formatting and code cleanup.
Still a lot of copy&pasted code here...


................
r48599 | rizzo | 2006-12-19 18:13:23 -0600 (Tue, 19 Dec 2006) | 5 lines

more formatting cleanup.
Move some code into a function sms_compose1() in preparation
for supporting protocol 2 as well.


................
r48638 | file | 2006-12-19 20:58:13 -0600 (Tue, 19 Dec 2006) | 10 lines

Merged revisions 48637 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r48637 | file | 2006-12-19 21:56:09 -0500 (Tue, 19 Dec 2006) | 2 lines

vms doesn't exist on non-IMAP storage builds.

........

................
r48639 | file | 2006-12-19 22:32:59 -0600 (Tue, 19 Dec 2006) | 2 lines

Clean up app_page

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

Removed:
    team/group/ast_storage/build_tools/mkdep
Modified:
    team/group/ast_storage/   (props changed)
    team/group/ast_storage/Makefile
    team/group/ast_storage/Makefile.moddir_rules
    team/group/ast_storage/Makefile.rules
    team/group/ast_storage/acinclude.m4
    team/group/ast_storage/agi/   (props changed)
    team/group/ast_storage/agi/Makefile
    team/group/ast_storage/apps/   (props changed)
    team/group/ast_storage/apps/app_dial.c
    team/group/ast_storage/apps/app_dumpchan.c
    team/group/ast_storage/apps/app_externalivr.c
    team/group/ast_storage/apps/app_festival.c
    team/group/ast_storage/apps/app_ices.c
    team/group/ast_storage/apps/app_meetme.c
    team/group/ast_storage/apps/app_mp3.c
    team/group/ast_storage/apps/app_nbscat.c
    team/group/ast_storage/apps/app_page.c
    team/group/ast_storage/apps/app_queue.c
    team/group/ast_storage/apps/app_sms.c
    team/group/ast_storage/apps/app_voicemail.c
    team/group/ast_storage/apps/app_zapras.c
    team/group/ast_storage/build_tools/prep_tarball
    team/group/ast_storage/cdr/   (props changed)
    team/group/ast_storage/channels/   (props changed)
    team/group/ast_storage/channels/Makefile
    team/group/ast_storage/channels/chan_features.c
    team/group/ast_storage/channels/chan_iax2.c
    team/group/ast_storage/channels/chan_sip.c
    team/group/ast_storage/channels/chan_zap.c
    team/group/ast_storage/codecs/   (props changed)
    team/group/ast_storage/codecs/codec_zap.c
    team/group/ast_storage/codecs/gsm/   (props changed)
    team/group/ast_storage/codecs/gsm/Makefile
    team/group/ast_storage/codecs/ilbc/   (props changed)
    team/group/ast_storage/codecs/ilbc/Makefile
    team/group/ast_storage/codecs/lpc10/   (props changed)
    team/group/ast_storage/codecs/lpc10/Makefile
    team/group/ast_storage/configure
    team/group/ast_storage/configure.ac
    team/group/ast_storage/doc/snmp.txt
    team/group/ast_storage/formats/   (props changed)
    team/group/ast_storage/funcs/   (props changed)
    team/group/ast_storage/funcs/func_curl.c
    team/group/ast_storage/funcs/func_odbc.c
    team/group/ast_storage/funcs/func_realtime.c
    team/group/ast_storage/funcs/func_strings.c
    team/group/ast_storage/include/asterisk.h
    team/group/ast_storage/include/asterisk/app.h
    team/group/ast_storage/include/asterisk/autoconfig.h.in
    team/group/ast_storage/include/asterisk/cdr.h
    team/group/ast_storage/include/asterisk/channel.h
    team/group/ast_storage/include/asterisk/http.h
    team/group/ast_storage/include/asterisk/lock.h
    team/group/ast_storage/include/asterisk/pbx.h
    team/group/ast_storage/include/asterisk/rtp.h
    team/group/ast_storage/include/asterisk/strings.h
    team/group/ast_storage/include/asterisk/tdd.h
    team/group/ast_storage/include/asterisk/threadstorage.h
    team/group/ast_storage/include/asterisk/utils.h
    team/group/ast_storage/main/   (props changed)
    team/group/ast_storage/main/Makefile
    team/group/ast_storage/main/app.c
    team/group/ast_storage/main/cdr.c
    team/group/ast_storage/main/channel.c
    team/group/ast_storage/main/cli.c
    team/group/ast_storage/main/db1-ast/   (props changed)
    team/group/ast_storage/main/http.c
    team/group/ast_storage/main/logger.c
    team/group/ast_storage/main/manager.c
    team/group/ast_storage/main/pbx.c
    team/group/ast_storage/main/rtp.c
    team/group/ast_storage/main/stdtime/localtime.c
    team/group/ast_storage/main/tdd.c
    team/group/ast_storage/main/translate.c
    team/group/ast_storage/main/utils.c
    team/group/ast_storage/pbx/   (props changed)
    team/group/ast_storage/res/   (props changed)
    team/group/ast_storage/res/res_agi.c
    team/group/ast_storage/res/res_config_odbc.c
    team/group/ast_storage/res/res_limit.c
    team/group/ast_storage/res/res_musiconhold.c
    team/group/ast_storage/res/res_smdi.c
    team/group/ast_storage/res/snmp/agent.c
    team/group/ast_storage/sounds/Makefile
    team/group/ast_storage/utils/   (props changed)
    team/group/ast_storage/utils/Makefile
    team/group/ast_storage/utils/ael_main.c
    team/group/ast_storage/utils/astman.c
    team/group/ast_storage/utils/smsq.c

Propchange: team/group/ast_storage/
------------------------------------------------------------------------------
Binary property 'branch-1.4-blocked' - no diff available.

Propchange: team/group/ast_storage/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Propchange: team/group/ast_storage/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Dec 20 15:03:03 2006
@@ -1,1 +1,1 @@
-/trunk:1-48353
+/trunk:1-48657

Modified: team/group/ast_storage/Makefile
URL: http://svn.digium.com/view/asterisk/team/group/ast_storage/Makefile?view=diff&rev=48658&r1=48657&r2=48658
==============================================================================
--- team/group/ast_storage/Makefile (original)
+++ team/group/ast_storage/Makefile Wed Dec 20 15:03:03 2006
@@ -181,6 +181,8 @@
 
 ASTCFLAGS+=-pipe -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG)
 
+ASTCFLAGS+=-include $(ASTTOPDIR)/include/asterisk/autoconfig.h
+
 ifeq ($(AST_DEVMODE),yes)
   ASTCFLAGS+=-Werror -Wunused
 endif
@@ -237,10 +239,6 @@
 SUBDIRS:=$(OTHER_SUBDIRS) $(MOD_SUBDIRS)
 SUBDIRS_INSTALL:=$(SUBDIRS:%=%-install)
 SUBDIRS_CLEAN:=$(SUBDIRS:%=%-clean)
-SUBDIRS_CLEAN_DEPEND:=$(SUBDIRS:%=%-clean-depend)
-MOD_SUBDIRS_DEPEND:=$(MOD_SUBDIRS:%=%-depend)
-OTHER_SUBDIRS_DEPEND:=$(OTHER_SUBDIRS:%=%-depend)
-SUBDIRS_DEPEND:=$(OTHER_SUBDIRS_DEPEND) $(MOD_SUBDIRS_DEPEND)
 SUBDIRS_UNINSTALL:=$(SUBDIRS:%=%-uninstall)
 MOD_SUBDIRS_EMBED_LDSCRIPT:=$(MOD_SUBDIRS:%=%-embed-ldscript)
 MOD_SUBDIRS_EMBED_LDFLAGS:=$(MOD_SUBDIRS:%=%-embed-ldflags)
@@ -304,7 +302,7 @@
 	@$(MAKE) --no-print-directory $(MOD_SUBDIRS_EMBED_LDFLAGS)
 	@$(MAKE) --no-print-directory $(MOD_SUBDIRS_EMBED_LIBS)
 
-$(SUBDIRS): depend makeopts.embed_rules
+$(SUBDIRS): include/asterisk/version.h include/asterisk/build.h include/asterisk/buildopts.h defaults.h makeopts.embed_rules
 
 # ensure that all module subdirectories are processed before 'main' during
 # a parallel build, since if there are modules selected to be embedded the
@@ -346,19 +344,13 @@
 	fi
 	@rm -f $@.tmp
 
-$(SUBDIRS_CLEAN_DEPEND):
-	@$(MAKE) --no-print-directory -C $(@:-clean-depend=) clean-depend
-
 $(SUBDIRS_CLEAN):
 	@$(MAKE) --no-print-directory -C $(@:-clean=) clean
 
-clean-depend: $(SUBDIRS_CLEAN_DEPEND)
-
-clean: $(SUBDIRS_CLEAN) clean-depend
+clean: $(SUBDIRS_CLEAN)
 	rm -f defaults.h
 	rm -f include/asterisk/build.h
 	rm -f include/asterisk/version.h
-	rm -f .depend
 	@$(MAKE) -C menuselect clean
 	cp -f .cleancount .lastclean
 
@@ -402,7 +394,6 @@
 			grep ^C update.out | cut -b4- ; \
 		fi ; \
 		rm -f update.out; \
-		$(MAKE) clean-depend; \
 	else \
 		echo "Not under version control";  \
 	fi
@@ -634,14 +625,6 @@
 		echo "We could not install init scripts for your operating system."; \
 	fi
 
-$(MOD_SUBDIRS_DEPEND):
-	@ASTCFLAGS="$(MOD_SUBDIR_CFLAGS) $(ASTCFLAGS)" $(MAKE) --no-print-directory -C $(@:-depend=) depend
-
-$(OTHER_SUBDIRS_DEPEND):
-	@ASTCFLAGS="$(OTHER_SUBDIR_CFLAGS) $(ASTCFLAGS)" $(MAKE) --no-print-directory -C $(@:-depend=) depend
-
-depend: include/asterisk/version.h include/asterisk/buildopts.h include/asterisk/build.h defaults.h $(SUBDIRS_DEPEND)
-
 sounds:
 	$(MAKE) -C sounds all
 
@@ -695,10 +678,10 @@
 	- at menuselect/menuselect $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS) menuselect.makeopts && (echo "menuselect changes saved!"; rm -f channels/h323/Makefile.ast main/asterisk) || echo "menuselect changes NOT saved!"
 
 menuselect/menuselect: makeopts menuselect/menuselect.c menuselect/menuselect_curses.c menuselect/menuselect_stub.c menuselect/menuselect.h menuselect/linkedlists.h makeopts
-	@unset CC LD AR RANLIB && $(MAKE) -C menuselect CONFIGURE_SILENT="--silent"
+	@env -i && $(MAKE) -C menuselect CONFIGURE_SILENT="--silent"
 
 menuselect-tree: $(foreach dir,$(filter-out main,$(MOD_SUBDIRS)),$(wildcard $(dir)/*.c) $(wildcard $(dir)/*.cc)) build_tools/cflags.xml sounds/sounds.xml build_tools/embed_modules.xml
 	@echo "Generating input for menuselect ..."
 	@build_tools/prep_moduledeps > $@
 
-.PHONY: menuselect main sounds clean clean-depend dist-clean distclean all prereqs depend cleantest uninstall _uninstall uninstall-all dont-optimize $(SUBDIRS_INSTALL) $(SUBDIRS_CLEAN) $(SUBDIRS_CLEAN_DEPEND) $(SUBDIRS_DEPEND) $(SUBDIRS_UNINSTALL) $(SUBDIRS) $(MOD_SUBDIRS_EMBED_LDSCRIPT) $(MOD_SUBDIRS_EMBED_LDFLAGS) $(MOD_SUBDIRS_EMBED_LIBS)
+.PHONY: menuselect main sounds clean dist-clean distclean all prereqs cleantest uninstall _uninstall uninstall-all dont-optimize $(SUBDIRS_INSTALL) $(SUBDIRS_CLEAN) $(SUBDIRS_UNINSTALL) $(SUBDIRS) $(MOD_SUBDIRS_EMBED_LDSCRIPT) $(MOD_SUBDIRS_EMBED_LDFLAGS) $(MOD_SUBDIRS_EMBED_LIBS)

Modified: team/group/ast_storage/Makefile.moddir_rules
URL: http://svn.digium.com/view/asterisk/team/group/ast_storage/Makefile.moddir_rules?view=diff&rev=48658&r1=48657&r2=48658
==============================================================================
--- team/group/ast_storage/Makefile.moddir_rules (original)
+++ team/group/ast_storage/Makefile.moddir_rules Wed Dec 20 15:03:03 2006
@@ -40,7 +40,7 @@
 modules.link: $(addsuffix .o,$(filter $(EMBEDDED_MODS),$(C_MODS)))
 modules.link: $(addsuffix .oo,$(filter $(EMBEDDED_MODS),$(CC_MODS)))
 
-.PHONY: clean clean-depend depend uninstall _all
+.PHONY: clean uninstall _all
 
 ifneq ($(LOADABLE_MODS),)
 _all: $(LOADABLE_MODS:%=%.so)
@@ -67,11 +67,9 @@
 	@for file in $(patsubst %,$(SUBDIR)/%,$(filter %.o,$^)); do echo "INPUT (../$${file})" >> $@; done
 	@for file in $(patsubst %,$(SUBDIR)/%,$(filter-out %.o,$^)); do echo "INPUT (../$${file})" >> $@; done
 
-clean-depend::
-	rm -f .depend
-
-clean:: clean-depend
+clean::
 	rm -f *.so *.o *.oo
+	rm -f .*.o.d .*.oo.d
 	rm -f modules.link
 
 install:: all
@@ -79,11 +77,6 @@
 
 uninstall::
 
-ifneq ($(wildcard .depend),)
-  include .depend
+ifneq ($(wildcard .*.d),)
+   include .*.d
 endif
-
-depend: .depend
-
-.depend:
-	../build_tools/mkdep $(ASTCFLAGS) `ls *.c *.cc 2> /dev/null`

Modified: team/group/ast_storage/Makefile.rules
URL: http://svn.digium.com/view/asterisk/team/group/ast_storage/Makefile.rules?view=diff&rev=48658&r1=48657&r2=48658
==============================================================================
--- team/group/ast_storage/Makefile.rules (original)
+++ team/group/ast_storage/Makefile.rules Wed Dec 20 15:03:03 2006
@@ -38,11 +38,19 @@
 
 %.o: %.c
 	$(ECHO_PREFIX) echo "   [CC] $< -> $@"
+ifeq ($(AST_DEVMODE),yes)
+	$(CMD_PREFIX) $(CC) -o $@ -c $< $(ASTCFLAGS) -MMD -MT $@ -MF .$(subst /,_,$@).d -MP
+else

[... 17668 lines stripped ...]


More information about the svn-commits mailing list