diff options
| author | Paul Jakma <paul@quagga.net> | 2009-06-23 14:30:52 +0100 |
|---|---|---|
| committer | Paul Jakma <paul@quagga.net> | 2009-06-23 14:30:52 +0100 |
| commit | ba803bd51cdf3decfc740b3d7287fe51228f78fb (patch) | |
| tree | 69396dbcdc22d42df6356265c7998bd92e503e8c | |
| parent | 50aef6f3b0e36b56cfa9f3d374be0c1d25c30c45 (diff) | |
| parent | 3523bea8cbe98c83e3d1bdeb60180c8e59622773 (diff) | |
Merge remote branch 'origin/master'
| -rw-r--r-- | ospfd/ospf_nsm.c | 8 | ||||
| -rwxr-xr-x | solaris/quagga.init.in | 4 |
2 files changed, 2 insertions, 10 deletions
diff --git a/ospfd/ospf_nsm.c b/ospfd/ospf_nsm.c index f3ac9eaa..15fff349 100644 --- a/ospfd/ospf_nsm.c +++ b/ospfd/ospf_nsm.c @@ -778,14 +778,6 @@ nsm_change_state (struct ospf_neighbor *nbr, int state) break; } - /* Performance hack. Send hello immideately when some neighbor enter - Init state. This whay we decrease neighbor discovery time. Gleb.*/ - if (state == NSM_Init) - { - OSPF_ISM_TIMER_OFF (oi->t_hello); - OSPF_ISM_TIMER_MSEC_ON (oi->t_hello, ospf_hello_timer, 1); - } - /* Preserve old status? */ } diff --git a/solaris/quagga.init.in b/solaris/quagga.init.in index 8b298c37..8457e990 100755 --- a/solaris/quagga.init.in +++ b/solaris/quagga.init.in @@ -281,7 +281,7 @@ start () { eval exec $DAEMON_PATH/$DAEMON $DAEMON_ARGS --pid_file ${PIDFILE} & } -stop () { +stop_by_pidfile () { if [ -f "${PIDFILE}" ]; then /usr/bin/kill -TERM `/usr/bin/cat "${PIDFILE}"` fi @@ -292,7 +292,7 @@ case "$QUAGGA_METHOD" in start ;; 'stop') - stop + stop_by_pidfile ;; *) |