Commit: 5 - hunton_server (svn)

密猟オンラインサーバープログラム

Commit MetaInfo

• Revision: 5 (tree)
• Time: 2016-01-25 17:34:34
• Author: manjihq

Log Message

Win32環境下でビルド出来るように修正
(とりあえずVisualStudio2010Expressで通った)
送受信のselectタイムアウトを5秒に増加
(クライアントとの通信に失敗するケースを緩和するため)

Change Summary

• modified: trunk/huntserv.c
• modified: trunk/strtable.c
• modified: trunk/pktio.c
• modified: trunk/port.h
• modified: trunk/Makefile.vc

Incremental Difference

--- trunk/huntserv.c	(revision 4)
+++ trunk/huntserv.c	(revision 5)
@@ -715,55 +715,7 @@
 
 
 /************************************************/
-#ifdef MAKEWIN32
-/* convert Shift-jis to UTF-8 */
-static const char *
-convertC2H (char *p, int nlen)
-{
-  int i;
-  const char *pret = p;
-  for (i = 0; i < nlen && *p != '\0'; i++)
-    {
-      unsigned char c = *p++;
-      if (_ismbblead (c))
-	{
-	  /* first byte of KANJI */
-	  unsigned char c2 = *p++;
-	  unsigned int njis = _mbcjmstojis (((unsigned int) c << 8) | c2);
-	  njis |= 0x8080;	/* MBS up */
-	  *(p - 2) = (unsigned char) (njis >> 8);
-	  *(p - 1) = (unsigned char) njis;
-	  i++;
-	}
-    }
-  return pret;
-}
 
-/* convert UTF-8 to Shift-jis */
-static const char *
-convertH2C (char *p, int nlen)
-{
-  int i;
-  const char *pret = p;
-  for (i = 0; i < nlen && *p != '\0'; i++)
-    {
-      unsigned char c = *p++;
-      if (c & 0x80)
-	{
-	  /* first byte of KANJI */
-	  unsigned char c2 = *p++;
-	  unsigned int neuc = ((unsigned int) c << 8) | c2;
-	  unsigned int nsjis = _mbcjistojms (neuc & 0x7f7f);
-	  *(p - 2) = (unsigned char) (nsjis >> 8);
-	  *(p - 1) = (unsigned char) nsjis;
-	  i++;
-	}
-    }
-  return pret;
-}
-
-#endif /* MAKEWIN32 */
-
 /* search item for name */
 static int
 SearchItemForName (const char *p)
@@ -1521,9 +1473,6 @@
 		{
 		  char namebuf[BUFFER_SIZE];
 		  memcpy (namebuf, User[i].myshop[j].name, USERNAME_LEN);
-#ifdef MAKEWIN32
-		  convertH2C (namebuf, USERNAME_LEN);
-#endif
 		  fprintf (optr, "%d,%d,%d,%-.24s\n",
 			   User[i].myshop[j].build,
 			   User[i].myshop[j].pos.x, User[i].myshop[j].pos.y,
@@ -1536,9 +1485,6 @@
 			  memcpy (namebuf,
 				  Weapon[User[i].myshop[j].list[0][k]].name,
 				  WEAPONNAME_LEN);
-#ifdef MAKEWIN32
-			  convertH2C (namebuf, WEAPONNAME_LEN);
-#endif
 			  fprintf (optr, "%-.24s,%u,%u,%lu\n",
 				   namebuf,
 				   User[i].myshop[j].leftuse[0][k],
@@ -1550,9 +1496,6 @@
 			  memcpy (namebuf,
 				  Item[User[i].myshop[j].list[1][k]].name,
 				  ITEMNAME_LEN);
-#ifdef MAKEWIN32
-			  convertH2C (namebuf, ITEMNAME_LEN);
-#endif
 			  fprintf (optr, "%-.24s,%u,%u,%lu\n",
 				   namebuf,
 				   User[i].myshop[j].leftuse[1][k],
@@ -1616,9 +1559,6 @@
 	{
 	  return -1;
 	}
-#ifdef MAKEWIN32
-      convertC2H (namebuf, USERNAME_LEN);
-#endif
       for (j = 0; j < USERNAME_LEN && namebuf[0] != '\0'; j++)
 	{
 	  User[nuser].myshop[i].name[j] = namebuf[j];
@@ -1640,9 +1580,6 @@
 		{
 		  return -1;
 		}
-#ifdef MAKEWIN32
-	      convertC2H (namebuf, WEAPONNAME_LEN);
-#endif
 	      User[nuser].myshop[i].list[0][j] =
 		SearchWeaponForName (namebuf);
 	      if (User[nuser].myshop[i].list[0][j] == 0)
@@ -1661,9 +1598,6 @@
 		{
 		  return -1;
 		}
-#ifdef MAKEWIN32
-	      convertC2H (namebuf, ITEMNAME_LEN);
-#endif
 	      User[nuser].myshop[i].list[1][j] = SearchItemForName (namebuf);
 	      if (User[nuser].myshop[i].list[1][j] == 0)
 		{
@@ -2185,9 +2119,6 @@
       memset (User[userno].statusinfo, 0, PACKET_MAX);
       memset (User[userno].mapdata, 0, PACKET_MAX);
       memcpy (work, User[userno].name, USERNAME_LEN);
-#ifdef MAKEWIN32
-      convertH2C (work, USERNAME_LEN);
-#endif
       printf ("user(%d)[%-.24s] logoff.\n", userno, work);
       User[userno].idletimer = 0;
     }
@@ -2458,9 +2389,6 @@
 {
   int i;
   strncpy (outbuffer, puser, USERNAME_LEN);
-#ifdef MAKEWIN32
-  convertH2C (outbuffer, USERNAME_LEN);
-#endif
   for (i = USERNAME_LEN - 1; i >= 0; i--)
     {
       if (outbuffer[i] != ' ')
@@ -2523,9 +2451,6 @@
 		      FreeMail (pmail);
 		      break;
 		    }
-#ifdef MAKEWIN32
-		  convertC2H (namebuf, USERNAME_LEN);
-#endif
 		  pmail->fromuser = SearchUser (namebuf);
 		  if (pmail->fromuser == -1)
 		    {
@@ -2544,9 +2469,6 @@
 		    {
 		      n = PACKET_DATA_MAX - 1;
 		    }
-#ifdef MAKEWIN32
-		  convertC2H (namebuf, n);
-#endif
 		  pmail->subject[0] = n;
 		  if (n)
 		    {
@@ -2566,9 +2488,6 @@
 			{
 			  n = PACKET_DATA_MAX - 1;
 			}
-#ifdef MAKEWIN32
-		      convertC2H (namebuf, n);
-#endif
 		      pmail->message[j][0] = n;
 		      if (n)
 			{
@@ -2620,9 +2539,6 @@
 	    }
 	  strncpy (namebuf, User[pmail->fromuser].name, USERNAME_LEN);
 	  namebuf[USERNAME_LEN] = '\0';
-#ifdef MAKEWIN32
-	  convertH2C (namebuf, USERNAME_LEN);
-#endif
 	  fprintf (optr, "%d,%d,%lu\n%-.24s\n",
 		   pmail->readflag, pmail->line, pmail->timestamp, namebuf);
 	  n = (unsigned char) (pmail->subject[0]);
@@ -2631,9 +2547,6 @@
 	      memcpy (work, &pmail->subject[1], n);
 	    }
 	  work[n] = '\0';
-#ifdef MAKEWIN32
-	  convertH2C (work, n);
-#endif
 	  fprintf (optr, "%s\n", work);
 	  for (j = 0; j < pmail->line; j++)
 	    {
@@ -2643,9 +2556,6 @@
 		  memcpy (work, &pmail->message[j][1], n);
 		}
 	      work[n] = '\0';
-#ifdef MAKEWIN32
-	      convertH2C (work, n);
-#endif
 	      fprintf (optr, "%s\n", work);
 	    }
 	}
@@ -2750,9 +2660,6 @@
 		      FreeMail (pmail);
 		      break;
 		    }
-#ifdef MAKEWIN32
-		  convertC2H (namebuf, USERNAME_LEN);
-#endif
 		  pmail->fromuser = SearchUser (namebuf);
 		  if (pmail->fromuser == -1)
 		    {
@@ -2771,9 +2678,6 @@
 		    {
 		      n = PACKET_DATA_MAX - 1;
 		    }
-#ifdef MAKEWIN32
-		  convertC2H (namebuf, n);
-#endif
 		  pmail->subject[0] = n;
 		  if (n)
 		    {
@@ -2793,9 +2697,6 @@
 			{
 			  n = PACKET_DATA_MAX - 1;
 			}
-#ifdef MAKEWIN32
-		      convertC2H (namebuf, n);
-#endif
 		      pmail->message[j][0] = n;
 		      if (n)
 			{
@@ -2847,9 +2748,6 @@
 	    }
 	  strncpy (namebuf, User[pmail->fromuser].name, USERNAME_LEN);
 	  namebuf[USERNAME_LEN] = '\0';
-#ifdef MAKEWIN32
-	  convertH2C (namebuf, USERNAME_LEN);
-#endif
 	  fprintf (optr, "%d,%d,%lu\n%-.24s\n",
 		   pmail->readflag, pmail->line, pmail->timestamp, namebuf);
 	  n = (unsigned char) (pmail->subject[0]);
@@ -2858,9 +2756,6 @@
 	      memcpy (work, &pmail->subject[1], n);
 	    }
 	  work[n] = '\0';
-#ifdef MAKEWIN32
-	  convertH2C (work, n);
-#endif
 	  fprintf (optr, "%s\n", work);
 	  for (j = 0; j < pmail->line; j++)
 	    {
@@ -2870,9 +2765,6 @@
 		  memcpy (work, &pmail->message[j][1], n);
 		}
 	      work[n] = '\0';
-#ifdef MAKEWIN32
-	      convertH2C (work, n);
-#endif
 	      fprintf (optr, "%s\n", work);
 	    }
 	}
@@ -2933,9 +2825,6 @@
 			{
 			  break;
 			}
-#ifdef MAKEWIN32
-		      convertC2H (work, strlen (work));
-#endif
 		      for (j = 0; work[j] != '\0' && j < USERNAME_LEN; j++)
 			{
 			  User[i].name[j] = work[j];
@@ -2954,9 +2843,6 @@
 			{
 			  break;
 			}
-#ifdef MAKEWIN32
-		      convertC2H (work, strlen (work));
-#endif
 		      for (j = 0; work[j] != '\0' && j < PASSWORD_LEN; j++)
 			{
 			  User[i].password[j] = work[j];
@@ -3012,9 +2898,6 @@
 			    {
 			      break;
 			    }
-#ifdef MAKEWIN32
-			  convertC2H (namebuf, strlen (namebuf));
-#endif
 			  User[i].weapon[j] =
 			    SearchWeaponForNameType (namebuf, User[i].c_type);
 			  if (User[i].weapon[j])
@@ -3041,9 +2924,6 @@
 			    {
 			      break;
 			    }
-#ifdef MAKEWIN32
-			  convertC2H (namebuf, strlen (namebuf));
-#endif
 			  User[i].item[j] = SearchItemForName (namebuf);
 			  if (User[i].item[j])
 			    {
@@ -3122,15 +3002,9 @@
 	      char work[BUFFER_SIZE];
 	      memcpy (work, User[i].name, USERNAME_LEN);
 	      work[USERNAME_LEN] = '\0';
-#ifdef MAKEWIN32
-	      convertH2C (work, USERNAME_LEN);
-#endif
 	      fprintf (optr, "%-*s\n", USERNAME_LEN, work);
 	      memcpy (work, User[i].password, PASSWORD_LEN);
 	      work[PASSWORD_LEN] = '\0';
-#ifdef MAKEWIN32
-	      convertH2C (work, PASSWORD_LEN);
-#endif
 	      fprintf (optr, "%-*s\n", PASSWORD_LEN, work);
 	      fprintf (optr, "%lu\n", User[i].score);
 	      fprintf (optr, "%d,%d,%d,%d,%d,%d,%d\n", User[i].c_type,
@@ -3142,9 +3016,6 @@
 		  memcpy (work, Weapon[User[i].weapon[j]].name,
 			  WEAPONNAME_LEN);
 		  work[WEAPONNAME_LEN] = '\0';
-#ifdef MAKEWIN32
-		  convertH2C (work, WEAPONNAME_LEN);
-#endif
 		  fprintf (optr, "%s,%u\n", work, User[i].bullette[j]);
 		}
 	      for (j = 0; j < ITEM_MAX; j++)
@@ -3151,9 +3022,6 @@
 		{
 		  memcpy (work, Item[User[i].item[j]].name, ITEMNAME_LEN);
 		  work[ITEMNAME_LEN] = '\0';
-#ifdef MAKEWIN32
-		  convertH2C (work, ITEMNAME_LEN);
-#endif
 		  fprintf (optr, "%s,%u\n", work, User[i].itemcount[j]);
 		}
 	    }
@@ -3216,9 +3084,6 @@
 	      /* can't read data */
 	      break;
 	    }
-#ifdef MAKEWIN32
-	  convertC2H (namebuf, strlen (namebuf));
-#endif
 	  for (i = 0; namebuf[i] != '\0' && i < ANIMALNAME_LEN; i++)
 	    {
 	      p->name[i] = namebuf[i];
@@ -3227,9 +3092,6 @@
 	    {
 	      p->name[i] = ' ';
 	    }
-#ifdef MAKEWIN32
-	  convertC2H (inamebuf, strlen (inamebuf));
-#endif
 	  p->forsell_item = SearchItemForName (inamebuf);
 	  n++;
 	}
@@ -3382,9 +3244,6 @@
 	      /* can't read data */
 	      break;
 	    }
-#ifdef MAKEWIN32
-	  convertC2H (namebuf, strlen (namebuf));
-#endif
 	  strncpy (p->name, namebuf, WEAPONNAME_LEN);
 	  p->b_type = (enum bullet_type) b_type;
 	  n++;
@@ -3447,9 +3306,6 @@
 	      /* can't read data */
 	      break;
 	    }
-#ifdef MAKEWIN32
-	  convertC2H (namebuf, strlen (namebuf));
-#endif
 	  strncpy (p->name, namebuf, ITEMNAME_LEN);
 	  p->id = ntype;
 	  p->effect = neffect;
@@ -4949,9 +4805,6 @@
 	      char uname[USERNAME_LEN];
 	      char work[PASSWORD_LEN];
 	      memcpy (uname, User[nuser].name, USERNAME_LEN);
-#ifdef MAKEWIN32
-	      convertH2C (uname, USERNAME_LEN);
-#endif
 	      printf ("User name:%-16.24s\n", uname);
 	      for (i = 0; i < PASSWORD_LEN; i++)
 		{
@@ -5053,7 +4906,7 @@
 		{
 		  /* illegal system password */
 		  puts ("system password mismatch");
-		  printf ("Client key[%-16.24s]\n",
+		  printf ("Client key[%-16.16s]\n",
 			  packet + 2 + USERNAME_LEN + PASSWORD_LEN + 16);
 		  SendResultPacket (psession->handle, -1);
 		}
@@ -5142,9 +4995,6 @@
 	      char uname[USERNAME_LEN];
 	      char work[PASSWORD_LEN];
 	      memcpy (uname, User[nuser].name, USERNAME_LEN);
-#ifdef MAKEWIN32
-	      convertH2C (uname, USERNAME_LEN);
-#endif
 	      printf ("User name:%-16.24s\n", uname);
 	      for (i = 0; i < PASSWORD_LEN; i++)
 		{
@@ -8690,9 +8540,6 @@
 	      /* perhaps,disconnect session. */
 	      char work[USERNAME_LEN];
 	      memcpy (work, User[i].name, USERNAME_LEN);
-#ifdef MAKEWIN32
-	      convertH2C (work, USERNAME_LEN);
-#endif
 	      printf ("user(%d)[%-16.24s] no response\n", i, work);
 	      DisconnectUser (i);
 	    }

--- trunk/strtable.c	(revision 4)
+++ trunk/strtable.c	(revision 5)
@@ -44,8 +44,8 @@
     {
       /* new data */
       Table[hash] = malloc (sizeof (STRTABLE));
-      Table[hash]->pkeyword = strdup (pkeyword);
-      Table[hash]->pmesg = strdup (pmesg);
+      Table[hash]->pkeyword = STRDUP (pkeyword);
+      Table[hash]->pmesg = STRDUP (pmesg);
       Table[hash]->pnext = NULL;
     }
   else
@@ -70,8 +70,8 @@
       if (plast != NULL)
 	{
 	  plast->pnext = malloc (sizeof (STRTABLE));
-	  plast->pnext->pkeyword = strdup (pkeyword);
-	  plast->pnext->pmesg = strdup (pmesg);
+	  plast->pnext->pkeyword = STRDUP (pkeyword);
+	  plast->pnext->pmesg = STRDUP (pmesg);
 	  plast->pnext->pnext = NULL;
 	}
     }

--- trunk/pktio.c	(revision 4)
+++ trunk/pktio.c	(revision 5)
@@ -137,7 +137,7 @@
       int result;
       fd_set wfds;
       struct timeval tmout;
-      tmout.tv_sec = 1;
+      tmout.tv_sec = 5;
       tmout.tv_usec = 0;
       FD_ZERO (&wfds);
       FD_SET (handle, &wfds);
@@ -186,7 +186,7 @@
       int result;
       fd_set rfds;
       struct timeval tmout;
-      tmout.tv_sec = 1;
+      tmout.tv_sec = 5;
       tmout.tv_usec = 0;
       FD_ZERO (&rfds);
       FD_SET (handle, &rfds);

--- trunk/port.h	(revision 4)
+++ trunk/port.h	(revision 5)
@@ -31,6 +31,9 @@
 #define REQ_SEGMENT_SIZE	512
 #endif
 
+/* string duplicate function */
+#define STRDUP	strdup
+
 #elif defined(MAKEWIN32)
 #define STRICT
 #include <winsock2.h>
@@ -61,6 +64,14 @@
 /* win32 no have 'socklen_t' */
 #define socklen_t int
 
+/* for Visual C++ */
+/* use strtok_s instead of strtok_r */
+#define strtok_r strtok_s
+
+/* use _strdup instead of strdup */
+/* string duplicate function */
+#define STRDUP	_strdup
+
 #else
 #error NEED enviroment-type!
 #endif