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

mod_register_actions now uses parameter mode.

Browse Source 
FossilOrigin-Name: 7fccf33259836d6d1139d611825315e21428fbb88d7359d4176ef8ba258488fa
This commit is contained in:
7u83@mail.ru
2016-03-10 07:07:30 +00:00
parent c4f9bca1e6
commit fb74f28756
10 changed files with 47 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/cw/conn_process_packet.c
View File

@ -179,14 +179,14 @@ static struct cw_actiondef * load_mods(struct conn *conn, uint8_t * rawmsg, int
int elems_len, struct sockaddr *from)
{
struct mod_ac * cmod = detect_mod(conn, rawmsg, len, elems_len, from, MOD_DETECT_CAPWAP);
struct mod_ac * cmod = detect_mod(conn, rawmsg, len, elems_len, from, MOD_MODE_CAPWAP);
if (cmod == MOD_NULL) {
cw_dbg(DBG_MSG_ERR, "Cant't find mod to handle connection from %s , discarding message",
sock_addr2str_p(from));
return NULL;
}
struct mod_ac * bmod = detect_mod(conn, rawmsg, len, elems_len, from, MOD_DETECT_BINDINGS);
struct mod_ac * bmod = detect_mod(conn, rawmsg, len, elems_len, from, MOD_MODE_BINDINGS);
cw_dbg(DBG_INFO,"Mods deteced: %s,%s",cmod->name,bmod->name);

6
src/cw/mod.c
View File

@ -14,7 +14,7 @@ struct cache_item
static struct mavl * cache = NULL;
static int mod_null_register_actions(struct cw_actiondef *def)
static int mod_null_register_actions(struct cw_actiondef *def,int mode)
{
return 0;
}
@ -73,11 +73,11 @@ struct cw_actiondef * mod_cache_add(struct mod_ac *c, struct mod_ac *b)
memset (i,0,sizeof(struct cache_item));
if (c){
i->capwap=c->name;
c->register_actions(&(i->actions));
c->register_actions(&(i->actions),MOD_MODE_CAPWAP);
}
if (b){
i->bindings=b->name;
b->register_actions(&(i->actions));
b->register_actions(&(i->actions),MOD_MODE_BINDINGS);
}
mavl_add(cache,i);

6
src/cw/mod.h
View File

@ -31,8 +31,8 @@ struct cw_actiondef;
#define MOD_MAXMODS 8
enum {
MOD_DETECT_CAPWAP,
MOD_DETECT_BINDINGS
MOD_MODE_CAPWAP,
MOD_MODE_BINDINGS
};
struct mod_ac {
@ -51,7 +51,7 @@ struct mod_ac {
void *data;
/** Register actions */
int (*register_actions) (struct cw_actiondef * def);
int (*register_actions) (struct cw_actiondef * def,int mode);
};