diff options
| author | paulo <paul@bayleaf.org.uk> | 2009-12-09 16:08:50 +0000 |
|---|---|---|
| committer | paulo <paul@bayleaf.org.uk> | 2009-12-09 16:08:50 +0000 |
| commit | 482674bb1e9401fa4f954fb03cdc84ad9908845f (patch) | |
| tree | 7361127efa13b897beef995874688ce3a6d3af5e | |
| parent | a2910f39f78a8c361abef8779746b5dab31a2ac8 (diff) | |
| download | quagga-482674bb1e9401fa4f954fb03cdc84ad9908845f.tar.bz2 quagga-482674bb1e9401fa4f954fb03cdc84ad9908845f.tar.xz | |
Fixed -ve return from qps_pselect. Fixed calls of qps_enable_mode - uses
mnum, not mbits.
| -rw-r--r-- | lib/qpnexus.c | 4 | ||||
| -rw-r--r-- | lib/vty.c | 12 |
2 files changed, 6 insertions, 10 deletions
diff --git a/lib/qpnexus.c b/lib/qpnexus.c index 861f7eee..fc4d6b9d 100644 --- a/lib/qpnexus.c +++ b/lib/qpnexus.c @@ -100,10 +100,6 @@ qpn_start(void* arg) /* block for some input, output or timeout */ actions = qps_pselect( qpn->selection, qtimer_pile_top_time(qpn->pile, now + QTIME(MAX_PSELECT_TIMOUT)) ); - if (actions < 0) - { - zabort_errno("qps_pselect failed"); - } /* process I/O actions */ while (actions) @@ -2970,7 +2970,7 @@ vty_event_r (enum event event, int sock, struct vty *vty) qps_add_file(master_nexus->selection, accept_file, sock, NULL); vector_set_index(Vvty_serv_thread, sock, accept_file); } - qps_enable_mode(accept_file, qps_read_mbit, vty_accept_r) ; + qps_enable_mode(accept_file, qps_read_mnum, vty_accept_r) ; break; #ifdef VTYSH case VTYSH_SERV: @@ -2981,17 +2981,17 @@ vty_event_r (enum event event, int sock, struct vty *vty) qps_add_file(master, accept_file, sock, NULL); vector_set_index(Vvty_serv_thread, sock, accept_file); } - qps_enable_mode(accept_file, qps_read_mbit, vtysh_accept_r) ; + qps_enable_mode(accept_file, qps_read_mnum, vtysh_accept_r) ; break; case VTYSH_READ: - qps_enable_mode(vty->file, qps_read_mbit, vtysh_read_r) ; + qps_enable_mode(vty->file, qps_read_mnum, vtysh_read_r) ; break; case VTYSH_WRITE: - qps_enable_mode(vty->file, qps_write_mbit, vtysh_write_r) ; + qps_enable_mode(vty->file, qps_write_mnum, vtysh_write_r) ; break; #endif /* VTYSH */ case VTY_READ: - qps_enable_mode(vty->qf, qps_read_mbit, vty_read_r) ; + qps_enable_mode(vty->qf, qps_read_mnum, vty_read_r) ; /* Time out treatment. */ if (vty->v_timeout) @@ -3000,7 +3000,7 @@ vty_event_r (enum event event, int sock, struct vty *vty) } break; case VTY_WRITE: - qps_enable_mode(vty->qf, qps_write_mbit, vty_flush_r) ; + qps_enable_mode(vty->qf, qps_write_mnum, vty_flush_r) ; break; case VTY_TIMEOUT_RESET: if (vty->v_timeout) |