diff options
| author | paul <paul> | 2003-07-08 08:09:45 +0000 |
|---|---|---|
| committer | paul <paul> | 2003-07-08 08:09:45 +0000 |
| commit | 9bcdb638923e3254b64744d02ceab62b8f2941a1 (patch) | |
| tree | 2262989f3d4105cd0b539ece52628666ff3b580c | |
| parent | 0c14ad88aab5df610acfe035385a7323e1683035 (diff) | |
2003-07-8 Chris Andrews <chris@nodnol.org>
* 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.
| -rw-r--r-- | lib/zebra.h | 3 | ||||
| -rw-r--r-- | zebra/ipforward_solaris.c | 6 | ||||
| -rw-r--r-- | zebra/kernel_socket.c | 7 |
3 files changed, 10 insertions, 6 deletions
diff --git a/lib/zebra.h b/lib/zebra.h index 3d71ad8d..dc17730b 100644 --- a/lib/zebra.h +++ b/lib/zebra.h @@ -28,6 +28,9 @@ Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA #ifdef SUNOS_5 #define _XPG4_2 #define __EXTENSIONS__ +typedef unsigned int u_int32_t; +typedef unsigned short u_int16_t; +typedef unsigned char u_int8_t; #endif /* SUNOS_5 */ #ifndef HAVE_SOCKLEN_T diff --git a/zebra/ipforward_solaris.c b/zebra/ipforward_solaris.c index fe06e74d..791d175c 100644 --- a/zebra/ipforward_solaris.c +++ b/zebra/ipforward_solaris.c @@ -24,6 +24,8 @@ #include "log.h" #include "prefix.h" +#include "privs.h" + /* ** Solaris should define IP_DEV_NAME in <inet/ip.h>, but we'll save ** configure.in changes for another day. We can use the same device @@ -33,11 +35,11 @@ #ifndef IP_DEV_NAME #define IP_DEV_NAME "/dev/ip" #endif -/* + extern struct zebra_privs_t zserv_privs; -** This is a limited ndd style function that operates one integer +/* This is a limited ndd style function that operates one integer ** value only. Errors return -1. ND_SET commands return 0 on ** success. ND_GET commands return the value on success (which could ** be -1 and be confused for an error). The parameter is the string 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 |