- fixed branch parsed bug (parse_via)

- added module dependecy to master Makefile (modules/*/Makefile)

Makefile

@@ -33,8 +33,10 @@ NAME=ser
 # PKG_MALLOC uses a faster malloc (exclusive w/ USE_SHM_MEM)
 # USE_SHM_MEM all pkg_malloc => shm_malloc (most mallocs use a common sh. mem.
 #           segment); don't define PKG_MALLOC if you want this!
-DEFS=-DTHREAD -DNOCR -DMACROEATER -DDNS_IP_HACK  -DSHM_MEM -DUSE_SHM_MEM \
-	 -DPKG_MALLOC  -DNO_DEBUG
+DEFS=-DTHREAD -DNOCR -DMACROEATER -DDNS_IP_HACK  -DSHM_MEM \
+	 -DPKG_MALLOC #-DNO_DEBUG
+# -DUSE_SHM_MEM
+#-DNO_DEBUG 
 #-DPKG_MALLOC
 #-DNO_DEBUG#-DSTATS -DNO_DEBUG 
 #-DNO_LOG

modules/tm/Makefile

@@ -15,6 +15,8 @@ NAME=tm.so
 SHLIB_LD_FLAGS= -shared
 LIBS= -lpthread
 
+ALLDEP=Makefile ../../Makefile
+
 ifeq ($(ARCH), SunOS)
 LDFLAGS=-O2 -G
 endif

parse_via.c

@@ -263,6 +263,9 @@ __inline char* parse_via_param(	char* p, char* end, int* pstate,
 						state=HIDDEN1;
 						param->name.s=tmp;
 						break;
+					case BRANCH5:
+						state=FIN_BRANCH;
+						break;
 					case GEN_PARAM:
 						break;
 					case F_CR:
@@ -809,7 +812,6 @@ char* parse_via(char* buffer, char* end, struct via_body *vb)
 	char* tmp_param;
 	struct via_param* param;
 
-
 parse_again:
 	vb->error=VIA_PARSE_ERROR;
 	/* parse start of via ( SIP/2.0/UDP    )*/
@@ -1586,12 +1588,6 @@ main_via:
 						memset(param,0, sizeof(struct via_param));
 						tmp=parse_via_param(tmp, end, &state, &saved_state,
 											param);
-						/*add param to the list*/
-						if (vb->last_param)	vb->last_param->next=param;
-						else				vb->param_lst=param;
-						vb->last_param=param;
-						if (param->type==PARAM_BRANCH)
-							vb->branch=param;
 						
 						switch(state){
 							case L_PARAM:
@@ -1616,6 +1612,12 @@ main_via:
 										*tmp, state);
 								goto error;
 						}
+						/*add param to the list*/
+						if (vb->last_param)	vb->last_param->next=param;
+						else				vb->param_lst=param;
+						vb->last_param=param;
+						if (param->type==PARAM_BRANCH)
+							vb->branch=param;
 						break;
 					case P_PARAM:
 						break;
@@ -1706,6 +1708,7 @@ endofpacket:
 	}
 	return tmp;
 nextvia:
+	DBG("parse_via: next_via\n");
 	vb->error=VIA_PARSE_OK;
 	vb->bsize=tmp-buffer;
 	if (vb->port_str.s){

ut.h

@@ -86,7 +86,7 @@ error_dots:
 	if (err) *err=1;
 	return 0;
 error_char:
-	DBG("str2ip: ERROR: unexpected char %c in %s\n", *str, init);
+	DBG("str2ip: WARNING: unexpected char %c in %s\n", *str, init);
 	if (err) *err=1;
 	return 0;
 }