Commit: 6 - hunton_server (svn)

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

Commit MetaInfo

• Revision: 6 (tree)
• Time: 2016-01-26 17:47:18
• Author: manjihq

Log Message

管理者用コマンドを実装
＊ユーザー削除
＊シャットダウン
＊ユーザーアカウントのブロック／解除
＊管理者のスコアおよびHPを回復
ユーザーアカウントのブロック状態を実装

Change Summary

• modified: trunk/huntserv.c
• modified: trunk/hunt.h

Incremental Difference

--- trunk/huntserv.c	(revision 5)
+++ trunk/huntserv.c	(revision 6)
@@ -231,6 +231,12 @@
   unsigned long maybearrest;
   unsigned crime_level;
   unsigned arrest_count;
+  enum account_t
+  {
+    AccountActive,
+    AccountBlock
+  }
+  account_status;
   enum move_t
   {
     NoMove,
@@ -2190,6 +2196,7 @@
 	      User[i].myshop[j].build = 0;
 	    }
 	  memset (User[i].password, 0, PASSWORD_LEN);
+	  User[i].account_status = AccountActive;
 	  User[i].session.handle = INVALID_SOCKET;
 	  User[i].idletimer = 0;
 	  User[i].hp = 0;
@@ -4798,7 +4805,7 @@
 	      puts ("protocol mismatch.");
 	      SendResultPacket (psession->handle, -1);
 	    }
-	  else if (nuser != -1)
+	  else if (nuser != -1 && User[nuser].account_status == AccountActive)
 	    {
 	      int i;
 	      const unsigned char *p = packet + 2 + USERNAME_LEN;
@@ -4805,7 +4812,7 @@
 	      char uname[USERNAME_LEN];
 	      char work[PASSWORD_LEN];
 	      memcpy (uname, User[nuser].name, USERNAME_LEN);
-	      printf ("User name:%-16.24s\n", uname);
+	      printf ("User name:%-.24s\n", uname);
 	      for (i = 0; i < PASSWORD_LEN; i++)
 		{
 		  if (*(p + i) == '\0')
@@ -4883,7 +4890,14 @@
 	    }
 	  else
 	    {
-	      puts ("no user.");
+	      if (nuser == -1)
+		{
+		  puts ("no user.");
+		}
+	      else
+		{
+		  printf ("Blocked User:%-.24s\n", User[nuser].name);
+		}
 	      SendResultPacket (psession->handle, -1);
 	    }
 	}
@@ -4984,49 +4998,6 @@
 		}
 	    }
 	}
-      else if (packet[0] == HCLIT_DELUSER)
-	{
-	  int nuser = SearchUser ((char *) (packet + 2));
-	  puts ("attempt to delete.");
-	  if (nuser != -1)
-	    {
-	      int i;
-	      const unsigned char *p = packet + 2 + USERNAME_LEN;
-	      char uname[USERNAME_LEN];
-	      char work[PASSWORD_LEN];
-	      memcpy (uname, User[nuser].name, USERNAME_LEN);
-	      printf ("User name:%-16.24s\n", uname);
-	      for (i = 0; i < PASSWORD_LEN; i++)
-		{
-		  if (*(p + i) == '\0')
-		    {
-		      break;
-		    }
-		  work[i] = *(p + i);
-		}
-	      for (; i < PASSWORD_LEN; i++)
-		{
-		  work[i] = ' ';
-		}
-	      if (memcmp (User[nuser].password, work, PASSWORD_LEN) == 0)
-		{
-		  /* ok. delete this user. */
-		  puts ("OK. delete this user.");
-		  DeleteUser (nuser);
-		  SendResultPacket (psession->handle, 0);
-		}
-	      else
-		{
-		  puts ("password mismatch.");
-		  SendResultPacket (psession->handle, -1);
-		}
-	    }
-	  else
-	    {
-	      puts ("no user.");
-	      SendResultPacket (psession->handle, -1);
-	    }
-	}
     }
   return ret;
 }
@@ -5487,7 +5458,7 @@
     {
       char work[MESG_BUFFER];
       unsigned n = ntohl (*(unsigned long *) (p + USERNAME_LEN));
-      unsigned ntax = n / 100;
+      unsigned ntax = (nuser != 0) ? (n / 100) : 0;
       if (User[nuser].score < n + ntax)
 	{
 	  /* no score */
@@ -5528,6 +5499,64 @@
   return;
 }
 
+/* block or recover user account */
+static void
+doJailAccount (unsigned char *p)
+{
+  int ntarget = SearchUser ((char *) p);
+  if (ntarget != -1)
+    {
+      unsigned char action = *(p + USERNAME_LEN);
+      if (action)
+	{
+	  /* block user account */
+	  puts ("block user account");
+	  printf ("User %d [%-.24s]\n", ntarget, User[ntarget].name);
+	  DisconnectUser (ntarget);
+	  User[ntarget].account_status = AccountBlock;
+	}
+      else
+	{
+	  /* recover user account */
+	  puts ("recover user account");
+	  printf ("User %d [%-.24s]\n", ntarget, User[ntarget].name);
+	  User[ntarget].account_status = AccountActive;
+	}
+    }
+  return;
+}
+
+/* execute admin command */
+static void
+doAdminCommand (unsigned char *p)
+{
+  unsigned n;
+  switch (*p)
+    {
+    case 1:
+      /* gain score */
+      n = ntohl (*(unsigned long *) (p + 1));
+      add_score (0, n);
+      break;
+    case 2:
+      /* gain HP */
+      n = ntohl (*(unsigned long *) (p + 1));
+      cause_heal (0, n);
+    default:
+      printf ("unknown admin command %02X\n", (unsigned) *p);
+      break;
+    }
+  return;
+}
+
+/* shutdown server */
+static void
+doShutDownServer (void)
+{
+  NowRunning = 0;
+  return;
+}
+
 /* parse user command */
 static void
 parseCommand (int nuser, unsigned char *packet)
@@ -5689,9 +5718,59 @@
     case HCLIT_TRANSFERSCORE:
       doTransferScore (nuser, packet + 2);
       break;
+    case HCLIT_DELUSER:
+      puts ("attempt to delete.");
+      if (nuser == 0)
+	{
+	  /* for administrator */
+	  int ntarget = SearchUser ((char *) (packet + 2));
+	  if (ntarget != -1)
+	    {
+	      char uname[USERNAME_LEN];
+	      memcpy (uname, User[nuser].name, USERNAME_LEN);
+	      printf ("Delete User name:%-.24s\n", uname);
+	      DeleteUser (nuser);
+	      SendResultPacket (User[nuser].session.handle, 0);
+	    }
+	  else
+	    {
+	      puts ("no user.");
+	      SendResultPacket (User[nuser].session.handle, -1);
+	    }
+	}
+      else
+	{
+	  printf ("User:%d [%-.24s] is cracking!\n", nuser, User[nuser].name);
+	  SendResultPacket (User[nuser].session.handle, -1);
+	}
+      break;
     case HCLIT_LOGOFF:
       doLogoff (nuser);
       break;
+    case HCLIT_JAILUSER:
+      if (nuser == 0)
+	{
+	  /* for administrator */
+	  /* block or recover user account */
+	  doJailAccount (packet + 2);
+	}
+      break;
+    case HCLIT_ADMINCMD:
+      if (nuser == 0)
+	{
+	  /* for administrator */
+	  /* execute admin command */
+	  doAdminCommand (packet + 2);
+	}
+      break;
+    case HCLIT_SHUTDOWN:
+      if (nuser == 0)
+	{
+	  /* for administrator */
+	  /* shutdown server */
+	  doShutDownServer ();
+	}
+      break;
     }
   return;
 }

--- trunk/hunt.h	(revision 5)
+++ trunk/hunt.h	(revision 6)
@@ -82,6 +82,9 @@
 #define HCLIT_LOGOFF		0x3a
 #define HCLIT_NEWUSER		0x3b
 #define HCLIT_DELUSER		0x3c
+#define HCLIT_JAILUSER		0x3d
+#define HCLIT_ADMINCMD		0x3e
+#define HCLIT_SHUTDOWN		0x3f
 
 /* map data */
 #define HCLIT_MAP_INVALID	'?'