- fixed memory leak when rewritting uri

- route match after new uri
- dmalloc debuging support

Makefile

@@ -16,13 +16,13 @@ NAME=sip_router
 
 
 CC=gcc
-CFLAGS=-O2 -Wcast-align  #-Wmissing-prototypes  -Wall
+CFLAGS=-O2 -Wcast-align #-Wmissing-prototypes  -Wall
 LEX=lex
 YACC=yacc
 YACC_FLAGS=-d -b cfg
 # on linux and freebsd keep it empty (e.g. LIBS= )
 # on solaris add -lxnet (e.g. LIBS= -lxnet)
-LIBS=-lfl -L/usr/local/lib
+LIBS=-lfl -L/usr/local/lib 
 ALLDEP=Makefile
 
 MKDEP=gcc -M

action.c

@@ -21,6 +21,10 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
+#ifdef DEBUG_DMALLOC
+#include <dmalloc.h>
+#endif
+
 
 /* ret= 0! if action -> end of list(e.g DROP), 
       > 0 to continue processing next actions

cfg.lex

@@ -9,6 +9,11 @@
 	#include "cfg.tab.h"
 	#include "dprint.h"
 	#include <string.h>
+	#include <stdlib.h>
+
+#ifdef DEBUG_DMALLOC
+#include <dmalloc.h>
+#endif
 
 	/* states */
 	#define INITIAL_S		0

cfg.y

@@ -17,6 +17,10 @@
 #include "route.h"
 #include "dprint.h"
 
+#ifdef DEBUG_DMALLOC
+#include <dmalloc.h>
+#endif
+
 void yyerror(char* s);
 char* tmp;
 

forward.c

@@ -20,6 +20,10 @@
 #include "udp_server.h"
 #include "globals.h"
 
+#ifdef DEBUG_DMALLOC
+#include <dmalloc.h>
+#endif
+
 #define MAX_VIA_LINE_SIZE      240
 #define MAX_RECEIVED_SIZE  57
 

main.c

@@ -21,6 +21,11 @@
 #include "globals.h"
 
 
+#ifdef DEBUG_DMALLOC
+#include <dmalloc.h>
+#endif
+
+
 static char id[]="@(#) $Id$";
 static char version[]="sip_router 0.6";
 static char help_msg[]= "\

msg_parser.c

@@ -13,6 +13,10 @@
 #include "error.h"
 #include "dprint.h"
 
+#ifdef DEBUG_DMALLOC
+#include <dmalloc.h>
+#endif
+
 
 
 #define DEBUG

proxy.c

@@ -13,6 +13,9 @@
 #include <string.h>
 #include <stdlib.h>
 
+#ifdef DEBUG_DMALLOC
+#include <dmalloc.h>
+#endif
 
 struct proxy_l* proxies=0;
 

receive.c

@@ -12,6 +12,9 @@
 #include "forward.h"
 #include "action.h"
 
+#ifdef DEBUG_DMALLOC
+#include <dmalloc.h>
+#endif
 
 int receive_msg(char* buf, unsigned int len, unsigned long src_ip)
 {
@@ -78,9 +81,11 @@ int receive_msg(char* buf, unsigned int len, unsigned long src_ip)
 		}
 	}
 skip:
+	if (msg.new_uri) free(msg.new_uri);
 	free(msg.orig);
 	return 0;
 error:
+	if (msg.new_uri) free(msg.new_uri);
 	free(msg.orig);
 error1:
 	return -1;

route.c

@@ -19,6 +19,10 @@
 #include "dprint.h"
 #include "proxy.h"
 
+#ifdef DEBUG_DMALLOC
+#include <dmalloc.h>
+#endif
+
 /* main routing list */
 struct route_elem* rlist[RT_NO];
 
@@ -284,8 +288,13 @@ static int eval_elem(struct expr* e, struct sip_msg* msg)
 								e->op, e->subtype);
 				break;
 		case URI_O:
-				ret=comp_str(msg->first_line.u.request.uri, e->r.param,
-								e->op, e->subtype);
+				if(msg->new_uri){
+					ret=comp_str(msg->new_uri, e->r.param,
+									e->op, e->subtype);
+				}else{
+					ret=comp_str(msg->first_line.u.request.uri, e->r.param,
+									e->op, e->subtype);
+				}
 				break;
 		case SRCIP_O:
 				ret=comp_ip(msg->src_ip, e->r.param, e->op, e->subtype);

route_struct.c

@@ -14,6 +14,10 @@
 
 #include "dprint.h"
 
+#ifdef DEBUG_DMALLOC
+#include <dmalloc.h>
+#endif
+
 struct expr* mk_exp(int op, struct expr* left, struct expr* right)
 {
 	struct expr * e;

udp_server.c

@@ -15,6 +15,9 @@
 #include "dprint.h"
 #include "receive.h"
 
+#ifdef DEBUG_DMALLOC
+#include <dmalloc.h>
+#endif
 
 int udp_sock;