initial work on fork() rewrite

Sean 'Shaleh' Perry
Commit fdc6161f ... fdc6161fe5e259ea7b1687e67abbed4fa0107eba authored 1999-10-05 01:01:49 +0000 by Sean 'Shaleh' Perry
Showing 3 changed files with 101 additions and 71 deletions
ChangeLog
pop3d/extra.c
pop3d/pop3d.c
--- a/ChangeLog
View file @fdc6161
+++ b/ChangeLog
View file @fdc6161
+Sean 'Shaleh' Perry <shaleh@debian.org>  Mon,  4 Oct 1999 17:57:17 -0700
+	* initial fork() rewrite, not even compiled it yet
 Sean 'Shaleh' Perry <shaleh@debian.org>  Mon,  4 Oct 1999 14:28:35 -0700
 	* changed lock(int mode) to lock(mailbox_lock_t mode), this will allow
--- a/pop3d/extra.c
View file @fdc6161
+++ b/pop3d/extra.c
View file @fdc6161
@@ -79,7 +79,7 @@ pop3_cmd (const char *cmd)
  return buf;
 }
-/* This is called if GNU POP needs to quit without going to the UPDATE stage.
+/* This is called if GNU POP3 needs to quit without going to the UPDATE stage.
   This is used for conditions such as out of memory, a broken socket, or
   being killed on a signal */
@@ -115,6 +115,7 @@ pop3_abquit (int reason)
      break;
    }
  fflush (ofile);
+  closelog();
  exit (1);
 }
@@ -145,11 +146,7 @@ void
 pop3_signal (int signal)
 {
  if (signal == SIGCHLD)
-    {
+    --children;
-      int stat;
-      while (waitpid (-1, &stat, WNOHANG) > 0);
-      return;
-    }
  else
    pop3_abquit (ERR_SIGNAL);
 }
@@ -170,7 +167,7 @@ pop3_readline (int fd)
  tv.tv_usec = 0;
  memset (buf, '\0', 1024);
-  while (strchr (buf, '\n') == NULL)
+  do
    {
      if (timeout > 0)
 	{
@@ -193,5 +190,7 @@ pop3_readline (int fd)
 	  strcat (ret, buf);
 	}
    }
+  while (strchr (buf, '\n') == NULL);
  return ret;
 }
--- a/pop3d/pop3d.c
View file @fdc6161
+++ b/pop3d/pop3d.c
View file @fdc6161
@@ -17,6 +17,10 @@
 #include "pop3d.h"
+typedef struct sockaddr_in SA;
+unsigned int children = 0;
+#define strorepid(foo) /* will add more code here later */
 static struct option long_options[] =
 {
  {"daemon", 2, 0, 'd'},
@@ -32,7 +36,7 @@ int
 main (int argc, char **argv)
 {
  struct group *gr;
-  static int mode;
+  static int mode = INTERACTIVE;
  int maxchildren = 10;
  int option_index = 0;
  int c = 0;
@@ -47,6 +51,8 @@ main (int argc, char **argv)
 	case 'd':
 	  mode = DAEMON;
 	  maxchildren = optarg ? atoi (optarg) : 10;
+	  if (maxchildren <= 0)
+          maxchildren = 10;
 	  break;
 	case 'h':
 	  pop3_usage (argv[0]);
@@ -113,18 +119,11 @@ main (int argc, char **argv)
  umask (S_IROTH | S_IWOTH | S_IXOTH);	/* 007 */
  /* Actually run the daemon */
-  switch (mode)
+  if (mode == DAEMON)
-    {
-    case DAEMON:
-      if (maxchildren < 10)
-	maxchildren = 10;
      pop3_daemon (maxchildren);
-      break;
+      /* exit() -- no way out of daemon except a signal */
-    case INTERACTIVE:
+  else
-    default:
      pop3_mainloop (fileno (stdin), fileno (stdout));
-      break;
-    }
  /* Close the syslog connection and exit */
  closelog ();
@@ -136,19 +135,36 @@ main (int argc, char **argv)
 void
 pop3_daemon_init (void)
 {
-  if (fork ())
+  pid_t pid;
-    exit (0);			/* parent exits */
+  unsigned int i;
+#define MAXFD 64
+  pid = fork();
+  if (pid == -1)
+    {
+      perror(errno);
+      exit (-1);
+    }
+  else if (pid > 0)
+      exit (0);			/* parent exits */
  setsid ();			/* become session leader */
-  if (fork ())
+  signal (SIGHUP, SIG_IGN);	/* ignore SIGHUP */
-    exit (0);			/* new parent exits */
+  pid = fork();
+  if (pid == -1)
+    {
+      perror(errno);
+      exit (-1);
+    }
+  else if (pid > 0)
+      exit (0);			/* parent exits */
  /* close inherited file descriptors */
-  close (0);
+  for (i = 0; i < MAXFD; ++i)
-  close (1);
+      close(i);
-  close (2);
-  signal (SIGHUP, SIG_IGN);	/* ignore SIGHUP */
  signal (SIGCHLD, pop3_signal);	/* for forking */
 }
@@ -208,6 +224,10 @@ pop3_mainloop (int infile, int outfile)
 	status = ERR_TOO_LONG;
      else if (strlen (cmd) > 4)
 	status = ERR_BAD_CMD;
+      else if (strncasecmp (cmd, "RETR", 4) == 0)
+	status = pop3_retr (arg);
+      else if (strncasecmp (cmd, "DELE", 4) == 0)
+	status = pop3_dele (arg);
      else if (strncasecmp (cmd, "USER", 4) == 0)
 	status = pop3_user (arg);
      else if (strncasecmp (cmd, "QUIT", 4) == 0)
@@ -220,10 +240,6 @@ pop3_mainloop (int infile, int outfile)
 	status = pop3_stat (arg);
      else if (strncasecmp (cmd, "LIST", 4) == 0)
 	status = pop3_list (arg);
-      else if (strncasecmp (cmd, "RETR", 4) == 0)
-	status = pop3_retr (arg);
-      else if (strncasecmp (cmd, "DELE", 4) == 0)
-	status = pop3_dele (arg);
      else if (strncasecmp (cmd, "NOOP", 4) == 0)
 	status = pop3_noop (arg);
      else if (strncasecmp (cmd, "RSET", 4) == 0)
@@ -255,6 +271,8 @@ pop3_mainloop (int infile, int outfile)
 	fprintf (ofile, "-ERR [IN-USE] " MBOX_LOCK "\r\n");
      else if (status == ERR_TOO_LONG)
 	fprintf (ofile, "-ERR " TOO_LONG "\r\n");
+	  else
+	fprintf (ofile, "-ERR unknown error\r\n");
      free (buf);
      free (cmd);
@@ -265,58 +283,67 @@ pop3_mainloop (int infile, int outfile)
  return OK;
 }
-/* Runs GNU POP in standalone daemon mode. This opens and binds to a port 
+/* Runs GNU POP3 in standalone daemon mode. This opens and binds to a port 
   (default 110) then executes a pop3_mainloop() upon accepting a connection.
   It starts maxchildren child processes to listen to and accept socket
   connections */
-int
+void
-pop3_daemon (int maxchildren)
+pop3_daemon (unsigned int maxchildren)
 {
-  int children = 0;
+  SA server, client;
-  struct sockaddr_in client;
+  pid_t pid;
-  int sock, sock2;
+  int listenfd, connfd;
-  unsigned int socksize;
-  sock = socket (PF_INET, SOCK_STREAM, (getprotobyname ("tcp"))->p_proto);
+  if ( (listenfd = socket (AF_INET, SOCK_STREAM, 0)) == -1 )
-  if (sock < 0)
    {
-      syslog (LOG_ERR, "%s\n", strerror (errno));
+      syslog (LOG_ERR, "socket: %s", strerror(errno));
-      exit (1);
+	  exit (-1);
    }
-  memset (&client, 0, sizeof (struct sockaddr_in));
+  memset (&server, 0, sizeof(server));
-  client.sin_family = AF_INET;
+  server.sin_family = AF_INET;
-  client.sin_port = htons (port);
+  server.sin_addr.s_addr = htonl (INADDR_ANY);
-  client.sin_addr.s_addr = htonl (INADDR_ANY);
+  server.sin_port = htonl (port);
-  socksize = sizeof (client);
-  if (bind (sock, (struct sockaddr *) &client, socksize))
+  if (bind(listenfd, (SA *) &server, sizeof(server)) == -1 )
    {
-      perror ("Couldn't bind to socket");
+      syslog(LOG_ERR, "bind: %s", strerror(errno));
-      exit (1);
+      exit(-1);
    }
-  listen (sock, 128);
-  while (1)
+  if (listen(listenfd, 128) == -1)
    {
-      if (children < maxchildren)
+      syslog(LOG_ERR, "listen: %s", strerror(errno));
-	{
+	  exit(-1);
-	  if (!fork ())
+    }
-	    {
-	      sock2 = accept (sock, &client, &socksize);
+  for ( ; ; )
-	      pop3_mainloop (sock2, sock2);
+    {
-	      close (sock2);
+      if (children > maxchildren)
-	      exit (OK);
+        {
-	    }
+          pause();
-	  else
+          continue;
-	    {
+        }
-	      /* wait (NULL); */
+      if ( (connfd = accept(listenfd, (SA *) &client, sizeof(client))) == -1)
-	      children++;
+        {
-	    }
+          syslog(LOG_ERR, "accept: %s", strerror(errno));
-	}
+          exit(-1);
+        }
+      pid = fork();
+      if (pid == -1)
+          syslog(LOG_ERR, "fork: %s", strerror(errno));
+      else if(pid == 0) /* child */
+        {
+          close(listenfd);
+          pop3_mainloop(connfd, connfd);
+        }
      else
-	{
+        {
-	  wait (NULL);
+          storepid(pid);
-	  children--;
+          ++children;
-	}
+        }
+	  close(connfd);
    }
-  return OK;
 }