sun compilation fixes

Makefile.defs

@@ -9,7 +9,7 @@
 VERSION = 0
 PATCHLEVEL = 8
 SUBLEVEL = 6
-EXTRAVERSION =
+EXTRAVERSION = 1
 
 RELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
 OS = $(shell uname -s)
@@ -97,11 +97,11 @@ MKTAGS=ctags -R .
 
 ifeq ($(mode), release)
 	CFLAGS=-O9 -funroll-loops  -Wcast-align $(PROFILE) -Winline\
-			-malign-double -malign-loops=4
+			-malign-loops=4
 			#-Wmissing-prototypes \
 	
 ifneq (,$(findstring 3.0, $(CC_VER)))
-	CFLAGS=-minline-all-stringops \
+	CFLAGS=-minline-all-stringops -malign-double \
 				-march=athlon \
 				#-mcpu=athlon
 endif
@@ -140,7 +140,7 @@ ifeq  ($(OS), SunOS)
 	endif
 
 YACC=yacc
-LIBS+=-L/usr/local/lib -lxnet # or -lnsl -lsocket or -lglibc ?
+LIBS+=-L/usr/local/lib -lxnet -lrt # or -lnsl -lsocket or -lglibc ?
 
 endif
 ifeq ($(OS), FreeBSD)

fastlock.h

@@ -17,7 +17,7 @@
 
 
 
-typedef  volatile int lock_t;
+typedef  volatile int fl_lock_t;
 
 
 
@@ -26,7 +26,7 @@ typedef  volatile int lock_t;
 
 
 /*test and set lock, ret 1 if lock held by someone else, 0 otherwise*/
-inline static int tsl(lock_t* lock)
+inline static int tsl(fl_lock_t* lock)
 {
 	volatile char val;
 #ifdef __i386
@@ -47,7 +47,7 @@ inline static int tsl(lock_t* lock)
 
 
 
-inline static void get_lock(lock_t* lock)
+inline static void get_lock(fl_lock_t* lock)
 {
 	
 	while(tsl(lock)){
@@ -57,7 +57,7 @@ inline static void get_lock(lock_t* lock)
 
 
 
-inline static void release_lock(lock_t* lock)
+inline static void release_lock(fl_lock_t* lock)
 {
 	char val;
 

mem/shm_mem.c

@@ -43,7 +43,7 @@ static int shm_shmid=-1; /*shared memory id*/
 #endif
 
 #ifdef FAST_LOCK
-lock_t* mem_lock=0;
+fl_lock_t* mem_lock=0;
 #else
 int shm_semid=-1; /*semaphore id*/
 #endif
@@ -198,7 +198,7 @@ int shm_mem_init()
 		return -1;
 	}
 #ifdef FAST_LOCK
-	mem_lock=shm_malloc_unsafe(sizeof(lock_t));
+	mem_lock=shm_malloc_unsafe(sizeof(fl_lock_t));
 	init_lock(*mem_lock);
 #endif
 	

mem/shm_mem.h

@@ -50,7 +50,7 @@
 #ifdef FAST_LOCK
 #include "../fastlock.h"
 	
-	extern lock_t* mem_lock;
+	extern fl_lock_t* mem_lock;
 #else
 extern  int shm_semid;
 #endif

test/stateless.cfg

@@ -18,9 +18,9 @@ check_via=no     # (cmd. line: -v)
 dns=off           # (cmd. line: -r)
 rev_dns=off      # (cmd. line: -R)
 #port=5070
-listen=10.0.0.179
+#listen=10.0.0.179
 #listen=127.0.0.1
-#listen=192.168.57.33
+listen=192.168.57.33
 loop_checks=0
 # for more info: sip_router -h
 

test/th-uri.cfg

@@ -6,8 +6,8 @@
 
 
 debug=3          # debug level (cmd line: -dddddddddd)
-fork=yes          # (cmd. line: -D)
-#fork=no
+#fork=yes          # (cmd. line: -D)
+fork=no
 log_stderror=yes # (cmd line: -E)
 #log_stderror=no	# (cmd line: -E)
 
@@ -17,8 +17,8 @@ check_via=no     # (cmd. line: -v)
 dns=off           # (cmd. line: -r)
 rev_dns=off      # (cmd. line: -R)
 #port=5070
-listen=10.0.0.179
-#listen=192.168.57.33
+#listen=10.0.0.179
+listen=192.168.57.33
 loop_checks=0
 # for more info: sip_router -h
 
@@ -27,13 +27,10 @@ loop_checks=0
 loadmodule "modules/tm/tm.so"
 #loadmodule "modules/rr/rr.so"
 loadmodule "modules/maxfwd/maxfwd.so"
-loadmodule "modules/sl/sl.so"
+#loadmodule "modules/sl/sl.so"
 
 
 route{
-             if ( !sl_filter_ACK() ){
-                log("SER : error in sl_filter_ACK!\n");
-             };
 
              if ( mf_is_maxfwd_present() )
              {
@@ -44,7 +41,6 @@ route{
                    if ( mf_is_maxfwd_zero() )
                    {
                      log("SER: MAX FORWARD header is zero\n");
-                     sl_send_reply("483","Too Many Hops");
                      drop();
                    };
              }else{