- OS macro defined in Makefile.defs left unquoted and added OS_QUOTED. OS macro maybe used by 3rd party header in regular way, w/o quotes

- added dont_daemonize feature. When a process manager is responsible for running processes then is not happy when spawned process is terminated almost immediately. Manager will try restart ser in infinite loop.
Cmd line params (ser.cfg) (backward compatible):
  -D ... don't fork (dont_fork=1)
  -DD ... don't daemonize creator process (dont_fork=2)
  -DDD | or no -D param ... normal daemonizetion (dont_fork>2 or 0)

Note there is problem when Ctrl-C in dont_daemonize mode, not all processes are terminated

Creator_pid variable..pid of creator process, may be terminated

Makefile.defs

@@ -340,10 +340,11 @@ endif
 #		adding it to via, lumps a.s.o). WARNING: right now this option
 #		is useless since the compression code doesn't exist yet.
 
+# Sometimes is needes correct non-quoted $OS. HACK: gcc translates known OS to number ('linux'), so there is added underscore
 
 DEFS+= $(extra_defs) \
 	 -DNAME='"$(MAIN_NAME)"' -DVERSION='"$(RELEASE)"' -DARCH='"$(ARCH)"' \
-	 -DOS='"$(OS)"' -DCOMPILER='"$(CC_VER)"' -D__CPU_$(ARCH) -D__OS_$(OS) \
+	 -DOS='$(OS)_' -DOS_QUOTED='"$(OS)"' -DCOMPILER='"$(CC_VER)"' -D__CPU_$(ARCH) -D__OS_$(OS) \
 	 -DSER_VER=$(SER_VER) \
 	 -DCFG_DIR='"$(cfg-target)"'\
 	 -DPKG_MALLOC \

config.h

@@ -77,11 +77,11 @@
 #define CONTENT_LENGTH_LEN (sizeof(CONTENT_LENGTH)-1)
 
 #define USER_AGENT "User-Agent: Sip EXpress router"\
-		"(" VERSION " (" ARCH "/" OS"))"
+		"(" VERSION " (" ARCH "/" OS_QUOTED "))"
 #define USER_AGENT_LEN (sizeof(USER_AGENT)-1)
 
 #define SERVER_HDR "Server: Sip EXpress router "\
-		"(" VERSION " (" ARCH "/" OS"))"
+		"(" VERSION " (" ARCH "/" OS_QUOTED "))"
 #define SERVER_HDR_LEN (sizeof(SERVER_HDR)-1)
 
 #define MAX_WARNING_LEN  256

daemonize.c

@@ -59,13 +59,12 @@
 #include "daemonize.h"
 #include "globals.h"
 #include "dprint.h"
+#include "signals.h"
 
 
 #define MAX_FD 32 /* maximum number of inherited open file descriptors,
 		    (normally it shouldn't  be bigger  than 3) */
 
-
-
 /* daemon init, return 0 on success, -1 on error */
 int daemonize(char*  name)
 {
@@ -92,29 +91,30 @@ int daemonize(char*  name)
 		goto error;
 	}
 
-	/* fork to become!= group leader*/
-	if ((pid=fork())<0){
-		LOG(L_CRIT, "Cannot fork:%s\n", strerror(errno));
-		goto error;
-	}else if (pid!=0){
-		/* parent process => exit*/
-		exit(0);
-	}
-	/* become session leader to drop the ctrl. terminal */
-	if (setsid()<0){
-		LOG(L_WARN, "setsid failed: %s\n",strerror(errno));
-	}else{
-		own_pgid=1;/* we have our own process group */
-	}
-	/* fork again to drop group  leadership */
-	if ((pid=fork())<0){
-		LOG(L_CRIT, "Cannot  fork:%s\n", strerror(errno));
-		goto error;
-	}else if (pid!=0){
-		/*parent process => exit */
-		exit(0);
+	if (!dont_daemonize) {
+		/* fork to become!= group leader*/
+		if ((pid=fork())<0){
+			LOG(L_CRIT, "Cannot fork:%s\n", strerror(errno));
+			goto error;
+		}else if (pid!=0){	
+			/*parent process => exit */
+			exit(0);
+		}
+		/* become session leader to drop the ctrl. terminal */
+		if (setsid()<0){
+			LOG(L_WARN, "setsid failed: %s\n",strerror(errno));
+		}else{
+			own_pgid=1;/* we have our own process group */
+		}
+		/* fork again to drop group  leadership */
+		if ((pid=fork())<0){
+			LOG(L_CRIT, "Cannot  fork:%s\n", strerror(errno));
+			goto error;
+		}else if (pid!=0){
+			/*parent process => exit */
+			exit(0);
+		}
 	}
-
 	/* added by noh: create a pid file for the main process */
 	if (pid_file!=0){
 		

globals.h

@@ -91,6 +91,7 @@ extern int tls_disable;
 extern unsigned short tls_port_no;
 #endif
 extern int dont_fork;
+extern int dont_daemonize;
 extern int check_via;
 extern int received_dns;
 extern int syn_branch;

main.c

@@ -162,7 +162,7 @@ Options:\n\
                   (to use both use `-rR`)\n\
     -v           Turn on \"via:\" host checking when forwarding replies\n\
     -d           Debugging mode (multiple -d increase the level)\n\
-    -D           Do not fork into daemon mode\n\
+    -D           1..do not fork (almost) anyway, 2..do not daemonize creator, 3..daemonize(default)\n\
     -E           Log to stderr\n"
 #ifdef USE_TCP
 "    -T           Disable tcp\n\
@@ -244,6 +244,7 @@ struct process_table *pt=0;		/*array with children pids, 0= main proc,
 int sig_flag = 0;              /* last signal received */
 int debug = L_DEFAULT; /* print only msg. < L_WARN */
 int dont_fork = 0;
+int dont_daemonize = 0;
 int log_stderr = 0;
 pid_t creator_pid = (pid_t) -1;
 /* log facility (see syslog(3)) */
@@ -1210,6 +1211,7 @@ int main(int argc, char** argv)
 	unsigned int seed;
 	int rfd;
 	int debug_save, debug_flag = 0;
+	int dont_fork_cnt = 0;
 
 	/*init*/
 	creator_pid = getpid();
@@ -1416,7 +1418,7 @@ try_again:
 					received_dns|=DO_REV_DNS;
 					break;
 			case 'D':
-					dont_fork=1;
+					dont_fork_cnt++;
 					break;
 			case 'T':
 				#ifdef USE_TCP
@@ -1477,6 +1479,13 @@ try_again:
 		}
 	}
 
+	if (dont_fork_cnt)
+		dont_fork = dont_fork_cnt;	/* override by command line */
+
+	if (dont_fork > 0) {
+		dont_daemonize = dont_fork == 2;
+		dont_fork = dont_fork == 1;
+	}
 	/* init the resolver, before fixing the config */
 	resolv_init();
 	/* fix parameters */

version.h

@@ -31,8 +31,7 @@
 #ifndef version_h
 #define version_h
 
-#define SER_FULL_VERSION  NAME " " VERSION " (" ARCH "/" OS ")" 
-
+#define SER_FULL_VERSION  NAME " " VERSION " (" ARCH "/" OS_QUOTED ")" 
 
 #ifdef STATS
 #define STATS_STR  "STATS: On"
@@ -186,7 +185,6 @@
 #define USE_SYSV_SEM_STR ""
 #endif
 
-
 #ifdef NOSMP
 #define NOSMP_STR "-NOSMP"
 #else