@@ -8,7 +8,7 @@

 VERSION = 0

 PATCHLEVEL = 8

 SUBLEVEL = 6

-EXTRAVERSION = -6x

+EXTRAVERSION = -6-beer

 RELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)

 OS = $(shell uname -s)

@@ -2,6 +2,7 @@ $Id$

 ( - todo, x - done)

+- replace  remaining mallocs/frees at least in msg_translator.c

 - add $(INCLUDES) to the Makefiles

 - make ser suncc ready

 - fix parse_cseq!!! (it doesnt parse 1234\n INVITE a.s.o)

@@ -16,8 +16,15 @@

 #define FRAG_OVERHEAD	(sizeof(struct fm_frag))

-#define ROUNDUP(s)		(((s)%ROUNDTO)?((s)+ROUNDTO)/ROUNDTO*ROUNDTO:(s))

-#define ROUNDDOWN(s)	(((s)%ROUNDTO)?((s)-ROUNDTO)/ROUNDTO*ROUNDTO:(s))

+/* ROUNDTO= 2^k so the following works */

+#define ROUNDTO_MASK	(~((unsigned long)ROUNDTO-1))

+#define ROUNDUP(s)		(((s)+(ROUNDTO-1))&ROUNDTO_MASK)

+#define ROUNDDOWN(s)	((s)&ROUNDTO_MASK)

+

+/*

+ #define ROUNDUP(s)		(((s)%ROUNDTO)?((s)+ROUNDTO)/ROUNDTO*ROUNDTO:(s))

+ #define ROUNDDOWN(s)	(((s)%ROUNDTO)?((s)-ROUNDTO)/ROUNDTO*ROUNDTO:(s))

+*/

@@ -30,8 +30,14 @@

 #define FRAG_OVERHEAD	(sizeof(struct qm_frag)+sizeof(struct qm_frag_end))

+#define ROUNDTO_MASK	(~((unsigned long)ROUNDTO-1))

+#define ROUNDUP(s)		(((s)+(ROUNDTO-1))&ROUNDTO_MASK)

+#define ROUNDDOWN(s)	((s)&ROUNDTO_MASK)

+

+/*

 #define ROUNDUP(s)		(((s)%ROUNDTO)?((s)+ROUNDTO)/ROUNDTO*ROUNDTO:(s))

 #define ROUNDDOWN(s)	(((s)%ROUNDTO)?((s)-ROUNDTO)/ROUNDTO*ROUNDTO:(s))

+*/

@@ -11,7 +11,10 @@

 #include "../../ut.h"

-#define ROUND4(s) (((s)%4)?((s)+4)/4*4:(s))

+/*#define ROUND4(s) (((s)%4)?((s)+4)/4*4:(s))*/

+

+#define ROUND4(s)		(((s)+3)&(~(3UL)))

+

 #define  lump_len( _lump)  (ROUND4(sizeof(struct lump)) + \

                ROUND4( ((_lump)->op==LUMP_ADD)?(_lump)->len:0 ))

@@ -21,8 +21,8 @@ dns=on           # (cmd. line: -r)

 rev_dns=yes      # (cmd. line: -R)

 #port=5070

 #listen=127.0.0.1

-listen=192.168.57.33

-#listen=10.0.0.179

+#listen=192.168.57.33

+listen=10.0.0.179

 loop_checks=0

 # for more info: sip_router -h