Hi again,<div><br></div><div>There were still cases in the function that needed to change the proceed variable.</div><div><br></div><div>Please find attached the git diff output with the changes.</div><div><br></div><div>Rafael Scheffer Vargas<br>
desenvolvimento KHOMP - 15 Anos<br><br>R. Joe Collaço, 253 <a href="http://www.khomp.com.br" target="_blank">www.khomp.com.br</a><br>Florianópolis | SC<br>+55 48 3722-2916 | 9612-0276 | USA: +1 213-943-1535<br>
<a href="mailto:vargas@khomp.com.br" target="_blank">vargas@khomp.com.br</a><br><br>
<br><br><div class="gmail_quote">On Tue, Jan 31, 2012 at 19:31, Anthony Minessale <span dir="ltr"><<a href="mailto:anthony.minessale@gmail.com">anthony.minessale@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
this appears to be a regression from a recent change.<br>
<br>
Fixed:<br>
<br>
commit e00a61c48bce26cb96f3d615bd0f08091d7143e1<br>
Author: Anthony Minessale <<a href="mailto:anthm@freeswitch.org">anthm@freeswitch.org</a>><br>
Date: Tue Jan 31 15:31:08 2012 -0600<br>
<div><div class="h5"><br>
<br>
On Tue, Jan 31, 2012 at 2:31 PM, Rafael Vargas <<a href="mailto:vargas@khomp.com.br">vargas@khomp.com.br</a>> wrote:<br>
> Hi,<br>
><br>
> I've noticed that when I have an extension containing only an absolute<br>
> condition, the proceed variable in mod_dialplan_xml.c:parse_exten(...) is<br>
> not changed and the next extension is also executed, thus ignoring the first<br>
> extension's "continue" attribute, which was set to "false".<br>
><br>
> I'm referring to this code: (mod_dialplan.c:221 in today's GIT)<br>
> ...<br>
> } else if (time_match == -1) {<br>
> switch_log_printf(SWITCH_CHANNEL_SESSION_LOG_CLEAN(session),<br>
> SWITCH_LOG_DEBUG,<br>
> "Dialplan: %s Absolute Condition [%s] match=%s\n",<br>
> switch_channel_get_name(channel), exten_name, all ? "all" : "any");<br>
> pass++;<br>
> if (!all && !xor) break;<br>
> } else if (time_match == 1) {<br>
> ...<br>
><br>
> Shouldn't this set the proceed variable to 1, just like the regex condition<br>
> a few lines above (line 208 in today's GIT)?<br>
><br>
> I just made a quick test and it worked as (I) expected.<br>
><br>
> What I'm proposing is to change the code above to the following:<br>
><br>
> ...<br>
> } else if (time_match == -1) {<br>
> switch_log_printf(SWITCH_CHANNEL_SESSION_LOG_CLEAN(session),<br>
> SWITCH_LOG_DEBUG,<br>
> "Dialplan: %s Absolute Condition [%s] match=%s\n",<br>
> switch_channel_get_name(channel), exten_name, all ? "all" : "any");<br>
> proceed = 1;<br>
> pass++;<br>
> if (!all && !xor) break;<br>
> } else if (time_match == 1) {<br>
> ...<br>
><br>
> Sorry if this was already discussed, I've searched this list and the users<br>
> list to no avail...<br>
><br>
> Best regards,<br>
><br>
> Rafael Scheffer Vargas<br>
> desenvolvimento KHOMP - 15 Anos<br>
><br>
> R. Joe Collaço, 253 <a href="http://www.khomp.com.br" target="_blank">www.khomp.com.br</a><br>
> Florianópolis | SC<br>
> <a href="tel:%2B55%2048%203722-2916" value="+554837222916">+55 48 3722-2916</a> | 9612-0276 | USA: <a href="tel:%2B1%20213-943-1535" value="+12139431535">+1 213-943-1535</a><br>
> <a href="mailto:vargas@khomp.com.br">vargas@khomp.com.br</a><br>
><br>
><br>
</div></div>> _________________________________________________________________________<br>
> Professional FreeSWITCH Consulting Services:<br>
> <a href="mailto:consulting@freeswitch.org">consulting@freeswitch.org</a><br>
> <a href="http://www.freeswitchsolutions.com" target="_blank">http://www.freeswitchsolutions.com</a><br>
><br>
> FreeSWITCH-powered IP PBX: The CudaTel Communication Server<br>
> <a href="http://www.cudatel.com" target="_blank">http://www.cudatel.com</a><br>
><br>
> Official FreeSWITCH Sites<br>
> <a href="http://www.freeswitch.org" target="_blank">http://www.freeswitch.org</a><br>
> <a href="http://wiki.freeswitch.org" target="_blank">http://wiki.freeswitch.org</a><br>
> <a href="http://www.cluecon.com" target="_blank">http://www.cluecon.com</a><br>
><br>
> FreeSWITCH-dev mailing list<br>
> <a href="mailto:FreeSWITCH-dev@lists.freeswitch.org">FreeSWITCH-dev@lists.freeswitch.org</a><br>
> <a href="http://lists.freeswitch.org/mailman/listinfo/freeswitch-dev" target="_blank">http://lists.freeswitch.org/mailman/listinfo/freeswitch-dev</a><br>
> UNSUBSCRIBE:<a href="http://lists.freeswitch.org/mailman/options/freeswitch-dev" target="_blank">http://lists.freeswitch.org/mailman/options/freeswitch-dev</a><br>
> <a href="http://www.freeswitch.org" target="_blank">http://www.freeswitch.org</a><br>
><br>
<br>
<br>
<br>
--<br>
Anthony Minessale II<br>
<br>
FreeSWITCH <a href="http://www.freeswitch.org/" target="_blank">http://www.freeswitch.org/</a><br>
ClueCon <a href="http://www.cluecon.com/" target="_blank">http://www.cluecon.com/</a><br>
Twitter: <a href="http://twitter.com/FreeSWITCH_wire" target="_blank">http://twitter.com/FreeSWITCH_wire</a><br>
<br>
AIM: anthm<br>
<a href="mailto:MSN%3Aanthony_minessale@hotmail.com">MSN:anthony_minessale@hotmail.com</a><br>
GTALK/JABBER/<a href="mailto:PAYPAL%3Aanthony.minessale@gmail.com">PAYPAL:anthony.minessale@gmail.com</a><br>
IRC: <a href="http://irc.freenode.net" target="_blank">irc.freenode.net</a> #freeswitch<br>
<br>
FreeSWITCH Developer Conference<br>
<a href="mailto:sip%3A888@conference.freeswitch.org">sip:888@conference.freeswitch.org</a><br>
<a href="mailto:googletalk%3Aconf%2B888@conference.freeswitch.org">googletalk:conf+888@conference.freeswitch.org</a><br>
pstn:<a href="tel:%2B19193869900" value="+19193869900">+19193869900</a><br>
<br>
_________________________________________________________________________<br>
Professional FreeSWITCH Consulting Services:<br>
<a href="mailto:consulting@freeswitch.org">consulting@freeswitch.org</a><br>
<a href="http://www.freeswitchsolutions.com" target="_blank">http://www.freeswitchsolutions.com</a><br>
<br>
FreeSWITCH-powered IP PBX: The CudaTel Communication Server<br>
<a href="http://www.cudatel.com" target="_blank">http://www.cudatel.com</a><br>
<br>
Official FreeSWITCH Sites<br>
<a href="http://www.freeswitch.org" target="_blank">http://www.freeswitch.org</a><br>
<a href="http://wiki.freeswitch.org" target="_blank">http://wiki.freeswitch.org</a><br>
<a href="http://www.cluecon.com" target="_blank">http://www.cluecon.com</a><br>
<br>
FreeSWITCH-dev mailing list<br>
<a href="mailto:FreeSWITCH-dev@lists.freeswitch.org">FreeSWITCH-dev@lists.freeswitch.org</a><br>
<a href="http://lists.freeswitch.org/mailman/listinfo/freeswitch-dev" target="_blank">http://lists.freeswitch.org/mailman/listinfo/freeswitch-dev</a><br>
UNSUBSCRIBE:<a href="http://lists.freeswitch.org/mailman/options/freeswitch-dev" target="_blank">http://lists.freeswitch.org/mailman/options/freeswitch-dev</a><br>
<a href="http://www.freeswitch.org" target="_blank">http://www.freeswitch.org</a><br>
</blockquote></div><br></div>