X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fnetserv.c;h=f29a19c8e39f906851bc8f754736341783adb38e;hb=c020bbb83dd5b52a353fa867d7746a43eb5e6ffc;hp=aec5d0576d3d147f735e4d03d3b1aa4ceb07d116;hpb=e7f36cd97c8580345714b4a22d6b4ad291e50ed6;p=rocksndiamonds.git

diff --git a/src/netserv.c b/src/netserv.c
index aec5d057..f29a19c8 100644
--- a/src/netserv.c
+++ b/src/netserv.c
@@ -1,15 +1,15 @@
-/*
- *   A server for a multi-player version of Tetris
- *
- *   Copyright (C) 1996 Roger Espel Llima <roger.espel.llima@pobox.com>
- *
- *   Started: 10 Oct 1996
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation. See the file COPYING for details.
- *
- */
+/***********************************************************
+*  Rocks'n'Diamonds -- McDuffin Strikes Back!              *
+*----------------------------------------------------------*
+*  (c) 1995-98 Artsoft Entertainment                       *
+*              Holger Schemel                              *
+*              Oststrasse 11a                              *
+*              33604 Bielefeld                             *
+*              phone: ++49 +521 290471                     *
+*              email: aeglos@valinor.owl.de                *
+*----------------------------------------------------------*
+*  network.c                                               *
+***********************************************************/
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -27,24 +27,11 @@
 #include <netdb.h>
 
 #include "netserv.h"
-
-
-
-extern int verbose;
-
-extern void copydown(char *, char *, int);
-extern void fatal(char *);
-
-
+#include "misc.h"
 
 static int clients = 0;
-static int bots = 0;
 static int onceonly = 0;
-static int timetoplay = 0;
 static int is_daemon = 0;
-static int level = 5;
-static int mode = -1;
-static int paused = 0;
 
 struct user
 {
@@ -59,7 +46,6 @@ struct user
   unsigned char writbuf[MAX_BUFFER_SIZE];
   int nwrite;
   char playing;
-  char isbot;
   int lines;
   unsigned int games;
   unsigned char action;
@@ -91,7 +77,8 @@ static void syserr(char *s)
 static void addtobuffer(struct user *u, unsigned char *b, int len)
 {
   if (u->nwrite + len >= MAX_BUFFER_SIZE)
-    fatal("Internal error: send buffer overflow");
+    Error(ERR_EXIT, "internal error: network send buffer overflow");
+
   memcpy(u->writbuf + u->nwrite, b, len);
   u->nwrite += len;
 }
@@ -127,7 +114,7 @@ static void dropuser(struct user *u)
 {
   struct user *v, *w;
   
-  if (verbose)
+  if (options.verbose)
     printf("RND_SERVER: dropping client %d (%s)\n", u->number, u->nick);
 
   if (u == user0)
@@ -169,28 +156,18 @@ static void dropuser(struct user *u)
     }
   }
 
-  if (u->isbot)
-    bots--;
-
   free(u);
   clients--;
 
-  if (onceonly && clients == bots)
+  if (onceonly && clients == 0)
   {
-    if (verbose)
+    if (options.verbose)
     {
       printf("RND_SERVER: no clients left\n");
       printf("RND_SERVER: aborting\n");
     }
     exit(0);
   }
-
-  if (clients == 0)
-  {
-    mode = -1;
-    level = 5;
-    timetoplay = 0;
-  }
 }
 
 static void new_connect(int fd)
@@ -198,9 +175,8 @@ static void new_connect(int fd)
   struct user *u, *v;
   unsigned char nxn;
 
-  u = malloc(sizeof (struct user));
-  if (!u)
-    fatal("Out of memory");
+  u = checked_malloc(sizeof (struct user));
+
   u->fd = fd;
   u->nick[0] = 0;
   u->next = user0;
@@ -209,7 +185,6 @@ static void new_connect(int fd)
   u->nread = 0;
   u->nwrite = 0;
   u->playing = 0;
-  u->isbot = 0;
   u->introduced = 0;
   u->games = 0;
   u->action = 0;
@@ -232,7 +207,7 @@ static void new_connect(int fd)
   }
 
   u->number = nxn;
-  if (verbose)
+  if (options.verbose)
     printf("RND_SERVER: client %d connecting from %s\n", nxn, inet_ntoa(saddr.sin_addr));
   clients++;
 
@@ -244,16 +219,16 @@ static void new_connect(int fd)
 
 static void Handle_OP_PROTOCOL_VERSION(struct user *u, unsigned int len)
 {
-  if (len != 5 || buf[2] != PROT_VERS_1 || buf[3] != PROT_VERS_2)
+  if (len != 5 || buf[2] != PROTOCOL_VERSION_1 || buf[3] != PROTOCOL_VERSION_2)
   {
-    if (verbose)
+    if (options.verbose)
       printf("RND_SERVER: client %d (%s) has wrong protocol version %d.%d.%d\n", u->number, u->nick, buf[2], buf[3], buf[4]);
 
     buf[0] = 0;
     buf[1] = OP_BADVERS;
-    buf[2] = PROT_VERS_1;
-    buf[3] = PROT_VERS_2;
-    buf[4] = PROT_VERS_3;
+    buf[2] = PROTOCOL_VERSION_1;
+    buf[3] = PROTOCOL_VERSION_2;
+    buf[4] = PROTOCOL_VERSION_3;
     sendtoone(u, 5);
     flushuser(u);
 
@@ -262,7 +237,7 @@ static void Handle_OP_PROTOCOL_VERSION(struct user *u, unsigned int len)
   }
   else
   {
-    if (verbose)
+    if (options.verbose)
       printf("RND_SERVER: client %d (%s) uses protocol version %d.%d.%d\n", u->number, u->nick, buf[2], buf[3], buf[4]);
   }
 }
@@ -274,7 +249,7 @@ static void Handle_OP_NUMBER_WANTED(struct user *u)
   int nr_wanted = buf[2];
   int nr_is_free = 1;
 
-  if (verbose)
+  if (options.verbose)
     printf("RND_SERVER: client %d (%s) wants to switch to # %d\n",
 	   u->number, u->nick, nr_wanted);
 
@@ -287,7 +262,7 @@ static void Handle_OP_NUMBER_WANTED(struct user *u)
     }
   }
 
-  if (verbose)
+  if (options.verbose)
   {
     if (nr_is_free)
       printf("RND_SERVER: client %d (%s) switches to # %d\n",
@@ -341,7 +316,7 @@ static void Handle_OP_NICKNAME(struct user *u, unsigned int len)
     broadcast(u, 2, 0);
   }
 	      
-  if (verbose)
+  if (options.verbose)
     printf("RND_SERVER: client %d calls itself \"%s\"\n", u->number, u->nick);
   buf[1] = OP_NICKNAME;
   broadcast(u, len, 0);
@@ -362,19 +337,6 @@ static void Handle_OP_NICKNAME(struct user *u, unsigned int len)
 	sendtoone(u, 2+strlen(v->nick));
       }
     }
-    if (level != 5)
-    {
-      buf[0] = 0;
-      buf[1] = OP_LEVEL;
-      buf[2] = level;
-      sendtoone(u, 3);
-    }
-    if (mode >= 0)
-    {
-      buf[1] = OP_MODE;
-      buf[2] = mode;
-      sendtoone(u, 3);
-    }
   }
 
   u->introduced = 1;
@@ -384,13 +346,12 @@ static void Handle_OP_START_PLAYING(struct user *u)
 {
   struct user *v, *w;
 
-  if (verbose)
+  if (options.verbose)
     printf("RND_SERVER: client %d (%s) starts game [level %d from levedir %d (%s)]\n",
 	   u->number, u->nick,
 	   (buf[2] << 8) + buf[3],
 	   (buf[4] << 8) + buf[5],
 	   &buf[6]);
-  timetoplay = 0;
 
   for (w=user0; w; w=w->next)
   {
@@ -411,17 +372,6 @@ static void Handle_OP_START_PLAYING(struct user *u)
     }
   }
 
-  /*
-  if (paused)
-  {
-    paused = 0;
-    buf[1] = OP_CONT;
-    broadcast(NULL, 2, 0);
-  }
-  buf[1] = OP_START_PLAYING;
-  broadcast(NULL, 2, 0);
-  */
-
   /* reset frame counter */
   frame_counter = 0;
 
@@ -437,23 +387,21 @@ static void Handle_OP_START_PLAYING(struct user *u)
 
 static void Handle_OP_PAUSE_PLAYING(struct user *u)
 {
-  if (verbose)
+  if (options.verbose)
     printf("RND_SERVER: client %d (%s) pauses game\n", u->number, u->nick);
   broadcast(NULL, 2, 0);
-  paused = 1;
 }
 
 static void Handle_OP_CONTINUE_PLAYING(struct user *u)
 {
-  if (verbose)
+  if (options.verbose)
     printf("RND_SERVER: client %d (%s) continues game\n", u->number, u->nick);
   broadcast(NULL, 2, 0);
-  paused = 0;
 }
 
 static void Handle_OP_STOP_PLAYING(struct user *u)
 {
-  if (verbose)
+  if (options.verbose)
     printf("RND_SERVER: client %d (%s) stops game\n", u->number, u->nick);
   broadcast(NULL, 2, 0);
 }
@@ -516,7 +464,7 @@ static void Handle_OP_MOVE_FIGURE(struct user *u)
 void NetworkServer(int port, int serveronly)
 {
   int i, sl, on;
-  struct user *u, *v, *w;
+  struct user *u;
   int mfd;
   int r; 
   unsigned int len;
@@ -565,7 +513,7 @@ void NetworkServer(int port, int serveronly)
   if (is_daemon)
   {
     /* become a daemon, breaking all ties with the controlling terminal */
-    verbose = 0;
+    options.verbose = 0;
     for (i=0; i<255; i++)
     {
       if (i != lfd)
@@ -585,29 +533,18 @@ void NetworkServer(int port, int serveronly)
     open("/dev/null", O_WRONLY);
   }
 
-  if (verbose)
+  if (options.verbose)
   {
     printf("rocksndiamonds network server: started up, listening on port %d\n",
 	   port);
     printf("rocksndiamonds network server: using protocol version %d.%d.%d\n",
-	   PROT_VERS_1, PROT_VERS_2, PROT_VERS_3);
+	   PROTOCOL_VERSION_1, PROTOCOL_VERSION_2, PROTOCOL_VERSION_3);
   }
 
   while(1)
   {
     interrupt = 0;
 
-    /*
-    if (timetoplay && time(NULL) >= timetoplay)
-    {
-      buf[0] = 0;
-      do_play();
-      if (verbose)
-	printf("RND_SERVER: everyone lost... restarting game\n");
-      timetoplay = 0;
-    }
-    */
-
     for (u=user0; u; u=u->next)
       flushuser(u);
 
@@ -625,21 +562,15 @@ void NetworkServer(int port, int serveronly)
     tv.tv_sec = 0;
     tv.tv_usec = 500000;
     if ((sl = select(mfd + 1, &fds, NULL, NULL, &tv)) < 0)
+    {
       if (errno != EINTR)
 	syserr("select");
-      else continue;
-    
-    if (sl < 0)
-      continue;
+      else
+	continue;
+    }
 
-    if (clients > 0 && clients == bots)
-    {
-      if (verbose)
-	printf("RND_SERVER: only bots left... dropping all bots\n");
-      while (user0)
-	dropuser(user0);
+    if (sl < 0)
       continue;
-    }
     
     if (sl == 0)
       continue;
@@ -676,7 +607,7 @@ void NetworkServer(int port, int serveronly)
 	r = read(u->fd, u->readbuf + u->nread, MAX_BUFFER_SIZE - u->nread);
 	if (r <= 0)
 	{
-	  if (verbose)
+	  if (options.verbose)
 	    printf("RND_SERVER: EOF from client %d (%s)\n", u->number, u->nick);
 	  dropuser(u);
 	  interrupt = 1;
@@ -688,7 +619,7 @@ void NetworkServer(int port, int serveronly)
 	  len = u->readbuf[3];
 	  if (u->readbuf[0] || u->readbuf[1] || u->readbuf[2])
 	  {
-	    if (verbose)
+	    if (options.verbose)
 	      printf("RND_SERVER: crap from client %d (%s)\n", u->number, u->nick);
 	    write(u->fd, "\033]50;kanji24\007\033#8\033(0", 19);
 	    dropuser(u);
@@ -697,12 +628,12 @@ void NetworkServer(int port, int serveronly)
 	  }
 	  memcpy(buf, &u->readbuf[4], len);
 	  u->nread -= 4 + len;
-	  copydown(u->readbuf, u->readbuf + 4 + len, u->nread);
+	  memmove(u->readbuf, u->readbuf + 4 + len, u->nread);
 
 	  buf[0] = u->number;
 	  if (!u->introduced && buf[1] != OP_NICKNAME)
 	  {
-	    if (verbose)
+	    if (options.verbose)
 	      printf("RND_SERVER: !(client %d)->introduced && buf[1]==%d (expected OP_NICKNAME)\n", buf[0], buf[1]);
 
 	    dropuser(u);
@@ -744,158 +675,15 @@ void NetworkServer(int port, int serveronly)
 	      Handle_OP_MOVE_FIGURE(u);
 	      break;
 
-	    case OP_KILL:
-	      for (v=user0; v; v=v->next)
-	      {
-		if (v->number == buf[2])
-		  break;
-	      }
-	      if (v)
-	      {
-		if (v->isbot)
-		{
-		  if (verbose)
-		    printf("RND_SERVER: client %d (%s) kills bot %d (%s)\n", u->number, u->nick, v->number, v->nick);
-
-		  dropuser(v);
-		  interrupt = 1;
-		  break;
-		}
-		else
-		{
-		  if (verbose)
-		    printf("RND_SERVER: client %d (%s) attempting to kill non-bot %d (%s)\n", u->number, u->nick, v->number, v->nick);
-		}
-	      }
-	      break;
-
-	    case OP_MODE:
-	      mode = buf[2];
-	      if (verbose)
-		printf("RND_SERVER: client %d (%s) sets mode %d (%s)\n", u->number, u->nick, buf[2], buf[2] == 0 ? "normal" : (buf[2] == 1 ? "fun" : "unknown"));
-	      broadcast(NULL, 3, 0);
-	      break;
-
-	    case OP_BOT:
-	      if (!u->isbot)
-		bots++;
-	      u->isbot = 1;
-	      if (verbose)
-		printf("RND_SERVER: client %d (%s) declares itself to be a bot\n", u->number, u->nick);
-	      break;
-	    
-	    case OP_LEVEL:
-	      level = buf[2];
-	      if (verbose)
-		printf("RND_SERVER: client %d (%s) sets level %d\n", u->number, u->nick, buf[2]);
-	      broadcast(NULL, 3, 0);
-	      break;
-
-	    case OP_LOST:
-	      {
-		struct user *won = NULL;
-
-		if (verbose)
-		  printf("RND_SERVER: client %d (%s) has lost\n", u->number, u->nick);
-		u->playing = 0;
-		broadcast(u, 2, 1);
-		i = 0;
-		for (v=user0; v; v=v->next)
-		{
-		  if (v->nextvictim == u)
-		  {
-		    for (w=NEXT(v); w!=v; w=NEXT(w))
-		    {
-		      if (w->active && w->playing)
-		      {
-			v->nextvictim = w;
-			break;
-		      }
-		    }
-		    if (v->nextvictim == u)
-		      v->nextvictim = NULL;
-		  }
-		}
-		for (v=user0; v; v=v->next)
-		{
-		  if (v->playing)
-		  {
-		    i++;
-		    won = v;
-		  }
-		}
-		if (i == 1)
-		{
-		  buf[0] = won->number;
-		  buf[1] = OP_WON;
-		  won->games++;
-		  broadcast(NULL, 2, 0);
-		}
-		else if (i == 0)
-		{
-		  buf[0] = u->number;
-		  buf[1] = OP_WON;
-		  u->games++;
-		  broadcast(NULL, 2, 0);
-		}
-		if (i < 2 && clients > 1)
-		  timetoplay = time(NULL) + 4;
-	      }
-	      break;
-	    
-	    case OP_ZERO:
-	      broadcast(NULL, 2, 0);
-	      if (verbose)
-		printf("RND_SERVER: client %d (%s) resets the game counters\n", u->number, u->nick);
-	      for (v=user0; v; v=v->next)
-		v->games = 0;
-	      break;
-
-	    case OP_CLEAR:
-	    case OP_GROW:
-	      broadcast(u, 2, 1);
-	      break;
-
 	    case OP_MSG:
 	      buf[len] = '\0';
-	      if (verbose)
+	      if (options.verbose)
 		printf("RND_SERVER: client %d (%s) sends message: %s\n", u->number, u->nick, &buf[2]);
 	      broadcast(u, len, 0);
 	      break;
-
-	    case OP_LINES:
-	      if (len != 3)
-	      {
-		if (verbose)
-		  printf("RND_SERVER: client %d (%s) sends crap for an OP_LINES\n", u->number, u->nick);
-
-		dropuser(u);
-		interrupt = 1;
-		break;
-	      }
-	      if (u->nextvictim)
-	      {
-		if (verbose)
-		  printf("RND_SERVER: client %d (%s) sends %d %s to client %d (%s)\n", u->number, u->nick, (int)buf[2], buf[2] == 1 ? "line" : "lines", u->nextvictim->number, u->nextvictim->nick);
-		sendtoone(u->nextvictim, 3);
-		buf[3] = u->nextvictim->number;
-		buf[1] = OP_LINESTO;
-		broadcast(u->nextvictim, 4, 1);
-		for (v=NEXT(u->nextvictim); v!=u->nextvictim; v=NEXT(v))
-		{
-		  if (v->active && v != u && v->playing)
-		  {
-		    u->nextvictim = v;
-		    break;
-		  }
-		}
-	      }
-	      else if (verbose)
-		printf("RND_SERVER: client %d (%s) makes %d %s but has no victim\n", u->number, u->nick, (int)buf[2], buf[2] == 1 ? "line" : "lines");
-	      break;
 	    
 	    default:
-	      if (verbose)
+	      if (options.verbose)
 		printf("RND_SERVER: opcode %d from client %d (%s) not understood\n", buf[0], u->number, u->nick);
 	  }
 	}