planix.org/actube
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Uses AVL Tree Iterator now.

Browse Source 
FossilOrigin-Name: a949c9eb97a4de5abca0bf5cc0568a75a8137ecedfb8e73116f59ae17d273e72
This commit is contained in:
7u83@mail.ru 2015-04-10 07:50:59 +00:00
parent 214e6f66a0
commit e148b7c9f6
1 changed files with 26 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
src/capwap/cw_put_msg.c
View File

@ -27,47 +27,6 @@
#include "cw_log.h" #include "cw_log.h"
struct args{
struct conn * conn;
uint32_t msg_id;
uint8_t * dst;
int len;
};
static int action_cb(void *args_param, void *a_param)
{
struct cw_action_out * a = (struct cw_action_out *)a_param;
struct args * args = (struct args *)args_param;
//printf("ACTION_CB: %d %d %d\n",a->msg_id, a->vendor_id, a->item_id);
if (a->msg_id != args->msg_id) {
/* Element is from next msg, close action */
return 0;
}
if (a->item_id == CW_ITEM_NONE) {
/* Start of message */
args->len=0;
return 1;
}
int l = 0;
uint8_t *dst = args->dst + args->len;
if (a->out) {
l = a->out(args->conn, a, dst);
}
args->len += l;
return 1;
}
/** /**
* Put a message to a buffer * Put a message to a buffer
@ -90,31 +49,38 @@ int cw_put_msg(struct conn *conn, uint8_t * rawout)
as.item_id = CW_ITEM_NONE; as.item_id = CW_ITEM_NONE;
as.vendor_id = 0; as.vendor_id = 0;
uint8_t *dst = msgptr+8;
/* setup arguments for callback function */
struct args args;
args.conn = conn; DEFINE_AVLITER(i,conn->actions->out);
args.msg_id = as.msg_id;
args.dst = msgptr+8;
args.len=-1;
avltree_foreach_from_asc(conn->actions->out, &as, action_cb, &args); cw_action_out_t *am;
cw_set_msg_elems_len(msgptr, args.len); if (! (am=avliter_seek(&i,&as))){
/*
printf ("Total elems len = %d\n",args.len);
printf("Total msg len = %d\n",cw_get_hdr_msg_total_len(rawout));
*/
if (args.len==-1) {
cw_log(LOG_ERR,"Error: Can't create message of type %d (%s) - no definition found.", cw_log(LOG_ERR,"Error: Can't create message of type %d (%s) - no definition found.",
args.msg_id,cw_strmsg(args.msg_id)); as.msg_id,cw_strmsg(as.msg_id));
return -1;
} }
return args.len; cw_action_out_t *ae;
int len = 0;
while(NULL != (ae=avliter_next(&i))) {
printf("Put %d %d\n",ae->msg_id,ae->elem_id);
if (ae->msg_id != as.msg_id) {
/* Element is from next msg, close action */
break;
}
if (ae->out) {
len += ae->out(conn, ae, dst+len);
}
};
cw_set_msg_elems_len(msgptr, len);
return len;
} }