Author: mjordan Date: Sat Nov 8 18:37:25 2014 New Revision: 427614 URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=427614 Log: channels/chan_mgcp: Fix regression which causes gateways to be skipped
In r227276, a while loop was turned into a for loop. Unfortunately, a portion of the while loop was left in the code such that, when a static gateway is encountered in the list of MGCP gateways, the next gateway would be skipped. At best, we would simply flip past a gateway; at worst, this could lead to a crash. ASTERISK-24500 #close Reported by: Xavier Hienne patches: chan_mgcp.patch uploaded by Xavier Hienne (License 6657) ........ Merged revisions 427613 from http://svn.asterisk.org/svn/asterisk/branches/11 Modified: branches/12/ (props changed) branches/12/channels/chan_mgcp.c Propchange: branches/12/ ------------------------------------------------------------------------------ Binary property 'branch-11-merged' - no diff available. Modified: branches/12/channels/chan_mgcp.c URL: http://svnview.digium.com/svn/asterisk/branches/12/channels/chan_mgcp.c?view=diff&rev=427614&r1=427613&r2=427614 ============================================================================== --- branches/12/channels/chan_mgcp.c (original) +++ branches/12/channels/chan_mgcp.c Sat Nov 8 18:37:25 2014 @@ -1809,17 +1809,12 @@ /* not dynamic, check if the name matches */ } else if (name) { if (strcasecmp(g->name, at)) { - g = g->next; continue; } /* not dynamic, no name, check if the addr matches */ } else if (!name && sin) { if ((g->addr.sin_addr.s_addr != sin->sin_addr.s_addr) || (g->addr.sin_port != sin->sin_port)) { - if(!g->next) - g = find_realtime_gw(name, at, sin); - else - g = g->next; continue; } } else { -- _____________________________________________________________________ -- Bandwidth and Colocation Provided by http://www.api-digital.com -- svn-commits mailing list To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/svn-commits
