diff options
| author | Jan Moskyto Matejka <mq@ucw.cz> | 2016-05-10 14:30:49 +0200 |
|---|---|---|
| committer | Jan Moskyto Matejka <mq@ucw.cz> | 2016-05-10 14:30:49 +0200 |
| commit | 0c6dfe52369a59d7f3da8ee6bc7c505e3da5c064 (patch) | |
| tree | 264aa0aa4e9393491d74d473181faab4ae288cb9 /proto/rip | |
| parent | 7a7ac656829223713f9e6bcef63d2b5a5efce7d2 (diff) | |
| parent | 92912f063a94bd7c743a25628ca2073380e09ef4 (diff) | |
Merge branch 'int-new' into int-new-merged
Diffstat (limited to 'proto/rip')
| -rw-r--r-- | proto/rip/Makefile | 9 | ||||
| -rw-r--r-- | proto/rip/rip.c | 8 | ||||
| -rw-r--r-- | proto/rip/rip.h | 2 |
3 files changed, 7 insertions, 12 deletions
diff --git a/proto/rip/Makefile b/proto/rip/Makefile index d2d3c987..6e645cc2 100644 --- a/proto/rip/Makefile +++ b/proto/rip/Makefile @@ -1,5 +1,4 @@ -source=rip.c packets.c -root-rel=../../ -dir-name=proto/rip - -include ../../Rules +src := packets.c rip.c +obj := $(src-o-files) +$(all-daemon) +$(cf-local) diff --git a/proto/rip/rip.c b/proto/rip/rip.c index 22023279..131c09ce 100644 --- a/proto/rip/rip.c +++ b/proto/rip/rip.c @@ -143,8 +143,6 @@ rip_announce_rte(struct rip_proto *p, struct rip_entry *en) if (rt) { /* Update */ - net *n = net_get(p->p.main_channel->table, en->n.addr); - rta a0 = { .src = p->p.main_source, .source = RTS_RIP, @@ -204,16 +202,14 @@ rip_announce_rte(struct rip_proto *p, struct rip_entry *en) e->u.rip.metric = rt_metric; e->u.rip.tag = rt_tag; - e->net = n; e->pflags = 0; - rte_update(&p->p, n, e); + rte_update(&p->p, en->n.addr, e); } else { /* Withdraw */ - net *n = net_find(p->p.main_channel->table, en->n.addr); - rte_update(&p->p, n, NULL); + rte_update(&p->p, en->n.addr, NULL); } } diff --git a/proto/rip/rip.h b/proto/rip/rip.h index d1c9933c..7ec7e24d 100644 --- a/proto/rip/rip.h +++ b/proto/rip/rip.h @@ -24,7 +24,7 @@ #include "lib/resource.h" #include "lib/socket.h" #include "lib/string.h" -#include "lib/timer.h" +#include "sysdep/unix/timer.h" #define RIP_V1 1 |