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

Almost all ktv stuff deleted

Browse Source
This commit is contained in:
7u83
2022-08-19 22:23:55 +02:00
parent 14354039e1
commit 6dc8d80102
51 changed files with 658 additions and 1880 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/ac/ac_main.c
View File

@ -282,6 +282,7 @@ int ac_run(cw_Cfg_t * cfg)
{
struct cw_Cfg_iter cfi;
const char *s;
struct cw_Cfg_entry *e;
int i;
@ -292,11 +293,12 @@ int ac_run(cw_Cfg_t * cfg)
* good unicast reply socket */
cw_cfg_iter_init(cfg, &cfi, "actube/listen");
for (i=0; (s = cw_cfg_iter_next(&cfi, NULL)) != NULL; i++) {
for (i=0; (e = cw_cfg_iter_next(&cfi, NULL)) != NULL; i++) {
char addr[100];
char port[50];
int proto;
s=e->val;
conf_parse_listen_addr (s, addr, port, &proto);
socklist_add_unicast (addr, port, proto,
@ -337,11 +339,12 @@ int ac_run(cw_Cfg_t * cfg)
//mavl_print(cfg,pcb,180);
cw_cfg_iter_init(cfg, &cfi, "actube/bcast");
for (i=0; (s = cw_cfg_iter_next(&cfi, NULL)) != NULL; i++) {
for (i=0; (e = cw_cfg_iter_next(&cfi, NULL)) != NULL; i++) {
// for (i = 0; i < conf_bcast_addrs_len; i++) {
char addr[50], port[50];
int proto;
s=e->val;
conf_parse_listen_addr (s, addr, port, &proto);
socklist_add_broadcast (addr, port, proto);

8
src/ac/conf.c
View File

@ -498,6 +498,7 @@ char *conf_mods_dir = NULL;
static int init_mods(cw_Cfg_t *cfg){
int n, i;
struct cw_Cfg_entry *e;
const char * modname;
struct cw_Cfg_iter cfi;
@ -511,11 +512,8 @@ static int init_mods(cw_Cfg_t *cfg){
// cw_mod_set_path(conf_mods_dir);
cw_cfg_iter_init(cfg, &cfi, "actube/mod");
printf("iter mods\n");
for (i=0; (modname = cw_cfg_iter_next(&cfi, NULL)) != NULL; i++) {
printf("init mod name: %s\n",modname);
for (i=0; (e = cw_cfg_iter_next(&cfi, NULL)) != NULL; i++) {
modname = e->val;
struct cw_Mod * mod = cw_mod_load(modname, cfg, CW_ROLE_AC);
if (!mod)

45
src/ac/shell.c
View File

@ -33,7 +33,7 @@ void set_cmd(struct shelldata *sd, const char * cmd);
void del_cmd(struct shelldata *sd, const char * cmd);
void send_cmd(struct shelldata *sd, const char * cmd);
void wlan0_cmd(struct shelldata *sd, const char * cmd);
void show_cfg (FILE *out, mavl_t ktv);
//void show_cfg (FILE *out, mavl_t ktv);
void show_aps (FILE *out);
struct cw_Conn * find_ap(const char *name);
@ -79,7 +79,8 @@ void cfg_cmd(struct shelldata *sd, const char *cmd)
fprintf(sd->out,"WTP '%s' not found\n",sd->prompt);
}
else {
show_cfg(sd->out,conn->remote_cfg);
stop();
// show_cfg(sd->out,conn->remote_cfg);
}
wtplist_unlock();
}
@ -87,7 +88,8 @@ void cfg_cmd(struct shelldata *sd, const char *cmd)
void ucfg_cmd(struct shelldata *sd, const char *cmd)
{
struct cw_Conn * conn;
show_cfg(sd->out,sd->update_cfg);
stop();
// show_cfg(sd->out,sd->update_cfg);
}
@ -157,7 +159,7 @@ void del_cmd(struct shelldata *sd, const char *str)
}
/*
void show_cfg (FILE *out, mavl_t ktv)
{
char value[500];
@ -179,10 +181,12 @@ void show_cfg (FILE *out, mavl_t ktv)
}
*/
void show_aps (FILE *out)
{
struct connlist * cl;
stop();
/* struct connlist * cl;
mavliter_t it;
wtplist_lock();
@ -199,8 +203,9 @@ void show_aps (FILE *out)
conn = mavliter_get_ptr (&it);
sock_addr2str_p (&conn->addr, addr);
result = cw_ktv_get (conn->remote_cfg, "wtp-name", NULL);
stop();
// result = cw_ktv_get (conn->remote_cfg, "wtp-name", NULL);
if (result == NULL) {
strcpy (wtp_name, "");
@ -213,16 +218,18 @@ void show_aps (FILE *out)
fprintf (out, "%s\t\t%s\n", addr, wtp_name);
}
wtplist_unlock();
*/
}
struct cw_Conn * find_ap(const char *name)
{
stop();
/*
struct connlist * cl;
mavliter_t it;
/*wtplist_lock();*/
cl = wtplist_get_connlist();
@ -250,12 +257,16 @@ struct cw_Conn * find_ap(const char *name)
}
return NULL;
*/
/*wtplist_unlock();*/
}
void con (FILE *out)
{
stop();
/*
struct connlist * cl;
mavliter_t it;
@ -290,10 +301,12 @@ void con (FILE *out)
fprintf (out, "Con!! %s\t\t%s\n", addr, wtp_name);
{
stop();
mavl_t update;
update = cw_ktv_create();
cw_ktv_set_byte(update,"radio.255/admin-state",1);
conn->update_cfg=update;
// update = cw_ktv_create();
// cw_ktv_set_byte(update,"radio.255/admin-state",1);
// conn->update_cfg=update;
}
@ -301,6 +314,7 @@ void con (FILE *out)
}
wtplist_unlock();
*/
}
@ -355,8 +369,10 @@ void execute_cmd (struct shelldata * sd, const char *str)
key[0]=0;
type[0]=0;
val[0]=0;
cw_ktv_init_str_reader(&reader,str, strlen(str));
n = cw_ktv_parse_string(&reader, key,type,val);
stop();
// cw_ktv_init_str_reader(&reader,str, strlen(str));
// n = cw_ktv_parse_string(&reader, key,type,val);
if (n==-1){
int i;
@ -403,7 +419,8 @@ void shell_loop (FILE *file)
*/
char str[2048];
sd.update_cfg = cw_ktv_create();
stop();
// sd.update_cfg = cw_ktv_create();

6
src/ac/wtpman.c
View File

@ -631,7 +631,7 @@ static int join_cb(struct cw_ElemHandlerParams * params, uint8_t * elems_ptr, in
copy(params);
const char * wtpname = cw_cfg_get(conn->local_cfg,"wtp-name","default");
sprintf(filename,"wtp-join-%s.ckv",wtpname);
cw_cfg_save(filename,params->cfg);
cw_cfg_save(filename,params->cfg,NULL);
cw_cfg_clear(params->cfg);
return 0;
}
@ -648,8 +648,8 @@ static int update_cb(struct cw_ElemHandlerParams * params, uint8_t * elems_ptr,
const char * wtpname = cw_cfg_get(conn->local_cfg,"wtp-name","default");
sprintf(filename,"wtp-status-%s.ckv",wtpname);
cw_cfg_save(filename,params->cfg);
cw_cfg_save(filename,params->cfg,NULL);
stop();
return 0;
}