From 9bcdb638923e3254b64744d02ceab62b8f2941a1 Mon Sep 17 00:00:00 2001 From: paul Date: Tue, 8 Jul 2003 08:09:45 +0000 Subject: 2003-07-8 Chris Andrews * zebra/kernel_socket.c: Update for new zebrad global struct * zebra/ipforward_solaris.c: Add missing privs.h include. Uncomment /dev/ip define. * lib/zebra.h: Add typedefs for SunOS. --- zebra/kernel_socket.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'zebra/kernel_socket.c') diff --git a/zebra/kernel_socket.c b/zebra/kernel_socket.c index 30e0fb1d..95273159 100644 --- a/zebra/kernel_socket.c +++ b/zebra/kernel_socket.c @@ -38,6 +38,7 @@ #include "zebra/debug.h" extern struct zebra_privs_t zserv_privs; +extern struct zebra_t zebrad; /* Socket length roundup function. */ #define ROUNDUP(a) \ @@ -679,8 +680,6 @@ rtm_write (int message, #include "thread.h" #include "zebra/zserv.h" -extern struct thread_master *master; - /* For debug purpose. */ void rtmsg_debug (struct rt_msghdr *rtm) @@ -764,7 +763,7 @@ kernel_read (struct thread *thread) return 0; } - thread_add_read (master, kernel_read, NULL, sock); + thread_add_read (zebrad.master, kernel_read, NULL, sock); if (IS_ZEBRA_DEBUG_KERNEL) rtmsg_debug (&buf.r.rtm); @@ -820,7 +819,7 @@ routing_socket () zlog_err ("routing_socket: Can't lower privileges"); /* kernel_read needs rewrite. */ - thread_add_read (master, kernel_read, NULL, routing_sock); + thread_add_read (zebrad.master, kernel_read, NULL, routing_sock); } /* Exported interface function. This function simply calls -- cgit v1.2.1