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.
This commit is contained in:
paul 2003-07-08 08:09:45 +00:00
parent 0c14ad88aa
commit 9bcdb63892
3 changed files with 10 additions and 6 deletions

View File

@ -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

View File

@ -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

View File

@ -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