Commit: 5563452411b05d582a74c603c8611cefc6d95c33 - vmtui (git)

Virtual machine Management Terminal User Interface

Commit MetaInfo

• Revisión: 5563452411b05d582a74c603c8611cefc6d95c33 (tree)
• Tiempo: 2022-07-02 22:36:57
• Autor: Koine Yuusuke(koinec) <koinec@user...>
• Commiter: Koine Yuusuke(koinec)

Log Message

Suppot connect(2) Non-Blocking mode.

Cambiar Resumen

• modified: src/hvctl.c
• modified: src/sshcmd.c
• modified: src/sshcmd.h

Diferencia incremental

--- a/src/hvctl.c
+++ b/src/hvctl.c
@@ -432,7 +432,7 @@ int
 
 	// Connect ---
 	if( HVISOR_CON_REMOTE_SSH == p_hvisor->b_connection )	{
-		i_err	= SSHCmd_Connect( p_hvcon, &t_ssh );
+		i_err	= SSHCmd_Connect_Phase1( p_hvcon, &t_ssh );
 
 		p_hvcon->ExecCmd	= SSHCmd_ExecCmd;
 		dw_status			= HVISOR_STATUS_CONNECTING;
@@ -465,29 +465,42 @@ int
 {
 	int			i_err	= 0x00;
 	HVisor		*p_hvisor	= NULL;
+	SSH_Info	t_ssh;
+
+	p_hvisor	= HVisor_Ref( p_hvcon->i_id );
+	if( NULL == p_hvisor )	{
+		return -0x01;
+	}
+
+	memcpy( &t_ssh, &(p_hvisor->ssh), sizeof( SSH_Info ) );
+
+	HVisor_Release( p_hvisor );
 
 	// Connect ---
 	if( HVISOR_CON_REMOTE_SSH == p_hvcon->b_connection )	{
-		//i_err	= SSHCmd_Connect( p_hvcon, &t_ssh );
+		i_err	= SSHCmd_Connect_Phase2( p_hvcon, &t_ssh );
+		if( 0x01 == i_err )	{
+			// Not Error -- Continue connect(2) proc. ---
+			return 0x00;
+		}
 
 	} else if( HVISOR_CON_LOCALHOST == p_hvcon->b_connection )	{
 		// NONE Proc. ---
 	}
 
 	// Set Connected flag ---
-	if( 0x00 == i_err )	{
-		p_hvisor	= HVisor_Use( p_hvcon->i_id );
-		assert( NULL != p_hvisor );
+	p_hvisor	= HVisor_Use( p_hvcon->i_id );
+	assert( NULL != p_hvisor );
 
+	if( 0x00 == i_err )	{
 		p_hvcon->dw_status	|= HVISOR_STATUS_CONNECTED;
-		p_hvcon->dw_status	&= ~(HVISOR_STATUS_CONNECTING);
-
 		p_hvisor->dw_status	|= HVISOR_STATUS_CONNECTED;
-		p_hvisor->dw_status	&= ~(HVISOR_STATUS_CONNECTING);
+	}
 
-		HVisor_Release( p_hvisor );
+	p_hvcon->dw_status	&= ~(HVISOR_STATUS_CONNECTING);
+	p_hvisor->dw_status	&= ~(HVISOR_STATUS_CONNECTING);
 
-	}
+	HVisor_Release( p_hvisor );
 
 	return i_err;
 }

--- a/src/sshcmd.c
+++ b/src/sshcmd.c
@@ -192,11 +192,12 @@ int
 /* ===========================================================================*/
 VMTUI_SSHCMD_EXTERN
 int
-	SSHCmd_Connect(
+	SSHCmd_Connect_Phase1(
 		HvConnect	*p_hvcon,
 		SSH_Info	*pt_ssh )
 {
 	int			i_err;
+	int			i_value;
 	struct		hostent	*pt_host;
 
 	p_hvcon->ssh.i_sock = socket(AF_INET, SOCK_STREAM, 0x00 );
@@ -204,17 +205,27 @@ int
 		return -0x01;
 	}
 
+	// Change Non-Blocking mode for connect(2) waiting ---
+	i_value	= 0x01;
+	i_err	= ioctl( p_hvcon->ssh.i_sock, FIONBIO, &i_value );
+	if( 0 > i_err )	{
+		close( p_hvcon->ssh.i_sock );
+		p_hvcon->ssh.i_sock	= -0x01;
+		return -0x01;
+	}
+
 	p_hvcon->ssh.t_sin.sin_family		= AF_INET;
 	p_hvcon->ssh.t_sin.sin_port			= htons( pt_ssh->w_port );
 	p_hvcon->ssh.t_sin.sin_addr.s_addr	= inet_addr( pt_ssh->str_hostfqdn );
 
+	// Resolv IP addr from HostName ----
 	if( 0xffffffff == p_hvcon->ssh.t_sin.sin_addr.s_addr )	{
 		pt_host	=gethostbyname( pt_ssh->str_hostfqdn );
 		if( NULL == pt_host )	{
 			ErrInfo_Warn( "Can't resolve SSH server hostname.",
 					p_hvcon->i_id, GUEST_ID_NONE, REQUEST_ID_NONE,
 					errno, 0x00, 0x00, pt_ssh->str_hostfqdn );
-			return -0x01;
+			return -0x02;
 		}
 
 		if( 4 == pt_host->h_length )
@@ -223,17 +234,76 @@ int
 			ErrInfo_Warn( "Invalid IP addr. length",
 					p_hvcon->i_id, GUEST_ID_NONE, REQUEST_ID_NONE,
 					errno, (int)pt_host->h_length, 0x00, pt_ssh->str_hostfqdn );
-			return -0x02;
+			return -0x03;
 		}
 	}
 
 	i_err = connect( p_hvcon->ssh.i_sock, (struct sockaddr *)&(p_hvcon->ssh.t_sin),
 					sizeof( struct sockaddr_in));
-	if( 0x00 != i_err )	{
+	if(( 0x00 != i_err ) && ( EINPROGRESS != errno ))	{
 		ErrInfo_Warn( "Failed connect() for SSH server",
 				p_hvcon->i_id, GUEST_ID_NONE, REQUEST_ID_NONE,
 				errno, i_err, 0x00, pt_ssh->str_hostfqdn );
-		return -0x03;
+		return -0x04;
+	}
+
+	return 0x00;
+}
+
+/* ===========================================================================*/
+VMTUI_SSHCMD_EXTERN
+int
+	SSHCmd_Connect_Phase2(
+		HvConnect	*p_hvcon,
+		SSH_Info	*pt_ssh )
+{
+	int			i_err;
+	int			i_value;
+	socklen_t	t_len;
+	int			i_sockerr;
+	fd_set		t_rfd;
+	fd_set		t_wfd;
+	fd_set		t_efd;
+	struct timeval	t_tout;
+	int			i_sels;
+
+	// Check connect(2) status ---
+	FD_ZERO( &t_rfd );
+	FD_SET( p_hvcon->ssh.i_sock, &t_rfd );
+	FD_ZERO( &t_wfd );
+	FD_SET( p_hvcon->ssh.i_sock, &t_wfd );
+	FD_ZERO( &t_efd );
+	FD_SET( p_hvcon->ssh.i_sock, &t_efd );
+	t_tout.tv_sec	= 0;
+	t_tout.tv_usec	= 1;
+	i_sels	= select( p_hvcon->ssh.i_sock + 1, &t_rfd, &t_wfd, &t_efd, &t_tout );
+	if( 0 == i_sels )	{
+		// Not Error -- Continue connect(2) proc. ---
+		return 0x01;
+	}
+	else if( 0 > i_sels )	{
+		ErrInfo_Warn( "Failed check connecting status for HyperVisor (SSH) server.",
+				p_hvcon->i_id, GUEST_ID_NONE, REQUEST_ID_NONE,
+				errno, i_sels, 0, NULL);
+		return -0x01;
+	}
+
+	t_len	= (socklen_t)sizeof( i_sockerr );
+	i_err	= getsockopt( p_hvcon->ssh.i_sock, SOL_SOCKET, SO_ERROR, &i_sockerr, &t_len);
+	if( 0x00 < i_sockerr )	{
+		ErrInfo_Warn( "Failed connect(2) for HyperVisor (SSH) server.",
+				p_hvcon->i_id, GUEST_ID_NONE, REQUEST_ID_NONE,
+				errno, i_sels, 0, NULL);
+		return -0x02;
+	}
+
+	// Change Blocking mode for connect(2) waiting ---
+	i_value	= 0x00;
+	i_err	= ioctl( p_hvcon->ssh.i_sock, FIONBIO, &i_value );
+	if( 0 > i_err )	{
+		close( p_hvcon->ssh.i_sock );
+		p_hvcon->ssh.i_sock	= -0x01;
+		return -0x01;
 	}
 
 	p_hvcon->ssh.pt_session = libssh2_session_init();

--- a/src/sshcmd.h
+++ b/src/sshcmd.h
@@ -37,7 +37,8 @@
 #endif
 VMTUI_SSHCMD_EXTERN int SSHCmd_ExecCmd( void *pv_hvcnt, char *pstr_cmdline );
 VMTUI_SSHCMD_EXTERN int SSHCmd_DisConnect( HvConnect *p_hvcon );
-VMTUI_SSHCMD_EXTERN int SSHCmd_Connect( HvConnect *p_hvcon, SSH_Info *pt_ssh );
+VMTUI_SSHCMD_EXTERN int SSHCmd_Connect_Phase1( HvConnect *p_hvcon, SSH_Info *pt_ssh );
+VMTUI_SSHCMD_EXTERN int SSHCmd_Connect_Phase2( HvConnect *p_hvcon, SSH_Info *pt_ssh );
 VMTUI_SSHCMD_EXTERN int SSHCmd_Init( void );
 VMTUI_SSHCMD_EXTERN int SSHCmd_Term( void );