From 05bb53c655782f2cc691a111ed5f18c4563cc30b Mon Sep 17 00:00:00 2001 From: Pekka Riikonen Date: Thu, 12 Apr 2001 09:51:40 +0000 Subject: [PATCH] update --- apps/silcd/server.c | 3 ++- doc/example_silc.conf | 2 +- lib/silcclient/client.c | 9 +++++---- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/apps/silcd/server.c b/apps/silcd/server.c index 6962409d..148e51b1 100644 --- a/apps/silcd/server.c +++ b/apps/silcd/server.c @@ -1303,7 +1303,8 @@ SILC_TASK_CALLBACK(silc_server_packet_process) if (sock->outbuf->data - sock->outbuf->head) silc_buffer_push(sock->outbuf, sock->outbuf->data - sock->outbuf->head); - ret = silc_server_packet_send_real(server, sock, TRUE); + /* Send the packet */ + ret = silc_packet_send(sock, TRUE); /* If returned -2 could not write to connection now, will do it later. */ diff --git a/doc/example_silc.conf b/doc/example_silc.conf index 71fce70c..f3b56e9f 100644 --- a/doc/example_silc.conf +++ b/doc/example_silc.conf @@ -6,7 +6,7 @@ # If the cipher is builtin the maybe omitted. # [cipher] -aes-256-cbc:/usr/local/silc/silc/modules/aes.sim.so:32:16 +aes-256-cbc:/usr/local/silc/modules/aes.sim.so:32:16 aes-192-cbc:/usr/local/silc/modules/aes.sim.so:24:16 aes-128-cbc:/usr/local/silc/modules/aes.sim.so:16:16 twofish-256-cbc:/usr/local/silc/modules/twofish.sim.so:32:16 diff --git a/lib/silcclient/client.c b/lib/silcclient/client.c index 12900bd1..1b3cab0f 100644 --- a/lib/silcclient/client.c +++ b/lib/silcclient/client.c @@ -581,13 +581,14 @@ SILC_TASK_CALLBACK(silc_client_connect_to_server_final) int silc_client_packet_send_real(SilcClient client, SilcSocketConnection sock, - int force_send) + bool force_send, + bool flush) { int ret; /* If rekey protocol is active we must assure that all packets are sent through packet queue. */ - if (SILC_CLIENT_IS_REKEY(sock)) + if (flush == FALSE && SILC_CLIENT_IS_REKEY(sock)) force_send = FALSE; /* Send the packet */ @@ -635,7 +636,7 @@ SILC_TASK_CALLBACK_GLOBAL(silc_client_packet_process) silc_buffer_push(sock->outbuf, sock->outbuf->data - sock->outbuf->head); - ret = silc_client_packet_send_real(client, sock, TRUE); + ret = silc_client_packet_send_real(client, sock, TRUE, TRUE); /* If returned -2 could not write to connection now, will do it later. */ @@ -1129,7 +1130,7 @@ void silc_client_packet_send(SilcClient client, sock->outbuf->data, sock->outbuf->len); /* Now actually send the packet */ - silc_client_packet_send_real(client, sock, force_send); + silc_client_packet_send_real(client, sock, force_send, FALSE); } /* Closes connection to remote end. Free's all allocated data except -- 2.43.0