FossilOrigin-Name: 4bbb8402b5110003c6d19908b6fa9b4a7a6b5903ba1fa691eb93a49aa0f089f4
This commit is contained in:
7u83@mail.ru
2015-04-07 05:42:36 +00:00
parent a4175d4cce
commit 4c0d06e21d
55 changed files with 1312 additions and 1226 deletions

View File

@ -19,7 +19,7 @@
/**
* @file
* @brief Implementation of methods for actionlists.
*/
*/
#include <stdlib.h>
@ -27,30 +27,30 @@
#include "action.h"
static inline int cw_action_in_cmp(const void *elem1,const void *elem2)
static inline int cw_action_in_cmp(const void *elem1, const void *elem2)
{
struct cw_action_in * e1 = (struct cw_action_in*)elem1;
struct cw_action_in * e2 = (struct cw_action_in*)elem2;
int r;
struct cw_action_in *e1 = (struct cw_action_in *) elem1;
struct cw_action_in *e2 = (struct cw_action_in *) elem2;
int r;
r = e1->msg_id - e2->msg_id;
if (r!=0)
return r;
r = e1->capwap_state - e2->capwap_state;
if (r!=0)
if (r != 0)
return r;
r = e1->elem_id - e2->elem_id;
if (r!=0)
if (r != 0)
return r;
r = e1->capwap_state - e2->capwap_state;
if (r != 0)
return r;
r = e1->vendor_id - e2->vendor_id;
if (r!=0)
if (r != 0)
return r;
r = e1->proto - e2->proto;
if (r!=0)
if (r != 0)
return r;
@ -59,41 +59,41 @@ static inline int cw_action_in_cmp(const void *elem1,const void *elem2)
}
cw_action_in_t * cw_actionlist_in_add(cw_actionlist_in_t t, struct cw_action_in * a)
cw_action_in_t *cw_actionlist_in_add(cw_actionlist_in_t t, struct cw_action_in * a)
{
return cw_actionlist_add(t,a,sizeof(struct cw_action_in));
return cw_actionlist_add(t, a, sizeof(struct cw_action_in));
}
struct cw_action_in * cw_actionlist_in_get(cw_actionlist_in_t t,struct cw_action_in *a)
struct cw_action_in *cw_actionlist_in_get(cw_actionlist_in_t t, struct cw_action_in *a)
{
return avltree_get(t,a);
return avltree_get(t, a);
}
cw_actionlist_in_t cw_actionlist_in_create()
{
return avltree_create(cw_action_in_cmp,free);
return avltree_create(cw_action_in_cmp, free);
}
int cw_actionlist_in_register_actions(cw_actionlist_in_t t,cw_action_in_t * actions)
int cw_actionlist_in_register_actions(cw_actionlist_in_t t, cw_action_in_t * actions)
{
while(actions->capwap_state){
cw_action_in_t * rc = cw_actionlist_in_add(t,actions);
if (rc==0)
return 0;
while (actions->capwap_state) {
cw_action_in_t *rc = cw_actionlist_in_add(t, actions);
if (rc == 0)
return 0;
actions++;
}
return 1;
}
int cw_actionlist_out_register_actions(cw_actionlist_out_t t,cw_action_out_t * actions)
int cw_actionlist_out_register_actions(cw_actionlist_out_t t, cw_action_out_t * actions)
{
while(actions->msg_id!=0){
cw_action_out_t * rc = cw_actionlist_out_add(t,actions);
if (rc==0)
return 0;
while (actions->msg_id != 0) {
cw_action_out_t *rc = cw_actionlist_out_add(t, actions);
if (rc == 0)
return 0;
actions++;
}
return 1;
@ -104,23 +104,23 @@ int cw_actionlist_out_register_actions(cw_actionlist_out_t t,cw_action_out_t * a
/*
* Compare function for actionlist_out_t lists
*/
static int cw_action_out_cmp(const void *elem1,const void *elem2)
*/
static int cw_action_out_cmp(const void *elem1, const void *elem2)
{
struct cw_action_out * e1 = (struct cw_action_out*)elem1;
struct cw_action_out * e2 = (struct cw_action_out*)elem2;
int r;
struct cw_action_out *e1 = (struct cw_action_out *) elem1;
struct cw_action_out *e2 = (struct cw_action_out *) elem2;
int r;
r = e1->msg_id - e2->msg_id;
if (r!=0)
if (r != 0)
return r;
r = e1->item_id - e2->item_id;
if (r!=0)
if (r != 0)
return r;
r = e1->vendor_id - e2->vendor_id;
if (r!=0)
if (r != 0)
return r;
return 0;
@ -134,19 +134,19 @@ static int cw_action_out_cmp(const void *elem1,const void *elem2)
* @param a action to add
* @param s size of element to add
* @return pointer to added element or NULL if an error has opccured
*/
void * cw_actionlist_add(struct avltree *t, void *a, size_t s)
*/
void *cw_actionlist_add(struct avltree *t, void *a, size_t s)
{
void * r = avltree_replace_data(t,a,sizeof(struct cw_action_in));
void *r = avltree_replace_data(t, a, sizeof(struct cw_action_in));
if (r)
return r;
void *an = malloc(sizeof(struct cw_action_in));
if (!an)
return NULL;
memcpy(an,a,s);
return avltree_add(t,an);
memcpy(an, a, s);
return avltree_add(t, an);
}
@ -154,19 +154,38 @@ void * cw_actionlist_add(struct avltree *t, void *a, size_t s)
/**
* Create an action list for outgoing message lements
* @return the created action list or NULL if an erro has occured.
*/
*/
cw_actionlist_out_t cw_actionlist_out_create()
{
return avltree_create(cw_action_out_cmp,free);
return avltree_create(cw_action_out_cmp, free);
}
cw_action_out_t * cw_actionlist_out_add(cw_actionlist_out_t t, struct cw_action_out * a)
cw_action_out_t *cw_actionlist_out_add(cw_actionlist_out_t t, struct cw_action_out * a)
{
return cw_actionlist_add(t,a,sizeof (struct cw_action_out));
return cw_actionlist_add(t, a, sizeof(struct cw_action_out));
}
cw_action_in_t *cw_actionlist_in_set_msg_end_callback(cw_actionlist_in_t a,
uint8_t capwap_state,
uint32_t msg_id,
int (*fun) (struct conn * conn,
struct cw_action_in * a, uint8_t * data,
int len))
{
cw_action_in_t as,*ar;
as.vendor_id=0;
as.proto=0;
as.elem_id=-1;
as.msg_id=msg_id;
as.capwap_state=capwap_state;
ar = cw_actionlist_in_get(a,&as);
if (!ar)
return NULL;
ar->end=fun;
return ar;
}