Commit Graph

4039 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
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
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
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
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
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
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
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
Steve Murphy
2907433599 committed in behalf of bug 8190
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47343 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-08 22:52:01 +00:00
Olle Johansson
bbcd0d0450 - Add Max-Forwards higher in the packet, following recommendations
- Fix documentation for sip_pvt_lock/unlock - doxygen does not inherit like zapata.conf !!!
- Change doc for a sip_pvt setting


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47341 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-08 22:35:22 +00:00
Kevin P. Fleming
02c6f507bb Merged revisions 47333 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r47333 | kpfleming | 2006-11-08 12:07:16 -0600 (Wed, 08 Nov 2006) | 2 lines

add simple fix for SDP to report proper sample rate for G.722 media sessions

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47337 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-08 18:28:53 +00:00
Kevin P. Fleming
e108453e02 coding guidelines, coding guidelines, coding guidelines
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47321 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-08 15:28:39 +00:00
Luigi Rizzo
5e61077632 merge from team/rizzo/astobj2 rev.47271
avoid doing p > 0 when p is a pointer;
move a lock closer to the place where it is needed

Approved By: oej



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47318 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-08 13:59:32 +00:00
Luigi Rizzo
d5b101e974 merge from team/rizzo/astobj2 rev.47246
Same as for peers and users, replace ASTOBJ_UNREF(r, sip_registry_destroy)
with unref_registry(r);

Approved By: oej



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47317 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-08 13:53:01 +00:00
Luigi Rizzo
09012d5f20 merge from team/rizzo/astobj2, rev 47243, 47244, 47245:
Replace ASTOBJ_UNREF(peer, sip_destroy_peer) with unref_peer(peer);

This places the name of the destructor in one place only (where it
should be), eliminates the chance of errors in case you specify the wrong
destructor, and also lets the compiler do type checking on the argument,
again helping with keeping the code clean.

Same for users.
remove two duplicate definitions.

Approved By: oej



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47316 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-08 13:49:25 +00:00
Luigi Rizzo
24dfbe955e merge rev.47224 from team/rizzo/astobj2:
hide dialoglist lock/unlocking in wrapper functions.

Approved By: oej



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47315 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-08 13:44:27 +00:00
Luigi Rizzo
f58302fc9c silence compiler about uninitialized variables.
The compiler is wrong, but it has the last word.



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47314 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-08 13:43:06 +00:00
Olle Johansson
e644ba34c5 Destroy dialog properly at unload (rizzo)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47313 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-08 08:01:44 +00:00
Luigi Rizzo
c8597704ce fix compilation.
Overall i think the previous change to ast_channel_alloc()
to close bug 7506 should have been done by defining
an ast_set_callerid_noevent() function that does the
setting without generating the event.
Lot less code duplication, and easier to handle.



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47306 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-08 07:21:45 +00:00
Steve Murphy
908f176cf3 A fair number of changes for the sake of bug 7506
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47290 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-07 21:47:49 +00:00
Joshua Colp
7659f6d524 Merged revisions 47287 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r47287 | file | 2006-11-07 15:14:58 -0500 (Tue, 07 Nov 2006) | 2 lines

This is not the commit you are looking for...

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47288 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-07 20:16:02 +00:00
Joshua Colp
66d3792f11 Merged revisions 47284 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r47284 | file | 2006-11-07 15:08:52 -0500 (Tue, 07 Nov 2006) | 2 lines

Make MOH work as it did before in chan_local, without this then it can go funky when transfers and MOH are involved. (issue #7671 reported by jmls)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47285 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-07 20:12:30 +00:00
Olle Johansson
b557aeda38 Break -> continue to make stuff work... Thanks, Luigi!
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47269 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-07 17:33:24 +00:00
Olle Johansson
20af2870d9 issue #8265 - don't reply to ACK. Imported from 1.2, 1.4
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47252 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-07 13:26:31 +00:00
Olle Johansson
7d368caa98 Don't lock dialoglist if monitor runs __sip_destroy.
Hmmm. I did not change pbx_dundi and yet it doesn't compile ;-)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47209 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-04 22:16:57 +00:00
Olle Johansson
80293c2ed8 Move IP address selection for media out of add_sdp
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47205 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-04 21:48:02 +00:00
Olle Johansson
18b694d318 Make srvlookup global_srvlookup to follow the rest of the code
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47203 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-04 21:17:40 +00:00
Olle Johansson
fe5440b7c8 Simplify previous patch
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47202 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-04 19:20:30 +00:00
Olle Johansson
d900b47ccf Adding new config option "limitpeersonly" to only apply call limits
to the peer side of a type=friend. 

This is for trying to support BJ in his quest to solve some issues
with the queue system and type=friend objects.

BJ: Please test!


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47201 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-04 19:13:30 +00:00
Olle Johansson
338c18486c Importing patch for Invite/replaces from 1.4
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47200 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-04 18:40:51 +00:00
Olle Johansson
37e39111c5 Reverting rev 47093 until we have an agreement on how to
implement this, if at all.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47194 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-04 17:45:47 +00:00
Steve Murphy
65beb9dc10 This fix introduced via bug 8233
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47178 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-03 23:27:58 +00:00
Luigi Rizzo
4a545a7662 remove old/useless usecnt stuff
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47131 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-03 18:17:08 +00:00