From bb8257d830a0af3a58f8ad976808f3d8062ae333 Mon Sep 17 00:00:00 2001
From: "7u83@mail.ru" <7u83@mail.ru@noemail.net>
Date: Sun, 13 Mar 2016 17:50:24 +0000
Subject: [PATCH] More flexible now.

FossilOrigin-Name: ceb2a1395107345de76537e10a60b40f8ddcee6ce32f80938f12878fdb6074eb
---
 src/cw/cw_out_wtp_board_data.c | 43 ++++++++++++++++++++++++++++++----
 1 file changed, 38 insertions(+), 5 deletions(-)

diff --git a/src/cw/cw_out_wtp_board_data.c b/src/cw/cw_out_wtp_board_data.c
index a5d3ef77..14c4eb33 100644
--- a/src/cw/cw_out_wtp_board_data.c
+++ b/src/cw/cw_out_wtp_board_data.c
@@ -6,18 +6,42 @@
 #include "cw.h"
 
 
-int cw_out_wtp_board_data(struct conn *conn, struct cw_action_out *a, uint8_t * dst)
+int cw_get_out_item(struct conn * conn, struct cw_action_out *a, void *dst, mbagtype_t type)
 {
+	if (!a->get)
+		return 0;
 
-	mbag_t board_data =
-	    mbag_get_mbag(conn->config, CW_ITEM_WTP_BOARD_DATA,NULL);
+	/* Get the item */
+	struct mbag_item *item = a->get(conn, a);
+	if (!item)
+		return 0;
 
 
-	if (!board_data) {
-		cw_log(LOG_ERR, "Error: Can't send WTP Board Data element. \"%s\" is undefined.",CW_ITEM_WTP_BOARD_DATA);
+
+	if (item->type != type){
 		return 0;
 	}
 
+	return cw_put_mbag_item(dst,item);
+}
+
+int cw_out_wtp_board_data(struct conn *conn, struct cw_action_out *a, uint8_t * dst)
+{
+
+	mbag_t board_data;
+      	 
+//	    mbag_get_mbag(conn->config, CW_ITEM_WTP_BOARD_DATA,NULL);
+
+ 	if (!cw_get_out_item(conn,a,&board_data,MBAG_MBAG)){
+		cw_log(LOG_ERROR,"Can't get item '%s' for msg %d, elem %d",a->item_id,a->msg_id,a->elem_id);
+		return 0;
+	}
+
+/*	if (!board_data) {
+		cw_log(LOG_ERR, "Error: Can't send WTP Board Data element. \"%s\" is undefined.",CW_ITEM_WTP_BOARD_DATA);
+		return 0;
+	}
+*/
 	struct mbag_item *i;
 	i = mbag_get(board_data, CW_ITEM_WTP_BOARD_VENDOR);
 	if (!i) {
@@ -29,8 +53,17 @@ int cw_out_wtp_board_data(struct conn *conn, struct cw_action_out *a, uint8_t *
 	uint8_t *d = dst + 4;
 	d += cw_put_dword(d, i->dword);
 
+char buf[90];
+
 	i = mbag_get(board_data, CW_ITEM_WTP_BOARD_MODELNO);
 	if (i) {
+
+printf("We have got an i %p\n",i);
+printf("len: %d\n",bstr16_len(i->data));
+memcpy(buf,bstr16_data(i->data),bstr16_len(i->data));
+buf[bstr16_len(i->data)]=0;
+printf("Val: %s\n",buf);
+
 		d += cw_put_word(d, CW_BOARDDATA_MODELNO);
 		d += cw_put_word(d, bstr16_len(i->data));
 		d += cw_put_data(d, bstr16_data(i->data), bstr16_len(i->data));