second commit

lintcoder · lintcoder · commit 03af0180769d · 2016-03-24T22:49:02.000+08:00
diff --git a/Clientmain.cpp b/Clientmain.cpp
@@ -41,13 +41,13 @@ int main(int argc,char* argv[])
 	   printf("username : ");
 	   scanf("%s",name);
 	   fflush(stdin);
-	   int nwrite = sprintf(line,"USER %s\r\n",name);
+	   int nwrite = sprintf(line,"%s %s\r\n",ClientCMD[User],name);
 	   write(connSock,line,nwrite);
 
 	   printf("password : ");
 	   scanf("%s",passwd);
 	   fflush(stdin);
-	   nwrite = sprintf(line,"PASS %s\r\n",passwd);
+	   nwrite = sprintf(line,"%s %s\r\n",ClientCMD[Pass],passwd);
 	   write(connSock,line,strlen(line));
 
 	   int nread = read(connSock,line,MAXLINE);
@@ -102,26 +102,26 @@ int main(int argc,char* argv[])
 
 	   switch(i)
 	   {
-		   case 3:
+		   case Ls:
 			   showFileVec(connSock);
 			   break;
-		   case 4:
+		   case Get:
 			   downloadFiles(connSock);
 			   break;
-		   case 5:
+		   case Put:
 			   if (!splitFiles(spaceptr,filename,numtodeal))
 				 printf("some files are not found!\n");
 			   else
 			   	 uploadFiles(connSock,numtodeal);
 			   break;
-		   case 6:
+		   case Quit:
 			   close(connSock);
 			   flag = false;
 			   break;
-		   case 7:
+		   case Lcd:
 			   printLocalFile(clientfilevec);
 			   break;
-               case 8:
+           case Cd:
 			   str = str.substr(spacepos+1);
 			   if (!changeLocalDir(str))
 				printf("invalid directory or permission denied!\n");
diff --git a/FTP.h b/FTP.h
@@ -12,7 +12,7 @@ extern const int cmdport;			//服务器端的命令套接字端口
 extern const char rightmsg[10];		
 extern const char wrongmsg[10];
 extern const char* ServerCMD[];
-
+enum {USER = 0,PASS,PASV,SHOW,GET,PUT,QUIT};
 void err_sys(const char*);
 unsigned long getFileSize(const std::string&);
 void setFileVec(std::vector<std::string>&,char* path);
diff --git a/FTPClient.cpp b/FTPClient.cpp
@@ -13,6 +13,7 @@
 
 using std::string;
 using std::vector;
+
 const char* ClientCMD[ClientCMDNUM] = {"USER","PASS","PASV","ls","get","put","bye","lcd","cd"};
 char clientpath[MAXLINE] = ".";
 vector<string> clientfilevec;
diff --git a/FTPClient.h b/FTPClient.h
@@ -9,6 +9,8 @@ extern const char* ClientCMD[ClientCMDNUM];					//客户端的命令列表
 extern char clientpath[MAXLINE];							//客户端的当前路径
 extern std::vector<std::string> clientfilevec;					//客户端当前路径下的文件名列表
 
+enum {User = 0,Pass,Pasv,Ls,Get,Put,Quit,Lcd,Cd};
+
 void showFileVec(int);
 int passPasvCmd(int,char*);
 void downloadFiles(int);
diff --git a/FTPServ.cpp b/FTPServ.cpp
@@ -87,7 +87,6 @@ void communicateWithClient(int connfd)								//处理客户端命令端口套
 		}
 
 		line[nread] = '\0';
-		//printf("%s",line);
 
 		char* spacepos = strchr(line,' ');
 		if (spacepos == NULL)
@@ -110,10 +109,10 @@ void communicateWithClient(int connfd)								//处理客户端命令端口套
 		char* pos = strstr(spacepos+1,"\r\n");
 		switch (i)
 		{
-			case 0:
+			case USER:
 				legaluser = strncmp(spacepos+1,USERNAME,pos-spacepos-1);
 				break;
-			case 1:
+			case PASS:
 				legalpasswd = strncmp(spacepos+1,PASSWD,pos-spacepos-1);
 				if (legaluser == 0 && legalpasswd == 0)
 				{
@@ -123,23 +122,23 @@ void communicateWithClient(int connfd)								//处理客户端命令端口套
 				else
 					write(connfd,wrongmsg,strlen(wrongmsg));
 				break;
-			case 2:
+			case PASV:
 				char dataport[10];
 				initDataSock(&dataSock,&dataCltAddr);
 		//		printf("dataport : %d\n",dataCltAddr.sin_port);
 				nwrite = sprintf(dataport,"%d \r\n",dataCltAddr.sin_port);
 				dataport[nwrite] = '\0';
 				write(connfd,dataport,strlen(dataport));
-				
+
 				switch (passtype)
 				{
-					case 3:
+					case SHOW:
 						passFileVec(dataSock);
 						break;
-					case 4:
+					case GET:
 						sendFiles(dataSock,filename,numtodeal);
 						break;
-					case 5:
+					case PUT:
 						recvFiles(dataSock,filename,numtodeal);
 						break;
 					default:
@@ -148,7 +147,7 @@ void communicateWithClient(int connfd)								//处理客户端命令端口套
 				}
 				close(dataSock);
 				break;
-			case 3:
+			case SHOW:
 				if (pos != spacepos+1)
 					write(connfd,wrongmsg,strlen(wrongmsg));
 				else
@@ -157,7 +156,7 @@ void communicateWithClient(int connfd)								//处理客户端命令端口套
 					passtype = i;
 				}
 				break;
-			case 4:
+			case GET:
 				filename.clear();
                 numtodeal = splitFiles(spacepos+1,filename,1);
 				printf("numtodeal %d\n",numtodeal);
@@ -170,7 +169,7 @@ void communicateWithClient(int connfd)								//处理客户端命令端口套
 					passtype = i;
 				}
 				break;
-			case 5:
+			case PUT:
 				filename.clear();
                 numtodeal = splitFiles(spacepos+1,filename,0);
 				printf("numtodeal %d\n",numtodeal);
@@ -182,7 +181,7 @@ void communicateWithClient(int connfd)								//处理客户端命令端口套
 					passtype = i;
 				}
 				break;
-			case 6:
+			case QUIT:
 				close(connfd);
 				flag = false;
 				printf("client %d logged out\n",connfd);
@@ -227,7 +226,7 @@ void passFileVec(int datafd)									//传输本地文件名列表
 		strcat(data,string(servfilevec[i]+'\n').c_str());
 		datalen += servfilevec[i].size()+1;
 	}
-	pthread_mutex_lock(&filevec_mutex);
+	pthread_mutex_unlock(&filevec_mutex);
 	int nwrite = sprintf(line,"%d \r\n",datalen);
 	line[nwrite] = '\0';
 	
diff --git a/Makefile b/Makefile
@@ -0,0 +1,19 @@
+all: ftpserv ftpclient clean
+ftpserv: Servmain.o FTPServ.o FTP.o
+	g++ -o ftpserv Servmain.o FTPServ.o FTP.o -lpthread
+Servmain.o: Servmain.cpp FTPServ.h
+	g++ -c -D_REENTRANT Servmain.cpp
+FTPServ.o: FTPServ.cpp FTPServ.h
+	g++ -c -D_REENTRANT FTPServ.cpp
+FTP.o: FTP.cpp FTP.h
+	g++ -c FTP.cpp
+
+ftpclient: Clientmain.o FTPClient.o FTP.o
+	g++ -o ftpclient Clientmain.o FTPClient.o FTP.o
+Clientmain.o: Clientmain.cpp FTPClient.h
+	g++ -c Clientmain.cpp
+FTPClient.o: FTPClient.cpp FTP.h
+	g++ -c FTPClient.cpp
+clean:
+	-rm -f *.o
+
diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 # lightftp
-本程序是一个模拟ftp的简单的文件传输程序，ftpserv和ftpclient分别是服务器端和客户端的可执行文件。
+本程序是在Linux环境下开发的一个模拟ftp的简单的文件传输程序，ftpserv和ftpclient分别是服务器端和客户端的可执行文件。
 服务器端利用多线程的方式分别对连接的每个客户端进行服务，采取预先启动一定数量的线程的方式，提高了效率，同时主程序采用I/O复用的方式监测来自监听套接字和标准输入的数据；
 客户端采用单线程的方式进行文件的上传和下载，支持的命令包括：列出服务器端当前路径的文件列表， 本地当前路径列表，更改本地路径，
 下载、上传文件，关闭客户端等操作；服务器端支持的命令目前包括，列出本地路径下的文件，关闭服务器等操作。 
diff --git a/ftpclient b/ftpclient
diff --git a/ftpserv b/ftpserv
