diff options
| author | lmadsen <lmadsen@f38db490-d61c-443f-a65b-d21fe96a405b> | 2011-02-22 22:51:10 +0000 |
|---|---|---|
| committer | lmadsen <lmadsen@f38db490-d61c-443f-a65b-d21fe96a405b> | 2011-02-22 22:51:10 +0000 |
| commit | aac1d6d4f31cdb279c402e5933d19b7abaaf5ddb (patch) | |
| tree | 3779d3f18d5255a219c51ff7b95eeb797945fac1 | |
| parent | 7079e9f819b41eb721a8c212b1e1bd95f0d1c730 (diff) | |
Changed .version, ChangeLog, and remove old summary files.
Includes merge for AST-2011-002.
git-svn-id: http://svn.digium.com/svn/asterisk/tags/1.6.2.17@308578 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | .version | 2 | ||||
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | asterisk-1.6.2.17-rc3-summary.html | 60 | ||||
| -rw-r--r-- | asterisk-1.6.2.17-rc3-summary.txt | 92 | ||||
| -rw-r--r-- | main/udptl.c | 48 |
5 files changed, 28 insertions, 180 deletions
@@ -1 +1 @@ -1.6.2.17-rc3 +1.6.2.17 @@ -1,3 +1,9 @@ +2011-02-22 Leif Madsen <lmadsen@digium.com> + + * Asterisk 1.6.2.17 Released. + + * Merged in changes related to AST-2011-002 + 2011-02-16 Leif Madsen <lmadsen@digium.com> * Asterisk 1.6.2.17-rc3 Released. diff --git a/asterisk-1.6.2.17-rc3-summary.html b/asterisk-1.6.2.17-rc3-summary.html deleted file mode 100644 index f9ca47aa7..000000000 --- a/asterisk-1.6.2.17-rc3-summary.html +++ /dev/null @@ -1,60 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"> -<head><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /><title>Release Summary - asterisk-1.6.2.17-rc3</title></head> -<body> -<h1 align="center"><a name="top">Release Summary</a></h1> -<h3 align="center">asterisk-1.6.2.17-rc3</h3> -<h3 align="center">Date: 2011-02-16</h3> -<h3 align="center"><asteriskteam@digium.com></h3> -<hr/> -<h2 align="center">Table of Contents</h2> -<ol> - <li><a href="#summary">Summary</a></li> - <li><a href="#contributors">Contributors</a></li> - <li><a href="#commits">Other Changes</a></li> - <li><a href="#diffstat">Diffstat</a></li> -</ol> -<hr/> -<a name="summary"><h2 align="center">Summary</h2></a> -<center><a href="#top">[Back to Top]</a></center><br/><p>This release includes only bug fixes. The changes included were made only to address problems that have been identified in this release series. Users should be able to safely upgrade to this version if this release series is already in use. Users considering upgrading from a previous release series are strongly encouraged to review the UPGRADE.txt document as well as the CHANGES document for information about upgrading to this release series.</p> -<p>The data in this summary reflects changes that have been made since the previous release, asterisk-1.6.2.17-rc2.</p> -<hr/> -<a name="contributors"><h2 align="center">Contributors</h2></a> -<center><a href="#top">[Back to Top]</a></center><br/><p>This table lists the people who have submitted code, those that have tested patches, as well as those that reported issues on the issue tracker that were resolved in this release. For coders, the number is how many of their patches (of any size) were committed into this release. For testers, the number is the number of times their name was listed as assisting with testing a patch. Finally, for reporters, the number is the number of issues that they reported that were closed by commits that went into this release.</p> -<table width="100%" border="0"> -<tr> -<td width="33%"><h3>Coders</h3></td> -<td width="33%"><h3>Testers</h3></td> -<td width="33%"><h3>Reporters</h3></td> -</tr> -<tr valign="top"> -<td> -2 lmadsen<br/> -</td> -<td> -</td> -<td> -</td> -</tr> -</table> -<hr/> -<a name="commits"><h2 align="center">Commits Not Associated with an Issue</h2></a> -<center><a href="#top">[Back to Top]</a></center><br/><p>This is a list of all changes that went into this release that did not directly close an issue from the issue tracker. The commits may have been marked as being related to an issue. If that is the case, the issue numbers are listed here, as well.</p> -<table width="100%" border="1"> -<tr><td><b>Revision</b></td><td><b>Author</b></td><td><b>Summary</b></td><td><b>Issues Referenced</b></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=308140">308140</a></td><td>lmadsen</td><td>Create 1.6.2.17-rc3 from 1.6.2.17-rc2</td> -<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/1.6.2?view=revision&revision=308143">308143</a></td><td>lmadsen</td><td>Update .version file, ChangLog, removed old summary files, and merged in change to app_queue.</td> -<td></td></tr></table> -<hr/> -<a name="diffstat"><h2 align="center">Diffstat Results</h2></a> -<center><a href="#top">[Back to Top]</a></center><br/><p>This is a summary of the changes to the source code that went into this release that was generated using the diffstat utility.</p> -<pre> -.version | 2 -ChangeLog | 22 +++++++++ -apps/app_queue.c | 1 -asterisk-1.6.2.17-rc2-summary.html | 60 ------------------------ -asterisk-1.6.2.17-rc2-summary.txt | 90 ------------------------------------- -5 files changed, 23 insertions(+), 152 deletions(-) -</pre><br/> -<hr/> -</body> -</html> diff --git a/asterisk-1.6.2.17-rc3-summary.txt b/asterisk-1.6.2.17-rc3-summary.txt deleted file mode 100644 index 742563030..000000000 --- a/asterisk-1.6.2.17-rc3-summary.txt +++ /dev/null @@ -1,92 +0,0 @@ - Release Summary - - asterisk-1.6.2.17-rc3 - - Date: 2011-02-16 - - <asteriskteam@digium.com> - - ---------------------------------------------------------------------- - - Table of Contents - - 1. Summary - 2. Contributors - 3. Other Changes - 4. Diffstat - - ---------------------------------------------------------------------- - - Summary - - [Back to Top] - - This release includes only bug fixes. The changes included were made only - to address problems that have been identified in this release series. - Users should be able to safely upgrade to this version if this release - series is already in use. Users considering upgrading from a previous - release series are strongly encouraged to review the UPGRADE.txt document - as well as the CHANGES document for information about upgrading to this - release series. - - The data in this summary reflects changes that have been made since the - previous release, asterisk-1.6.2.17-rc2. - - ---------------------------------------------------------------------- - - Contributors - - [Back to Top] - - This table lists the people who have submitted code, those that have - tested patches, as well as those that reported issues on the issue tracker - that were resolved in this release. For coders, the number is how many of - their patches (of any size) were committed into this release. For testers, - the number is the number of times their name was listed as assisting with - testing a patch. Finally, for reporters, the number is the number of - issues that they reported that were closed by commits that went into this - release. - - Coders Testers Reporters - 2 lmadsen - - ---------------------------------------------------------------------- - - Commits Not Associated with an Issue - - [Back to Top] - - This is a list of all changes that went into this release that did not - directly close an issue from the issue tracker. The commits may have been - marked as being related to an issue. If that is the case, the issue - numbers are listed here, as well. - - +------------------------------------------------------------------------+ - | Revision | Author | Summary | Issues Referenced | - |----------+---------+-------------------------------+-------------------| - | 308140 | lmadsen | Create 1.6.2.17-rc3 from | | - | | | 1.6.2.17-rc2 | | - |----------+---------+-------------------------------+-------------------| - | | | Update .version file, | | - | 308143 | lmadsen | ChangLog, removed old summary | | - | | | files, and merged in change | | - | | | to app_queue. | | - +------------------------------------------------------------------------+ - - ---------------------------------------------------------------------- - - Diffstat Results - - [Back to Top] - - This is a summary of the changes to the source code that went into this - release that was generated using the diffstat utility. - - .version | 2 - ChangeLog | 22 +++++++++ - apps/app_queue.c | 1 - asterisk-1.6.2.17-rc2-summary.html | 60 ------------------------ - asterisk-1.6.2.17-rc2-summary.txt | 90 ------------------------------------- - 5 files changed, 23 insertions(+), 152 deletions(-) - - ---------------------------------------------------------------------- diff --git a/main/udptl.c b/main/udptl.c index d120c27fb..eba362e65 100644 --- a/main/udptl.c +++ b/main/udptl.c @@ -217,38 +217,29 @@ static int decode_length(uint8_t *buf, unsigned int limit, unsigned int *len, un } *pvalue = (buf[*len] & 0x3F) << 14; (*len)++; - /* Indicate we have a fragment */ + /* We have a fragment. Currently we don't process fragments. */ + ast_debug(1, "UDPTL packet with length greater than 16K received, decoding will fail\n"); return 1; } /*- End of function --------------------------------------------------------*/ static int decode_open_type(uint8_t *buf, unsigned int limit, unsigned int *len, const uint8_t **p_object, unsigned int *p_num_octets) { - unsigned int octet_cnt; - unsigned int octet_idx; - unsigned int i; - int length; /* a negative length indicates the limit has been reached in decode_length. */ - const uint8_t **pbuf; + unsigned int octet_cnt = 0; - for (octet_idx = 0, *p_num_octets = 0; ; octet_idx += octet_cnt) { - octet_cnt = 0; - if ((length = decode_length(buf, limit, len, &octet_cnt)) < 0) - return -1; - if (octet_cnt > 0) { - *p_num_octets += octet_cnt; + if (decode_length(buf, limit, len, &octet_cnt) != 0) + return -1; - pbuf = &p_object[octet_idx]; - i = 0; - /* Make sure the buffer contains at least the number of bits requested */ - if ((*len + octet_cnt) > limit) - return -1; + if (octet_cnt > 0) { + /* Make sure the buffer contains at least the number of bits requested */ + if ((*len + octet_cnt) > limit) + return -1; - *pbuf = &buf[*len]; - *len += octet_cnt; - } - if (length == 0) - break; + *p_num_octets = octet_cnt; + *p_object = &buf[*len]; + *len += octet_cnt; } + return 0; } /*- End of function --------------------------------------------------------*/ @@ -335,8 +326,8 @@ static int udptl_rx_packet(struct ast_udptl *s, uint8_t *buf, unsigned int len) const uint8_t *data; unsigned int ifp_len; int repaired[16]; - const uint8_t *bufs[16]; - unsigned int lengths[16]; + const uint8_t *bufs[ARRAY_LEN(s->f) - 1]; + unsigned int lengths[ARRAY_LEN(s->f) - 1]; int span; int entries; int ifp_no; @@ -366,13 +357,13 @@ static int udptl_rx_packet(struct ast_udptl *s, uint8_t *buf, unsigned int len) do { if ((stat2 = decode_length(buf, len, &ptr, &count)) < 0) return -1; - for (i = 0; i < count; i++) { + for (i = 0; i < count && total_count + i < ARRAY_LEN(bufs); i++) { if ((stat1 = decode_open_type(buf, len, &ptr, &bufs[total_count + i], &lengths[total_count + i])) != 0) return -1; } - total_count += count; + total_count += i; } - while (stat2 > 0); + while (stat2 > 0 && total_count < ARRAY_LEN(bufs)); /* Step through in reverse order, so we go oldest to newest */ for (i = total_count; i > 0; i--) { if (seq_no - i >= s->rx_seq_no) { @@ -435,6 +426,9 @@ static int udptl_rx_packet(struct ast_udptl *s, uint8_t *buf, unsigned int len) if (ptr + 1 > len) return -1; entries = buf[ptr++]; + if (entries > MAX_FEC_ENTRIES) { + return -1; + } s->rx[x].fec_entries = entries; /* Decode the elements */ |