[Ipmitool-cvs] ipmitool/src/plugins/lanplus lanplus.c,1.17,1.18 lanplus_dump.c,1.1,1.2

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

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

Modified Files:
	lanplus.c lanplus_dump.c 
Log Message:
fix lots of little errors that show up with -Werror -Wall


Index: lanplus.c
===================================================================
RCS file: /cvsroot/ipmitool/ipmitool/src/plugins/lanplus/lanplus.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** lanplus.c	27 Aug 2004 16:57:04 -0000	1.17
--- lanplus.c	31 Aug 2004 23:52:59 -0000	1.18
***************
*** 106,110 ****
  											  struct ipmi_intf * intf,
  											  struct ipmi_v2_payload * payload);
! static int check_sol_packet_for_data(
  									 struct ipmi_intf * intf,
  									 struct ipmi_rs *rsp);
--- 106,110 ----
  											  struct ipmi_intf * intf,
  											  struct ipmi_v2_payload * payload);
! static int check_sol_packet_for_new_data(
  									 struct ipmi_intf * intf,
  									 struct ipmi_rs *rsp);
***************
*** 547,553 ****
  					   rsp->session.payloadtype);
  				printf("<<   Session ID              : 0x%08lx\n",
! 					   rsp->session.id);
  				printf("<<   Sequence                : 0x%08lx\n",
! 					   rsp->session.seq);
  					
  				printf("<<   IPMI Msg/Payload Length : %d\n",
--- 547,553 ----
  					   rsp->session.payloadtype);
  				printf("<<   Session ID              : 0x%08lx\n",
! 					   (long)rsp->session.id);
  				printf("<<   Sequence                : 0x%08lx\n",
! 					   (long)rsp->session.seq);
  					
  				printf("<<   IPMI Msg/Payload Length : %d\n",
***************
*** 1703,1708 ****
  		printf(">>   Authtype   : %s\n", val2str(IPMI_SESSION_AUTHTYPE_NONE,
  												 ipmi_authtype_vals));
! 		printf(">>   Sequence   : 0x%08lx\n", session->out_seq);
! 		printf(">>   Session ID : 0x%08lx\n", 0);
  
  		printf(">> IPMI Request Message Header\n");
--- 1703,1708 ----
  		printf(">>   Authtype   : %s\n", val2str(IPMI_SESSION_AUTHTYPE_NONE,
  												 ipmi_authtype_vals));
! 		printf(">>   Sequence   : 0x%08lx\n", (long)session->out_seq);
! 		printf(">>   Session ID : 0x%08lx\n", (long)0);
  
  		printf(">> IPMI Request Message Header\n");
***************
*** 1773,1777 ****
  						  struct ipmi_v2_payload * payload)
  {
! 	struct ipmi_rs      * rsp;
  	unsigned char       * msg_data;
  	int                   msg_length;
--- 1773,1777 ----
  						  struct ipmi_v2_payload * payload)
  {
! 	struct ipmi_rs      * rsp = NULL;
  	unsigned char       * msg_data;
  	int                   msg_length;
***************
*** 2369,2373 ****
  	if (rsp->ccode == 0x87) {
  		printf("Failed to Close Session: invalid session ID %08lx\n",
! 			   intf->session->v2_data.bmc_id);
  		return -1;
  	}
--- 2369,2373 ----
  	if (rsp->ccode == 0x87) {
  		printf("Failed to Close Session: invalid session ID %08lx\n",
! 			   (long)intf->session->v2_data.bmc_id);
  		return -1;
  	}
***************
*** 2378,2382 ****
  
  	if (verbose > 1)
! 		printf("\nClosed Session %08lx\n\n", intf->session->v2_data.bmc_id);
  
  	return 0;
--- 2378,2382 ----
  
  	if (verbose > 1)
! 		printf("\nClosed Session %08lx\n\n", (long)intf->session->v2_data.bmc_id);
  
  	return 0;

Index: lanplus_dump.c
===================================================================
RCS file: /cvsroot/ipmitool/ipmitool/src/plugins/lanplus/lanplus_dump.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** lanplus_dump.c	25 May 2004 20:53:51 -0000	1.1
--- lanplus_dump.c	31 Aug 2004 23:52:59 -0000	1.2
***************
*** 63,70 ****
  	printf("%s  Console Session ID                 : 0x%08lx\n",
  		   DUMP_PREFIX_INCOMING,
! 		   rsp->payload.open_session_response.console_id);
  	printf("%s  BMC Session ID                     : 0x%08lx\n",
  		   DUMP_PREFIX_INCOMING,
! 		   rsp->payload.open_session_response.bmc_id);
  	printf("%s  Negotiated authenticatin algorithm : %s\n",
  		   DUMP_PREFIX_INCOMING,
--- 63,70 ----
  	printf("%s  Console Session ID                 : 0x%08lx\n",
  		   DUMP_PREFIX_INCOMING,
! 		   (long)rsp->payload.open_session_response.console_id);
  	printf("%s  BMC Session ID                     : 0x%08lx\n",
  		   DUMP_PREFIX_INCOMING,
! 		   (long)rsp->payload.open_session_response.bmc_id);
  	printf("%s  Negotiated authenticatin algorithm : %s\n",
  		   DUMP_PREFIX_INCOMING,
***************
*** 101,105 ****
  	printf("%s  Console Session ID            : 0x%08lx\n",
  		   DUMP_PREFIX_INCOMING,
! 		   rsp->payload.rakp2_message.console_id);
  
  	printf("%s  BMC random number             : 0x", DUMP_PREFIX_INCOMING);
--- 101,105 ----
  	printf("%s  Console Session ID            : 0x%08lx\n",
  		   DUMP_PREFIX_INCOMING,
! 		   (long)rsp->payload.rakp2_message.console_id);
  
  	printf("%s  BMC random number             : 0x", DUMP_PREFIX_INCOMING);
***************
*** 155,159 ****
  	printf("%s  Console Session ID            : 0x%08lx\n",
  		   DUMP_PREFIX_INCOMING,
! 		   rsp->payload.rakp2_message.console_id);
  
  	printf("%s  BMC random number             : 0x", DUMP_PREFIX_INCOMING);
--- 155,159 ----
  	printf("%s  Console Session ID            : 0x%08lx\n",
  		   DUMP_PREFIX_INCOMING,
! 		   (long)rsp->payload.rakp2_message.console_id);
  
  	printf("%s  BMC random number             : 0x", DUMP_PREFIX_INCOMING);