diff --git a/apprc/apprc.cpp b/apprc/apprc.cpp index b625f95..3e0cae0 100644 --- a/apprc/apprc.cpp +++ b/apprc/apprc.cpp @@ -37,7 +37,7 @@ int tmp_sender(string ip,string port) if(WSAStartup(MAKEWORD(2,2),&wsa)!=0) { MessageBox(NULL, "网络无响应,请检查网络是否畅通?","",MB_OK); - wlog("CloudTerm\\cthandler.log",true,"ERROR:socket initialize failed.\n"); + wlog("CloudTerm\\cthandler.log",true,"socket initialize failed.\n"); return -1; } //创建套接字 @@ -45,7 +45,7 @@ int tmp_sender(string ip,string port) if((sock=socket(AF_INET,SOCK_STREAM,IPPROTO_TCP))==INVALID_SOCKET) { MessageBox(NULL, "网络无响应,请检查网络是否畅通?","",MB_OK); - wlog("CloudTerm\\cthandler.log",true,"ERROR:create socket failed.\n"); + wlog("CloudTerm\\cthandler.log",true,"create socket failed.\n"); return -1; } struct sockaddr_in serverAddress; @@ -57,7 +57,7 @@ int tmp_sender(string ip,string port) if(connect(sock,(sockaddr*)&serverAddress,sizeof(serverAddress))==SOCKET_ERROR) { MessageBox(NULL, "网络无响应,请检查网络是否畅通?","",MB_OK); - wlog("CloudTerm\\cthandler.log",true,"ERROR:connect failed.\n"); + wlog("CloudTerm\\cthandler.log",true,"connect failed.\n"); return -1; } //printf("Message from %s: %s\n",inet_ntoa(serverAddress.sin_addr),buf); @@ -104,49 +104,48 @@ int CommuToVm(string ip,string szGranule,string szCmd) if(send(sockToVm,"if=vmuser\n",strlen("if=vmuser\n"),0)==SOCKET_ERROR) { MessageBox(NULL, "网络无响应,请检查网络是否畅通?","",MB_OK); - wlog("CloudTerm\\cthandler.log",true,"ERROR:send data failed."); + wlog("CloudTerm\\cthandler.log",true,"send data failed."); return -1; } char tmp[10]; if((bytes = recv(sockToVm, tmp, 10, 0)) == SOCKET_ERROR) { MessageBox(NULL, "网络无响应,请检查网络是否畅通?","",MB_OK); - wlog("CloudTerm\\cthandler.log",true,"ERROR:recive data failed."); + wlog("CloudTerm\\cthandler.log",true,"recive data failed."); return -1; } if (strncmp(tmp,"ok",2)!=0) { MessageBox(NULL, "网络无响应,请检查网络是否畅通?","",MB_OK); - wlog("CloudTerm\\cthandler.log",true,"ERROR:ok?"); + wlog("CloudTerm\\cthandler.log",true,"ok?"); return -1; } //cdc:|userid|passworddes|appid|granule| sprintf(SendInfo,"cdc:|%s|%s|%s|%s|%s|\n",userid,passwordes,appid,szGranule.c_str(),szCmd.c_str()); - //wlog("CloudTerm\\cthandler.log",true,"%s\n",SendInfo); + wlog("CloudTerm\\cthandler.log",true,"%s\n",SendInfo); if(send(sockToVm,SendInfo,strlen(SendInfo),0)==SOCKET_ERROR) { MessageBox(NULL, "网络无响应,请检查网络是否畅通?","",MB_OK); - wlog("CloudTerm\\cthandler.log",true,"ERROR:send data failed."); + wlog("CloudTerm\\cthandler.log",true,"send data failed."); return -1; } - //wlog("CloudTerm\\cthandler.log",true,"%s\n",tmp); + wlog("CloudTerm\\cthandler.log",true,"%s\n",tmp); char cRecv[1024]; if((bytes = recv(sockToVm, accountid, 1024, 0)) == SOCKET_ERROR) { MessageBox(NULL, "网络无响应,请检查网络是否畅通?","",MB_OK); - wlog("CloudTerm\\cthandler.log",true,"ERROR:recive data failed."); + wlog("CloudTerm\\cthandler.log",true,"recive data failed."); return -1; } accountid[bytes]='\0'; wlog("CloudTerm\\cthandler.log",true,"%s\n",accountid); - closesocket(sockToVm); if (strncmp(accountid,"fail",4)==0) { MessageBox(NULL, "请联系管理员,计算资源不足!","",MB_OK); - wlog("CloudTerm\\cthandler.log",true,"ERROR:accounitd error"); - wlog("CloudTerm\\cthandler.log",true,"ERROR:%s\n",accountid); + wlog("CloudTerm\\cthandler.log",true,"accounitd error"); + wlog("CloudTerm\\cthandler.log",true,"%s\n",accountid); return -1; } int i,j; @@ -168,26 +167,25 @@ int CommuToVm(string ip,string szGranule,string szCmd) } vmpassportdes[j]='\0'; desdec(vmpassportdes,vmpassport,"cac"); - //wlog("CloudTerm\\cthandler.log",true,"%s\n",vmpassport); + wlog("CloudTerm\\cthandler.log",true,"%s\n",vmpassport); //wrlog("CloudTerm\\cthandler.log",SendInfo.c_str(),true); - //wlog("CloudTerm\\cthandler.log",true,"%s\n",accountid); + wlog("CloudTerm\\cthandler.log",true,"%s\n",accountid); return 0; } int _tmain(int argc, _TCHAR* argv[]) { - wlog("CloudTerm\\cthandler.log",true,"%s:start\n",argv[0]); userid=getenv("USERID"); password=getenv("PASSWORD"); desenc(password,passwordes,"cac"); - //wlog("CloudTerm\\cthandler.log",true,"userid ,%s,password,%s\n",userid,password); + wlog("CloudTerm\\cthandler.log",true,"userid ,%s,password,%s\n",userid,password); string sRecv(argv[1]); int loc1; ((loc1=sRecv.find('\"'))!=string::npos)?sRecv.erase(loc1,1):sRecv; - //wlog("CloudTerm\\cthandler.log",true,"apprc start\n"); - //wlog("CloudTerm\\cthandler.log",true,"%s\n",argv[1]); + wlog("CloudTerm\\cthandler.log",true,"apprc start\n"); + wlog("CloudTerm\\cthandler.log",true,"%s\n",argv[1]); STARTUPINFO si; PROCESS_INFORMATION pi; ZeroMemory(&si, sizeof(si)); @@ -202,10 +200,10 @@ int _tmain(int argc, _TCHAR* argv[]) ZeroMemory(szPassword, sizeof(szPassword)); int nIndex(-1); (nIndex = sRecv.find("|setting=")) != string::npos? nIndex += strlen("|setting="): - wlog("CloudTerm\\cthandler.log",true,"ERROR:rc command error"); + wlog("CloudTerm\\cthandler.log",true,"rd command error"); if (nIndex==-1) { - MessageBox(NULL, "计算资源不足,请联系管理员",argv[0],MB_OK); + MessageBox(NULL, "网络无响应,请检查网络是否畅通?","",MB_OK); return -1; } int i = 0; @@ -220,7 +218,10 @@ int _tmain(int argc, _TCHAR* argv[]) { sAppname = "cacrd"; } - + else + { + ConvertUtf8ToGBK(sAppname); + } //wrlog("CloudTerm\\CloudTerm.log",sAppname.c_str(),true); nIndex++; i = 0; @@ -284,7 +285,7 @@ int _tmain(int argc, _TCHAR* argv[]) { MessageBox(NULL, "网络无响应,请检查网络是否畅通?","",MB_OK); char szError[256]; - sprintf(szError, "ERROR:CreateProcess failed (%d).", GetLastError()); + sprintf(szError, "CreateProcess failed (%d).", GetLastError()); wlog("CloudTerm\\cthandler.log",true,"%s",szError); return -1; } @@ -292,7 +293,7 @@ int _tmain(int argc, _TCHAR* argv[]) { CloseHandle( pi.hProcess ); CloseHandle( pi.hThread ); - wlog("CloudTerm\\cthandler.log",true,"%s complete\n",argv[0]); + wlog("CloudTerm\\cthandler.log",true,"rc complete\n"); } return 0; -} +}//zhenjiang diff --git a/apprd/apprd.cpp b/apprd/apprd.cpp index cbdfc8d..43bbd34 100644 --- a/apprd/apprd.cpp +++ b/apprd/apprd.cpp @@ -92,7 +92,6 @@ void ConvertUtf8ToGBK(string& strUtf8) } int CommuToVm(string ip,string szGranule,string szCmd) { - //char *appid="23"; char *appid; appid=getenv("APPID"); SOCKET sockToVm=tmp_sender(ip,"50000"); @@ -104,48 +103,47 @@ int CommuToVm(string ip,string szGranule,string szCmd) if(send(sockToVm,"if=vmuser\n",strlen("if=vmuser\n"),0)==SOCKET_ERROR) { MessageBox(NULL, "网络无响应,请检查网络是否畅通?","",MB_OK); - wlog("CloudTerm\\cthandler.log",true,"ERROR:send data failed.\n"); + wlog("CloudTerm\\cthandler.log",true,"send data failed."); return -1; } char tmp[10]; if((bytes = recv(sockToVm, tmp, 10, 0)) == SOCKET_ERROR) { MessageBox(NULL, "网络无响应,请检查网络是否畅通?","",MB_OK); - wlog("CloudTerm\\cthandler.log",true,"ERROR:recive data failed.\n"); + wlog("CloudTerm\\cthandler.log",true,"recive data failed."); return -1; } if (strncmp(tmp,"ok",2)!=0) { MessageBox(NULL, "网络无响应,请检查网络是否畅通?","",MB_OK); - wlog("CloudTerm\\cthandler.log",true,"ERROR:ok?\n"); + wlog("CloudTerm\\cthandler.log",true,"ok?"); return -1; } sprintf(SendInfo,"cdc:|%s|%s|%s|%s|%s|\n",userid,passworddes,appid,szGranule.c_str(),szCmd.c_str()); - //wlog("CloudTerm\\cthandler.log",true,"send data failed."); + wlog("CloudTerm\\cthandler.log",true,"send data failed."); if(send(sockToVm,SendInfo,strlen(SendInfo),0)==SOCKET_ERROR) { MessageBox(NULL, "网络无响应,请检查网络是否畅通?","",MB_OK); - wlog("CloudTerm\\cthandler.log",true,"ERROR:send data failed.\n"); + wlog("CloudTerm\\cthandler.log",true,"send data failed."); return -1; } -// wlog("CloudTerm\\cthandler.log",true,"%s\n",tmp); + wlog("CloudTerm\\cthandler.log",true,"%s\n",tmp); char cRecv[1024]; if((bytes = recv(sockToVm, accountid, 1024, 0)) == SOCKET_ERROR) { MessageBox(NULL, "网络无响应,请检查网络是否畅通?","",MB_OK); - wlog("CloudTerm\\cthandler.log",true,"ERROR:recive data failed.\n"); + wlog("CloudTerm\\cthandler.log",true,"recive data failed."); return -1; } accountid[bytes]='\0'; - closesocket(sockToVm); if (strncmp(accountid,"fail",4)==0) { MessageBox(NULL, "请联系管理员,计算资源不足!","",MB_OK); - wlog("CloudTerm\\cthandler.log",true,"ERROR:accounitd error"); - wlog("CloudTerm\\cthandler.log",true,"ERROR:%s\n",accountid); + wlog("CloudTerm\\cthandler.log",true,"accounitd error"); + wlog("CloudTerm\\cthandler.log",true,"%s\n",accountid); return -1; } int i,j; @@ -167,36 +165,21 @@ int CommuToVm(string ip,string szGranule,string szCmd) } vmpassportdes[j]='\0'; desdec(vmpassportdes,vmpassport,"cac"); -// wlog("CloudTerm\\cthandler.log",true,"%s",vmpassport); + wlog("CloudTerm\\cthandler.log",true,"%s",vmpassport); //wrlog("CloudTerm\\cthandler.log",SendInfo.c_str(),true); - //wlog("CloudTerm\\cthandler.log",true,"%s",accountid); + wlog("CloudTerm\\cthandler.log",true,"%s",accountid); return 0; } int _tmain(int argc, _TCHAR* argv[]) { - wlog("CloudTerm\\cthandler.log",true,"%s:start\n",argv[0]); userid=getenv("USERID"); - if(userid==NULL) - { - return -1; - } - wlog("CloudTerm\\cthandler.log",true,"%s\n",userid); password=getenv("PASSWORD"); - if(password==NULL) - return -1; - //userid="1"; - //password="111111"; - wlog("CloudTerm\\cthandler.log",true,"%s\n",password); - desenc(password,passworddes,"cac"); - wlog("CloudTerm\\cthandler.log",true,"%s\n",passworddes); + desdec(password,passworddes,"cac"); + wlog("CloudTerm\\cthandler.log",true,"userid=%s,password=%s,passworddes=%s\n",userid,password,passworddes); string sRecv(argv[1]); - wlog("CloudTerm\\cthandler.log",true,"%s\n",sRecv.c_str()); - int loc1; - ((loc1=sRecv.find('\"'))!=string::npos)?sRecv.erase(loc1,1):sRecv; - wlog("CloudTerm\\cthandler.log",true,"%s\n",sRecv.c_str()); - //wlog("CloudTerm\\cthandler.log",true,"apprd start\n"); - //wlog("CloudTerm\\cthandler.log",true,"%s\n",argv[1]); + wlog("CloudTerm\\cthandler.log",true,"apprd start\n"); + wlog("CloudTerm\\cthandler.log",true,"%s\n",argv[1]); STARTUPINFO si; PROCESS_INFORMATION pi; ZeroMemory(&si, sizeof(si)); @@ -212,8 +195,6 @@ int _tmain(int argc, _TCHAR* argv[]) int nIndex(-1); (nIndex = sRecv.find("|setting=")) != string::npos? nIndex += strlen("|setting="): wlog("CloudTerm\\cthandler.log",true,"rd command error"); - - if(nIndex==-1) {MessageBox(NULL,"计算资源不足,请联系管理员",argv[0],0);return -1;} int i = 0; while (sRecv[nIndex] != '*') { @@ -226,7 +207,10 @@ int _tmain(int argc, _TCHAR* argv[]) { sAppname = "cacrd"; } - + else + { + ConvertUtf8ToGBK(sAppname); + } //wrlog("CloudTerm\\CloudTerm.log",sAppname.c_str(),true); nIndex++; i = 0; @@ -269,12 +253,12 @@ int _tmain(int argc, _TCHAR* argv[]) nIndex++; i = 0; string rdp_path; - rdp_path = GetModuleDir() + "\\if\\cacrd_old.exe"; + rdp_path = GetModuleDir() + "\\if\\cacrd_old.exe s"; string scmd; scmd = rdp_path+" -t "+ "\""+ sAppname + "\"" + " -s "+ szIp + " -d "+ szPort+" -u "+vmuserid+" -p "+vmpassport; string logmsg("启动程序及传入参数:"); logmsg+=scmd; - wlog("CloudTerm\\cthandler.log",true,"%s\n",logmsg.c_str()); + //wrlog("CloudTerm\\cthandler.log",logmsg.c_str(),true); if( !CreateProcess( NULL, // No module name (use command line) const_cast (scmd.c_str()), // Command line @@ -290,7 +274,7 @@ int _tmain(int argc, _TCHAR* argv[]) { MessageBox(NULL, "网络无响应,请检查网络是否畅通?","",MB_OK); char szError[256]; - sprintf(szError, "ERROR:CreateProcess failed (%d).", GetLastError()); + sprintf(szError, "CreateProcess failed (%d).", GetLastError()); wlog("CloudTerm\\cthandler.log",true,"%s",szError); return -1; } @@ -298,7 +282,7 @@ int _tmain(int argc, _TCHAR* argv[]) { CloseHandle( pi.hProcess ); CloseHandle( pi.hThread ); - wlog("CloudTerm\\cthandler.log",true,"apprd complete\n"); + wlog("CloudTerm\\cthandler.log",true,"rd complete\n"); } return 0; } \ No newline at end of file diff --git a/clickapp/clickapp.cpp b/clickapp/clickapp.cpp index 765b9cb..4f67651 100644 --- a/clickapp/clickapp.cpp +++ b/clickapp/clickapp.cpp @@ -86,19 +86,15 @@ int tmp_sender(string ip,string port) if(WSAStartup(MAKEWORD(2,2),&wsa)!=0) { MessageBox(NULL, "网络无响应,请检查网络是否畅通?","",MB_OK); - wlog("CloudTerm\\cthandler.log",true,"ERROR:socket initialize failed.\n"); + wrlog("CloudTerm\\cthandler.log","socket initialize failed.\n",true); return -1; } //创建套接字 SOCKET sock; - //DWORD bufLength=1460*4; - //setsockopt(sock,SOL_SOCKET,SO_SNDBUF,&bufLength,sizeof(bufLength)); - //setsockopt(sock,SOL_SOCKET,SO_RCVBUF,&bufLength,sizeof(bufLength)); - //setsockopt(sock,SOL_SOCKET,SO,&bufLength,sizeof(bufLength)); if((sock=socket(AF_INET,SOCK_STREAM,IPPROTO_TCP))==INVALID_SOCKET) { MessageBox(NULL, "网络无响应,请检查网络是否畅通?","",MB_OK); - wlog("CloudTerm\\cthandler.log",true,"ERROR:create socket failed.\n"); + wrlog("CloudTerm\\cthandler.log","create socket failed.\n",true); return -1; } struct sockaddr_in serverAddress; @@ -106,12 +102,11 @@ int tmp_sender(string ip,string port) serverAddress.sin_family=AF_INET; serverAddress.sin_addr.S_un.S_addr = inet_addr(ip.c_str()); serverAddress.sin_port = htons(atoi(port.c_str())); - //建立和服务器的连接 if(connect(sock,(sockaddr*)&serverAddress,sizeof(serverAddress))==SOCKET_ERROR) { MessageBox(NULL, "网络无响应,请检查网络是否畅通?","",MB_OK); - wlog("CloudTerm\\cthandler.log",true,"ERROR:connect failed.\n"); + wrlog("CloudTerm\\cthandler.log","connect failed.\n",true); return -1; } //printf("Message from %s: %s\n",inet_ntoa(serverAddress.sin_addr),buf); @@ -190,9 +185,7 @@ int CommuToVm(string ip) wrlog("CloudTerm\\cthandler.log","recive data failed.",true); return -1; } - accountid[bytes]='\0'; - closesocket(sockToVm); if (strncmp(accountid,"update",6)==0) { MessageBox(NULL, "网络无响应,请检查网络是否畅通?","",MB_OK); @@ -665,12 +658,12 @@ int CallApp(string path) { MessageBox(NULL, "网络无响应,请检查网络是否畅通?","",MB_OK); char szError[256]; - sprintf(szError, "ERROR:CreateProcess failed (%d).\n", GetLastError()); - wlog("CloudTerm\\cthandler.log",true,szError); + sprintf(szError, "CreateProcess failed (%d).", GetLastError()); + wrlog("CloudTerm\\cthandler.log",szError,true); return -1; } else{ - wlog("CloudTerm\\cthandler.log",true,"clickapp complete\n"); + wrlog("CloudTerm\\cthandler.log"," complete",true); CloseHandle( pi.hProcess ); CloseHandle( pi.hThread ); return 0; @@ -679,7 +672,6 @@ int CallApp(string path) int handler(char *cRecv) { string arg=cRecv; - ConvertUtf8ToGBK(arg); int locin; while((locin=(arg.find("\"")))!=string::npos) { @@ -688,7 +680,7 @@ int handler(char *cRecv) if(arg.find("infotype")==string::npos) { MessageBox(NULL, "网络无响应,请检查网络是否畅通?","",MB_OK); - wlog("CloudTerm\\cthandler.log",true,"ERROR:%s",arg.c_str()); + wlog("CloudTerm\\cthandler.log",true,"%s",arg.c_str()); return -1; } int loc=arg.find("="); @@ -745,7 +737,7 @@ void configuration() int _tmain(int argc, _TCHAR* argv[]) { - if(argc!=3) + if(argc<2) { MessageBox(NULL,"param error","error",0); return -1; @@ -787,15 +779,15 @@ int _tmain(int argc, _TCHAR* argv[]) i=0;k=0; char env[128]={'0'}; sprintf(env,"USERID=%s",userid); - if(_putenv(env)) + if(0==_putenv(env)) { - wlog("CloudTerm\\cthandler.log",true,"ERROR:userid write to env\n"); + wlog("CloudTerm\\cthandler.log",true,"userid write to env ok\n"); } memset(env,128,0); sprintf(env,"APPID=%s",appid); - if(_putenv(env)) + if(0==_putenv(env)) { - wlog("CloudTerm\\cthandler.log",true,"ERROR:appid write to env \n"); + wlog("CloudTerm\\cthandler.log",true,"appid write to env ok\n"); } string arg(argv[1]); string logmsg="接收参数:"; @@ -803,9 +795,9 @@ int _tmain(int argc, _TCHAR* argv[]) ccip=argv[2]; memset(env,128,0); sprintf(env,"CCIP=%s",ccip.c_str()); - if(_putenv(env)) + if(!_putenv(env)) { - wlog("CloudTerm\\CloudTerm.log",true,"ERROR:put env ccip \n"); + wlog("CloudTerm\\CloudTerm.log",true,"put env ccip ok\n"); } wlog("CloudTerm\\cthandler.log",true,"%s:%s %s\n",argv[0],logmsg.c_str(),ccip.c_str()); //接命令就发cc @@ -821,7 +813,7 @@ int _tmain(int argc, _TCHAR* argv[]) if(send(Sock,"if=clickapp\n",strlen("if=clickapp\n"),0)==SOCKET_ERROR) { MessageBox(NULL, "网络无响应,请检查网络是否畅通?","",MB_OK); - wlog("CloudTerm\\cthandler.log",true,"ERROR:send data failed."); + wrlog("CloudTerm\\cthandler.log","send data failed.",true); return -1; } int bytes; @@ -830,7 +822,7 @@ int _tmain(int argc, _TCHAR* argv[]) if((bytes = recv(Sock, cRecv, 1024, 0)) == SOCKET_ERROR) { MessageBox(NULL, "网络无响应,请检查网络是否畅通?","",MB_OK); - wlog("CloudTerm\\cthandler.log",true,"ERROR:recive data failed."); + wrlog("CloudTerm\\cthandler.log","recive data failed.",true); return -1; } if (!strncmp(cRecv, "ok", 2)) @@ -839,14 +831,14 @@ int _tmain(int argc, _TCHAR* argv[]) if(send(Sock,SendInfo.c_str(),strlen(SendInfo.c_str()),0)==SOCKET_ERROR) { MessageBox(NULL, "网络无响应,请检查网络是否畅通?","",MB_OK); - wlog("CloudTerm\\cthandler.log",true,"ERROR:send data failed."); - //GetLastError(); + wrlog("CloudTerm\\cthandler.log","send data failed.",true); + GetLastError(); return -1; } if((bytes = recv(Sock, cRecv, 1024, 0)) == SOCKET_ERROR) { MessageBox(NULL, "网络无响应,请检查网络是否畅通?","",MB_OK); - wlog("CloudTerm\\cthandler.log",true,"ERROR:recive data failed."); + wrlog("CloudTerm\\cthandler.log","recive data failed.",true); return -1; } } diff --git a/crphandler1.1.2/protocol.cpp b/crphandler1.1.2/protocol.cpp index c835f09..a86cdd2 100644 --- a/crphandler1.1.2/protocol.cpp +++ b/crphandler1.1.2/protocol.cpp @@ -150,16 +150,16 @@ int getCCipRandom(char ips[][24],int *ipcount) iptemp[count][j] = '\0'; count++; }*/ - //wlog("CloudTerm\\cthandler.log",true,"getcciprandom\n"); + wlog("CloudTerm\\cthandler.log",true,"getcciprandom\n"); char iptemp[30][24]={'0'}; int count=0; if (getenv("CCNUM")==0) { - wlog("CloudTerm\\cthandler.log",true,"ERROR:getenv error\n"); + wlog("CloudTerm\\cthandler.log",true,"getenv error\n"); return -1; } count=atoi(getenv("CCNUM")); - //wlog("CloudTerm\\cthandler.log",true,"%d\n",count); + wlog("CloudTerm\\cthandler.log",true,"%d\n",count); char tmp[10]={'0'}; for (int i=0;i