Skip to content

W
White Rabbit Switch - Software
Commit 4462a3a5 authored by Alessandro Rubini's avatar Alessandro Rubini
Browse files
Options

tools/wrsw_vlans: error checking, simplification 

Signed-off-by: Alessandro Rubini's avatarAlessandro Rubini <rubini@gnudd.com>
parent 48228ed6
Hide whitespace changes
Inline Side-by-side
Showing with 21 additions and 22 deletions
userspace/tools/wrsw_vlans.c
View file @ 4462a3a5
...@@ -124,7 +124,10 @@ int main(int argc, char *argv[]) ...@@ -124,7 +124,10 @@ int main(int argc, char *argv[])
array[8 * sizeof(portmask) - NPORTS]; array[8 * sizeof(portmask) - NPORTS];
} }
if (argc == 1) {
print_help(prgname);
exit(0);
}
rtud_ch = minipc_client_create("rtud", 0); rtud_ch = minipc_client_create("rtud", 0);
if(!rtud_ch) { if(!rtud_ch) {
fprintf(stderr, "%s: Can't connect to RTUd mini-rpc server\n", fprintf(stderr, "%s: Can't connect to RTUd mini-rpc server\n",
...@@ -337,12 +340,12 @@ void list_rtu_vlans(void) ...@@ -337,12 +340,12 @@ void list_rtu_vlans(void)
do { do {
if (minipc_call(rtud_ch, MINIPC_TIMEOUT, if (minipc_call(rtud_ch, MINIPC_TIMEOUT,
&rtud_export_get_vd_list, &vlist, idx) < 0) { &rtud_export_get_vd_list, &vlist, idx) < 0) {
fprintf(stderr, "%s: minipc_call: %s\n", prgname, strerror(errno)); fprintf(stderr, "%s: minipc_call: %s (%s)\n", prgname, strerror(errno), strerror(*(int *)&vlist));
return; return;
} }
for(i=0; i<vlist.num_entries; ++i) { for(i=0; i<vlist.num_entries; ++i) {
ventry = &vlist.list[i]; ventry = &vlist.list[i];
printf("%4d %4d 0x%8x ", ventry->vid, ventry->fid, ventry->port_mask); printf("%4d %4d 0x%08x ", ventry->vid, ventry->fid, ventry->port_mask);
if(ventry->drop == 0) printf("NO "); if(ventry->drop == 0) printf("NO ");
else printf("YES"); else printf("YES");
if(ventry->has_prio == 0) printf(" -- "); if(ventry->has_prio == 0) printf(" -- ");
...@@ -368,6 +371,7 @@ int clear_all() ...@@ -368,6 +371,7 @@ int clear_all()
&rtud_export_get_vd_list, &vlist, idx) < 0) { &rtud_export_get_vd_list, &vlist, idx) < 0) {
/* Duplicated from above */ /* Duplicated from above */
fprintf(stderr, "%s: minipc_call: %s\n", prgname, strerror(errno)); fprintf(stderr, "%s: minipc_call: %s\n", prgname, strerror(errno));
fprintf(stderr, "%s: minipc_call: %s (%s)\n", prgname, strerror(errno), strerror(*(int *)&vlist));
return -1; return -1;
} }
...@@ -391,32 +395,27 @@ int clear_all() ...@@ -391,32 +395,27 @@ int clear_all()
int set_rtu_vlan(int vid, int fid, int pmask, int drop, int prio, int del, int flags) int set_rtu_vlan(int vid, int fid, int pmask, int drop, int prio, int del, int flags)
{ {
static struct rtu_vlans_t *cur; struct rtu_vlans_t *cur = rtu_vlans;;
if ( vid > 0 && rtu_vlans == NULL) { if (!rtu_vlans && vid <= 0) {
/* allocate first element of the list */ fprintf(stderr, "%s: missing \"--rvid <vid>\" before rtu cmd\n",
rtu_vlans = (struct rtu_vlans_t*) malloc( sizeof(struct rtu_vlans_t) ); prgname);
if (rtu_vlans == NULL) { return -1;
fprintf(stderr, "Could not allocate rtu_vlans\n");
return -1;
}
cur = rtu_vlans;
} }
else if( vid > 0 ) {
/* allocate next element of the list */ if (vid > 0) {
cur->next = (struct rtu_vlans_t*) malloc( sizeof(struct rtu_vlans_t) ); cur = calloc(1, sizeof(*cur));
if (cur->next == NULL) { if (!cur) {
fprintf(stderr, "Could not allocate next rtu_vlans\n"); fprintf(stderr, "%s: %s\n", prgname, strerror(errno));
return -1; return -1;
} }
cur = cur->next;
}
if(vid > 0) {
bzero(cur, sizeof(struct rtu_vlans_t));
cur->vid = vid; cur->vid = vid;
cur->fid = vid; cur->fid = vid;
cur->flags |= VALID_VID; cur->flags |= VALID_VID;
/* link to the list, next time head is "cur" */
cur->next = rtu_vlans;
rtu_vlans = cur;
} }
if(flags & VALID_FID) if(flags & VALID_FID)
cur->fid = fid; cur->fid = fid;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment