Commit Graph

10497 Commits

Author SHA1 Message Date
Luigi Rizzo
52148c96f5 merge from astobj2-r47450: use UNLINK to remove a packet from its queue,
and related code rearrangement.

Approved by: oej

This could be made better if we declared

	struct sip_pvt *dialpg = pkt->owner;

at the beginning of the function, and use it throughout the function.
I'll let the boss decide :)



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47539 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-13 14:29:31 +00:00
Luigi Rizzo
c26ccb97b9 merge from codename-pineapple and astobj2 47499:
simplify __sip_ack() removing a strcmp for looking up packets.

no functional change, only performance, so don't need to merging
to earlier branches now.

Approved By: oej



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47538 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-13 14:14:54 +00:00
Luigi Rizzo
06c9ef6411 stop looking for new entries when we know we are done.
there is no functional change, so it is not necessary to
bother merging this to 1.4 now.



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47537 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-13 12:04:05 +00:00
Luigi Rizzo
b2e2f3f957 free memory when unregistering an entry.
needs to be merged to 1.4



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47536 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-13 12:01:25 +00:00
Tilghman Lesher
f2bc05d1d4 Feature: allow the sanity SQL to be customized per connection class (Issue 6453)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47530 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-13 05:58:14 +00:00
Russell Bryant
6fb342ecfe Merged revisions 47527 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r47527 | russell | 2006-11-13 00:48:18 -0500 (Mon, 13 Nov 2006) | 5 lines

AC_PROG_SED is included in autoconf 2.60, but apparently it is not included
in 2.59.  So, to maintain compatability with 2.59 since it is a small change,
copy this macro into acinclude.m4 and rename it to AST_PROG_SED.
(issue #8345)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47529 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-13 05:51:30 +00:00
Tilghman Lesher
70f6330157 Merged revisions 47526 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r47526 | tilghman | 2006-11-12 23:46:18 -0600 (Sun, 12 Nov 2006) | 10 lines

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

........
r47525 | tilghman | 2006-11-12 23:45:11 -0600 (Sun, 12 Nov 2006) | 2 lines

If the execute fails a second time, make sure that we don't pass back a stale handle

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47528 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-13 05:48:27 +00:00
Tilghman Lesher
8dbe2063ed Merged revisions 47523 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r47523 | tilghman | 2006-11-12 19:12:01 -0600 (Sun, 12 Nov 2006) | 10 lines

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

........
r47522 | tilghman | 2006-11-12 18:34:44 -0600 (Sun, 12 Nov 2006) | 2 lines

Don't play dialtone if the seizing the channel fails (Bug 7754)

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47524 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-13 01:16:30 +00:00
Olle Johansson
139bf2b626 Part of patch in #7403 to improve tag checking in pedantic mode (stephen_dredge)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47521 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-12 20:47:25 +00:00
Russell Bryant
462407a3a6 The use of an ifdef to check for FreeBSD is useless here because the two
versions of the format string are identical.  Also, since each format is only
used once, get rid of the use of defines all together.  (issue #8344, julieng)

In passing, also clean up the formatting a but to get rid of the nesting
without the use of braces, as defined in the coding guidelines.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47520 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-12 19:22:19 +00:00
Olle Johansson
2286ff9659 Restore auto-framing (DEA). Imported from 1.4
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47514 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-12 16:15:49 +00:00
Olle Johansson
aa275d4970 - Support UDPTL as well as udptl in T38 sdp.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47512 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-12 15:40:03 +00:00
Olle Johansson
b744a76565 - Don't hangup because of failed re-invite. Go back to previous state.
- Keep RTP running during T.38 session
  We might improve the code to issue ast_rtp_stop if T.38 re-invite not fails
  later on in the code, but I don't see many reasons to.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47510 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-12 15:30:48 +00:00
Olle Johansson
1f9dcf758c - Add some comments to t.38 code
- Remove improper blocking of ptime: in SDP


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47508 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-12 15:14:35 +00:00
Russell Bryant
e19fc06e2c Merged revisions 47497 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r47497 | russell | 2006-11-12 01:23:23 -0500 (Sun, 12 Nov 2006) | 12 lines

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

........
r47496 | russell | 2006-11-12 01:09:03 -0500 (Sun, 12 Nov 2006) | 4 lines

Only do the check to determine whether the channel calling this function is an
IAX2 channel when getting the IP address using the special argument, 
CURRENTCHANNEL.  (issue #8341, jcovert)

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47498 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-12 06:31:39 +00:00
Russell Bryant
f5176bcebb Merged revisions 47494 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r47494 | russell | 2006-11-11 10:31:08 -0500 (Sat, 11 Nov 2006) | 6 lines

Add the target "menuconfig" as an alias for the "menuselect" target.  This is
just a favor to users so that if you accidentally type "make menuconfig"
instead of "make menuselect", it still works.
(inspired by a comment on IRC from wangster calling me an "especially devious
asterisk developer" for having it be menuselect instead of menuconfig. :) )

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47495 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-11 15:33:06 +00:00
Russell Bryant
f575b7e25d Merged revisions 47492 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r47492 | russell | 2006-11-11 10:18:02 -0500 (Sat, 11 Nov 2006) | 2 lines

Tweak the formatting of this new function to better conform to coding guidelines.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47493 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-11 15:22:08 +00:00
Matt O'Gorman
b025702287 safe terminal output is sweet.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47491 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-11 02:12:27 +00:00
Matthew Fredrickson
69d3416c12 Make sure we don't use 32bits for a value that only requires 1 bit. Also, fix a compiler warning for one of the SS7 functions.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47478 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-10 22:06:11 +00:00
Olle Johansson
0c18d91817 Add some history and fix some debug output for autodestruct.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47477 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-10 21:55:31 +00:00
Olle Johansson
2b6d3952e1 Proper fix for adding debug...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47475 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-10 21:39:58 +00:00
Olle Johansson
d5243cc7aa Make sure we destroy dialog in case of loop
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47468 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-10 20:31:57 +00:00
Olle Johansson
d69eb90f82 Cleanup imported from 1.4
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47467 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-10 20:25:32 +00:00
Joshua Colp
eceb5c60d7 Fine, take this.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47465 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-10 20:05:31 +00:00
Joshua Colp
0282cc1a4d A trunk that builds is a productive trunk.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47464 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-10 19:51:15 +00:00
Joshua Colp
3521586712 Hello compiler working, goodbye compiler warning. (fix compiler warning introduced from pbx_dundi optimizations)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47461 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-10 19:42:15 +00:00
Joshua Colp
c6e8dbf189 Merged revisions 47457 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r47457 | file | 2006-11-10 14:36:25 -0500 (Fri, 10 Nov 2006) | 2 lines

Let's give this a go...

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47459 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-10 19:40:01 +00:00
Matthew Fredrickson
554902f070 Add fix for 7321. Ability to hide calleridname from zapata.conf
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47456 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-10 19:35:41 +00:00
Olle Johansson
d53979523c Issue 8336- fix support for multipart SDP (imported from 1.2/1.4). (Alphaque)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47455 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-10 19:01:12 +00:00
Russell Bryant
8b1de34c45 Blocked revisions 47444 via svnmerge
........
r47444 | rizzo | 2006-11-10 12:13:34 -0500 (Fri, 10 Nov 2006) | 3 lines

grep -m is not available on BSD, so use head -1 instead


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47446 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-10 17:53:46 +00:00
Luigi Rizzo
47a95b3f38 manual merge from 1.4:
grep -m not available on bsd, use head -1 which works for all



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47445 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-10 17:22:51 +00:00
Tilghman Lesher
691363656f Merged revisions 47436 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r47436 | tilghman | 2006-11-10 10:51:55 -0600 (Fri, 10 Nov 2006) | 2 lines

Discussion of these CLI changes resulted in more consistency (Bug 8236)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47439 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-10 17:01:06 +00:00
Joshua Colp
0d367b09a5 Merged revisions 47437 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r47437 | file | 2006-11-10 11:53:16 -0500 (Fri, 10 Nov 2006) | 2 lines

Only split up extension and context if a value exists. (issue #8332 reported by loloski)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47438 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-10 16:55:13 +00:00
Kevin P. Fleming
9398ac87a2 Merged revisions 47433 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r47433 | kpfleming | 2006-11-10 10:36:49 -0600 (Fri, 10 Nov 2006) | 2 lines

if adding a queue member is LOG_NOTICE, then removing them should be LOG_NOTICE, not LOG_DEBUG

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47435 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-10 16:38:33 +00:00
Kevin P. Fleming
fed9126600 Merged revisions 47432 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r47432 | kpfleming | 2006-11-10 10:34:04 -0600 (Fri, 10 Nov 2006) | 2 lines

reflect addition/removal of dynamic queue members in queue_log, so that people using dialplan replacement for AgentCallbackLogin can still track login/logout (issue #7736, reported/patched by whoiswes but this commit was written by me and covers all three paths for AQM/RQM)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47434 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-10 16:37:42 +00:00
Olle Johansson
2c5bbdc938 Ripping out bad support for 491 replies to INVITE's. Let's try again properly later.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47419 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-10 13:14:44 +00:00
Olle Johansson
088d1f0def Fix badly defined flag. Thanks fenlander!
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47416 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-10 12:22:44 +00:00
Olle Johansson
7a3528c4a9 Small simplification and documentation correction.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47415 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-10 12:11:06 +00:00
Russell Bryant
74b6314d50 Various little bits of code cleanup to reduce nesting, remove useless casts,
and to remove a duplicated error message after a memory allocation error


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47410 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-10 04:30:23 +00:00
Russell Bryant
2b2693499d Add the ability to specify multiple prompts to the Read() dialplan application,
similar to Background() and Playback().
(issue #7897, jsmith, with some modifications)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47408 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-10 03:59:48 +00:00
Joshua Colp
7142180792 Merged revisions 47405 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r47405 | file | 2006-11-09 22:44:36 -0500 (Thu, 09 Nov 2006) | 2 lines

Fix building of chan_h323 by completeing some structure definitions. (issue #8327 reported by Mithraen)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47406 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-10 03:45:59 +00:00
Joshua Colp
0efd51e1d2 This should already be called while locked.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47404 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-10 03:34:13 +00:00
Joshua Colp
1991814a38 Merged revisions 47398 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r47398 | file | 2006-11-09 17:32:30 -0500 (Thu, 09 Nov 2006) | 2 lines

Do conversion in a more easier to read and working way for \r, \n, and \t. (issue #8324 reported by johnlange)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47399 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-09 22:34:00 +00:00
Russell Bryant
36793b730c Merged revisions 47391 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r47391 | russell | 2006-11-09 16:26:27 -0500 (Thu, 09 Nov 2006) | 7 lines

Work around an issue that caused menuselect to display a bogus description for
app_voicemail and chan_zap.  These modules use some preprocessor directives to
determine what it will report to Asterisk as its description.  However, the way
we extract this information from the source files for menuselect is not smart
enough to figure this out.
(issue #8326, #8328)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47392 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-09 21:32:27 +00:00
Joshua Colp
ead6c4655e Merged revisions 47380 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r47380 | file | 2006-11-09 11:53:25 -0500 (Thu, 09 Nov 2006) | 10 lines

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

........
r47379 | file | 2006-11-09 11:48:05 -0500 (Thu, 09 Nov 2006) | 2 lines

Don't include compiler.h on kernels 2.6.18 and higher as, well, it's apparently going to be removed. This should make all you FC6 fans happy as your Asterisk will now build without any mods.

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47382 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-09 17:08:29 +00:00
Russell Bryant
7209032ffe Merged revisions 47377 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r47377 | russell | 2006-11-09 11:28:15 -0500 (Thu, 09 Nov 2006) | 2 lines

fix tab completion for "core debug channel" and "core no debug channel"

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47378 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-09 16:30:06 +00:00
Russell Bryant
adf6bb1d9a Merged revisions 47375 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r47375 | russell | 2006-11-09 11:24:02 -0500 (Thu, 09 Nov 2006) | 3 lines

Fix "core show channel".  Also, fix tab completion for both "core show channel"
and "core show channels".

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47376 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-09 16:26:47 +00:00
Russell Bryant
2ea9bb223f Merged revisions 47372 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r47372 | russell | 2006-11-09 11:18:33 -0500 (Thu, 09 Nov 2006) | 3 lines

Fix "core debug channel <whatever>".  I guess someone needs to go through and
audit every CLI command that changed number of arguments ...

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47374 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-09 16:20:43 +00:00
Russell Bryant
031dc7b566 Blocked revisions 47369 via svnmerge
........
r47369 | russell | 2006-11-09 11:04:38 -0500 (Thu, 09 Nov 2006) | 3 lines

Fix argument parsing for the "core show profile" CLI command
(fixed by rizzo in his branch, team/rizzo/astobj2)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47371 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-09 16:15:49 +00:00
Russell Bryant
f3c0a35b6e Merged revisions 47366 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r47366 | russell | 2006-11-09 10:49:39 -0500 (Thu, 09 Nov 2006) | 3 lines

Fix another CLI command, "core show uptime" ...
(issue #8323, reported by johnlange, fixed by myself)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47367 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-09 15:51:15 +00:00