Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Insteon: Pass Message Clearing Decision to on_read_write_aldb #260

Merged
merged 2 commits into from
Oct 12, 2013
Merged

Insteon: Pass Message Clearing Decision to on_read_write_aldb #260

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1590563
Insteon: Pass Message Clearing Decision to on_read_write_aldb
krkeegan Sep 27, 2013
211592b
Insteon: Don't Clear Queue on Unhandled Mem_Action
krkeegan Sep 28, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 13 additions & 6 deletions lib/Insteon/AllLinkDatabase.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2127,14 +2127,16 @@ Called as part of any process to read or write to a device's ALDB.
sub on_read_write_aldb
{
my ($self, %msg) = @_;

my $clear_message = 1; #Default Action is to Clear the Current Message
&::print_log("[Insteon::ALDB_i2] DEBUG3: " . $$self{device}->get_object_name
. " [0x" . $$self{_mem_msb} . $$self{_mem_lsb} . "] received: "
. lc $msg{extra} . " for _mem_activity=".$$self{_mem_activity}
." _mem_action=". $$self{_mem_action}) if $main::Debug{insteon} >= 3;

if ($$self{_mem_action} eq 'aldb_i2read')
{
#This is an ACK. Will be followed by a Link Data message, so don't clear
$clear_message = 0;
#Only move to the next state if the received message is a device ack
#if the ack is dropped the retransmission logic will resend the request
if($msg{is_ack}) {
Expand All @@ -2156,25 +2158,28 @@ sub on_read_write_aldb
&::print_log("[Insteon::ALDB_i2] DEBUG3: " . $$self{device}->get_object_name
. " [0x" . $$self{_mem_msb} . $$self{_mem_lsb} . "] received duplicate ack. Ignoring.")
if $main::Debug{insteon} >= 3;
$clear_message = 0;
} elsif(length($msg{extra})<30)
{
&::print_log("[Insteon::ALDB_i2] WARNING: Corrupted I2 response not processed: "
. $$self{device}->get_object_name
. " [0x" . $$self{_mem_msb} . $$self{_mem_lsb} . "] received: "
. lc $msg{extra} . " for " . $$self{_mem_action}) if $main::Debug{insteon} >= 3;
$$self{device}->corrupt_count_log(1) if $$self{device}->can('corrupt_count_log');
#retry previous address again
$self->send_read_aldb(sprintf("%04x", hex($$self{_mem_msb} . $$self{_mem_lsb})));
#can't clear message, if valid message doesn't arrive
#resend logic will kick in
$clear_message = 0;
} elsif ($$self{_mem_msb} . $$self{_mem_lsb} ne '0000' and
$$self{_mem_msb} . $$self{_mem_lsb} ne substr($msg{extra},6,4)){
::print_log("[Insteon::ALDB_i2] WARNING: Corrupted I2 response not processed, "
. " address received did not match address requested: "
. $$self{device}->get_object_name
. " [0x" . $$self{_mem_msb} . $$self{_mem_lsb} . "] received: "
. lc $msg{extra} . " for " . $$self{_mem_action}) if $main::Debug{insteon} >= 3;
$$self{device}->corrupt_count_log(1) if $$self{device}->can('corrupt_count_log');
#retry previous address again
$self->send_read_aldb(sprintf("%04x", hex($$self{_mem_msb} . $$self{_mem_lsb})));
$$self{device}->corrupt_count_log(1) if $$self{device}->can('corrupt_count_log');
#can't clear message, if valid message doesn't arrive
#resend logic will kick in
$clear_message = 0;
}
elsif ($$self{_stress_test_act}){
$$self{_mem_activity} = undef;
Expand Down Expand Up @@ -2368,7 +2373,9 @@ sub on_read_write_aldb
main::print_log("[Insteon::ALDB_i2] " . $$self{device}->get_object_name
. ": unhandled _mem_action=".$$self{_mem_action})
if $main::Debug{insteon};
$clear_message = 0;
}
return $clear_message;
}

sub _write_link
Expand Down
21 changes: 4 additions & 17 deletions lib/Insteon/BaseInsteon.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -776,14 +776,8 @@ sub _process_message
}
elsif ($pending_cmd eq 'read_write_aldb') {
if ($msg{cmd_code} eq $self->message_type_hex($pending_cmd)) {
if ($self->_aldb && $self->_aldb->{_mem_action} ne 'aldb_i2writeack'){
#This is an ACK. Will be followed by a Link Data message
$clear_message = 0;
$self->_aldb->on_read_write_aldb(%msg) if $self->_aldb;
} else {
$self->_aldb->on_read_write_aldb(%msg) if $self->_aldb;
$self->_process_command_stack(%msg);
}
$clear_message = $self->_aldb->on_read_write_aldb(%msg) if $self->_aldb;
$self->_process_command_stack(%msg) if ($clear_message);
} else {
$corrupt_cmd = 1;
$clear_message = 0;
Expand Down Expand Up @@ -877,15 +871,8 @@ sub _process_message
$self->request_status($self);
} elsif ($msg{command} eq 'read_write_aldb') {
if ($self->_aldb){
if ($self->_aldb->{_mem_action} eq 'aldb_i2readack'){
#If aldb_i2readack is set then this is good
$clear_message = 1;
$self->_aldb->on_read_write_aldb(%msg);
$self->_process_command_stack(%msg);
} else {
#This is an out of sequence message
$self->_aldb->on_read_write_aldb(%msg);
}
$clear_message = $self->_aldb->on_read_write_aldb(%msg) if $self->_aldb;
$self->_process_command_stack(%msg) if($clear_message);
}
} elsif ($msg{type} eq 'broadcast') {
$self->devcat($msg{devcat});
Expand Down