Commit Graph

4039 Commits

Author SHA1 Message Date
Russell Bryant
777d03bd17 Merge fix to not leak the stringfields of a thread speicif sip_pvt. This also
includes the fix not to leak the actual sip_pvt.


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

........
r45622 | russell | 2006-10-18 20:59:51 -0400 (Wed, 18 Oct 2006) | 2 lines

Don't leak the actual thread-specific sip_pvt struct

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@45624 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-19 01:04:18 +00:00
Russell Bryant
bd53e7ee4c Extend the thread storage API such that a custom initialization function can
be called for each thread specific object after they are allocated.  Note that
there was already the ability to define a custom cleanup function.  Also, if
the custom cleanup function is used, it *MUST* call free on the thread
specific object at the end.  There is no way to have this magically done that
I can think of because the cleanup function registered with the pthread
implementation will only call the function back with a pointer to the
thread specific object, not the parent ast_threadstorage object.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@45623 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-19 01:00:57 +00:00
Olle Johansson
7db2dfaf4e Remove duplicate declarations...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@45528 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-18 12:15:23 +00:00
Kevin P. Fleming
696f9ed677 Merged revisions 45408 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r45408 | kpfleming | 2006-10-17 17:24:10 -0500 (Tue, 17 Oct 2006) | 3 lines

optimize the 'quick response' code a bit more... no more malloc() or memset() for each response
expand stringfields API a bit to allow reusing the stringfield pool on a structure when needed, and remove some unnecessary code when the structure was being freed

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@45409 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-17 22:24:45 +00:00
Joshua Colp
15c473908b Merged revisions 45378 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r45378 | file | 2006-10-17 16:30:34 -0400 (Tue, 17 Oct 2006) | 2 lines

Don't create a "real" pvt structure for requests that shouldn't be able to create one. Instead use a temporary pvt and fill it with enough information so we can send a reply.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@45379 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-17 20:34:22 +00:00
Olle Johansson
0b0d72579e Issue #5484 (branch sipdiversion) - Support for Diversion header in redirects of calls
with 302 redirection. (tinning)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@45365 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-17 19:57:35 +00:00
Olle Johansson
3376c8e976 Issue #7254 - Add support of "423 Interval too brief" to outbound SIP registrations.
Thanks, tardieu!


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@45335 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-17 17:54:59 +00:00
Olle Johansson
748de51a84 - Remove unneeded code that won't be reached now that we kill responses
to unkonwn dialogs earlier in the process. 
- move debug message.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@45331 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-17 17:47:09 +00:00
Olle Johansson
9f837a0baa Get rid of the ignore variable that was only partially replaced
by the flag.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@45295 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-17 06:47:02 +00:00
Joshua Colp
c62784c10d In the course of a data this has been turned into an option to ignore replies, then ignore responses and finally I'm just getting rid of the option altogether and making it the default no matter what. C'est la vie!
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@45286 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-16 20:26:56 +00:00
Joshua Colp
da330feb60 Merged revisions 45280 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r45280 | file | 2006-10-16 16:06:18 -0400 (Mon, 16 Oct 2006) | 10 lines

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

........
r45265 | file | 2006-10-16 15:59:54 -0400 (Mon, 16 Oct 2006) | 2 lines

Use responses rather then replies even though they mean the same thing.

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@45281 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-16 20:08:23 +00:00
Joshua Colp
b58cc9e1bd Merged revisions 45262 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r45262 | file | 2006-10-16 15:37:34 -0400 (Mon, 16 Oct 2006) | 10 lines

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

........
r45260 | file | 2006-10-16 15:28:18 -0400 (Mon, 16 Oct 2006) | 2 lines

Add 'ignoreoodreplies' option which will not create a pvt structure on a SIP response but instead basically drop it.

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@45263 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-16 19:43:33 +00:00
Olle Johansson
5b52f69201 When adding new functions, please add a forward declaration.
I *know* it is not required, but it makes navigation easier and will help
when splitting up this large source code file. 

Thank you!


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@45209 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-16 13:20:21 +00:00
Olle Johansson
43505df9f4 Importing rev 45196 from 1.4 - don't kill dialog for a bad response
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@45204 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-16 13:03:02 +00:00
Olle Johansson
09b8583937 A B2BUA should *not* issue proxy auth.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@45194 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-16 12:28:18 +00:00
Christian Richter
edc6c54145 Merged revisions 45088 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r45088 | crichter | 2006-10-13 21:19:46 +0200 (Fr, 13 Okt 2006) | 1 line

avoiding warning, fixing potential bug
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@45089 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-13 19:24:02 +00:00
Kevin P. Fleming
2194e57499 Merged revisions 45049 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r45049 | kpfleming | 2006-10-13 11:19:35 -0500 (Fri, 13 Oct 2006) | 10 lines

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

........
r45048 | kpfleming | 2006-10-13 11:18:08 -0500 (Fri, 13 Oct 2006) | 2 lines

when sending a call to a peer, use the proper socket if we have multiple bindings (reported on asterisk-dev)

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@45050 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-13 16:20:26 +00:00
Joshua Colp
e1bb0dab37 Merged revisions 45040 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r45040 | file | 2006-10-13 12:01:17 -0400 (Fri, 13 Oct 2006) | 2 lines

Complete merging in RPID screen changes (issue #8101 reported by hristo, patch by oej in revision 44757)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@45047 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-13 16:02:27 +00:00
Christian Richter
45146c800e Merged revisions 45026 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r45026 | crichter | 2006-10-13 16:45:39 +0200 (Fr, 13 Okt 2006) | 9 lines

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

........
r45020 | crichter | 2006-10-13 15:11:13 +0200 (Fr, 13 Okt 2006) | 1 line

fixed some echocandisable issues when bridged. this caused a kernel panic sometimes..also some minor formatting fixes
........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@45028 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-13 15:42:09 +00:00
Luigi Rizzo
e1378c470f Try to avoid the use of 'z' modifier in cases where it is not
necessary - rather, cast the argument to int.

In this case, the string is in a UDP packet and as such
limited to 64k so its length can be safely represented in an int
without truncation (besides, this is just a debugging message!)



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@45010 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-13 11:18:01 +00:00
Luigi Rizzo
1fe21371a3 arguments to auth_headers() needed to be swapped here.
To avoid the same mistake in the future (due to slightly
confusing variable names), add a comment.

On passing, remove a redundant initialization.



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@45009 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-13 11:11:19 +00:00
Christian Richter
d8ab613fdf Merged revisions 44994 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r44994 | crichter | 2006-10-13 09:52:41 +0200 (Fr, 13 Okt 2006) | 9 lines

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

........
r44993 | crichter | 2006-10-13 09:40:07 +0200 (Fr, 13 Okt 2006) | 1 line

fixed issue, that the hangupcause got a wrong isdn cause at RELEASE_COMPLETE
........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@45000 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-13 08:23:41 +00:00
Matt O'Gorman
e20bb6fa69 Merged revisions 44982 via svnmerge from
https://svn.digium.com/svn/asterisk/branches/1.4

........
r44982 | mogorman | 2006-10-12 15:34:49 -0500 (Thu, 12 Oct 2006) | 2 lines

fix for bug 7764.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44983 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-12 20:41:37 +00:00
Kevin P. Fleming
49b0cc8c94 eliminate compiler warning
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44973 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-12 19:16:16 +00:00
Kevin P. Fleming
0ecfae3dbd Merged revisions 44971 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r44971 | kpfleming | 2006-10-12 14:14:24 -0500 (Thu, 12 Oct 2006) | 2 lines

we can only send one 'a=ptime' attribute per media session, not one for each format

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44972 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-12 19:15:25 +00:00
Kevin P. Fleming
035aeb82e4 Merged revisions 44956 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r44956 | kpfleming | 2006-10-12 13:38:51 -0500 (Thu, 12 Oct 2006) | 10 lines

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

........
r44955 | kpfleming | 2006-10-12 13:31:26 -0500 (Thu, 12 Oct 2006) | 2 lines

ensure that IAX2 and SIP sockets allow UDP fragmentation when running on Linux (thanks to Brian Candler on the asterisk-dev list for the tip)

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44957 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-12 18:43:52 +00:00
Luigi Rizzo
97ac6793c7 + move [almost] all instances of WWW-Authenticate/Proxy-Authenticate
and friends in a function, auth_headers(), which is used to
  simplify the interface of do_{proxy|register}_auth().
 
+ use PROXY_AUTH = 407, WWW_AUTH = 401 as values for enum sip_auth_type;

No functional change, only code cleanup.



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44933 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-12 15:12:54 +00:00
Luigi Rizzo
59e61ae4a0 reduce indentation of two large blocks
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44901 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-11 23:36:25 +00:00
Luigi Rizzo
6d6e60be79 operator != also works between booleans...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44900 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-11 23:26:44 +00:00
Russell Bryant
9e2abab8fa Revert Luigi's accidental commit of his local changes when debugging some SIP
authentication issues.  This was committed in revision 44844, where the commit
message was just "small formatting cleanup", so I am pretty sure he didn't mean
to commit this part.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44876 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-11 13:38:37 +00:00
Luigi Rizzo
328e1c9d1c remove duplicate prototypes. Have not checked if there are more.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44875 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-11 13:21:33 +00:00
Luigi Rizzo
ed683ccc2a simplify and comment handle_response_peerpoke()
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44874 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-11 13:12:31 +00:00
Luigi Rizzo
312fd57758 fix indentation of a function after previous commit
(whitespace-only change)



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44865 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-11 12:24:57 +00:00
Luigi Rizzo
2eeaeaa7a7 handle_response_peerpoke() does not need to return anything.
(Reindentation in the next commit.)



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44853 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-11 09:17:05 +00:00
Luigi Rizzo
510b9f04c0 small formatting cleanup
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44844 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-11 08:56:09 +00:00
Christian Richter
7ff86b686f Merged revisions 44563 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r44563 | crichter | 2006-10-06 14:53:41 +0200 (Fr, 06 Okt 2006) | 9 lines

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

........
r44460 | crichter | 2006-10-05 12:02:38 +0200 (Do, 05 Okt 2006) | 1 line

fixed segfault which happens during hold/transfer action
........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44843 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-11 08:45:40 +00:00
Christian Richter
8c3ab3122a Merged revisions 44562 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r44562 | crichter | 2006-10-06 14:52:01 +0200 (Fr, 06 Okt 2006) | 9 lines

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

........
r44335 | crichter | 2006-10-04 17:26:59 +0200 (Mi, 04 Okt 2006) | 1 line

if INFORMATION Message come with keypad instead of called party number, we just use the keypad as called party number.
........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44842 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-11 08:39:50 +00:00
Christian Richter
e09ad744af Merged revisions 44561 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r44561 | crichter | 2006-10-06 14:50:25 +0200 (Fr, 06 Okt 2006) | 9 lines

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

........
r44334 | crichter | 2006-10-04 17:13:58 +0200 (Mi, 04 Okt 2006) | 1 line

added the option 'reject_cause' to make it possible to set the RELEASE_COMPLETE - cause on the 3. incoming PMP channel, which is automatically rejected because chan_misdn does not support that kind of callwaiting. Therefore chan_misdn supports now 3 incoming channels on a PMP BRI Port. misdn_lib_get_free_bc now gets the info if the requested channel is incoming or outgoing to make the 3. channel possible
........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44841 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-11 08:34:03 +00:00
Christian Richter
05c4624d9b Merged revisions 44559 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r44559 | crichter | 2006-10-06 12:44:34 +0200 (Fr, 06 Okt 2006) | 9 lines

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

........
r44149 | crichter | 2006-10-02 15:28:14 +0200 (Mo, 02 Okt 2006) | 1 line

fixed the hold/retrieve/transfer issues, removed a useless bc field, added setting of frame.delivery fields, some minor code cleanups
........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44840 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-11 08:23:16 +00:00
Joshua Colp
832014a91b Merged revisions 44819 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r44819 | file | 2006-10-10 13:21:44 -0400 (Tue, 10 Oct 2006) | 2 lines

Move some stuff around so that a NOTIFY dialog won't hang around until the end of the world under certain circumstances

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44820 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-10 17:23:14 +00:00
Joshua Colp
1eedc8af43 Merged revisions 44806 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r44806 | file | 2006-10-10 12:30:00 -0400 (Tue, 10 Oct 2006) | 2 lines

Bail out if we have no refer structure and we get a refer response

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44807 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-10 16:31:05 +00:00
Joshua Colp
fadc6c4ed7 Merged revisions 44788 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r44788 | file | 2006-10-10 11:23:14 -0400 (Tue, 10 Oct 2006) | 2 lines

Only set DTMF information if an RTP structure exists

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44789 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-10 15:25:05 +00:00
Christian Richter
2a8764f4ba Merged revisions 44786 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r44786 | crichter | 2006-10-10 15:50:26 +0200 (Di, 10 Okt 2006) | 9 lines

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

........
r44785 | crichter | 2006-10-10 15:34:33 +0200 (Di, 10 Okt 2006) | 1 line

(re)added support of dynamical enabling hdlc on bchannels
........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44787 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-10 14:54:58 +00:00
Luigi Rizzo
06fab1382b clarify the use of the standard SIP port number, 5060,
and rename the old DEFAULT_SIP_PORT as STANDARD_SIP_PORT
to make it clear that this is not something we can change,
unlike other defaults.



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44774 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-10 08:08:35 +00:00
Luigi Rizzo
15fcc45c4e improve formatting of SIP packets when dumped to the verbose
output stream, so it is easier to find them in the log.



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44770 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-10 07:40:27 +00:00
Jason Parker
a35c0989dd Merged revisions 44764 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r44764 | qwell | 2006-10-09 11:12:35 -0500 (Mon, 09 Oct 2006) | 4 lines

Fix a problem where phones that go "missing" never got unregistered.

Issue #8067, reported by pj, patch by Anthony LaMantia (with minor whitespace modifications)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44765 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-09 16:15:16 +00:00
Joshua Colp
7b3665596f Merged revisions 44759 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r44759 | file | 2006-10-09 11:41:28 -0400 (Mon, 09 Oct 2006) | 2 lines

Properly avoid a collision with iax2_hangup (issue #8115 reported by vazir)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44762 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-09 15:49:45 +00:00
Olle Johansson
d766095219 Being pedantic... "media" is easier to understand than "data" in the function name... :-)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44753 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-09 11:20:02 +00:00
Luigi Rizzo
853f7ed660 slightly restructure sipsock_read() removing a "goto"
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44752 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-09 09:04:30 +00:00
Luigi Rizzo
69af2cea2f use S_OR in one place
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44751 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-09 08:33:52 +00:00