Fixes to socket system to make it cope better with fd depletion.

Also added timeout for fullconnect, secured map server from stateless
connections.

2 files changed, 16 insertions, 16 deletions

diff --git a/src/txt-converter/char/char-converter.c b/src/txt-converter/char/char-converter.c
index 44f6d29..1890049 100644
--- a/src/txt-converter/char/char-converter.c
+++ b/src/txt-converter/char/char-converter.c
@@ -666,7 +666,7 @@ int mmo_char_init(void){
   input=getchar();
   if(input == 'y' || input == 'Y'){
 	printf("\nConverting Character Database...\n");
-	fp=fopen("save/athena.txt","r");
+	fp=fopen_("save/athena.txt","r");
 	char_dat=malloc(sizeof(char_dat[0])*256);
 	char_max=256;
 	if(fp==NULL)
@@ -687,7 +687,7 @@ int mmo_char_init(void){
 	    }
 	  }
 	  printf("char data convert end\n");
-	  fclose(fp);
+	  fclose_(fp);
   }
   
   while(getchar() != '\n');  
@@ -695,7 +695,7 @@ int mmo_char_init(void){
   input=getchar();
   if(input == 'y' || input == 'Y') {
 	printf("\nConverting Storage Database...\n");
-	fp=fopen(storage_txt,"r");
+	fp=fopen_(storage_txt,"r");
 	if(fp==NULL){
 		printf("cant't read : %s\n",storage_txt);
 		return 0;
@@ -716,7 +716,7 @@ int mmo_char_init(void){
 			i++;
 		}
 	}
-	fclose(fp);
+	fclose_(fp);
   }
 	
   while(getchar() != '\n');
@@ -724,7 +724,7 @@ int mmo_char_init(void){
   input=getchar();
   if(input == 'y' || input == 'Y') {
 	printf("\nConverting Pet Database...\n");
-	if( (fp=fopen(pet_txt,"r")) ==NULL )
+	if( (fp=fopen_(pet_txt,"r")) ==NULL )
 		return 1;
 	
 	p=malloc(sizeof(struct s_pet));
@@ -741,7 +741,7 @@ int mmo_char_init(void){
 		}
 		c++;
 	}
-	fclose(fp);
+	fclose_(fp);
   }
 
   return 0;
@@ -752,7 +752,7 @@ int inter_config_read(const char *cfgName) {
 	char line[1024], w1[1024], w2[1024];
 	FILE *fp;
 
-	fp=fopen(cfgName,"r");
+	fp=fopen_(cfgName,"r");
 	if(fp==NULL){
 		printf("file not found: %s\n", cfgName);
 		return 1;
@@ -790,7 +790,7 @@ int inter_config_read(const char *cfgName) {
 			printf ("set db_server_logindb : %s\n",w2);
 		}
 	}
-	fclose(fp);
+	fclose_(fp);
 	
 	printf ("success reading interserver configuration\n");
 
@@ -803,7 +803,7 @@ int char_config_read(const char *cfgName) {
 	char line[1024], w1[1024], w2[1024];
 	FILE *fp;
 
-	fp=fopen(cfgName,"r");
+	fp=fopen_(cfgName,"r");
 	if(fp==NULL){
 		printf("file not found: %s\n", cfgName);
 		return 1;
@@ -821,7 +821,7 @@ int char_config_read(const char *cfgName) {
 				strcpy(char_txt, w2);
 			}
 		}
-		fclose(fp);
+		fclose_(fp);
 		printf("reading configure done.....\n");
 	
 	return 0;
diff --git a/src/txt-converter/login/login-converter.c b/src/txt-converter/login/login-converter.c
index c0055da..22957ff 100644
--- a/src/txt-converter/login/login-converter.c
+++ b/src/txt-converter/login/login-converter.c
@@ -87,7 +87,7 @@ int read_gm_account()
 	gm_account_db = numdb_init();
 	printf("gm_account: read start\n");
 
-	if( (fp=fopen("conf/GM_account.txt","r"))==NULL )
+	if( (fp=fopen_("conf/GM_account.txt","r"))==NULL )
 		return 1;
 	while(fgets(line,sizeof(line),fp)){
 		if(line[0] == '/' && line[1] == '/')
@@ -107,7 +107,7 @@ int read_gm_account()
 		}
 		c++;
 	}
-	fclose(fp);
+	fclose_(fp);
 	printf("gm_account: read done (%d gm account ID)\n",c);
 	return 0;
 }
@@ -138,7 +138,7 @@ int mmo_auth_init(void)
 	time_t connect_until_time;
 	char t_uid[256];
 
-	fp=fopen("save/account.txt","r");
+	fp=fopen_("save/account.txt","r");
 	auth_dat=malloc(sizeof(auth_dat[0])*256);
 	auth_max=256;
 	if(fp==NULL)
@@ -173,7 +173,7 @@ int mmo_auth_init(void)
 			printf("DB server Error - %s\n", mysql_error(&mysql_handle) );
 		}
 	}
-	fclose(fp);
+	fclose_(fp);
 
 	printf ("convert end...\n");
 
@@ -191,7 +191,7 @@ int login_config_read(const char *cfgName){
 	char line[1024], w1[1024], w2[1024];
 	FILE *fp;
 
-	fp=fopen(cfgName,"r");
+	fp=fopen_(cfgName,"r");
 
 	if(fp==NULL){
 		printf("file not found: %s\n", cfgName);
@@ -229,7 +229,7 @@ int login_config_read(const char *cfgName){
 			printf ("set db_server_logindb : %s\n",w2);
 		}
 	}
-	fclose(fp);
+	fclose_(fp);
 	printf ("End reading configuration...\n");
 	return 0;
 }