- SYSV lock fixes: fixed includes, added seteuid before lock init and restore

  it afterwards (so that SYSV sems get created with the proper uid in case
    -u uid is used)
- moved shm_mem initialization after the config is parsed (so that ser will
 know if it's supposed to suid and use the seteuid hack above in the
 SYSV locks case)
- fixed ser shutdown procedure on main_loop error (proper cleanup)
- the fifo file is now deleted on exit
- added version.h and changed module version control to check also the
 compile flags
- usrloc: fixed missing lock_destroy
- usrloc: fixed DB capability check even if no db mode

Makefile

@@ -48,7 +48,7 @@ skip_modules?=
 exclude_modules?= 			cpl ext extcmd \
 							postgres snmp \
 							im \
-							jabber \
+							jabber mysql \
 							cpl-c \
 							auth_radius group_radius uri_radius \
 							pa

Makefile.defs

@@ -49,7 +49,7 @@ MAIN_NAME=ser
 VERSION = 0
 PATCHLEVEL = 8
 SUBLEVEL =   99
-EXTRAVERSION = -dev5
+EXTRAVERSION = -dev6
 
 RELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
 OS = $(shell uname -s | sed -e s/SunOS/solaris/ | tr "[A-Z]" "[a-z]")
@@ -282,7 +282,7 @@ endif
 
 
 DEFS+= $(extra_defs) \
-	 -DNAME='"$(NAME)"' -DVERSION='"$(RELEASE)"' -DARCH='"$(ARCH)"' \
+	 -DNAME='"$(MAIN_NAME)"' -DVERSION='"$(RELEASE)"' -DARCH='"$(ARCH)"' \
 	 -DOS='"$(OS)"' -DCOMPILER='"$(CC_VER)"' -D__CPU_$(ARCH) -D__OS_$(OS) \
 	 -DCFG_DIR='"$(cfg-target)"'\
 	 -DPKG_MALLOC \

doc/HISTORY

@@ -0,0 +1,40 @@
+# $Id$
+# A short history of ser beginnings
+#
+# by Andrei Pelinescu-Onciul <[email protected]>
+
+This is a short ser history based mainly on my memory and my old mail archive. I've tried to mention only the important events. I'm sure I have missed a lot of things and/or people. If this is your case, please don't feel offended, send me an email and I will straighten things up.
+
+
+
+Three years ago on 4 September 2001 I committed the first working ser version on a private cvs. In fact I started writting ser 2 days before, on 2nd September.
+ I was supposed to write some kind of sip glue for a Cisco PSTN gateway in 1 week, but of course I did it in the last 2 days :-)
+
+At that time the config looked like:
+
+#  method_re   sip_uri_re      dest_host
+# (warning: re cannot contain space)
+
+^R.*        ^sip:.*@dorian.*   ekina.fokus.gmd.de
+^INVITE     .*                 ape:5061             # my laptop
+.           .                  192.168.46.55
+
+A short time after this Jiri began testing the code and requesting new features.2 weeks later I completely changed the config format bringing it pretty close to what we have today. At the time Jiri stronlgy disagreed with the ideea arguing that the new config would increase code complexity too much and would severely 
+ impact performance. The final argument was: I already wrote the code and it works :-)
+In Octomber 2001 I made some changes to ser routing language bringing it to what we still use today.
+In the next months I've created the module interface, the first two modules (print and textops) and I've added the shared memory support (this involved the creation of ser's own malloc library which proved to be much faster for ser's memory usage patterns than standards malloc implementations).
+During the same period Bogdan and Jan joined me and Jiri also began writing code.
+In December 2001 Bogdan announced that tm was up an running (after a sleepless night).
+At the beginning of 2002 we were joined by Daniel. Jan introduced the mysql, usrloc and auth modules.
+Ser first public appearance was at the April 2002 Sipit. We ran it on a pda an still managed to be faster than the testing tools that were used against us :-)
+
+In May 2002 ser got ipv6 support.
+In August 2002 Nils commited sipsak to berlios (very usefull testing tool).
+In September 2002 ser went public: it was GPL'ed and the cvs tree was moved to berlios. During the same month Jiri introduced  the FIFO interface, Karel committed serweb and we had the first GPL'ed release: ser 0.8.8.
+In December 2002 ser got its first big external contribution: the enum module, written by  Juha Heinanen.
+In January 2003 Raphael commited sems on berlios.
+In February 2003 ser got tcp support.
+Sometime during the 2003 spring ser got the permissions module from Miklos Tirpak and nathelper from  Maxim Sobolev.
+In August 2003, Uli commited isdngw to sems.
+
+All the rest is too new to be in the history :-)

fifo_server.c

@@ -63,6 +63,7 @@
  *  2004-03-09  open_fifo_server split into init_ and start_ (andrei)
  *  2004-04-29  added chown(sock_user, sock_group)  (andrei)
  *  2004-06-06  updated to the new DB interface  & init_db_fifo (andrei)
+ *  2004-09-19  fifo is deleted on exit (destroy_fifo)  (andrei)
  */
 
 
@@ -157,6 +158,17 @@ void destroy_fifo()
 		pkg_free(c);
 		c=foo;
 	}
+	if (fifo_stream){
+			fclose(fifo_stream);
+			fifo_stream=0;
+		/* if  FIFO was created, delete it */
+		if (fifo && strlen(fifo)){
+			if (unlink(fifo)<0){
+				LOG(L_ERR, "WARNING: destroy_fifo: cannot delete fifo (%s):"
+							" %s\n", fifo, strerror(errno));
+			}
+		}
+	}
 }
 
 

lock_ops.h

@@ -123,6 +123,13 @@ inline static gen_lock_t* lock_init(gen_lock_t* lock)
 #include <sys/ipc.h>
 #include <sys/sem.h>
 
+#include <errno.h>
+#include <string.h>
+#include <sys/types.h>
+#include <unistd.h>
+#include "dprint.h"
+#include "globals.h" /* uid */
+
 #if ((defined(HAVE_UNION_SEMUN) || defined(__GNU_LIBRARY__) )&& !defined(_SEM_SEMUN_UNDEFINED)) 
 	
 	/* union semun is defined by including sem.h */
@@ -144,8 +151,14 @@ typedef int gen_lock_t;
 inline static gen_lock_t* lock_init(gen_lock_t* lock)
 {
 	union semun su;
+	int euid;
 	
+	euid=geteuid();
+	if (uid && uid!=euid)
+		seteuid(uid); /* set euid to the cfg. requested one */
 	*lock=semget(IPC_PRIVATE, 1, 0700);
+	if (uid && uid!=euid)
+		seteuid(euid); /* restore it */
 	if (*lock==-1) return 0;
 	su.val=1;
 	if (semctl(*lock, 0, SETVAL, su)==-1){
@@ -245,11 +258,18 @@ inline static gen_lock_set_t* lock_set_init(gen_lock_set_t* s)
 {
 	union semun su;
 	int r;
-	
+	int euid;
+
+	euid=geteuid();
+	if (uid && uid!=euid)
+		seteuid(uid); /* set euid to the cfg. requested one */
 	s->semid=semget(IPC_PRIVATE, s->size, 0700);
+	if (uid && uid!=euid)
+		seteuid(euid); /* restore euid */
 	if (s->semid==-1){
-		LOG(L_CRIT, "ERROR: lock_set_init (SYSV): semget failed: %s\n",
-				strerror(errno));
+		LOG(L_CRIT, "ERROR: lock_set_init (SYSV): semget (..., %d, 0700)"
+				" failed: %s\n",
+				s->size, strerror(errno));
 		return 0;
 	}
 	su.val=1;

main.c

@@ -122,90 +122,13 @@
 #ifdef DEBUG_DMALLOC
 #include <dmalloc.h>
 #endif
+#include "version.h"
 
 static char id[]="@(#) $Id$";
-static char version[]=  NAME " " VERSION " (" ARCH "/" OS ")" ;
-static char compiled[]= __TIME__ " " __DATE__ ;
-static char flags[]=
-"STATS:"
-#ifdef STATS
-"On"
-#else
-"Off"
-#endif
-#ifdef USE_IPV6
-", USE_IPV6"
-#endif
-#ifdef USE_TCP
-", USE_TCP"
-#endif
-#ifdef USE_TLS
-", USE_TLS"
-#endif
-#ifdef DISABLE_NAGLE
-", DISABLE_NAGLE"
-#endif
-#ifdef USE_MCAST
-", USE_MCAST"
-#endif
-#ifdef NO_DEBUG
-", NO_DEBUG"
-#endif
-#ifdef NO_LOG
-", NO_LOG"
-#endif
-#ifdef EXTRA_DEBUG
-", EXTRA_DEBUG"
-#endif
-#ifdef DNS_IP_HACK
-", DNS_IP_HACK"
-#endif
-#ifdef SHM_MEM
-", SHM_MEM"
-#endif
-#ifdef SHM_MMAP
-", SHM_MMAP"
-#endif
-#ifdef PKG_MALLOC
-", PKG_MALLOC"
-#endif
-#ifdef VQ_MALLOC
-", VQ_MALLOC"
-#endif
-#ifdef F_MALLOC
-", F_MALLOC"
-#endif
-#ifdef USE_SHM_MEM
-", USE_SHM_MEM"
-#endif
-#ifdef DBG_QM_MALLOC
-", DBG_QM_MALLOC"
-#endif
-#ifdef DEBUG_DMALLOC
-", DEBUG_DMALLOC"
-#endif
-#ifdef FAST_LOCK
-", FAST_LOCK"
-#ifdef BUSY_WAIT
-"-BUSY_WAIT"
-#endif
-#ifdef USE_PTHREAD_MUTEX
-", USE_PTHREAD_MUTEX"
-#endif
-#ifdef USE_POSIX_SEM
-", USE_POSIX_SEM"
-#endif
-#ifdef USE_SYSV_SEM
-", USE_SYSV_SEM"
-#endif
-#ifdef ADAPTIVE_WAIT
-"-ADAPTIVE_WAIT"
-#endif
-#ifdef NOSMP
-"-NOSMP"
-#endif
-#endif /*FAST_LOCK*/
-;
+static char* version=SER_FULL_VERSION;
+static char* flags=SER_COMPILE_FLAGS;
+char compiled[]= __TIME__ " " __DATE__ ;
+
 
 static char help_msg[]= "\
 Usage: " NAME " -l address [-p port] [-l address [-p port]...] [options]\n\
@@ -423,7 +346,8 @@ char* pgid_file = 0;
 void cleanup(show_status)
 {
 	/*clean-up*/
-	shm_unlock(); /* hack: force-unlock the shared memory lock in case
+	if (mem_lock) 
+		shm_unlock(); /* hack: force-unlock the shared memory lock in case
 					 some process crashed and let it locked; this will 
 					 allow an almost gracious shutdown */
 	destroy_modules();
@@ -1124,6 +1048,9 @@ int main_loop()
 	
 	/*return 0; */
  error:
+	is_main=1;  /* if we are here, we are the "main process",
+				  any forked children should exit with exit(-1) and not
+				  ever use return */
 	return -1;
 
 }
@@ -1345,20 +1272,6 @@ try_again:
 	DBG("test random number %u\n", rand());
 	
 	
-
-
-	/*init shm mallocs (before parsing cfg !)
-	 *  this must be here to allow setting shm mem size from the command line
-	 *  and it must also be before init_timer and init_tcp
-	 *  => if shm_mem should be settable from the cfg file move everything
-	 *  after --andrei */
-	if (init_shm_mallocs()==-1)
-		goto error;
-	/*init timer, before parsing the cfg!*/
-	if (init_timer()<0){
-		LOG(L_CRIT, "could not initialize timer, exiting...\n");
-		goto error;
-	}
 	
 	/* register a diagnostic FIFO command  - moved to fifo server - bogdan
 	if (register_core_fifo()<0) {
@@ -1444,6 +1357,24 @@ try_again:
 		fprintf(stderr, "config file ok, exiting...\n");
 		goto error;
 	}
+
+
+	/*init shm mallocs
+	 *  this must be here 
+	 *     -to allow setting shm mem size from the command line
+	 *       => if shm_mem should be settable from the cfg file move
+	 *       everything after
+	 *     -it must be also before init_timer and init_tcp
+	 *     -it must be after we know uid (so that in the SYSV sems case,
+	 *        the sems will have the correct euid)
+	 * --andrei */
+	if (init_shm_mallocs()==-1)
+		goto error;
+	/*init timer, before parsing the cfg!*/
+	if (init_timer()<0){
+		LOG(L_CRIT, "could not initialize timer, exiting...\n");
+		goto error;
+	}
 	
 #ifdef USE_TCP
 	if (!tcp_disable){

mem/shm_mem.c

@@ -31,6 +31,7 @@
  *  2003-03-12  split shm_mem_init in shm_getmem & shm_mem_init_mallocs
  *               (andrei)
  *  2004-07-27  ANON mmap support, needed on darwin (andrei)
+ *  2004-09-19  shm_mem_destroy: destroy first the lock & then unmap (andrei)
  */
 
 
@@ -223,6 +224,10 @@ void shm_mem_destroy()
 #endif
 	
 	DBG("shm_mem_destroy\n");
+	if (mem_lock){
+		DBG("destroying the shared memory lock\n");
+		lock_destroy(mem_lock); /* we don't need to dealloc it*/
+	}
 	if (shm_mempool && (shm_mempool!=(void*)-1)) {
 #ifdef SHM_MMAP
 		munmap(shm_mempool, /* SHM_MEM_SIZE */ shm_mem_size );
@@ -237,10 +242,6 @@ void shm_mem_destroy()
 		shm_shmid=-1;
 	}
 #endif
-	if (mem_lock){
-		DBG("destroying the shared memory lock\n");
-		lock_destroy(mem_lock); /* we don't need to dealloc it*/
-	}
 }
 
 

sr_module.c

@@ -32,6 +32,7 @@
  *  2003-03-19  Support for flags in find_export (janakj)
  *  2003-03-29  cleaning pkg_mallocs introduced (jiri)
  *  2003-04-24  module version checking introduced (jiri)
+ *  2004-09-19  compile flags are checked too (andrei)
  */
 
 
@@ -156,6 +157,7 @@ error:
 static inline int version_control(void *handle, char *path)
 {
 	char **m_ver;
+	char **m_flags;
 	char* error;
 
 	m_ver=(char **)dlsym(handle, DLSYM_PREFIX "module_version");
@@ -164,14 +166,33 @@ static inline int version_control(void *handle, char *path)
 			path, error );
 		return 0;
 	}
+	m_flags=(char **)dlsym(handle, DLSYM_PREFIX "module_flags");
+	if ((error=(char *)dlerror())!=0) {
+		LOG(L_ERR, "ERROR: no compile flags info in module <%s>: %s\n",
+			path, error );
+		return 0;
+	}
 	if (!m_ver || !(*m_ver)) {
 		LOG(L_ERR, "ERROR: no version in module <%s>\n", path );
 		return 0;
 	}
-	if (strcmp(VERSION,*m_ver)==0)
-		return 1;
+	if (!m_flags || !(*m_flags)) {
+		LOG(L_ERR, "ERROR: no compile flags in module <%s>\n", path );
+		return 0;
+	}
+	
+	if (strcmp(SER_FULL_VERSION, *m_ver)==0){
+		if (strcmp(SER_COMPILE_FLAGS, *m_flags)==0)
+			return 1;
+		else {
+			LOG(L_ERR, "ERROR: module compile flags mismatch for %s "
+						" \ncore: %s \nmodule: %s\n",
+						path, SER_COMPILE_FLAGS, *m_flags);
+			return 0;
+		}
+	}
 	LOG(L_ERR, "ERROR: module version mismatch for %s; "
-		"core: %s; module: %s\n", path, VERSION, *m_ver );
+		"core: %s; module: %s\n", path, SER_FULL_VERSION, *m_ver );
 	return 0;
 }
 

sr_module.h

@@ -35,6 +35,7 @@
  *  2003-04-05  s/reply_route/failure_route, onreply_route introduced (jiri)
  *  2004-03-12  extra flag USE_FUNC_PARAM added to modparam type -
  *              instead of copying the param value, a func is called (bogdan)
+ *  2004-09-19  switched to version.h for the module versions checks (andrei)
  */
 
 
@@ -42,6 +43,7 @@
 #define sr_module_h
 
 #include "parser/msg_parser.h" /* for sip_msg */
+#include "version.h"
 
 typedef  struct module_exports* (*module_register)();
 typedef  int (*cmd_function)(struct sip_msg*, char*, char*);
@@ -78,7 +80,9 @@ typedef int (*param_func_t)( modparam_t type, param_func_param_t param_val);
 #define PROC_TCP_MAIN -4  /* TCP main process */
 #define PROC_UNIXSOCK -5  /* Unix domain socket server processes */
 
-#define MODULE_VERSION char *module_version=VERSION;
+#define MODULE_VERSION \
+	char *module_version=SER_FULL_VERSION; \
+	char *module_flags=SER_COMPILE_FLAGS;
 
 struct cmd_export_ {
 	char* name;             /* null terminated command name */

version.h

@@ -0,0 +1,200 @@
+/*
+ * $Id$
+ *
+ * version and compile flags macros 
+ *
+ *
+ * Copyright (C) 2004 FhG Fokus
+ *
+ * This file is part of ser, a free SIP server.
+ *
+ * ser 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; either version 2 of the License, or
+ * (at your option) any later version
+ *
+ * For a license to use the ser software under conditions
+ * other than those described here, or to purchase support for this
+ * software, please contact iptel.org by e-mail at the following addresses:
+ *    [email protected]
+ *
+ * ser is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License 
+ * along with this program; if not, write to the Free Software 
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef version_h
+#define version_h
+
+#define SER_FULL_VERSION  NAME " " VERSION " (" ARCH "/" OS ")" 
+
+
+#ifdef STATS
+#define STATS_STR  "STATS: On"
+#else
+#define STATS_STR  "STATS: Off"
+#endif
+
+#ifdef USE_IPV6
+#define USE_IPV6_STR ", USE_IPV6"
+#else
+#define USE_IPV6_STR ""
+#endif
+
+#ifdef USE_TCP
+#define USE_TCP_STR ", USE_TCP"
+#else
+#define USE_TCP_STR ""
+#endif
+
+#ifdef USE_TLS
+#define USE_TLS_STR ", USE_TLS"
+#else 
+#define USE_TLS_STR ""
+#endif
+
+
+#ifdef DISABLE_NAGLE
+#define DISABLE_NAGLE_STR ", DISABLE_NAGLE"
+#else
+#define DISABLE_NAGLE_STR ""
+#endif
+
+#ifdef USE_MCAST
+#define USE_MCAST_STR ", USE_MCAST"
+#else
+#define USE_MCAST_STR ""
+#endif
+
+
+#ifdef NO_DEBUG
+#define NO_DEBUG_STR ", NO_DEBUG"
+#else
+#define NO_DEBUG_STR ""
+#endif
+
+#ifdef NO_LOG
+#define NO_LOG_STR ", NO_LOG"
+#else
+#define NO_LOG_STR ""
+#endif
+
+#ifdef EXTRA_DEBUG
+#define EXTRA_DEBUG_STR ", EXTRA_DEBUG"
+#else
+#define EXTRA_DEBUG_STR ""
+#endif
+
+#ifdef DNS_IP_HACK
+#define DNS_IP_HACK_STR ", DNS_IP_HACK"
+#else
+#define DNS_IP_HACK_STR ""
+#endif
+
+#ifdef SHM_MEM
+#define SHM_MEM_STR ", SHM_MEM"
+#else
+#define SHM_MEM_STR ""
+#endif
+
+#ifdef SHM_MMAP
+#define SHM_MMAP_STR ", SHM_MMAP"
+#else
+#define SHM_MMAP_STR ""
+#endif
+
+#ifdef PKG_MALLOC
+#define PKG_MALLOC_STR ", PKG_MALLOC"
+#else
+#define PKG_MALLOC_STR ""
+#endif
+
+#ifdef VQ_MALLOC
+#define VQ_MALLOC_STR ", VQ_MALLOC"
+#else
+#define VQ_MALLOC_STR ""
+#endif
+
+#ifdef F_MALLOC
+#define F_MALLOC_STR ", F_MALLOC"
+#else
+#define F_MALLOC_STR ""
+#endif
+
+#ifdef USE_SHM_MEM
+#define USE_SHM_MEM_STR ", USE_SHM_MEM"
+#else
+#define USE_SHM_MEM_STR ""
+#endif
+
+#ifdef DBG_QM_MALLOC
+#define DBG_QM_MALLOC_STR ", DBG_QM_MALLOC"
+#else
+#define DBG_QM_MALLOC_STR ""
+#endif
+
+#ifdef DBG_F_MALLOC
+#define DBG_F_MALLOC_STR ", DBG_F_MALLOC"
+#else
+#define DBG_F_MALLOC_STR ""
+#endif
+
+#ifdef DEBUG_DMALLOC
+#define DEBUG_DMALLOC_STR ", DEBUG_DMALLOC"
+#else
+#define DEBUG_DMALLOC_STR ""
+#endif
+
+#ifdef FAST_LOCK
+#ifdef BUSY_WAIT
+#define FAST_LOCK_STR ", FAST_LOCK-BUSY_WAIT"
+#elif defined (ADAPTIVE_WAIT)
+#define FAST_LOCK_STR ", FAST_LOCK-ADAPTIVE_WAIT"
+#else
+#define FAST_LOCK_STR ", FAST_LOCK"
+#endif
+#else
+#define FAST_LOCK_STR ""
+#endif
+
+#ifdef USE_PTHREAD_MUTEX
+#define USE_PTHREAD_MUTEX_STR ", USE_PTHREAD_MUTEX"
+#else
+#define USE_PTHREAD_MUTEX_STR ""
+#endif
+
+#ifdef USE_POSIX_SEM
+#define USE_POSIX_SEM_STR ", USE_POSIX_SEM"
+#else
+#define USE_POSIX_SEM_STR ""
+#endif
+
+#ifdef USE_SYSV_SEM
+#define USE_SYSV_SEM_STR ", USE_SYSV_SEM"
+#else
+#define USE_SYSV_SEM_STR ""
+#endif
+
+
+#ifdef NOSMP
+#define NOSMP_STR "-NOSMP"
+#else
+#define NOSMP_STR ""
+#endif
+
+
+#define SER_COMPILE_FLAGS \
+	EXTRA_DEBUG_STR STATS_STR USE_IPV6_STR USE_TCP_STR USE_TLS_STR \
+	DISABLE_NAGLE_STR USE_MCAST_STR NO_DEBUG_STR NO_LOG_STR DNS_IP_HACK_STR \
+	SHM_MEM_STR SHM_MMAP_STR PKG_MALLOC_STR VQ_MALLOC_STR F_MALLOC_STR \
+	USE_SHM_MEM_STR DBG_QM_MALLOC_STR DBG_F_MALLOC_STR DEBUG_DMALLOC_STR \
+	FAST_LOCK_STR NOSMP_STR USE_PTHREAD_MUTEX_STR USE_POSIX_SEM_STR \
+	USE_SYSV_SEM_STR
+
+
+#endif