@@ -466,7 +466,9 @@ int acc_db_request( struct sip_msg *rq)

 			LM_DBG("attr[%d] is NULL\n", i);

 			VAL_NULL(db_vals + i) = 1;

 		} else {

-			LM_DBG("attr[%d] is STR\n", i);

+			LM_DBG("attr[%d] is STR len=%d\n", i, val_arr[i].len);

+			VAL_NULL(db_vals+i) = 0;

+			VAL_TYPE(db_vals+i)=DB1_STR;

 			VAL_STR(db_vals+i) = val_arr[i];

 		}

 	}

@@ -502,6 +504,8 @@ int acc_db_request( struct sip_msg *rq)

 			if (acc_extra_nullable == 1 && type_arr[i] == TYPE_NULL) {

 					VAL_NULL(db_vals + i) = 1;

 				} else {

+					VAL_NULL(db_vals+i) = 0;

+					VAL_TYPE(db_vals+i)=DB1_STR;

 					VAL_STR(db_vals+i)=val_arr[i];

 				}

 			}

@@ -429,18 +429,19 @@ int acc_db_request( struct sip_msg *rq)

 	for(i=0; i<m; i++)

 		VAL_STR(db_vals+i) = val_arr[i];

 	/* time value */

-	VAL_TIME(db_vals+(m++)) = acc_env.ts;

+	VAL_TIME(db_vals+m) = acc_env.ts;

+	m++;

 	/* extra time value */

 	if(acc_time_mode==1) {

-		VAL_INT(db_vals+(m++)) = (int)acc_env.tv.tv_sec;

-		i++;

-		VAL_INT(db_vals+(m++)) = (int)acc_env.tv.tv_usec;

-		i++;

+		VAL_INT(db_vals+m) = (int)acc_env.tv.tv_sec;

+		m++;

+		VAL_INT(db_vals+m) = (int)acc_env.tv.tv_usec;

+		m++;

 	} else if(acc_time_mode==2) {

 		dtime = (double)acc_env.tv.tv_usec;

 		dtime = (dtime / 1000000) + (double)acc_env.tv.tv_sec;

-		VAL_DOUBLE(db_vals+(m++)) = dtime;

-		i++;

+		VAL_DOUBLE(db_vals+m) = dtime;

+		m++;

 	} else if(acc_time_mode==3 || acc_time_mode==4) {

 		if(acc_time_mode==3) {

 			localtime_r(&acc_env.ts, &t);

@@ -451,19 +452,21 @@ int acc_db_request( struct sip_msg *rq)

 					acc_time_format, &t)<=0) {

 			acc_time_format_buf[0] = '\0';

 		}

-		VAL_STRING(db_vals+(m++)) = acc_time_format_buf;

-		i++;

+		VAL_STRING(db_vals+m) = acc_time_format_buf;

+		m++;

 	}

+	i = m;

 	/* extra columns */

 	o = extra2strar( db_extra, rq, val_arr+m, int_arr+m, type_arr+m);

 	m += o;

-	for( i++ ; i<m; i++) {

+	for( ; i<m; i++) {

 		if (acc_extra_nullable == 1 && type_arr[i] == TYPE_NULL) {

 			LM_DBG("attr[%d] is NULL\n", i);

 			VAL_NULL(db_vals + i) = 1;

 		} else {

+			LM_DBG("attr[%d] is STR\n", i);

 			VAL_STR(db_vals+i) = val_arr[i];

 		}

 	}

@@ -461,6 +461,7 @@ int acc_db_request( struct sip_msg *rq)

 	for( i++ ; i<m; i++) {

 		if (acc_extra_nullable == 1 && type_arr[i] == TYPE_NULL) {

+			LM_DBG("attr[%d] is NULL\n", i);

 			VAL_NULL(db_vals + i) = 1;

 		} else {

 			VAL_STR(db_vals+i) = val_arr[i];

@@ -61,9 +61,9 @@ extern struct acc_extra *db_extra;

 /* arrays used to collect the values before being

  * pushed to the storage backend (whatever used)

  * (3 = datetime + max 2 from time_mode) */

-static str val_arr[ACC_CORE_LEN+MAX_ACC_EXTRA+MAX_ACC_LEG+3];

-static int int_arr[ACC_CORE_LEN+MAX_ACC_EXTRA+MAX_ACC_LEG+3];

-static char type_arr[ACC_CORE_LEN+MAX_ACC_EXTRA+MAX_ACC_LEG+3];

+static str *val_arr = NULL;

+static int *int_arr = NULL;

+static char *type_arr = NULL;

 #define ACC_TIME_FORMAT_SIZE	128

 static char acc_time_format_buf[ACC_TIME_FORMAT_SIZE];

@@ -160,7 +160,7 @@ int core2strar(struct sip_msg *req, str *c_vals, int *i_vals, char *t_vals)

 /********************************************

  *        LOG  ACCOUNTING

  ********************************************/

-static str log_attrs[ACC_CORE_LEN+MAX_ACC_EXTRA+MAX_ACC_LEG];

+static str *log_attrs = NULL;

 #define SET_LOG_ATTR(_n,_atr)  \

 	do { \

@@ -309,8 +309,8 @@ int acc_is_db_ready(void)

 /* caution: keys need to be aligned to core format

  * (3 = datetime + max 2 from time_mode) */

-static db_key_t db_keys[ACC_CORE_LEN+3+MAX_ACC_EXTRA+MAX_ACC_LEG];

-static db_val_t db_vals[ACC_CORE_LEN+3+MAX_ACC_EXTRA+MAX_ACC_LEG];

+static db_key_t *db_keys = NULL;

+static db_val_t *db_vals = NULL;

 int acc_get_db_handlers(void **vf, void **vh) {

@@ -624,3 +624,62 @@ void acc_api_set_arrays(acc_info_t *inf)

 	inf->leg_info = leg_info;

 }

+int acc_arrays_alloc(void) {

+	if ((val_arr = pkg_malloc((ACC_CORE_LEN + acc_extra_size + MAX_ACC_LEG + 3) * sizeof(str))) == NULL) {

+		LM_ERR("failed to alloc val_arr\n");

+		return -1;

+	}

+

+	if ((int_arr = pkg_malloc((ACC_CORE_LEN + acc_extra_size + MAX_ACC_LEG + 3) * sizeof(int))) == NULL) {

+		LM_ERR("failed to alloc int_arr\n");

+		return -1;

+	}

+

+	if ((type_arr = pkg_malloc((ACC_CORE_LEN + acc_extra_size + MAX_ACC_LEG + 3) * sizeof(char))) == NULL) {

+		LM_ERR("failed to alloc type_arr\n");

+		return -1;

+	}

+

+	if ((log_attrs = pkg_malloc((ACC_CORE_LEN + acc_extra_size + MAX_ACC_LEG + 3) * sizeof(str))) == NULL) {

+		LM_ERR("failed to alloc log_attrs\n");

+		return -1;

+	}

+

+	if ((db_keys = pkg_malloc((ACC_CORE_LEN + acc_extra_size + MAX_ACC_LEG + 3) * sizeof(db_key_t))) == NULL) {

+		LM_ERR("failed to alloc db_keys\n");

+		return -1;

+	}

+

+	if ((db_vals = pkg_malloc((ACC_CORE_LEN + acc_extra_size + MAX_ACC_LEG + 3) * sizeof(db_val_t))) == NULL) {

+		LM_ERR("failed to alloc db_vals\n");

+		return -1;

+	}

+

+	return 1;

+}

+

+void acc_arrays_free(void) {

+	if (val_arr) {

+		pkg_free(val_arr);

+	}

+

+	if (int_arr) {

+		pkg_free(int_arr);

+	}

+

+	if (type_arr) {

+		pkg_free(type_arr);

+	}

+

+	if (log_attrs) {

+		pkg_free(log_attrs);

+	}

+

+	if (db_keys) {

+		pkg_free(db_keys);

+	}

+

+	if (db_vals) {

+		pkg_free(db_vals);

+	}

+}

@@ -52,6 +52,7 @@ extern struct acc_extra *log_extra;

 extern struct acc_extra *leg_info;

 extern struct acc_enviroment acc_env;

 extern char *acc_time_format;

+extern int acc_extra_nullable;

 static db_func_t acc_dbf;

 static db1_con_t* db_handle=0;

@@ -458,8 +459,13 @@ int acc_db_request( struct sip_msg *rq)

 	o = extra2strar( db_extra, rq, val_arr+m, int_arr+m, type_arr+m);

 	m += o;

-	for( i++ ; i<m; i++)

-		VAL_STR(db_vals+i) = val_arr[i];

+	for( i++ ; i<m; i++) {

+		if (acc_extra_nullable == 1 && type_arr[i] == TYPE_NULL) {

+			VAL_NULL(db_vals + i) = 1;

+		} else {

+			VAL_STR(db_vals+i) = val_arr[i];

+		}

+	}

 	if (acc_dbf.use_table(db_handle, &acc_env.text/*table*/) < 0) {

 		LM_ERR("error in use_table\n");

@@ -488,8 +494,13 @@ int acc_db_request( struct sip_msg *rq)

 	} else {

 		n = legs2strar(leg_info,rq,val_arr+m,int_arr+m,type_arr+m,1);

 		do {

-			for (i=m; i<m+n; i++)

-				VAL_STR(db_vals+i)=val_arr[i];

+			for (i=m; i<m+n; i++) {

+			if (acc_extra_nullable == 1 && type_arr[i] == TYPE_NULL) {

+					VAL_NULL(db_vals + i) = 1;

+				} else {

+					VAL_STR(db_vals+i)=val_arr[i];

+				}

+			}

 			if(acc_db_insert_mode==1 && acc_dbf.insert_delayed!=NULL) {

 				if(acc_dbf.insert_delayed(db_handle,db_keys,db_vals,m+n)<0) {

 					LM_ERR("failed to insert delayed into database\n");

@@ -123,6 +123,13 @@ int core2strar(struct sip_msg *req, str *c_vals, int *i_vals, char *t_vals)

 		t_vals[2] = TYPE_NULL;

 	}

+	LM_DBG("default - totag[%.*s]\n", c_vals[2].len, c_vals[2].s);

+	if (c_vals[2].len == 0 && acc_env.to_tag.s && acc_env.to_tag.len > 0) {

+		LM_DBG("extra [%p] totag[%.*s]\n", acc_env.to_tag.s, acc_env.to_tag.len, acc_env.to_tag.s);

+		c_vals[2].len = acc_env.to_tag.len;

+		c_vals[2].s = acc_env.to_tag.s;

+	}

+

 	/* Callid */

 	if (req->callid && req->callid->body.len) {

 		c_vals[3] = req->callid->body;

@@ -195,7 +195,7 @@ int acc_log_request( struct sip_msg *rq)

 	int m;

 	int o;

 	int i;

-	struct tm *t;

+	struct tm t;

 	double dtime;

 	/* get default values */

@@ -262,12 +262,12 @@ int acc_log_request( struct sip_msg *rq)

 				acc_time_attr.s, dtime, log_msg);

 	} else if(acc_time_mode==3 || acc_time_mode==4) {

 		if(acc_time_mode==3) {

-			t = localtime(&acc_env.ts);

+			localtime_r(&acc_env.ts, &t);

 		} else {

-			t = gmtime(&acc_env.ts);

+			gmtime_r(&acc_env.ts, &t);

 		}

 		if(strftime(acc_time_format_buf, ACC_TIME_FORMAT_SIZE,

-					acc_time_format, t)<=0) {

+					acc_time_format, &t)<=0) {

 			acc_time_format_buf[0] = '\0';

 		}

 		LM_GEN2(log_facility, log_level, "%.*stimestamp=%lu;%s=%s%s",

@@ -412,7 +412,7 @@ int acc_db_request( struct sip_msg *rq)

 	int n;

 	int i;

 	int o;

-	struct tm *t;

+	struct tm t;

 	double dtime;

 	/* formated database columns */

@@ -435,12 +435,12 @@ int acc_db_request( struct sip_msg *rq)

 		i++;

 	} else if(acc_time_mode==3 || acc_time_mode==4) {

 		if(acc_time_mode==3) {

-			t = localtime(&acc_env.ts);

+			localtime_r(&acc_env.ts, &t);

 		} else {

-			t = gmtime(&acc_env.ts);

+			gmtime_r(&acc_env.ts, &t);

 		}

 		if(strftime(acc_time_format_buf, ACC_TIME_FORMAT_SIZE,

-					acc_time_format, t)<=0) {

+					acc_time_format, &t)<=0) {

 			acc_time_format_buf[0] = '\0';

 		}

 		VAL_STRING(db_vals+(m++)) = acc_time_format_buf;

@@ -526,7 +526,7 @@ int is_eng_acc_on(sip_msg_t *msg)

 	}

 	while(e) {

 		if(e->flags & 1) {

-			if(msg->flags & e->acc_flag) {

+			if(isflagset(msg, e->acc_flag) == 1) {

 				return 1;

 			}

 		}

@@ -549,7 +549,7 @@ int is_eng_mc_on(sip_msg_t *msg)

 	}

 	while(e) {

 		if(e->flags & 1) {

-			if(msg->flags & e->missed_flag) {

+			if(isflagset(msg, e->missed_flag) == 1) {

 				return 1;

 			}

 		}

@@ -579,15 +579,15 @@ int acc_run_engines(struct sip_msg *msg, int type, int *reset)

 	inf.leg_info = leg_info;

 	while(e) {

 		if(e->flags & 1) {

-			if((type==0) && (msg->flags&(e->acc_flag))) {

+			if((type==0) && isflagset(msg, e->acc_flag) == 1) {

 				LM_DBG("acc event for engine: %s\n", e->name);

 				e->acc_req(msg, &inf);

-				if(reset) *reset |= e->acc_flag;

+				if(reset) *reset |= 1 << e->acc_flag;

 			}

-			if((type==1) && (msg->flags&(e->missed_flag))) {

+			if((type==1) && isflagset(msg, e->missed_flag) == 1) {

 				LM_DBG("missed event for engine: %s\n", e->name);

 				e->acc_req(msg, &inf);

-				if(reset) *reset |= e->missed_flag;

+				if(reset) *reset |= 1 << e->missed_flag;

 			}

 		}

 		e = e->next;

@@ -35,6 +35,7 @@

 #include "../../core/error.h"

 #include "../../core/mem/mem.h"

 #include "../../core/usr_avp.h"

+#include "../../core/async_task.h"

 #include "../../lib/srdb1/db.h"

 #include "../../core/parser/hf.h"

 #include "../../core/parser/msg_parser.h"

@@ -465,7 +466,8 @@ int acc_db_request( struct sip_msg *rq)

 				LM_ERR("failed to insert delayed into database\n");

 				goto error;

 			}

-		} else if(acc_db_insert_mode==2 && acc_dbf.insert_async!=NULL) {

+		} else if(acc_db_insert_mode==2 && acc_dbf.insert_async!=NULL

+				&& async_task_workers_active()) {

 			if (acc_dbf.insert_async(db_handle, db_keys, db_vals, m) < 0) {

 				LM_ERR("failed to insert async into database\n");

 				goto error;

@@ -510,6 +510,52 @@ error:

 	return -1;

 }

+/**

+ * @brief test if acc flag from enternal engines is set

+ */

+int is_eng_acc_on(sip_msg_t *msg)

+{

+	acc_engine_t *e;

+

+	e = acc_api_get_engines();

+

+	if(e==NULL) {

+		return 0;

+	}

+	while(e) {

+		if(e->flags & 1) {

+			if(msg->flags & e->acc_flag) {

+				return 1;

+			}

+		}

+		e = e->next;

+	}

+	return 0;

+}

+

+/**

+ * @brief test if acc flag from enternal engines is set

+ */

+int is_eng_mc_on(sip_msg_t *msg)

+{

+	acc_engine_t *e;

+

+	e = acc_api_get_engines();

+

+	if(e==NULL) {

+		return 0;

+	}

+	while(e) {

+		if(e->flags & 1) {

+			if(msg->flags & e->missed_flag) {

+				return 1;

+			}

+		}

+		e = e->next;

+	}

+	return 0;

+}

+

 /**

  * @brief execute all acc engines for a SIP request event

  */

@@ -47,23 +47,11 @@

 #include "acc_logic.h"

 #include "acc_api.h"

-#ifdef DIAM_ACC

-#include "diam_dict.h"

-#include "diam_message.h"

-#include "diam_tcp.h"

-#endif

-

 extern struct acc_extra *log_extra;

 extern struct acc_extra *leg_info;

 extern struct acc_enviroment acc_env;

 extern char *acc_time_format;

-#ifdef DIAM_ACC

-extern char *diameter_client_host;

-extern int diameter_client_port;

-extern struct acc_extra *dia_extra;

-#endif

-

 static db_func_t acc_dbf;

 static db1_con_t* db_handle=0;

 extern struct acc_extra *db_extra;

@@ -111,7 +99,7 @@ int core2strar(struct sip_msg *req, str *c_vals, int *i_vals, char *t_vals)

 	/* from/to URI and TAG */

 	if (req->msg_flags&FL_REQ_UPSTREAM) {

 		LM_DBG("the flag UPSTREAM is set -> swap F/T\n"); \

-		from = acc_env.to;

+			from = acc_env.to;

 		to = req->from;

 	} else {

 		from = req->from;

@@ -252,8 +240,8 @@ int acc_log_request( struct sip_msg *rq)

 				}

 			}

 		} while (p!=log_msg_end && (n=legs2strar(leg_info,rq,val_arr+m,

-							int_arr+m,type_arr+m,

-							0))!=0);

+						int_arr+m,type_arr+m,

+						0))!=0);

 	}

 	/* terminating line */

@@ -262,15 +250,15 @@ int acc_log_request( struct sip_msg *rq)

 	if(acc_time_mode==1) {

 		LM_GEN2(log_facility, log_level, "%.*stimestamp=%lu;%s=%u%s",

-			acc_env.text.len, acc_env.text.s,(unsigned long)acc_env.ts,

-			acc_time_exten.s, (unsigned int)acc_env.tv.tv_usec,

-			log_msg);

+				acc_env.text.len, acc_env.text.s,(unsigned long)acc_env.ts,

+				acc_time_exten.s, (unsigned int)acc_env.tv.tv_usec,

+				log_msg);

 	} else if(acc_time_mode==2) {

 		dtime = (double)acc_env.tv.tv_usec;

 		dtime = (dtime / 1000000) + (double)acc_env.tv.tv_sec;

 		LM_GEN2(log_facility, log_level, "%.*stimestamp=%lu;%s=%.3f%s",

-			acc_env.text.len, acc_env.text.s,(unsigned long)acc_env.ts,

-			acc_time_attr.s, dtime, log_msg);

+				acc_env.text.len, acc_env.text.s,(unsigned long)acc_env.ts,

+				acc_time_attr.s, dtime, log_msg);

 	} else if(acc_time_mode==3 || acc_time_mode==4) {

 		if(acc_time_mode==3) {

 			t = localtime(&acc_env.ts);

@@ -282,14 +270,14 @@ int acc_log_request( struct sip_msg *rq)

 			acc_time_format_buf[0] = '\0';

 		}

 		LM_GEN2(log_facility, log_level, "%.*stimestamp=%lu;%s=%s%s",

-			acc_env.text.len, acc_env.text.s,(unsigned long)acc_env.ts,

-			acc_time_attr.s,

-			acc_time_format_buf,

-			log_msg);

+				acc_env.text.len, acc_env.text.s,(unsigned long)acc_env.ts,

+				acc_time_attr.s,

+				acc_time_format_buf,

+				log_msg);

 	} else {

 		LM_GEN2(log_facility, log_level, "%.*stimestamp=%lu%s",

-			acc_env.text.len, acc_env.text.s,(unsigned long)acc_env.ts,

-			log_msg);

+				acc_env.text.len, acc_env.text.s,(unsigned long)acc_env.ts,

+				log_msg);

 	}

 	/* free memory allocated by extra2strar */

 	free_strar_mem( &(type_arr[m-o]), &(val_arr[m-o]), o, m);

@@ -510,7 +498,7 @@ int acc_db_request( struct sip_msg *rq)

 				}

 			}

 		}while ( (n=legs2strar(leg_info,rq,val_arr+m,int_arr+m,

-				       type_arr+m,0))!=0 );

+						type_arr+m,0))!=0 );

 	}

 	/* free memory allocated by extra2strar */

@@ -522,266 +510,6 @@ error:

 	return -1;

 }

-

-/************ RADIUS & DIAMETER helper functions **************/

-#if defined (DIAM_ACC)

-#ifndef UINT4

-#define UINT4 uint32_t

-#endif

-inline static UINT4 phrase2code(str *phrase)

-{

-	UINT4 code;

-	int i;

-

-	if (phrase->len<3) return 0;

-	code=0;

-	for (i=0;i<3;i++) {

-		if (!(phrase->s[i]>='0' && phrase->s[i]<'9'))

-				return 0;

-		code=code*10+phrase->s[i]-'0';

-	}

-	return code;

-}

-#endif

-

-

-

-/********************************************

- *        DIAMETER  ACCOUNTING

- ********************************************/

-#ifdef DIAM_ACC

-

-#define AA_REQUEST 265

-#define AA_ANSWER  265

-

-#define ACCOUNTING_REQUEST 271

-#define ACCOUNTING_ANSWER  271

-

-static int diam_attrs[ACC_CORE_LEN+MAX_ACC_EXTRA+MAX_ACC_LEG];

-

-int acc_diam_init()

-{

-	int n;

-	int m;

-

-	n = 0;

-	/* caution: keep these aligned to core acc output */

-	diam_attrs[n++] = AVP_SIP_METHOD;

-	diam_attrs[n++] = AVP_SIP_FROM_TAG;

-	diam_attrs[n++] = AVP_SIP_TO_TAG;

-	diam_attrs[n++] = AVP_SIP_CALLID;

-	diam_attrs[n++] = AVP_SIP_STATUS;

-

-	m = extra2int( dia_extra, diam_attrs+n);

-	if (m<0) {

-		LM_ERR("extra names for DIAMETER must be integer AVP codes\n");

-		return -1;

-	}

-	n += m;

-

-	m = extra2int( leg_info, diam_attrs+n);

-	if (m<0) {

-		LM_ERR("leg info names for DIAMTER must be integer AVP codes\n");

-		return -1;

-	}

-	n += m;

-

-	return 0;

-}

-

-

-inline unsigned long diam_status(struct sip_msg *rq, int code)

-{

-	if ((rq->REQ_METHOD==METHOD_INVITE || rq->REQ_METHOD==METHOD_ACK)

-				&& code>=200 && code<300) 

-		return AAA_ACCT_START;

-

-	if ((rq->REQ_METHOD==METHOD_BYE || rq->REQ_METHOD==METHOD_CANCEL))

-		return AAA_ACCT_STOP;

-

-	if (code>=200 && code <=300)  

-		return AAA_ACCT_EVENT;

-

-	return -1;

-}

-

-

-int acc_diam_request( struct sip_msg *req )

-{

-	int attr_cnt;

-	int cnt;

-	AAAMessage *send = NULL;

-	AAA_AVP *avp;

-	struct sip_uri puri;

-	str *uri;

-	int ret;

-	int i;

-	int status;

-	char tmp[2];

-	unsigned int mid;

-	int m;

-	int o;

-

-	attr_cnt = core2strar( req, val_arr, int_arr, type_arr );

-	/* last value is not used */

-	attr_cnt--;

-

-	if ( (send=AAAInMessage(ACCOUNTING_REQUEST, AAA_APP_NASREQ))==NULL) {

-		LM_ERR("failed to create new AAA request\n");

-		return -1;

-	}

-

-	m = 0;

-	o = 0;

-	/* AVP_ACCOUNTIG_RECORD_TYPE */

-	if( (status = diam_status(req, acc_env.code))<0) {

-		LM_ERR("status unknown\n");

-		goto error;

-	}

-	tmp[0] = status+'0';

-	tmp[1] = 0;

-	if( (avp=AAACreateAVP(AVP_Accounting_Record_Type, 0, 0, tmp,

-	1, AVP_DUPLICATE_DATA)) == 0) {

-		LM_ERR("failed to create AVP:no more free memory!\n");

-		goto error;

-	}

-	if( AAAAddAVPToMessage(send, avp, 0)!= AAA_ERR_SUCCESS) {

-		LM_ERR("avp not added \n");

-		AAAFreeAVP(&avp);

-		goto error;

-	}

-	/* SIP_MSGID AVP */

-	mid = req->id;

-	if( (avp=AAACreateAVP(AVP_SIP_MSGID, 0, 0, (char*)(&mid), 

-	sizeof(mid), AVP_DUPLICATE_DATA)) == 0) {

-		LM_ERR("failed to create AVP:no more free memory!\n");

-		goto error;

-	}

-	if( AAAAddAVPToMessage(send, avp, 0)!= AAA_ERR_SUCCESS) {

-		LM_ERR("avp not added \n");

-		AAAFreeAVP(&avp);

-		goto error;

-	}

-

-	/* SIP Service AVP */

-	if( (avp=AAACreateAVP(AVP_Service_Type, 0, 0, SIP_ACCOUNTING, 

-	SERVICE_LEN, AVP_DUPLICATE_DATA)) == 0) {

-		LM_ERR("failed to create AVP:no more free memory!\n");

-		goto error;

-	}

-	if( AAAAddAVPToMessage(send, avp, 0)!= AAA_ERR_SUCCESS) {

-		LM_ERR("avp not added \n");

-		AAAFreeAVP(&avp);

-		goto error;

-	}

-

-	/* also the extra attributes */

-	o = extra2strar( dia_extra, req, val_arr, int_arr, type_arr);

-	attr_cnt += o;

-	m = attr_cnt;

-

-	/* add attributes */

-	for(i=0; i<attr_cnt; i++) {

-		if((avp=AAACreateAVP(diam_attrs[i], 0,0, val_arr[i].s, val_arr[i].len,

-		AVP_DUPLICATE_DATA)) == 0) {

-			LM_ERR("failed to create AVP: no more free memory!\n");

-			goto error;

-		}

-		if( AAAAddAVPToMessage(send, avp, 0)!= AAA_ERR_SUCCESS) {

-			LM_ERR("avp not added \n");

-			AAAFreeAVP(&avp);

-			goto error;

-		}

-	}

-

-	/* and the leg attributes */

-	if ( leg_info ) {

-	        cnt = legs2strar(leg_info,req,val_arr,int_arr,type_arr,1);

-		do {

-			for (i=0; i<cnt; i++) {

-				if((avp=AAACreateAVP(diam_attrs[attr_cnt+i], 0, 0,

-				val_arr[i].s, val_arr[i].len, AVP_DUPLICATE_DATA)) == 0) {

-					LM_ERR("failed to create AVP: no more free memory!\n");

-					goto error;

-				}

-				if( AAAAddAVPToMessage(send, avp, 0)!= AAA_ERR_SUCCESS) {

-					LM_ERR("avp not added \n");

-					AAAFreeAVP(&avp);

-					goto error;

-				}

-			}

-		} while ( (cnt=legs2strar(leg_info,req,val_arr,int_arr,

-					  type_arr,0))!=0 );

-	}

-

-	if (get_uri(req, &uri) < 0) {

-		LM_ERR("failed to get uri, From/To URI not found\n");

-		goto error;

-	}

-

-	if (parse_uri(uri->s, uri->len, &puri) < 0) {

-		LM_ERR("failed to parse From/To URI\n");

-		goto error;

-	}

-

-	/* Destination-Realm AVP */

-	if( (avp=AAACreateAVP(AVP_Destination_Realm, 0, 0, puri.host.s,

-	puri.host.len, AVP_DUPLICATE_DATA)) == 0) {

-		LM_ERR("failed to create AVP:no more free memory!\n");

-		goto error;

-	}

-

-	if( AAAAddAVPToMessage(send, avp, 0)!= AAA_ERR_SUCCESS) {

-		LM_ERR("avp not added \n");

-		AAAFreeAVP(&avp);

-		goto error;

-	}

-

-	/* prepare the message to be sent over the network */

-	if(AAABuildMsgBuffer(send) != AAA_ERR_SUCCESS) {

-		LM_ERR("message buffer not created\n");

-		goto error;

-	}

-

-	if(sockfd==AAA_NO_CONNECTION) {

-		sockfd = init_mytcp(diameter_client_host, diameter_client_port);

-		if(sockfd==AAA_NO_CONNECTION) {

-			LM_ERR("failed to reconnect to Diameter client\n");

-			goto error;

-		}

-	}

-

-	/* send the message to the DIAMETER client */

-	ret = tcp_send_recv(sockfd, send->buf.s, send->buf.len, rb, req->id);

-	if(ret == AAA_CONN_CLOSED) {

-		LM_NOTICE("connection to Diameter client closed.It will be "

-				"reopened by the next request\n");

-		close(sockfd);

-		sockfd = AAA_NO_CONNECTION;

-		goto error;

-	}

-

-	if(ret != ACC_SUCCESS) {

-		/* a transmission error occurred */

-		LM_ERR("message sending to the DIAMETER backend authorization "

-				"server failed\n");

-		goto error;

-	}

-

-	AAAFreeMessage(&send);

-	/* free memory allocated by extra2strar */

-	free_strar_mem( &(type_arr[m-o]), &(val_arr[m-o]), o, m);

-	return 1;

-

-error:

-	AAAFreeMessage(&send);

-	/* free memory allocated by extra2strar */

-	free_strar_mem( &(type_arr[m-o]), &(val_arr[m-o]), o, m);

-	return -1;

-}

-

-#endif

-

 /**

  * @brief execute all acc engines for a SIP request event

  */

@@ -64,11 +64,9 @@ extern int diameter_client_port;

 extern struct acc_extra *dia_extra;

 #endif

-#ifdef SQL_ACC

 static db_func_t acc_dbf;

 static db1_con_t* db_handle=0;

 extern struct acc_extra *db_extra;

-#endif

 /* arrays used to collect the values before being

  * pushed to the storage backend (whatever used)

@@ -306,16 +304,12 @@ int acc_log_request( struct sip_msg *rq)

 int acc_is_db_ready(void)

 {

-#ifdef SQL_ACC

 	if(db_handle!=0)

 		return 1;

-#endif

 	return 0;

 }

-#ifdef SQL_ACC

-

 /* caution: keys need to be aligned to core format

  * (3 = datetime + max 2 from time_mode) */

 static db_key_t db_keys[ACC_CORE_LEN+3+MAX_ACC_EXTRA+MAX_ACC_LEG];

@@ -528,8 +522,6 @@ error:

 	return -1;

 }

-#endif

-

 /************ RADIUS & DIAMETER helper functions **************/

 #if defined (DIAM_ACC)

@@ -304,6 +304,16 @@ int acc_log_request( struct sip_msg *rq)

  *        SQL  ACCOUNTING

  ********************************************/

+int acc_is_db_ready(void)

+{

+#ifdef SQL_ACC

+	if(db_handle!=0)

+		return 1;

+#endif

+

+	return 0;

+}

+

 #ifdef SQL_ACC

 /* caution: keys need to be aligned to core format

@@ -47,10 +47,6 @@

 #include "acc_logic.h"

 #include "acc_api.h"

-#ifdef RAD_ACC

-#include "../misc_radius/radius.h"

-#endif

-

 #ifdef DIAM_ACC

 #include "diam_dict.h"

 #include "diam_message.h"

@@ -62,10 +58,6 @@ extern struct acc_extra *leg_info;

 extern struct acc_enviroment acc_env;

 extern char *acc_time_format;

-#ifdef RAD_ACC

-extern struct acc_extra *rad_extra;

-#endif

-

 #ifdef DIAM_ACC

 extern char *diameter_client_host;

 extern int diameter_client_port;

@@ -530,7 +522,7 @@ error:

 /************ RADIUS & DIAMETER helper functions **************/

-#if defined(RAD_ACC) || defined (DIAM_ACC)

+#if defined (DIAM_ACC)

 #ifndef UINT4

 #define UINT4 uint32_t

 #endif

@@ -551,176 +543,6 @@ inline static UINT4 phrase2code(str *phrase)

 #endif

-/********************************************

- *        RADIUS  ACCOUNTING

- ********************************************/

-#ifdef RAD_ACC

-enum { RA_ACCT_STATUS_TYPE=0, RA_SERVICE_TYPE, RA_SIP_RESPONSE_CODE,

-	RA_SIP_METHOD, RA_TIME_STAMP, RA_STATIC_MAX};

-enum {RV_STATUS_START=0, RV_STATUS_STOP, RV_STATUS_ALIVE, RV_STATUS_FAILED,

-	RV_SIP_SESSION, RV_STATIC_MAX};

-static struct attr

-	rd_attrs[RA_STATIC_MAX+ACC_CORE_LEN-2+MAX_ACC_EXTRA+MAX_ACC_LEG];

-static struct val rd_vals[RV_STATIC_MAX];

-

-int init_acc_rad(char *rad_cfg, int srv_type)

-{

-	int n;

-

-	memset(rd_attrs, 0, sizeof(rd_attrs));

-	memset(rd_vals, 0, sizeof(rd_vals));

-	rd_attrs[RA_ACCT_STATUS_TYPE].n  = "Acct-Status-Type";