[Ipmitool-cvs] ipmitool/src/plugins/lanplus lanplus.c, 1.53, 1.54 lanplus_crypt.c, 1.18, 1.19

[Duncan L. <ice...@us...>]

Update of /cvsroot/ipmitool/ipmitool/src/plugins/lanplus
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv28686/src/plugins/lanplus

Modified Files:
	lanplus.c lanplus_crypt.c 
Log Message:
- fix SOL set errors when commit-write not supported
- fix reset of session timeout for lanplus interface



Index: lanplus.c
===================================================================
RCS file: /cvsroot/ipmitool/ipmitool/src/plugins/lanplus/lanplus.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -d -r1.53 -r1.54
*** lanplus.c	3 Aug 2006 16:41:18 -0000	1.53
--- lanplus.c	11 Aug 2006 17:57:15 -0000	1.54
***************
*** 2227,2230 ****
--- 2227,2233 ----
  	}
  
+ 	/* Reset timeout after retry loop completes */
+ 	intf->session->timeout = IPMI_LAN_TIMEOUT;
+ 
  	/* IPMI messages are deleted under ipmi_lan_poll_recv() */
  	switch (payload->payload_type) {

Index: lanplus_crypt.c
===================================================================
RCS file: /cvsroot/ipmitool/ipmitool/src/plugins/lanplus/lanplus_crypt.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** lanplus_crypt.c	28 Mar 2006 16:56:56 -0000	1.18
--- lanplus_crypt.c	11 Aug 2006 17:57:15 -0000	1.19
***************
*** 227,240 ****
  		if (session->v2_data.integrity_alg == IPMI_INTEGRITY_NONE)
  			return 1;
! 		
  		/* We don't yet support other algorithms */
  		assert(session->v2_data.integrity_alg == IPMI_INTEGRITY_HMAC_SHA1_96);
- 		
  	} else {
  		if (session->v2_data.auth_alg == IPMI_AUTH_RAKP_NONE)
! 			return 1;		
  
! 		/* We don't yet support other algorithms */	
! 		assert(session->v2_data.auth_alg == IPMI_AUTH_RAKP_HMAC_SHA1);	
  	}
  
--- 227,239 ----
  		if (session->v2_data.integrity_alg == IPMI_INTEGRITY_NONE)
  			return 1;
! 
  		/* We don't yet support other algorithms */
  		assert(session->v2_data.integrity_alg == IPMI_INTEGRITY_HMAC_SHA1_96);
  	} else {
  		if (session->v2_data.auth_alg == IPMI_AUTH_RAKP_NONE)
! 			return 1;
  
! 		/* We don't yet support other algorithms */
! 		assert(session->v2_data.auth_alg == IPMI_AUTH_RAKP_HMAC_SHA1);
  	}
  
***************
*** 906,908 ****
  	return (bytes_decrypted == 0);
  }
- 
--- 905,906 ----