From 49b78de8939278285aa27d142846caa81945fa90 Mon Sep 17 00:00:00 2001
From: jbjohnso <jbjohnso@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Fri, 2 Nov 2012 13:37:46 +0000
Subject: [PATCH] Improve reliability of duplicate response detection phase 1,
 also check netfn and command match

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@14225 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT-server/lib/perl/xCAT/IPMI.pm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/xCAT-server/lib/perl/xCAT/IPMI.pm b/xCAT-server/lib/perl/xCAT/IPMI.pm
index c927e7686..812aa94e2 100644
--- a/xCAT-server/lib/perl/xCAT/IPMI.pm
+++ b/xCAT-server/lib/perl/xCAT/IPMI.pm
@@ -384,6 +384,8 @@ sub subcmd {
     if ($self->{confalgo}) {
         $type = $type | 0b10000000; #add secrecy
     }
+    $self->{expectedcmd}=$args{command};
+    $self->{expectednetfn}=$args{netfn}+1;
     $self->sendpayload(payload=>\@payload,type=>$type,delayxmit=>$args{delayxmit});
 }
 
@@ -822,7 +824,7 @@ sub parse_ipmi_payload {
     my @payload = @_;
     #for now, just trash the headers, this has been validated to death anyway
     #except seqlun, that one is important
-    if ($payload[4] != $self->{seqlun} or $payload[0] != $self->{rqaddr}) {
+    unless ($payload[4] == $self->{seqlun} and $payload[0] == $self->{rqaddr} and $payload[1]>>2 == $self->{expectednetfn} and $payload[5] == $self->{expectedcmd} ) {
 	#both sequence number and arqaddr must match, because we are using rqaddr to extend the sequence number
         #print "Successfully didn't get confused by stale response ".$payload[4]." and ".($self->{seqlun}-4)."\n";
         #hexdump(@payload);