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

Better formatting in list command

Browse Source
This commit is contained in:
7u83 2022-08-25 11:22:32 +02:00
parent a59a25baa5
commit e571a27c75
1 changed files with 42 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
src/ac/rpc.c
View File

@ -271,6 +271,25 @@ void show_cfg (FILE *out, mavl_t ktv)
} }
*/ */
void print_mw(FILE *f, int w, const char * str)
{
int n,i;
fprintf(f, "%.*s",w,str);
n=strlen(str);
if ( n>w ){
fprintf(f,"> ");
return;
}
n = w-n;
for(i=0;i<(n+2);i++){
fprintf(f,"%c",' ');
}
}
int show_aps (FILE *out) int show_aps (FILE *out)
{ {
struct connlist * cl; struct connlist * cl;
@ -281,18 +300,27 @@ int show_aps (FILE *out)
mavliter_init (&it, cl->by_addr); mavliter_init (&it, cl->by_addr);
fprintf (out, "IP\t\t\twtp-name\n"); print_mw (out, 16, "AP Name");
print_mw (out, 16, "AP Model");
print_mw (out, 14, "Vendor");
print_mw (out, 16, "IP ");
fprintf(out,"\n");
mavliter_foreach (&it) { mavliter_foreach (&it) {
char addr[SOCK_ADDR_BUFSIZE]; char addr[SOCK_ADDR_BUFSIZE];
const char * wtp_name; const char *vendor;
struct cw_Conn * conn; struct cw_Conn * conn;
conn = mavliter_get_ptr (&it); conn = mavliter_get_ptr (&it);
sock_addr2str_p (&conn->addr, addr);
wtp_name = cw_cfg_get (conn->remote_cfg, "wtp-name", "unknown"); print_mw(out,16,cw_cfg_get(conn->remote_cfg, "wtp-name", "Unknown"));
print_mw(out,16,cw_cfg_get(conn->remote_cfg, "wtp-board-data/model-no", "Unknown"));
fprintf (out, "%s\t\t%s\n", addr, wtp_name); vendor = cw_cfg_get(conn->remote_cfg, "wtp-board-data/vendor", "0");
print_mw(out,14,vendor);
sock_addr2str_p (&conn->addr, addr);
print_mw(out,16,addr);
fprintf(out,"\n");
} }
wtplist_unlock(); wtplist_unlock();
return 0; return 0;
@ -387,16 +415,20 @@ void con (FILE *out)
struct command * find_cmd(const char *cmd) struct command * find_cmd(const char *cmd)
{ {
struct command * search; struct command * search,*result;
result=NULL;
search = cmdlist; search = cmdlist;
while (search->cmd!=NULL){ while (search->cmd!=NULL){
if (strncmp(cmd,search->cmd,strlen(cmd))==0){ if (strncmp(cmd,search->cmd,strlen(cmd))==0){
return search; if (result==NULL)
result = search;
else
return NULL;
} }
search ++; search ++;
} }
return NULL; return result;
} }