summaryrefslogtreecommitdiffstats
path: root/lib/vector.c
diff options
context:
space:
mode:
authorChris Hall <chris.hall@highwayman.com>2012-06-08 15:01:11 +0100
committerChris Hall <chris.hall@highwayman.com>2012-06-08 15:01:11 +0100
commit58b4a3411f12d3ef34ef52ab197729887074f321 (patch)
treee456eec427d977e2e723039b83d614d13edcf983 /lib/vector.c
parent12d01b8b9c68f5dc72f2accdb29a760feb31420a (diff)
downloadquagga-ex25b.tar.bz2
quagga-ex25b.tar.xz
Fix bugs in vty error handlingex25b
Advance version to 0.99.20ex25b. Bug fixes: * when closing a vty, if close() returned an error, the vtys would fall into a loop trying to recover. This was found on FreeBSD, which will return ECONNRESET on close(), which is not standard POSIX behaviour. * when closing a vty in response to EPIPE or ECONNRESET, managed to leave the vty mutex locked. This stopped the Routing Engine *dead* on the next CLI command that required the Routing Engine. SIGTERM/SIGINT would not stop bgpd -- a SIGKILL would be required. Other changes: * toned down the error reporting of EPIPE in the vty -- so no longer looks like an error... ...closing a vty by "exit" command is logged as "closed" ...closing a vty in response to the client closing their end of the connection is logged as "terminated: terminal closed", and no longer logs an EPIPE error. * changed error reporting on close() and shutdown() for vty, so that nothing is logged if an i/o error has already logged... ...so that redundant error messages are suppressed. * applied slightly finer jittering to bgpd timers. * work in progress on new vtysh.
Diffstat (limited to 'lib/vector.c')
-rw-r--r--lib/vector.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/vector.c b/lib/vector.c
index 09fb1b54..09457aac 100644
--- a/lib/vector.c
+++ b/lib/vector.c
@@ -903,7 +903,7 @@ vector_sak(int to_copy, vector to,
if (n_dst_nulls > 0)
memset(&dst->p_items[dst->end], 0, P_ITEMS_SIZE(n_dst_nulls)) ;
if (n_dst_move > 0)
- memmove(&dst->p_items[i_dst + n_dst], &dst->p_items[i_dst + n_src],
+ memmove(&dst->p_items[i_dst + n_src], &dst->p_items[i_dst + n_dst],
P_ITEMS_SIZE(n_dst_move)) ;
if (n_src_real > 0)
memcpy(&dst->p_items[i_dst], &src->p_items[i_src],