diff options
| author | paul <paul> | 2003-06-15 01:28:29 +0000 |
|---|---|---|
| committer | paul <paul> | 2003-06-15 01:28:29 +0000 |
| commit | b21b19c5785487f2ff4a6ce38f45c2e6c35f4363 (patch) | |
| tree | c79f90ce7bd798b3f1391010153d9fdf7c7418f0 /zebra/rtadv.c | |
| parent | 0e4f190ebf5a26e4b66fb49cd74ae0ff0c7e0863 (diff) | |
2003-06-15 Paul Jakma <paul@dishone.st>
* lib/vty.{c,h}: Remove vty layer depending on a 'master' global,
pass the thread master in explicitly to vty_init. Sort out some
header dependency problems with lib/command.h
* zebra/: Move globals to struct zebrad. Update vty_init().
* (.*)/\1_main.c: update call to vty_init().
Diffstat (limited to 'zebra/rtadv.c')
| -rw-r--r-- | zebra/rtadv.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/zebra/rtadv.c b/zebra/rtadv.c index ab0d49f0..a6e2d920 100644 --- a/zebra/rtadv.c +++ b/zebra/rtadv.c @@ -34,6 +34,7 @@ #include "zebra/interface.h" #include "zebra/rtadv.h" #include "zebra/debug.h" +#include "zebra/zserv.h" extern struct zebra_privs_t zserv_privs; @@ -50,6 +51,8 @@ extern struct zebra_privs_t zserv_privs; #define ALLNODE "ff02::1" #define ALLROUTER "ff02::2" +extern struct zebra_t zebrad; + enum rtadv_event {RTADV_START, RTADV_STOP, RTADV_TIMER, RTADV_READ}; void rtadv_event (enum rtadv_event, int); @@ -999,7 +1002,6 @@ rtadv_config_write (struct vty *vty, struct interface *ifp) } } -extern struct thread_master *master; void rtadv_event (enum rtadv_event event, int val) @@ -1008,9 +1010,9 @@ rtadv_event (enum rtadv_event event, int val) { case RTADV_START: if (! rtadv->ra_read) - rtadv->ra_read = thread_add_read (master, rtadv_read, NULL, val); + rtadv->ra_read = thread_add_read (zebrad.master, rtadv_read, NULL, val); if (! rtadv->ra_timer) - rtadv->ra_timer = thread_add_event (master, rtadv_timer, NULL, 0); + rtadv->ra_timer = thread_add_event (zebrad.master, rtadv_timer, NULL, 0); break; case RTADV_STOP: if (rtadv->ra_timer) @@ -1026,11 +1028,11 @@ rtadv_event (enum rtadv_event event, int val) break; case RTADV_TIMER: if (! rtadv->ra_timer) - rtadv->ra_timer = thread_add_timer (master, rtadv_timer, NULL, val); + rtadv->ra_timer = thread_add_timer (zebrad.master, rtadv_timer, NULL, val); break; case RTADV_READ: if (! rtadv->ra_read) - rtadv->ra_read = thread_add_read (master, rtadv_read, NULL, val); + rtadv->ra_read = thread_add_read (zebrad.master, rtadv_read, NULL, val); break; default: break; |