#include <zebra.h>
-#include "version.h"
+#include <lib/version.h>
#include "getopt.h"
#include "command.h"
#include "thread.h"
#include "memory.h"
#include "prefix.h"
#include "log.h"
+#include "plist.h"
#include "privs.h"
#include "sigevent.h"
+#include "vrf.h"
#include "zebra/rib.h"
#include "zebra/zserv.h"
#include "zebra/debug.h"
-#include "zebra/rib.h"
+#include "zebra/router-id.h"
+#include "zebra/irdp.h"
+#include "zebra/rtadv.h"
+#include "zebra/zebra_fpm.h"
+#include "zebra/zebra_ptm.h"
+#include "zebra/zebra_ns.h"
+#include "zebra/redistribute.h"
+
+#define ZEBRA_PTM_SUPPORT
/* Zebra instance */
struct zebra_t zebrad =
};
/* process id. */
-pid_t old_pid;
pid_t pid;
+/* Pacify zclient.o in libzebra, which expects this variable. */
+struct thread_master *master;
+
/* Route retain mode flag. */
int retain_mode = 0;
+/* Allow non-quagga entities to delete quagga routes */
+int allow_delete = 0;
+
/* Don't delete kernel route. */
int keep_kernel_mode = 0;
+#ifdef HAVE_NETLINK
+/* Receive buffer size for netlink socket */
+u_int32_t nl_rcvbufsize = 4194304;
+#endif /* HAVE_NETLINK */
+
/* Command line options. */
struct option longopts[] =
{
- { "batch", no_argument, NULL, 'b'},
- { "daemon", no_argument, NULL, 'd'},
- { "keep_kernel", no_argument, NULL, 'k'},
- { "log_mode", no_argument, NULL, 'l'},
- { "config_file", required_argument, NULL, 'f'},
- { "pid_file", required_argument, NULL, 'i'},
- { "help", no_argument, NULL, 'h'},
- { "vty_addr", required_argument, NULL, 'A'},
- { "vty_port", required_argument, NULL, 'P'},
- { "retain", no_argument, NULL, 'r'},
- { "user", required_argument, NULL, 'u'},
- { "version", no_argument, NULL, 'v'},
+ { "batch", no_argument, NULL, 'b'},
+ { "daemon", no_argument, NULL, 'd'},
+ { "allow_delete", no_argument, NULL, 'a'},
+ { "keep_kernel", no_argument, NULL, 'k'},
+ { "config_file", required_argument, NULL, 'f'},
+ { "pid_file", required_argument, NULL, 'i'},
+ { "socket", required_argument, NULL, 'z'},
+ { "help", no_argument, NULL, 'h'},
+ { "vty_addr", required_argument, NULL, 'A'},
+ { "vty_port", required_argument, NULL, 'P'},
+ { "retain", no_argument, NULL, 'r'},
+ { "dryrun", no_argument, NULL, 'C'},
+#ifdef HAVE_NETLINK
+ { "nl-bufsize", required_argument, NULL, 's'},
+#endif /* HAVE_NETLINK */
+ { "user", required_argument, NULL, 'u'},
+ { "group", required_argument, NULL, 'g'},
+ { "version", no_argument, NULL, 'v'},
{ 0 }
};
zebra_capabilities_t _caps_p [] =
{
- ZCAP_ADMIN,
+ ZCAP_NET_ADMIN,
ZCAP_SYS_ADMIN,
- ZCAP_RAW,
+ ZCAP_NET_RAW,
};
/* zebra privileges to run with */
.vty_group = VTY_GROUP,
#endif
.caps_p = _caps_p,
- .cap_num_p = sizeof(_caps_p)/sizeof(_caps_p[0]),
+ .cap_num_p = array_size(_caps_p),
.cap_num_i = 0
};
/* Default configuration file path. */
-char config_current[] = DEFAULT_CONFIG_FILE;
char config_default[] = SYSCONFDIR DEFAULT_CONFIG_FILE;
/* Process ID saved for use by init system */
-char *pid_file = PATH_ZEBRA_PID;
+const char *pid_file = PATH_ZEBRA_PID;
/* Help information display. */
static void
fprintf (stderr, "Try `%s --help' for more information.\n", progname);
else
{
- printf ("Usage : %s [OPTION...]\n\n\
-Daemon which manages kernel routing table management and \
-redistribution between different routing protocols.\n\n\
--b, --batch Runs in batch mode\n\
--d, --daemon Runs in daemon mode\n\
--f, --config_file Set configuration file name\n\
--i, --pid_file Set process identifier file name\n\
--k, --keep_kernel Don't delete old routes which installed by zebra.\n\
--l, --log_mode Set verbose log mode flag\n\
--A, --vty_addr Set vty's bind address\n\
--P, --vty_port Set vty's port number\n\
--r, --retain When program terminates, retain added route by zebra.\n\
--u, --user User and group to run as\n\
--v, --version Print program version\n\
--h, --help Display this help and exit\n\
-\n\
-Report bugs to %s\n", progname, ZEBRA_BUG_ADDRESS);
+ printf ("Usage : %s [OPTION...]\n\n"\
+ "Daemon which manages kernel routing table management and "\
+ "redistribution between different routing protocols.\n\n"\
+ "-b, --batch Runs in batch mode\n"\
+ "-d, --daemon Runs in daemon mode\n"\
+ "-a, --allow_delete Allow other processes to delete Quagga Routes\n" \
+ "-f, --config_file Set configuration file name\n"\
+ "-i, --pid_file Set process identifier file name\n"\
+ "-z, --socket Set path of zebra socket\n"\
+ "-k, --keep_kernel Don't delete old routes which installed by "\
+ "zebra.\n"\
+ "-C, --dryrun Check configuration for validity and exit\n"\
+ "-A, --vty_addr Set vty's bind address\n"\
+ "-P, --vty_port Set vty's port number\n"\
+ "-r, --retain When program terminates, retain added route "\
+ "by zebra.\n"\
+ "-u, --user User to run as\n"\
+ "-g, --group Group to run as\n", progname);
+#ifdef HAVE_NETLINK
+ printf ("-s, --nl-bufsize Set netlink receive buffer size\n");
+#endif /* HAVE_NETLINK */
+ printf ("-v, --version Print program version\n"\
+ "-h, --help Display this help and exit\n"\
+ "\n"\
+ "Report bugs to %s\n", ZEBRA_BUG_ADDRESS);
}
exit (status);
}
-\f
+
/* SIGHUP handler. */
-void
+static void
sighup (void)
{
zlog_info ("SIGHUP received");
}
/* SIGINT handler. */
-void
+static void
sigint (void)
{
- /* Decrared in rib.c */
- void rib_close ();
+ struct zebra_ns *zns;
- zlog_info ("Terminating on signal");
+ zlog_notice ("Terminating on signal");
if (!retain_mode)
rib_close ();
+#ifdef HAVE_IRDP
+ irdp_finish();
+#endif
+
+ zebra_ptm_finish();
+ zns = zebra_ns_lookup (NS_DEFAULT);
+ zebra_ns_disable (0, (void **)&zns);
exit (0);
}
/* SIGUSR1 handler. */
-void
+static void
sigusr1 (void)
{
zlog_rotate (NULL);
},
{
.signal = SIGINT,
- .handler = &sigusr1,
+ .handler = &sigint,
+ },
+ {
+ .signal = SIGTERM,
+ .handler = &sigint,
},
};
-\f
+
/* Main startup routine. */
int
main (int argc, char **argv)
char *p;
char *vty_addr = NULL;
int vty_port = ZEBRA_VTY_PORT;
+ int dryrun = 0;
int batch_mode = 0;
int daemon_mode = 0;
char *config_file = NULL;
char *progname;
struct thread thread;
- void rib_weed_tables ();
- void zebra_vty_init ();
+ char *zserv_path = NULL;
/* Set umask before anything for security */
umask (0027);
/* preserve my name */
progname = ((p = strrchr (argv[0], '/')) ? ++p : argv[0]);
- zlog_default = openzlog (progname, ZLOG_STDOUT, ZLOG_ZEBRA,
+ zlog_default = openzlog (progname, ZLOG_ZEBRA, 0,
LOG_CONS|LOG_NDELAY|LOG_PID, LOG_DAEMON);
+ zprivs_init (&zserv_privs);
+#if defined(HAVE_CUMULUS)
+ zlog_set_level (NULL, ZLOG_DEST_SYSLOG, zlog_default->default_lvl);
+#endif
while (1)
{
int opt;
- opt = getopt_long (argc, argv, "bdklf:i:hA:P:ru:v", longopts, 0);
+#ifdef HAVE_NETLINK
+ opt = getopt_long (argc, argv, "bdakf:i:z:hA:P:ru:g:vs:C", longopts, 0);
+#else
+ opt = getopt_long (argc, argv, "bdakf:i:z:hA:P:ru:g:vC", longopts, 0);
+#endif /* HAVE_NETLINK */
if (opt == EOF)
break;
case 'd':
daemon_mode = 1;
break;
+ case 'a':
+ allow_delete = 1;
+ break;
case 'k':
keep_kernel_mode = 1;
break;
- case 'l':
- /* log_mode = 1; */
+ case 'C':
+ dryrun = 1;
break;
case 'f':
config_file = optarg;
case 'i':
pid_file = optarg;
break;
+ case 'z':
+ zserv_path = optarg;
+ break;
case 'P':
/* Deal with atoi() returning 0 on failure, and zebra not
listening on zebra port... */
break;
}
vty_port = atoi (optarg);
- vty_port = (vty_port ? vty_port : ZEBRA_VTY_PORT);
+ if (vty_port <= 0 || vty_port > 0xffff)
+ vty_port = ZEBRA_VTY_PORT;
break;
case 'r':
retain_mode = 1;
break;
- case 'u':
- zserv_privs.user = zserv_privs.group = optarg;
- break;
+#ifdef HAVE_NETLINK
+ case 's':
+ nl_rcvbufsize = atoi (optarg);
+ break;
+#endif /* HAVE_NETLINK */
+ case 'u':
+ zserv_privs.user = optarg;
+ break;
+ case 'g':
+ zserv_privs.group = optarg;
+ break;
case 'v':
print_version (progname);
exit (0);
/* Make master thread emulator. */
zebrad.master = thread_master_create ();
- /* privs initialise */
- zprivs_init (&zserv_privs);
-
/* Vty related initialize. */
- signal_init (zebrad.master, Q_SIGC(zebra_signals), zebra_signals);
+ signal_init (zebrad.master, array_size(zebra_signals), zebra_signals);
cmd_init (1);
vty_init (zebrad.master);
memory_init ();
rib_init ();
zebra_if_init ();
zebra_debug_init ();
+ router_id_cmd_init ();
zebra_vty_init ();
access_list_init ();
- rtadv_init ();
+ prefix_list_init ();
+#if defined (HAVE_RTADV)
+ rtadv_cmd_init ();
+#endif
+#ifdef HAVE_IRDP
+ irdp_init();
+#endif
+ /* PTM socket */
+#ifdef ZEBRA_PTM_SUPPORT
+ zebra_ptm_init();
+#endif
/* For debug purpose. */
/* SET_FLAG (zebra_debug_event, ZEBRA_DEBUG_EVENT); */
- /* Make kernel routing socket. */
- kernel_init ();
- interface_list ();
- route_read ();
-
- /* Sort VTY commands. */
- sort_node ();
+ /* Initialize NS( and implicitly the VRF module), and make kernel routing socket. */
+ zebra_ns_init ();
#ifdef HAVE_SNMP
zebra_snmp_init ();
#endif /* HAVE_SNMP */
- /* Clean up self inserted route. */
- if (! keep_kernel_mode)
- rib_sweep_route ();
-
- /* Configuration file read*/
- vty_read_config (config_file, config_current, config_default);
+#ifdef HAVE_FPM
+ zfpm_init (zebrad.master, 1, 0);
+#else
+ zfpm_init (zebrad.master, 0, 0);
+#endif
+ /* Process the configuration file. Among other configuration
+ * directives we can meet those installing static routes. Such
+ * requests will not be executed immediately, but queued in
+ * zebra->ribq structure until we enter the main execution loop.
+ * The notifications from kernel will show originating PID equal
+ * to that after daemon() completes (if ever called).
+ */
+ vty_read_config (config_file, config_default);
+
+ /* Don't start execution if we are in dry-run mode */
+ if (dryrun)
+ return(0);
+
/* Clean up rib. */
- rib_weed_tables ();
+ /* rib_weed_tables (); */
/* Exit when zebra is working in batch mode. */
if (batch_mode)
exit (0);
- /* Needed for BSD routing socket. */
- old_pid = getpid ();
-
/* Daemonize. */
- if (daemon_mode)
- daemon (0, 0);
+ if (daemon_mode && daemon (0, 0) < 0)
+ {
+ zlog_err("Zebra daemon failed: %s", strerror(errno));
+ exit (1);
+ }
/* Output pid of zebra. */
pid_output (pid_file);
+ /* After we have successfully acquired the pidfile, we can be sure
+ * about being the only copy of zebra process, which is submitting
+ * changes to the FIB.
+ * Clean up zebra-originated routes. The requests will be sent to OS
+ * immediately, so originating PID in notifications from kernel
+ * will be equal to the current getpid(). To know about such routes,
+ * we have to have route_read() called before.
+ */
+ if (! keep_kernel_mode)
+ rib_sweep_route ();
+
/* Needed for BSD routing socket. */
pid = getpid ();
+ /* This must be done only after locking pidfile (bug #403). */
+ zebra_zserv_socket_init (zserv_path);
+
/* Make vty server socket. */
vty_serv_sock (vty_addr, vty_port, ZEBRA_VTYSH_PATH);
+ /* Print banner. */
+ zlog_notice ("Zebra %s starting: vty@%d", QUAGGA_VERSION, vty_port);
+
while (thread_fetch (zebrad.master, &thread))
thread_call (&thread);
/* Not reached... */
- exit (0);
+ return 0;
}