From c6f578190d925fc0d1b901b8fa431cd428fba82a Mon Sep 17 00:00:00 2001 From: mnicholson Date: Thu, 14 Jan 2010 16:19:41 +0000 Subject: 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: http://svn.digium.com/svn/asterisk/branches/1.6.0@240092 f38db490-d61c-443f-a65b-d21fe96a405b --- main/udptl.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'main') diff --git a/main/udptl.c b/main/udptl.c index 492a2de43..24c1a4674 100644 --- a/main/udptl.c +++ b/main/udptl.c @@ -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 * the image data transfer rate) than sacrifice redundancy completely */ - for ( ; - (new_max < 80) && (udptl->error_correction_entries > 1); - --udptl->error_correction_entries) { + for (;;) { 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; case UDPTL_ERROR_CORRECTION_FEC: -- cgit v1.2.3