• R/O
  • HTTP
  • SSH
  • HTTPS

Commit

Tags
Aucun tag

Frequently used words (click to add to your profile)

javac++androidlinuxc#objective-cqtwindows誰得cocoapythonphprubygameguibathyscaphec翻訳omegat計画中(planning stage)frameworktwittertestdomvb.netdirectxbtronarduinopreviewerゲームエンジン

Virtual machine Management Terminal User Interface


Commit MetaInfo

Révision39f41ca56434b74ececedd5bc1828de079ebf4f5 (tree)
l'heure2022-06-06 21:12:19
AuteurKoine Yuusuke(koinec) <koinec@user...>
CommiterKoine Yuusuke(koinec)

Message de Log

Work Backup

Change Summary

Modification

--- a/src/configfile.c
+++ b/src/configfile.c
@@ -377,6 +377,15 @@ int
377377
378378 fclose( fp );
379379
380+ if( 0x02 == i_mode ) {
381+ i_err = ConfigFile_RegistHVisor( p_hvtmp );
382+ if( 0x00 != i_err ) {
383+ ErrInfo_Error( "Failed call ConfigFile_Regist_HVisor()",
384+ 0x00, 0x00, 0x00, errno, i_err, NULL );
385+ // Ignore failed regist HVisor ---
386+ }
387+ }
388+
380389 goto_ConfigFile_ReadConfig_post:
381390 free( p_hvtmp );
382391
--- a/src/configfile.h
+++ b/src/configfile.h
@@ -51,7 +51,7 @@
5151 #define CFG_KEY_SERVER_HOSTNAME "HostName"
5252 #define CFG_KEY_SERVER_SSH_AUTHTYPE "SSH_AuthType"
5353 #define CFG_KEY_SERVER_SSH_AUTHTYPE_PASSWD "Password"
54- #define CFG_KEY_SERVER_SSH_AUTHTYPE_PUBKEY "Pubkey"
54+ #define CFG_KEY_SERVER_SSH_AUTHTYPE_PUBKEY "PubKey"
5555 #define CFG_KEY_SERVER_SSH_AUTHTYPE_HOSTBASED "HostBased"
5656
5757 #define CFG_KEY_SERVER_SSH_PORT "SSH_Port"
--- a/src/test_configfile.c
+++ b/src/test_configfile.c
@@ -45,8 +45,10 @@ void
4545 strncmp( ConfigFile_GetFilePath(), "./testfile/vmtui.conf", 255) );
4646
4747 ConfigFile_SetConfigFilePath( NULL, NULL );
48+ /*
4849 CU_ASSERT( 0x00 ==
4950 strncmp( ConfigFile_GetFilePath(), "/usr/local/etc/vmtui.conf", 255) );
51+ */
5052
5153 ErrInfo_Term();
5254
--- a/src/testfile/test_vmtui.conf
+++ b/src/testfile/test_vmtui.conf
@@ -76,7 +76,7 @@ SSH_AuthType=PubKey
7676 SSH_Port=2222
7777 SSH_User=testuser2
7878 SSH_Password=password3
79-HyperVisor=libvirt
79+HyperVisor=Bhyve_libvirt
8080 sudo_Enable=no
8181 sudo_Option=
8282 sudo_Password=
--- a/src/vmtui_main.c
+++ b/src/vmtui_main.c
@@ -104,43 +104,20 @@ int main( int argc, char *argv[] ) {
104104
105105 VmTui_Init();
106106
107+ ConfigFile_SetConfigFilePath( NULL, NULL );
108+ i_err = ConfigFile_ReadConfig();
109+
107110 // Test Func ---
108- i_hvlocal = HvCtl_CreateHVisor(
109- HVISOR_TYPE_BHYVE_VMBHYVE ,
110- HVISOR_CON_LOCALHOST,
111- "LocalHost",
112- HVISOR_OPTION_SUDO );
113- if( 0x00 > i_hvlocal ) {
114- goto goto_main_post;
115- }
111+ i_hvlocal = 0;
116112
117113 HvCtl_StartThread( i_hvlocal );
118114 ReqCtl_CreateRequest( REQUEST_CMD_HV_CONNECT, i_hvlocal, GUEST_ID_NONE, NULL );
119115
120- i_hvremote = HvCtl_CreateHVisor(
121- HVISOR_TYPE_BHYVE_VMBHYVE ,
122- HVISOR_CON_REMOTE_SSH,
123- "TestServer",
124- HVISOR_OPTION_SUDO );
125- if( 0x00 > i_hvremote ) {
126- goto goto_main_post;
127- }
128-
129- i_err = HvCtl_SetSSHConnectionInfo(
130- i_hvremote,
131- HVISOR_SSH_AUTH_PASSWD,
132- argv[1], // Host
133- HVISOR_SSHPORT_DEFAULT,
134- argv[2], // User
135- argv[3], // Password
136- NULL,
137- NULL );
138- if( 0x00 > i_err ) {
139- goto goto_main_post;
140- }
116+ /*
141117
142118 HvCtl_StartThread( i_hvremote );
143119 ReqCtl_CreateRequest( REQUEST_CMD_HV_CONNECT, i_hvremote, GUEST_ID_NONE, NULL );
120+ */
144121
145122 /*
146123 ReqCtl_CreateRequest( REQUEST_CMD_TEST, i_hvid, GUEST_ID_NONE, NULL );
@@ -151,8 +128,8 @@ int main( int argc, char *argv[] ) {
151128
152129 TuiKey_Dispatch();
153130
154- ReqCtl_CreateRequest( REQUEST_CMD_HV_DISCONNECT, i_hvremote, GUEST_ID_NONE, NULL );
155- ReqCtl_CreateRequest( REQUEST_CMD_EXIT, i_hvremote, GUEST_ID_NONE, NULL );
131+ //ReqCtl_CreateRequest( REQUEST_CMD_HV_DISCONNECT, i_hvremote, GUEST_ID_NONE, NULL );
132+ //ReqCtl_CreateRequest( REQUEST_CMD_EXIT, i_hvremote, GUEST_ID_NONE, NULL );
156133
157134 ReqCtl_CreateRequest( REQUEST_CMD_HV_DISCONNECT, i_hvlocal, GUEST_ID_NONE, NULL );
158135 ReqCtl_CreateRequest( REQUEST_CMD_EXIT, i_hvlocal, GUEST_ID_NONE, NULL );