Commit Graph

12723 Commits

Author SHA1 Message Date
Jason Parker 70c076a9de Blocked revisions 76176 via svnmerge
........
r76176 | qwell | 2007-07-20 15:54:10 -0500 (Fri, 20 Jul 2007) | 2 lines

Eliminate a compiler warning with gcc 4.2 by constifying a char *

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@76177 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-07-20 20:56:07 +00:00
Jason Parker 4a023add58 Merged revisions 76174 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r76174 | qwell | 2007-07-20 15:32:55 -0500 (Fri, 20 Jul 2007) | 2 lines

It's possible for sub->owner to be NULL here if you cancel the call immediately after/during sending a digit.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@76175 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-07-20 20:33:34 +00:00
Mark Michelson 51bf714319 Merged revisions 76139 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r76139 | mmichelson | 2007-07-20 13:42:27 -0500 (Fri, 20 Jul 2007) | 6 lines

When using users.conf for the entries in the directory, if multiple users had the same last name, only the first user listed would be available
in the directory.

(closes issue #10200, reported by mrskippy, patched by me)


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@76140 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-07-20 18:44:30 +00:00
Russell Bryant d5b4fde291 Merged revisions 76132 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r76132 | russell | 2007-07-20 13:22:24 -0500 (Fri, 20 Jul 2007) | 6 lines

Use the define that specifies the default length of an artificially created
DTMF digit in the ast_senddigit() function.  The define is set to 100ms by
default, which is the same thing that this function was using.  But, using
the define lets changes take effect in this case, as well as the others where
it was already used.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@76138 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-07-20 18:28:15 +00:00
Joshua Colp 989b93143a Merged revisions 76087 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r76087 | file | 2007-07-20 14:20:09 -0300 (Fri, 20 Jul 2007) | 14 lines

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

........
r76080 | file | 2007-07-20 14:16:48 -0300 (Fri, 20 Jul 2007) | 6 lines

(closes issue #10247)
Reported by: fkasumovic
Patches:
      chan_sip.patch uploaded by fkasumovic (license #101)
Drop any peer realm authentication entries when reloading so multiple entries do not get added to the peer.

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@76091 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-07-20 17:21:23 +00:00
Joshua Colp 2c2af928fe Merged revisions 76067 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r76067 | file | 2007-07-20 14:10:17 -0300 (Fri, 20 Jul 2007) | 6 lines

(closes issue #10246)
Reported by: fkasumovic
Patches:
      res_conver.patch uploaded by fkasumovic (license #101)
Use the last occurance of . to find the extension, not the first occurance.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@76070 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-07-20 17:11:39 +00:00
Joshua Colp 66cae9269b It is impossible for the externhost variable to not exist, it is however possible for it to be empty.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@76056 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-07-20 16:51:09 +00:00
Joshua Colp 2e40a9c083 Blocked revisions 76054 via svnmerge
........
r76054 | file | 2007-07-20 13:49:13 -0300 (Fri, 20 Jul 2007) | 2 lines

Move makeannouncement variable declaration to proper place.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@76055 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-07-20 16:49:58 +00:00
Luigi Rizzo bfc782f4e9 Don't use a field size for the last argument of printf format,
because in this case the string is left-aligned and it is not
truncated anyways.

Omitting the field size prevents the generation of trailing whitespace,
which makes the string fit in smaller windows.



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@76037 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-07-20 15:06:54 +00:00
Luigi Rizzo b2fec9ad16 Extend the 'network settings' section with indication on the
localnet settings (requires the change in SVN 76034), and also
give an indication on whether/why/how the remapping of addresses
in SIP message is done or not.

I think this is especially useful for debugging the configuration,
as the address remapping depends on a combination of at least 3
parameters (localnet, externhost, externip) and successful DNS lookup.

An example of the output of this section is below:

	Network Settings:
	---------------------------
	  SIP address remapping:  Enabled using externhost
	  Externhost:             foo.dyndns.net
	  Externip:               80.64.128.23:0
	  Externrefresh:          10
	  Internal IP:            12.34.56.78:5060
	  Localnet:               192.168.0.0/255.255.0.0
				  10.0.0.0/255.0.0.0

I leave to the community the judgement if the above info is a
useful addition for 1.4. It is not a bugfix, but it is neither a
new feature, only a useful diagnostic tool.

Note that I would like to move there also the bindaddress/port
information, in the usual addr:port format e.g.

          Bindaddress:            0.0.0.0:5060

so that network information is all in one place.



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@76035 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-07-20 14:54:01 +00:00
Luigi Rizzo 925ebbb2b3 expose struct ast_ha so external code can do things such as printing it
(e.g. chan_sip.c in a subsequent commit).

Obviously exposing the internals of a data structure is far from ideal
(especially in a case like this where the implementation is very
inefficient and will need to be changed at some point).

On the other hand, it was also unclear what additional APIs should
we provide instead, and because exposing the stucture has no impact
on source and binary compatibility, this seemed to me the best option at
this time.



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@76034 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-07-20 14:38:36 +00:00
Tilghman Lesher 4af3f12b29 Reduce some logging contention by switching several locks over to rwlocks
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@76015 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-07-20 01:54:52 +00:00
Steve Murphy 0e969271ae After some study, thought, comparing, etc. I've backed out the previous universal mod to make ast_flags a 64 bit thing. Instead, I added a 64-bit version of ast_flags (ast_flags64), and 64-bit versions of the test-flag, set-flag, etc. macros, and an app_parse_options64 routine, and I use these in app_dial alone, to eliminate the 30-option limit it had grown to meet. There is room now for 32 more options and flags. I was heavily tempted to implement some of the other ideas that were presented, but this solution does not intro any new versions of dial, doesn't have a different API, has a minimal/zero impact on code outside of dial, and doesn't seriously (I hope) affect the code structure of dial. It's the best I can think of right now. My goal was NOT to rewrite dial. I leave that to a future, coordinated effort.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@75983 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-07-19 23:24:27 +00:00
Steve Murphy 7756ba6619 This repairs a 'warning: ISO C90 forbids mixed declarations and code' message that cripples my dev-mode enabled build
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@75982 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-07-19 22:00:59 +00:00
Jason Parker 7111c8e382 Blocked revisions 75980 via svnmerge
........
r75980 | qwell | 2007-07-19 15:36:06 -0500 (Thu, 19 Jul 2007) | 2 lines

Remove some duplicate code.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@75981 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-07-19 20:36:55 +00:00
Mark Michelson 51fa94c6f5 Merged revisions 75978 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r75978 | mmichelson | 2007-07-19 13:59:30 -0500 (Thu, 19 Jul 2007) | 3 lines

The diff on this looks pretty big but all I did was remove a pointless if statement (always evaluates true).


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@75979 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-07-19 19:02:38 +00:00
Mark Michelson 3dcce46f69 Merged revisions 75969 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r75969 | mmichelson | 2007-07-19 11:26:10 -0500 (Thu, 19 Jul 2007) | 10 lines

Changes in handling return values of several functions in app_queue. This all started as a fix for issue #10008
but now includes all of the following changes:

1. Simplifying the code to handle positive return values from ast API calls.
2. Removing the background_file function.
3. The fix for issue #10008

(closes issue #10008, reported and patched by dimas)


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@75977 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-07-19 16:29:51 +00:00
Russell Bryant a971b4bfc4 (closes issue #10210, reported and patched by juggie)
This merges the trunk only part of the patches from this issue.  In 1.4, res_agi
will issue a warning if you try to use DeadAGI on a channel that is not hung up.
Now, in trunk, it just plain won't let you do it.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@75930 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-07-19 15:59:19 +00:00
Russell Bryant 7b09e738f0 Merged revisions 75928 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r75928 | russell | 2007-07-19 10:53:15 -0500 (Thu, 19 Jul 2007) | 14 lines

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

........
r75927 | russell | 2007-07-19 10:49:42 -0500 (Thu, 19 Jul 2007) | 6 lines

When processing full frames, take sequence number wraparound into account when
deciding whether or not we need to request retransmissions by sending a VNAK.
This code could cause VNAKs to be sent erroneously in some cases, and to not
be sent in other cases when it should have been.
(closes issue #10237, reported and patched by mihai)

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@75929 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-07-19 15:53:50 +00:00
Russell Bryant f3b1eab2f3 Remove some debug code that was added in revision 75894, which removed some
other debug code.  :)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@75911 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-07-19 14:46:49 +00:00
Luigi Rizzo 20448013df comment out some terribly expensive debugging code
in the body of ast_apply_ha()



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@75894 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-07-19 12:38:13 +00:00
Luigi Rizzo d60c5ee296 print more of the network settings (externip, externhost etc.)
in the "sip show settings" cli output. I have put these in a
separate section, probably even bindaddr and SIP port should go
there.

There are more things to add here e.g. localnet and so on.



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@75878 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-07-19 08:07:04 +00:00
Luigi Rizzo 192ac53c3f document the use of externip, externhost and other nat-related options,
as well as the handling of the sip socket.



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@75875 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-07-19 08:00:03 +00:00
Luigi Rizzo fddd5b557c ast_sip_ouraddrfor() never fails, so make it void
and remove the code that would never be called.



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@75874 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-07-19 07:51:34 +00:00
Luigi Rizzo 00d9a3e7a0 portability fix: use %f instead of %lf when printing double.
The l is useless.



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@75873 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-07-19 07:41:45 +00:00
Tilghman Lesher 16fe42c536 Allow chan_misdn to build in dev-mode
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@75857 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-07-19 04:45:20 +00:00
Tilghman Lesher 24935c0304 Fix trunk where I broke it earlier (for ast_strftime branch)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@75841 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-07-19 03:37:12 +00:00
Jason Parker 204743a820 Merged revisions 75807 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r75807 | qwell | 2007-07-18 17:59:18 -0500 (Wed, 18 Jul 2007) | 1 line

Need to make sure we set milliseconds and timestamp - pointed out by the recent ast_ time stuff from Tilghman
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@75808 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-07-18 23:00:30 +00:00
Russell Bryant 5272289355 I thought I noticed a memory leak earlier when I saw that the contents of this
list were not destroyed when the module is unloaded.  However, after reading
the code related to the use of this list a lot today, I realized that it isn't
necessary.  So, I have added a comment to explain why it isn't necessary.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@75806 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-07-18 22:52:54 +00:00
Tilghman Lesher 9c99cba373 Change IAX variables to use datastores (closes issue #9315)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@75805 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-07-18 22:40:03 +00:00
Russell Bryant 4681316959 Merged revisions 75759 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r75759 | russell | 2007-07-18 16:09:46 -0500 (Wed, 18 Jul 2007) | 13 lines

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

........
r75757 | russell | 2007-07-18 16:09:13 -0500 (Wed, 18 Jul 2007) | 5 lines

When traversing the queue of frames for possible retransmission after
receiving a VNAK, handle sequence number wraparound so that all frames that 
should be retransmitted actually do get retransmitted.
(issue #10227, reported and patched by mihai)

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@75761 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-07-18 21:10:27 +00:00
Tilghman Lesher 5f39ac2b03 Merged revisions 75749 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r75749 | tilghman | 2007-07-18 15:40:18 -0500 (Wed, 18 Jul 2007) | 10 lines

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

........
r75748 | tilghman | 2007-07-18 15:31:36 -0500 (Wed, 18 Jul 2007) | 2 lines

Store prior to copy (closes issue #10193)

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@75750 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-07-18 20:43:54 +00:00
Jason Parker 89acafbf37 Merged revisions 75732 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r75732 | qwell | 2007-07-18 15:17:27 -0500 (Wed, 18 Jul 2007) | 1 line

Umm, why are we transmitting dialtone on cfwdall?
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@75734 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-07-18 20:18:00 +00:00
Jason Parker 4f22126365 Merged revisions 75711 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

(closes issue #9245)
........
r75711 | qwell | 2007-07-18 14:54:32 -0500 (Wed, 18 Jul 2007) | 4 lines

Fixes for 7935/7936 conference phones.

Issue 9245, patch by slimey.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@75714 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-07-18 20:05:45 +00:00
Joshua Colp bc2bd11dff Blocked revisions 75712 via svnmerge
........
r75712 | file | 2007-07-18 17:00:23 -0300 (Wed, 18 Jul 2007) | 2 lines

Backport GCC 4.2 fixes. Without these Asterisk won't build under devmode using GCC 4.2.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@75713 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-07-18 20:01:52 +00:00
Jason Parker a1b2a23b4d Merged revisions 75707 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

(closes issue #9887)
........
r75707 | qwell | 2007-07-18 14:48:12 -0500 (Wed, 18 Jul 2007) | 4 lines

Fix issues with new 79x1 phones.

Issue 9887, patches by DEA

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@75710 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-07-18 19:51:18 +00:00
Russell Bryant 707ca59923 convert some lines indented with spaces to tabs
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@75709 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-07-18 19:50:21 +00:00
Tilghman Lesher 81bc1d7af5 Merge in ast_strftime branch, which changes timestamps to be accurate to the microsecond, instead of only to the second
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@75706 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-07-18 19:47:20 +00:00
Dwayne M. Hubbard b96fde308c Merged revisions 75658 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r75658 | dhubbard | 2007-07-18 12:56:30 -0500 (Wed, 18 Jul 2007) | 9 lines

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

........
r75657 | dhubbard | 2007-07-18 12:48:33 -0500 (Wed, 18 Jul 2007) | 1 line

removed the word 'pissed' from ast_log(...) function call for BE-90
........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@75659 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-07-18 17:59:56 +00:00
Joshua Colp a23feea9d2 Merged revisions 75623 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r75623 | file | 2007-07-18 12:44:02 -0300 (Wed, 18 Jul 2007) | 2 lines

Few more places that needs to check for onhold state.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@75624 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-07-18 15:45:18 +00:00
Joshua Colp d90bddfa6c Merged revisions 75621 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r75621 | file | 2007-07-18 12:41:06 -0300 (Wed, 18 Jul 2007) | 5 lines

(closes issue #10165)
Reported by: elandivar

It is possible for hold status to exist without call limits set, so we need to ensure update_call_counter is executed regardless.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@75622 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-07-18 15:42:11 +00:00
Joshua Colp e2b0f321a3 Merged revisions 75619 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r75619 | file | 2007-07-18 12:25:45 -0300 (Wed, 18 Jul 2007) | 2 lines

Don't bother reloading chan_h323 if it did not load successfully in the first place. This would otherwise cause a crash.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@75620 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-07-18 15:26:52 +00:00
Joshua Colp 0772f62be7 Clean up func_curl a bit.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@75586 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-07-18 14:59:20 +00:00
Steve Murphy 5ac24b25d3 This corrects the problem with flags and %lld formats on 64-bit machines, where uint64_t is NOT acceptable for %lld, and also works on 32-bit machines. At least, with gcc.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@75585 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-07-18 14:35:07 +00:00
Joshua Colp 674dbeb0cf Merged revisions 75583 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r75583 | file | 2007-07-18 11:18:53 -0300 (Wed, 18 Jul 2007) | 5 lines

(closes issue #10224)
Reported by: irroot

Record the threadid of each running thread before shutting them down as the thread themselves may change the value.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@75584 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-07-18 14:20:19 +00:00
Joshua Colp 4003b31fc5 Minor code tweaks. Variables were being checked wrong in some situations and didn't need to be checked in others.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@75566 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-07-18 13:59:01 +00:00
Tilghman Lesher 2c5a07bf03 Merged revisions 75529 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r75529 | tilghman | 2007-07-18 07:29:41 -0500 (Wed, 18 Jul 2007) | 2 lines

Using a freed frame causes crashes (closes issue #9317)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@75530 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-07-18 12:38:36 +00:00
Steve Murphy 8b0b74c9b0 Spotted this bug today myself, trying to reproduce a BE bug. Use a vert bar instead of a comma, when calling RAND.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@75505 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-07-17 21:52:51 +00:00
Russell Bryant 91e2afe4e7 Merged revisions 75450 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r75450 | russell | 2007-07-17 15:57:56 -0500 (Tue, 17 Jul 2007) | 11 lines

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

........
r75449 | russell | 2007-07-17 15:57:09 -0500 (Tue, 17 Jul 2007) | 3 lines

Properly check for the length in the skinny packet to prevent an invalid memcpy.
(ASA-2007-016)

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@75451 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-07-17 20:58:40 +00:00
Russell Bryant 28ab081704 Blocked revisions 75447 via svnmerge
........
r75447 | russell | 2007-07-17 15:51:25 -0500 (Tue, 17 Jul 2007) | 1 line

cast arguments to ast_log so that it builds without warnings for me
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@75448 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-07-17 20:52:20 +00:00