WebSVN – mdb – Diff – /trunk/main.c

 #include <stdlib.h>
 #include <libgen.h>
 #include <math.h>
 #include <time.h>
 #include <signal.h>
+#ifndef __APPLE__
 #include <wait.h>
+#endif
 #include <syslog.h>
 #include <errno.h>
 #include <pthread.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #ifndef SIGCLD
 #   define SIGCLD SIGCHLD
 #endif
-static pthread_t pthr_pars;
+static pthread_t pthr_pars, pthr_cmds;
 struct SOCKETS soc;
 /* Prototypes */
 void daemon_start(int ignsigcld);
 void sig_child (int x);
 	length = sizeof(client1);
 	syslog (LOG_DEBUG, "Server ready: %d",s);
 	while (1)
+	{
-		int childpid, status;
+/*		int childpid, status; */
 		if ((s1 = accept (s, (struct sockaddr *)&client1, &length)) < 0)
+		{
 			syslog (LOG_DAEMON, "Error in accept: %d: %s", s1, strerror(errno));
 			continue;
 		inet_ntop(AF_INET, &(client1.sin_addr), str, INET_ADDRSTRLEN);
 		syslog (LOG_INFO, "Connected to client %s", str);
 		soc.sockfd = s;
 		soc.newfd = s1;
+		/* start a new thread to parse the commands */
+		if (pthread_create(&pthr_cmds, NULL, processCommands, (void *)&soc) != 0)
+		{
+			syslog (LOG_DAEMON,"Creation of thread \"pthr_cmds\" failed!");
+			close(s1);
+			close(s);
+			return NULL;
+		}
-		if ((childpid = fork()) < 0)
+/*		if ((childpid = fork()) < 0)
 			syslog(LOG_DAEMON, "Can't fork a child: %s", strerror(errno));
 		if (childpid == 0)
+		{
-			/* Child process */
+			/ Child process /
 			processCommands((void *)&soc);
 			exit(EXIT_SUCCESS);
+		}
 #if defined(BSD) && !defined(Linux)
 			sleep(1);
 #else
 		while (waitpid(-1, &status, WNOHANG) > 0)
 			sleep(1);
 #endif
-		close(s1);
+		close(s1); */
+	}
 	close (s);
 	return NULL;
+}

Subversion Repositories mdb

(root)/trunk/main.c – Rev 22 → 55