[Ipmitool-cvs] ipmitool/lib ipmi_sol.c,1.39,1.40 ipmi_tsol.c,1.10,1.11

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 454-5900

Update of /cvsroot/ipmitool/ipmitool/lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15762/lib

Modified Files:
	ipmi_sol.c ipmi_tsol.c 
Log Message:
fix typo in sol output when sending break

Index: ipmi_tsol.c
===================================================================
RCS file: /cvsroot/ipmitool/ipmitool/lib/ipmi_tsol.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** ipmi_tsol.c	11 Apr 2006 00:47:49 -0000	1.10
--- ipmi_tsol.c	27 Apr 2006 18:08:30 -0000	1.11
***************
*** 58,62 ****
  #elif defined (HAVE_SYS_TERMIOS_H)
  # include <sys/termios.h>
! #endif        

  #include <ipmitool/log.h>
--- 58,62 ----
  #elif defined (HAVE_SYS_TERMIOS_H)
  # include <sys/termios.h>
! #endif

  #include <ipmitool/log.h>
***************
*** 103,108 ****

  	memset(data, 0, sizeof(data));
!         data[0] = ip1;  
!         data[1] = ip2;                    
          data[2] = ip3;
          data[3] = ip4;
--- 103,108 ----

  	memset(data, 0, sizeof(data));
!         data[0] = ip1;
!         data[1] = ip2;
          data[2] = ip3;
          data[3] = ip4;
***************
*** 136,142 ****
  }

! static int                      
  ipmi_tsol_send_keystroke(struct ipmi_intf * intf, char *buff, int length)
! {                               
          struct ipmi_rs * rsp;
          struct ipmi_rq   req;
--- 136,142 ----
  }

! static int
  ipmi_tsol_send_keystroke(struct ipmi_intf * intf, char *buff, int length)
! {
          struct ipmi_rs * rsp;
          struct ipmi_rq   req;
***************
*** 154,158 ****
  	memcpy(data + 1, buff, length);
  	data[length + 1] = keyseq++;
!                 
          rsp = intf->sendrecv(intf, &req);
  	if (verbose) {
--- 154,158 ----
  	memcpy(data + 1, buff, length);
  	data[length + 1] = keyseq++;
! 
          rsp = intf->sendrecv(intf, &req);
  	if (verbose) {
***************
*** 169,173 ****

          return length;
! } 

  static int
--- 169,173 ----

          return length;
! }

  static int
***************
*** 175,179 ****
  {
          struct timeval end;
!         
          gettimeofday(&end, 0);

--- 175,179 ----
  {
          struct timeval end;
! 
          gettimeofday(&end, 0);

***************
*** 369,373 ****
  {
  	struct winsize winsize;
! 	
  	lprintf(LOG_NOTICE, "Usage: tsol [recvip] [port=NUM] [ro|rw] [rows=NUM] [cols=NUM] [altterm]");
  	lprintf(LOG_NOTICE, "       recvip       Receiver IP Address             [default=local]");
--- 369,373 ----
  {
  	struct winsize winsize;
! 
  	lprintf(LOG_NOTICE, "Usage: tsol [recvip] [port=NUM] [ro|rw] [rows=NUM] [cols=NUM] [altterm]");
  	lprintf(LOG_NOTICE, "       recvip       Receiver IP Address             [default=local]");
***************
*** 430,434 ****
  	}

! 	/* create udp socket to receive the packet */	
  	memset(&sin, 0, sizeof(sin));
  	sin.sin_family = AF_INET;
--- 430,434 ----
  	}

! 	/* create udp socket to receive the packet */
  	memset(&sin, 0, sizeof(sin));
  	sin.sin_family = AF_INET;
***************
*** 484,488 ****

  	/*
! 	 * talk to smdc to start Console redirect - IP address and port as parameter 
  	 * ipmitool -I lan -H 192.168.168.227 -U Administrator raw 0x30 0x06 0xC0 0xA8 0xA8 0x78 0x1A 0x0A
  	 */
--- 484,488 ----

  	/*
! 	 * talk to smdc to start Console redirect - IP address and port as parameter
  	 * ipmitool -I lan -H 192.168.168.227 -U Administrator raw 0x30 0x06 0xC0 0xA8 0xA8 0x78 0x1A 0x0A
  	 */
***************
*** 496,500 ****
  	       intf->session->sol_escape_char);

! 	gettimeofday(&_start_keepalive, 0);	

  	fds_wait[0].fd = fd_socket;
--- 496,500 ----
  	       intf->session->sol_escape_char);

! 	gettimeofday(&_start_keepalive, 0);

  	fds_wait[0].fd = fd_socket;
***************
*** 507,511 ****
  	fds_wait[2].events = 0;
  	fds_wait[2].revents = 0;
! 	
  	fds_data_wait[0].fd = fd_socket;
  	fds_data_wait[0].events = POLLIN | POLLOUT;
--- 507,511 ----
  	fds_wait[2].events = 0;
  	fds_wait[2].revents = 0;
! 
  	fds_data_wait[0].fd = fd_socket;
  	fds_data_wait[0].events = POLLIN | POLLOUT;
***************
*** 517,525 ****
  	fds_data_wait[2].events = POLLOUT;
  	fds_data_wait[2].revents = 0;
! 	
  	out_buff_fill = 0;
  	in_buff_fill = 0;
  	fds = fds_wait;
! 	
  	for (;;) {
  		result = poll(fds, 3, 15*1000);
--- 517,525 ----
  	fds_data_wait[2].events = POLLOUT;
  	fds_data_wait[2].revents = 0;
! 
  	out_buff_fill = 0;
  	in_buff_fill = 0;
  	fds = fds_wait;
! 
  	for (;;) {
  		result = poll(fds, 3, 15*1000);
***************
*** 560,564 ****
  					return result;
  				}
! 				if (read_only) 
  					bytes = 0;
  				in_buff_fill += bytes;
--- 560,564 ----
  					return result;
  				}
! 				if (read_only)
  					bytes = 0;
  				in_buff_fill += bytes;
***************
*** 576,580 ****
  		if ((fds[0].revents & POLLOUT) && in_buff_fill) {
  			/*
! 			 * translate key and send that to SMDC using IPMI 
  			 * ipmitool -I lan -H 192.168.168.227 -U Administrator raw 0x30 0x03 0x04 0x1B 0x5B 0x43
  			 */
--- 576,580 ----
  		if ((fds[0].revents & POLLOUT) && in_buff_fill) {
  			/*
! 			 * translate key and send that to SMDC using IPMI
  			 * ipmitool -I lan -H 192.168.168.227 -U Administrator raw 0x30 0x03 0x04 0x1B 0x5B 0x43
  			 */
***************
*** 588,595 ****
  			}
  		}
! 		fds = (in_buff_fill || out_buff_fill )? 
  			fds_data_wait : fds_wait;
  	}
! 	
  	return 0;
  }
--- 588,595 ----
  			}
  		}
! 		fds = (in_buff_fill || out_buff_fill )?
  			fds_data_wait : fds_wait;
  	}
! 
  	return 0;
  }

Index: ipmi_sol.c
===================================================================
RCS file: /cvsroot/ipmitool/ipmitool/lib/ipmi_sol.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** ipmi_sol.c	28 Mar 2006 16:56:56 -0000	1.39
--- ipmi_sol.c	27 Apr 2006 18:08:30 -0000	1.40
***************
*** 51,55 ****
  #elif defined (HAVE_SYS_TERMIOS_H)
  # include <sys/termios.h>
! #endif        

  #include <ipmitool/helper.h>
--- 51,55 ----
  #elif defined (HAVE_SYS_TERMIOS_H)
  # include <sys/termios.h>
! #endif

  #include <ipmitool/helper.h>
***************
*** 1209,1213 ****

  			case 'B':
! 				printf("%cb [send break]\r\n",
  				       intf->session->sol_escape_char);
  				sendBreak(intf);
--- 1209,1213 ----

  			case 'B':
! 				printf("%cB [send break]\r\n",
  				       intf->session->sol_escape_char);
  				sendBreak(intf);