Second tranche of updates for pipework branch.

	modified:   bgpd/bgp_connection.c
	modified:   bgpd/bgp_debug.c
	modified:   bgpd/bgp_engine.h
	modified:   bgpd/bgp_main.c
	modified:   bgpd/bgp_packet.c
	modified:   bgpd/bgp_peer.c
	modified:   bgpd/bgp_route.c
	modified:   bgpd/bgp_routemap.c
	modified:   bgpd/bgp_session.c
	modified:   bgpd/bgp_vty.c
	modified:   bgpd/bgpd.c
	modified:   bgpd/bgpd.h
	modified:   configure.ac
	modified:   isisd/dict.h
	modified:   isisd/isis_misc.c
	modified:   isisd/isis_routemap.c
	modified:   isisd/isis_spf.c
	modified:   lib/Makefile.am
	modified:   lib/command.c
	modified:   lib/command.h
	modified:   lib/command_execute.h
	modified:   lib/command_parse.c
	modified:   lib/command_parse.h
	modified:   lib/command_queue.c
	modified:   lib/command_queue.h
	modified:   lib/elstring.h
	modified:   lib/heap.c
	modified:   lib/if.c
	modified:   lib/if.h
	modified:   lib/keychain.c
	modified:   lib/keystroke.c
	modified:   lib/keystroke.h
	modified:   lib/list_util.c
	modified:   lib/list_util.h
	modified:   lib/log.c
	modified:   lib/log.h
	modified:   lib/memory.c
	modified:   lib/memory.h
	modified:   lib/memtypes.c
	modified:   lib/misc.h
	modified:   lib/mqueue.c
	modified:   lib/mqueue.h
	deleted:    lib/node_type.h
	modified:   lib/pthread_safe.c
	modified:   lib/qfstring.c
	modified:   lib/qiovec.c
	modified:   lib/qiovec.h
	modified:   lib/qpath.c
	modified:   lib/qpnexus.c
	modified:   lib/qpnexus.h
	modified:   lib/qpselect.c
	modified:   lib/qpthreads.h
	modified:   lib/qstring.c
	modified:   lib/qstring.h
	modified:   lib/qtime.c
	modified:   lib/qtime.h
	modified:   lib/qtimers.c
	modified:   lib/qtimers.h
	modified:   lib/routemap.c
	modified:   lib/symtab.h
	modified:   lib/thread.h
	deleted:    lib/uty.h
	modified:   lib/vector.c
	modified:   lib/vector.h
	modified:   lib/version.h.in
	modified:   lib/vio_fifo.c
	modified:   lib/vio_fifo.h
	modified:   lib/vio_lines.c
	modified:   lib/vio_lines.h
	modified:   lib/vty.c
	modified:   lib/vty.h
	modified:   lib/vty_cli.c
	modified:   lib/vty_cli.h
	modified:   lib/vty_io.c
	modified:   lib/vty_io.h
	modified:   lib/vty_io_basic.c
	modified:   lib/vty_io_basic.h
	modified:   lib/vty_io_file.c
	modified:   lib/vty_io_file.h
	modified:   lib/vty_io_shell.c
	modified:   lib/vty_io_term.c
	modified:   lib/vty_io_term.h
	modified:   lib/vty_local.h
	modified:   lib/vty_pipe.c
	modified:   lib/workqueue.h
	modified:   lib/zebra.h
	modified:   ospf6d/ospf6_lsa.c
	modified:   ripngd/ripngd.c
	modified:   tests/test-list_util.c
	modified:   tests/test-vector.c
	modified:   vtysh/vtysh.c
	modified:   vtysh/vtysh_config.c

1 files changed, 16 insertions, 11 deletions

diff --git a/bgpd/bgp_main.c b/bgpd/bgp_main.c
index 60b66533..6bbc8197 100644
--- a/bgpd/bgp_main.c
+++ b/bgpd/bgp_main.c
@@ -240,14 +240,17 @@ sighup (void)
 
 }
 
-/* SIGINT handler. */
+/* SIGINT and SIGTERM handler. */
 void
 sigint (void)
 {
   zlog_notice ("Terminating on signal");
 
+  vty_reset_because("Terminating");
+
   /* tell the routing engine to send notifies to peers and wait
-   * for all sessions to be disabled */
+   * for all sessions to be disabled, then terminate.
+   */
   sigterm_enqueue();
 }
 
@@ -301,6 +304,7 @@ bgp_exit (int status)
   /* reverse bgp_zebra_init/if_init */
   if (retain_mode)
     if_add_hook (IF_DELETE_HOOK, NULL);
+
   for (ALL_LIST_ELEMENTS (iflist, node, nnode, ifp))
     {
       struct listnode *c_node, *c_nnode;
@@ -366,10 +370,10 @@ bgp_exit (int status)
 
   if (qpthreads_enabled)
     {
-      qpn_reset_free(routing_nexus);
-      qpn_reset_free(bgp_nexus);
+      qpn_reset(routing_nexus, free_it);
+      qpn_reset(bgp_nexus, free_it);
     } ;
-  cli_nexus = qpn_reset_free(cli_nexus);
+  cli_nexus = qpn_reset(cli_nexus, free_it);
 
   if (CONF_BGP_DEBUG (normal, NORMAL))
     log_memstats_stderr ("bgpd");
@@ -744,16 +748,17 @@ sighup_action(mqueue_block mqb, mqb_flag_t flag)
     {
       zlog_info ("bgpd restarting!");
 
-      bgp_terminate (0, 0); /* send notifies */
+      bgp_terminate (false, false);     /* send notifies                */
       bgp_reset ();
 
-      /* Reload config file. */
-      vty_read_config (config_file, config_default);
+      /* Reload config file -- no special first command, now            */
+      vty_read_config_first_cmd_special(config_file, config_default,
+                                                 NULL, config_ignore_warnings) ;
 
-      /* Create VTY's socket */
+      /* Create VTY's socket                                            */
       vty_restart(vty_addr, vty_port, BGP_VTYSH_PATH);
 
-      /* Try to return to normal operation. */
+      /* Try to return to normal operation.                             */
     }
 
   mqb_free(mqb);
@@ -807,7 +812,7 @@ sigterm_action(mqueue_block mqb, mqb_flag_t flag)
        */
       program_terminating = true ;
 
-      bgp_terminate(1, retain_mode);
+      bgp_terminate(true, retain_mode);
 
       qpn_add_hook_function(&routing_nexus->foreground,
                                        program_terminate_if_all_peers_deleted) ;