cfg_list in conn

src/cw/conn.c

@@ -61,6 +61,7 @@ void cw_conn_init(struct cw_Conn * conn)
 	conn->update_cfg = cw_cfg_create();
 	conn->remote_cfg = cw_cfg_create();
 	conn->local_cfg = cw_cfg_create();
+	conn->cfg_list[0]=NULL;
 }
 
 int cw_conn_set_msg_cb(struct cw_Conn *conn, int type, cw_MsgCallbackFun fun)
@@ -489,10 +490,7 @@ static int process_elements(struct cw_Conn *conn, uint8_t * rawmsg, int len,
 	params.cfg->dbg_level = DBG_ELEM_DETAIL_IN;
 	params.cfg->dbg_prefix = "    ";
 
-	params.cfg_list[0]=params.cfg;
-	params.cfg_list[1]=conn->local_cfg;
-	params.cfg_list[2]=conn->global_cfg;
-	params.cfg_list[3]=NULL;
+	params.cfg_list=conn->cfg_list;
 
 	params.from = from;
 	params.msgdata = message;

src/cw/conn.h

@@ -86,6 +86,8 @@ struct cw_Conn {
 				     configuration status request.  */
 
 	cw_Cfg_t * update_cfg;
+
+	cw_Cfg_t * cfg_list[10];
 	
 	bstr16_t session_id;
 

src/cw/message.c

@@ -100,11 +100,7 @@ int cw_compose_message(struct cw_Conn *conn, uint8_t * rawout)
 //cw_dbg(DBG_X,"setting with update CFG");
 	params.conn=conn;
 	params.rawmsg = rawout;
-	params.cfg_list[0]=conn->update_cfg;
-	params.cfg_list[1]=conn->remote_cfg;
-	params.cfg_list[2]=conn->local_cfg;
-	params.cfg_list[3]=conn->global_cfg;
-	params.cfg_list[4]=NULL;
+	params.cfg_list=conn->cfg_list;
 	params.msgset=conn->msgset;
 	params.msgdata=msg;
 	params.debug_details=details;

src/cw/msgset.h

@@ -36,7 +36,7 @@ struct cw_ElemHandlerParams {
 	char * debug_details;
 	uint32_t dbg_level;
 	cw_Cfg_t * cfg;
-	cw_Cfg_t * cfg_list[10];
+	cw_Cfg_t ** cfg_list;
 	int len;
 };