|
@@ -66,7 +66,7 @@ static int __must_check rose_add_node(struct rose_route_struct *rose_route,
|
|
while (rose_node != NULL) {
|
|
while (rose_node != NULL) {
|
|
if ((rose_node->mask == rose_route->mask) &&
|
|
if ((rose_node->mask == rose_route->mask) &&
|
|
(rosecmpm(&rose_route->address, &rose_node->address,
|
|
(rosecmpm(&rose_route->address, &rose_node->address,
|
|
- rose_route->mask) == 0))
|
|
|
|
|
|
+ rose_route->mask) == 0))
|
|
break;
|
|
break;
|
|
rose_node = rose_node->next;
|
|
rose_node = rose_node->next;
|
|
}
|
|
}
|
|
@@ -300,7 +300,7 @@ static int rose_del_node(struct rose_route_struct *rose_route,
|
|
while (rose_node != NULL) {
|
|
while (rose_node != NULL) {
|
|
if ((rose_node->mask == rose_route->mask) &&
|
|
if ((rose_node->mask == rose_route->mask) &&
|
|
(rosecmpm(&rose_route->address, &rose_node->address,
|
|
(rosecmpm(&rose_route->address, &rose_node->address,
|
|
- rose_route->mask) == 0))
|
|
|
|
|
|
+ rose_route->mask) == 0))
|
|
break;
|
|
break;
|
|
rose_node = rose_node->next;
|
|
rose_node = rose_node->next;
|
|
}
|
|
}
|
|
@@ -1070,7 +1070,7 @@ static void *rose_node_start(struct seq_file *seq, loff_t *pos)
|
|
if (*pos == 0)
|
|
if (*pos == 0)
|
|
return SEQ_START_TOKEN;
|
|
return SEQ_START_TOKEN;
|
|
|
|
|
|
- for (rose_node = rose_node_list; rose_node && i < *pos;
|
|
|
|
|
|
+ for (rose_node = rose_node_list; rose_node && i < *pos;
|
|
rose_node = rose_node->next, ++i);
|
|
rose_node = rose_node->next, ++i);
|
|
|
|
|
|
return (i == *pos) ? rose_node : NULL;
|
|
return (i == *pos) ? rose_node : NULL;
|
|
@@ -1079,8 +1079,8 @@ static void *rose_node_start(struct seq_file *seq, loff_t *pos)
|
|
static void *rose_node_next(struct seq_file *seq, void *v, loff_t *pos)
|
|
static void *rose_node_next(struct seq_file *seq, void *v, loff_t *pos)
|
|
{
|
|
{
|
|
++*pos;
|
|
++*pos;
|
|
-
|
|
|
|
- return (v == SEQ_START_TOKEN) ? rose_node_list
|
|
|
|
|
|
+
|
|
|
|
+ return (v == SEQ_START_TOKEN) ? rose_node_list
|
|
: ((struct rose_node *)v)->next;
|
|
: ((struct rose_node *)v)->next;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -1146,7 +1146,7 @@ static void *rose_neigh_start(struct seq_file *seq, loff_t *pos)
|
|
if (*pos == 0)
|
|
if (*pos == 0)
|
|
return SEQ_START_TOKEN;
|
|
return SEQ_START_TOKEN;
|
|
|
|
|
|
- for (rose_neigh = rose_neigh_list; rose_neigh && i < *pos;
|
|
|
|
|
|
+ for (rose_neigh = rose_neigh_list; rose_neigh && i < *pos;
|
|
rose_neigh = rose_neigh->next, ++i);
|
|
rose_neigh = rose_neigh->next, ++i);
|
|
|
|
|
|
return (i == *pos) ? rose_neigh : NULL;
|
|
return (i == *pos) ? rose_neigh : NULL;
|
|
@@ -1155,8 +1155,8 @@ static void *rose_neigh_start(struct seq_file *seq, loff_t *pos)
|
|
static void *rose_neigh_next(struct seq_file *seq, void *v, loff_t *pos)
|
|
static void *rose_neigh_next(struct seq_file *seq, void *v, loff_t *pos)
|
|
{
|
|
{
|
|
++*pos;
|
|
++*pos;
|
|
-
|
|
|
|
- return (v == SEQ_START_TOKEN) ? rose_neigh_list
|
|
|
|
|
|
+
|
|
|
|
+ return (v == SEQ_START_TOKEN) ? rose_neigh_list
|
|
: ((struct rose_neigh *)v)->next;
|
|
: ((struct rose_neigh *)v)->next;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -1171,7 +1171,7 @@ static int rose_neigh_show(struct seq_file *seq, void *v)
|
|
int i;
|
|
int i;
|
|
|
|
|
|
if (v == SEQ_START_TOKEN)
|
|
if (v == SEQ_START_TOKEN)
|
|
- seq_puts(seq,
|
|
|
|
|
|
+ seq_puts(seq,
|
|
"addr callsign dev count use mode restart t0 tf digipeaters\n");
|
|
"addr callsign dev count use mode restart t0 tf digipeaters\n");
|
|
else {
|
|
else {
|
|
struct rose_neigh *rose_neigh = v;
|
|
struct rose_neigh *rose_neigh = v;
|
|
@@ -1229,7 +1229,7 @@ static void *rose_route_start(struct seq_file *seq, loff_t *pos)
|
|
if (*pos == 0)
|
|
if (*pos == 0)
|
|
return SEQ_START_TOKEN;
|
|
return SEQ_START_TOKEN;
|
|
|
|
|
|
- for (rose_route = rose_route_list; rose_route && i < *pos;
|
|
|
|
|
|
+ for (rose_route = rose_route_list; rose_route && i < *pos;
|
|
rose_route = rose_route->next, ++i);
|
|
rose_route = rose_route->next, ++i);
|
|
|
|
|
|
return (i == *pos) ? rose_route : NULL;
|
|
return (i == *pos) ? rose_route : NULL;
|
|
@@ -1238,8 +1238,8 @@ static void *rose_route_start(struct seq_file *seq, loff_t *pos)
|
|
static void *rose_route_next(struct seq_file *seq, void *v, loff_t *pos)
|
|
static void *rose_route_next(struct seq_file *seq, void *v, loff_t *pos)
|
|
{
|
|
{
|
|
++*pos;
|
|
++*pos;
|
|
-
|
|
|
|
- return (v == SEQ_START_TOKEN) ? rose_route_list
|
|
|
|
|
|
+
|
|
|
|
+ return (v == SEQ_START_TOKEN) ? rose_route_list
|
|
: ((struct rose_route *)v)->next;
|
|
: ((struct rose_route *)v)->next;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -1253,30 +1253,30 @@ static int rose_route_show(struct seq_file *seq, void *v)
|
|
char buf[11];
|
|
char buf[11];
|
|
|
|
|
|
if (v == SEQ_START_TOKEN)
|
|
if (v == SEQ_START_TOKEN)
|
|
- seq_puts(seq,
|
|
|
|
|
|
+ seq_puts(seq,
|
|
"lci address callsign neigh <-> lci address callsign neigh\n");
|
|
"lci address callsign neigh <-> lci address callsign neigh\n");
|
|
else {
|
|
else {
|
|
struct rose_route *rose_route = v;
|
|
struct rose_route *rose_route = v;
|
|
|
|
|
|
- if (rose_route->neigh1)
|
|
|
|
|
|
+ if (rose_route->neigh1)
|
|
seq_printf(seq,
|
|
seq_printf(seq,
|
|
"%3.3X %-10s %-9s %05d ",
|
|
"%3.3X %-10s %-9s %05d ",
|
|
rose_route->lci1,
|
|
rose_route->lci1,
|
|
rose2asc(&rose_route->src_addr),
|
|
rose2asc(&rose_route->src_addr),
|
|
ax2asc(buf, &rose_route->src_call),
|
|
ax2asc(buf, &rose_route->src_call),
|
|
rose_route->neigh1->number);
|
|
rose_route->neigh1->number);
|
|
- else
|
|
|
|
- seq_puts(seq,
|
|
|
|
|
|
+ else
|
|
|
|
+ seq_puts(seq,
|
|
"000 * * 00000 ");
|
|
"000 * * 00000 ");
|
|
|
|
|
|
- if (rose_route->neigh2)
|
|
|
|
|
|
+ if (rose_route->neigh2)
|
|
seq_printf(seq,
|
|
seq_printf(seq,
|
|
"%3.3X %-10s %-9s %05d\n",
|
|
"%3.3X %-10s %-9s %05d\n",
|
|
rose_route->lci2,
|
|
rose_route->lci2,
|
|
rose2asc(&rose_route->dest_addr),
|
|
rose2asc(&rose_route->dest_addr),
|
|
ax2asc(buf, &rose_route->dest_call),
|
|
ax2asc(buf, &rose_route->dest_call),
|
|
rose_route->neigh2->number);
|
|
rose_route->neigh2->number);
|
|
- else
|
|
|
|
|
|
+ else
|
|
seq_puts(seq,
|
|
seq_puts(seq,
|
|
"000 * * 00000\n");
|
|
"000 * * 00000\n");
|
|
}
|
|
}
|