Merged revisions 240078 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

........
  r240078 | mnicholson | 2010-01-14 10:14:35 -0600 (Thu, 14 Jan 2010) | 9 lines
  
  This change fixes a few bugs in the way the far max IFP was calculated that were introduced in r231692.
  
  (closes issue #16497)
  Reported by: globalnetinc
  Patches:
        udptl-max-ifp-fix1.diff uploaded by mnicholson (license 96)
  Tested by: globalnetinc
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@240092 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Matthew Nicholson
2010-01-14 16:19:41 +00:00
parent 32ab9b2bfb
commit 57a86fe426

View File

@@ -802,10 +802,17 @@ static void calculate_far_max_ifp(struct ast_udptl *udptl)
* zero in this loop; we'd rather send smaller IFPs (and thus reduce * zero in this loop; we'd rather send smaller IFPs (and thus reduce
* the image data transfer rate) than sacrifice redundancy completely * the image data transfer rate) than sacrifice redundancy completely
*/ */
for ( ; for (;;) {
(new_max < 80) && (udptl->error_correction_entries > 1);
--udptl->error_correction_entries) {
new_max = (udptl->far_max_datagram - 8) / (udptl->error_correction_entries + 1); new_max = (udptl->far_max_datagram - 8) / (udptl->error_correction_entries + 1);
if ((new_max < 80) && (udptl->error_correction_entries > 1)) {
/* the max ifp is not large enough, subtract an
* error correction entry and calculate again
* */
--udptl->error_correction_entries;
} else {
break;
}
} }
break; break;
case UDPTL_ERROR_CORRECTION_FEC: case UDPTL_ERROR_CORRECTION_FEC: