Author: Pekka Riikonen <priikone@silcnet.org>
- Copyright (C) 1997 - 2006 Pekka Riikonen
+ Copyright (C) 1997 - 2007 Pekka Riikonen
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
/************************** Types and definitions ***************************/
+/* Per scheduler (which usually means per thread) data. We put per scheduler
+ data here for accessing without locking. SILC Schedule dictates that
+ tasks are dispatched in one thread, hence the per scheduler context. */
+typedef struct {
+ SilcSchedule schedule; /* The scheduler */
+ SilcPacketEngine engine; /* Packet engine */
+ SilcDList inbufs; /* Data inbut buffer list */
+ SilcUInt32 stream_count; /* Number of streams using this */
+} *SilcPacketEngineContext;
+
/* Packet engine */
struct SilcPacketEngineStruct {
+ SilcMutex lock; /* Engine lock */
SilcRng rng; /* RNG for engine */
+ SilcHashTable contexts; /* Per scheduler contexts */
SilcPacketCallbacks *callbacks; /* Packet callbacks */
void *callback_context; /* Context for callbacks */
SilcList streams; /* All streams in engine */
SilcList packet_pool; /* Free list for received packets */
- SilcMutex lock; /* Engine lock */
SilcHashTable udp_remote; /* UDP remote streams, or NULL */
- SilcBool local_is_router;
+ unsigned int local_is_router : 1;
};
/* Packet processor context */
typedef struct SilcPacketProcessStruct {
- SilcInt32 priority; /* Priority */
SilcPacketType *types; /* Packets to process */
SilcPacketCallbacks *callbacks; /* Callbacks or NULL */
void *callback_context;
+ SilcInt32 priority; /* Priority */
} *SilcPacketProcess;
/* UDP remote stream tuple */
/* Packet stream */
struct SilcPacketStreamStruct {
struct SilcPacketStreamStruct *next;
- SilcPacketEngine engine; /* Packet engine */
+ SilcPacketEngineContext sc; /* Per scheduler context */
SilcStream stream; /* Underlaying stream */
- SilcMutex lock; /* Stream lock */
+ SilcMutex lock; /* Packet stream lock */
SilcDList process; /* Packet processors, or NULL */
SilcPacketRemoteUDP remote_udp; /* UDP remote stream tuple, or NULL */
void *stream_context; /* Stream context */
- SilcBufferStruct inbuf; /* In buffer */
SilcBufferStruct outbuf; /* Out buffer */
+ SilcBuffer inbuf; /* Inbuf from inbuf list or NULL */
SilcCipher send_key[2]; /* Sending key */
SilcHmac send_hmac[2]; /* Sending HMAC */
SilcCipher receive_key[2]; /* Receiving key */
/* EOS callback */
#define SILC_PACKET_CALLBACK_EOS(s) \
do { \
- (s)->engine->callbacks->eos((s)->engine, s, \
- (s)->engine->callback_context, \
- (s)->stream_context); \
+ (s)->sc->engine->callbacks->eos((s)->sc->engine, s, \
+ (s)->sc->engine->callback_context, \
+ (s)->stream_context); \
} while(0)
/* Error callback */
#define SILC_PACKET_CALLBACK_ERROR(s, err) \
do { \
- (s)->engine->callbacks->error((s)->engine, s, err, \
- (s)->engine->callback_context, \
- (s)->stream_context); \
+ (s)->sc->engine->callbacks->error((s)->sc->engine, s, err, \
+ (s)->sc->engine->callback_context, \
+ (s)->stream_context); \
} while(0)
-static void silc_packet_dispatch(SilcPacket packet);
+static SilcBool silc_packet_dispatch(SilcPacket packet);
static void silc_packet_read_process(SilcPacketStream stream);
static inline SilcBool silc_packet_send_raw(SilcPacketStream stream,
SilcPacketType type,
SILC_LOG_DEBUG(("Injecting packet %p to stream %p", packet, packet->stream));
silc_mutex_lock(stream->lock);
- silc_packet_dispatch(packet);
+ if (!stream->destroyed)
+ silc_packet_dispatch(packet);
silc_mutex_unlock(stream->lock);
+ silc_packet_stream_unref(stream);
}
/* Write data to the stream. Must be called with ps->lock locked. Unlocks
i = silc_net_udp_send(stream, ps->remote_udp->remote_ip,
ps->remote_udp->remote_port,
ps->outbuf.data, silc_buffer_len(&ps->outbuf));
- if (i == -2) {
+ if (silc_unlikely(i == -2)) {
/* Error */
silc_buffer_reset(&ps->outbuf);
SILC_PACKET_CALLBACK_ERROR(ps, SILC_PACKET_ERR_WRITE);
return FALSE;
}
- if (i == -1) {
+ if (silc_unlikely(i == -1)) {
/* Cannot write now, write later. */
if (!no_unlock)
silc_mutex_unlock(ps->lock);
while (silc_buffer_len(&ps->outbuf) > 0) {
i = silc_stream_write(stream, ps->outbuf.data,
silc_buffer_len(&ps->outbuf));
- if (i == 0) {
+ if (silc_unlikely(i == 0)) {
/* EOS */
silc_buffer_reset(&ps->outbuf);
silc_mutex_unlock(ps->lock);
return FALSE;
}
- if (i == -2) {
+ if (silc_unlikely(i == -2)) {
/* Error */
silc_buffer_reset(&ps->outbuf);
silc_mutex_unlock(ps->lock);
return FALSE;
}
- if (i == -1) {
+ if (silc_unlikely(i == -1)) {
/* Cannot write now, write later. */
if (!no_unlock)
silc_mutex_unlock(ps->lock);
return TRUE;
}
-/* Reads data from stream. Must be called with the ps->lock locked. If this
+/* Reads data from stream. Must be called with ps->lock locked. If this
returns FALSE the lock has been unlocked. If this returns packet stream
to `ret_ps' its lock has been acquired and `ps' lock has been unlocked.
It is returned if the stream is UDP and remote UDP stream exists for
static inline SilcBool silc_packet_stream_read(SilcPacketStream ps,
SilcPacketStream *ret_ps)
{
- SilcStream stream;
+ SilcStream stream = ps->stream;
+ SilcBuffer inbuf;
SilcBool connected;
int ret;
- stream = ps->stream;
-
- /* Make sure we have fair amount of free space in inbuf */
- if (silc_buffer_taillen(&ps->inbuf) < SILC_PACKET_DEFAULT_SIZE)
- if (!silc_buffer_realloc(&ps->inbuf, silc_buffer_truelen(&ps->inbuf) +
- SILC_PACKET_DEFAULT_SIZE * 2)) {
- silc_mutex_unlock(ps->lock);
- SILC_PACKET_CALLBACK_ERROR(ps, SILC_PACKET_ERR_NO_MEMORY);
- return FALSE;
+ /* Get inbuf. If there is already some data for this stream in the buffer
+ we already have it. Otherwise get the current one from list, it will
+ include the data. */
+ inbuf = ps->inbuf;
+ if (!inbuf) {
+ silc_dlist_start(ps->sc->inbufs);
+ inbuf = silc_dlist_get(ps->sc->inbufs);
+ if (!inbuf) {
+ /* Allocate new data input buffer */
+ inbuf = silc_buffer_alloc(SILC_PACKET_DEFAULT_SIZE * 31);
+ if (!inbuf) {
+ silc_mutex_unlock(ps->lock);
+ return FALSE;
+ }
+ silc_buffer_reset(inbuf);
+ silc_dlist_add(ps->sc->inbufs, inbuf);
}
+ }
+
+ /* Make sure there is enough room to read */
+ if (SILC_PACKET_DEFAULT_SIZE * 2 > silc_buffer_taillen(inbuf))
+ silc_buffer_realloc(inbuf, silc_buffer_truelen(inbuf) +
+ (SILC_PACKET_DEFAULT_SIZE * 2));
if (silc_socket_stream_is_udp(stream, &connected)) {
if (!connected) {
SilcPacketStream remote;
ret = silc_net_udp_receive(stream, remote_ip, sizeof(remote_ip),
- &remote_port, ps->inbuf.tail,
- silc_buffer_taillen(&ps->inbuf));
- if (ret == -2) {
- /* Error */
- silc_buffer_reset(&ps->inbuf);
- silc_mutex_unlock(ps->lock);
- SILC_PACKET_CALLBACK_ERROR(ps, SILC_PACKET_ERR_READ);
- return FALSE;
- }
+ &remote_port, inbuf->tail,
+ silc_buffer_taillen(inbuf));
- if (ret == -1) {
- /* Cannot read now, do it later. */
- silc_buffer_pull(&ps->inbuf, silc_buffer_len(&ps->inbuf));
+ if (silc_unlikely(ret < 0)) {
silc_mutex_unlock(ps->lock);
+ if (ret == -1) {
+ /* Cannot read now, do it later. */
+ silc_buffer_pull(inbuf, silc_buffer_len(inbuf));
+ return FALSE;
+ }
+
+ /* Error */
+ silc_buffer_reset(inbuf);
+ SILC_PACKET_CALLBACK_ERROR(ps, SILC_PACKET_ERR_READ);
return FALSE;
}
/* See if remote packet stream exist for this sender */
- snprintf(tuple, sizeof(tuple), "%d%s", remote_port, remote_ip);
- silc_mutex_lock(ps->engine->lock);
- if (silc_hash_table_find(ps->engine->udp_remote, tuple, NULL,
+ silc_snprintf(tuple, sizeof(tuple), "%d%s", remote_port, remote_ip);
+ silc_mutex_lock(ps->sc->engine->lock);
+ if (silc_hash_table_find(ps->sc->engine->udp_remote, tuple, NULL,
(void *)&remote)) {
- /* Found packet stream for this sender, copy the packet */
- silc_mutex_unlock(ps->engine->lock);
-
- SILC_LOG_DEBUG(("UDP packet from %s:%d for stream %p",
- remote_ip, remote_port, remote));
-
+ silc_mutex_unlock(ps->sc->engine->lock);
+ SILC_LOG_DEBUG(("UDP packet from %s:%d for stream %p", remote_ip,
+ remote_port, remote));
+ silc_mutex_unlock(ps->lock);
silc_mutex_lock(remote->lock);
- if (ret > silc_buffer_taillen(&remote->inbuf))
- if (!silc_buffer_realloc(&remote->inbuf, ret)) {
- silc_mutex_unlock(remote->lock);
- silc_mutex_unlock(ps->lock);
- SILC_PACKET_CALLBACK_ERROR(ps, SILC_PACKET_ERR_NO_MEMORY);
- return FALSE;
- }
-
- silc_buffer_put_tail(&remote->inbuf, ps->inbuf.tail, ret);
- silc_buffer_pull_tail(&remote->inbuf, ret);
*ret_ps = remote;
-
- silc_buffer_reset(&ps->inbuf);
- silc_mutex_unlock(ps->lock);
return TRUE;
}
- silc_mutex_unlock(ps->engine->lock);
+ silc_mutex_unlock(ps->sc->engine->lock);
/* Unknown sender */
if (!ps->remote_udp) {
ps->remote_udp = silc_calloc(1, sizeof(*ps->remote_udp));
- if (!ps->remote_udp) {
+ if (silc_unlikely(!ps->remote_udp)) {
silc_mutex_unlock(ps->lock);
SILC_PACKET_CALLBACK_ERROR(ps, SILC_PACKET_ERR_NO_MEMORY);
return FALSE;
ps->remote_udp->remote_ip = strdup(remote_ip);
ps->remote_udp->remote_port = remote_port;
- silc_buffer_pull_tail(&ps->inbuf, ret);
+ silc_buffer_pull_tail(inbuf, ret);
return TRUE;
}
}
/* Read data from the stream */
- ret = silc_stream_read(ps->stream, ps->inbuf.tail,
- silc_buffer_taillen(&ps->inbuf));
-
- if (ret == 0) {
- /* EOS */
- silc_buffer_reset(&ps->inbuf);
+ ret = silc_stream_read(stream, inbuf->tail, silc_buffer_taillen(inbuf));
+ if (silc_unlikely(ret <= 0)) {
silc_mutex_unlock(ps->lock);
- SILC_PACKET_CALLBACK_EOS(ps);
- return FALSE;
- }
+ if (ret == 0) {
+ /* EOS */
+ silc_buffer_reset(inbuf);
+ SILC_PACKET_CALLBACK_EOS(ps);
+ return FALSE;
+ }
+
+ if (ret == -1) {
+ /* Cannot read now, do it later. */
+ silc_buffer_pull(inbuf, silc_buffer_len(inbuf));
+ return FALSE;
+ }
- if (ret == -2) {
/* Error */
- silc_buffer_reset(&ps->inbuf);
- silc_mutex_unlock(ps->lock);
+ silc_buffer_reset(inbuf);
SILC_PACKET_CALLBACK_ERROR(ps, SILC_PACKET_ERR_READ);
return FALSE;
}
- if (ret == -1) {
- /* Cannot read now, do it later. */
- silc_buffer_pull(&ps->inbuf, silc_buffer_len(&ps->inbuf));
- silc_mutex_unlock(ps->lock);
- return FALSE;
- }
-
- silc_buffer_pull_tail(&ps->inbuf, ret);
+ silc_buffer_pull_tail(inbuf, ret);
return TRUE;
}
silc_mutex_lock(ps->lock);
- if (ps->destroyed) {
+ if (silc_unlikely(ps->destroyed)) {
silc_mutex_unlock(ps->lock);
return;
}
switch (status) {
-
- case SILC_STREAM_CAN_WRITE:
- SILC_LOG_DEBUG(("Writing pending data to stream"));
-
- if (!silc_buffer_headlen(&ps->outbuf)) {
- silc_mutex_unlock(ps->lock);
- return;
- }
-
- /* Write pending data to stream */
- silc_packet_stream_write(ps, FALSE);
- break;
-
case SILC_STREAM_CAN_READ:
- SILC_LOG_DEBUG(("Reading data from stream"));
+ /* Reading is locked also with stream->lock because we may be reading
+ at the same time other thread is writing to same underlaying stream. */
+ SILC_LOG_DEBUG(("Reading data from stream %p, ps %p", ps->stream, ps));
/* Read data from stream */
if (!silc_packet_stream_read(ps, &remote))
return;
/* Now process the data */
+ silc_packet_stream_ref(ps);
if (!remote) {
silc_packet_read_process(ps);
silc_mutex_unlock(ps->lock);
silc_packet_read_process(remote);
silc_mutex_unlock(remote->lock);
}
+ silc_packet_stream_unref(ps);
+ break;
+
+ case SILC_STREAM_CAN_WRITE:
+ SILC_LOG_DEBUG(("Writing pending data to stream %p, ps %p",
+ ps->stream, ps));
+
+ if (silc_unlikely(!silc_buffer_headlen(&ps->outbuf))) {
+ silc_mutex_unlock(ps->lock);
+ return;
+ }
+
+ /* Write pending data to stream */
+ silc_packet_stream_write(ps, FALSE);
break;
default:
silc_mutex_unlock(engine->lock);
packet = silc_calloc(1, sizeof(*packet));
- if (!packet)
+ if (silc_unlikely(!packet))
return NULL;
SILC_LOG_DEBUG(("Allocating new packet %p", packet));
tmp = silc_malloc(SILC_PACKET_DEFAULT_SIZE);
- if (!tmp) {
+ if (silc_unlikely(!tmp)) {
silc_free(packet);
return NULL;
}
silc_free(key);
}
+/* Per scheduler context hash table destructor */
+
+static void silc_packet_engine_context_destr(void *key, void *context,
+ void *user_context)
+{
+ SilcPacketEngineContext sc = context;
+ SilcBuffer buffer;
+
+ silc_dlist_start(sc->inbufs);
+ while ((buffer = silc_dlist_get(sc->inbufs))) {
+ silc_buffer_clear(buffer);
+ silc_buffer_free(buffer);
+ silc_dlist_del(sc->inbufs, buffer);
+ }
+
+ silc_dlist_uninit(sc->inbufs);
+ silc_free(sc);
+}
+
/******************************** Packet API ********************************/
if (!engine)
return NULL;
+ engine->contexts = silc_hash_table_alloc(0, silc_hash_ptr, NULL, NULL, NULL,
+ silc_packet_engine_context_destr,
+ engine, TRUE);
+ if (!engine->contexts) {
+ silc_free(engine);
+ return NULL;
+ }
+
engine->rng = rng;
engine->local_is_router = router;
engine->callbacks = callbacks;
void silc_packet_engine_stop(SilcPacketEngine engine)
{
+ SilcPacket packet;
SILC_LOG_DEBUG(("Stopping packet engine"));
if (!engine)
return;
- /* XXX */
+ /* Free packet free list */
+ silc_list_start(engine->packet_pool);
+ while ((packet = silc_list_get(engine->packet_pool))) {
+ silc_buffer_purge(&packet->buffer);
+ silc_free(packet);
+ }
+ silc_hash_table_free(engine->contexts);
+ silc_mutex_free(engine->lock);
silc_free(engine);
}
SilcStream stream)
{
SilcPacketStream ps;
+ SilcBuffer inbuf;
void *tmp;
SILC_LOG_DEBUG(("Creating new packet stream"));
if (!ps)
return NULL;
- ps->engine = engine;
ps->stream = stream;
silc_atomic_init8(&ps->refcnt, 1);
silc_mutex_alloc(&ps->lock);
- /* Allocate buffers */
- tmp = silc_malloc(SILC_PACKET_DEFAULT_SIZE);
- if (!tmp) {
- silc_packet_stream_destroy(ps);
- return NULL;
- }
- silc_buffer_set(&ps->inbuf, tmp, SILC_PACKET_DEFAULT_SIZE);
- silc_buffer_reset(&ps->inbuf);
+ /* Allocate out buffer */
tmp = silc_malloc(SILC_PACKET_DEFAULT_SIZE);
if (!tmp) {
silc_packet_stream_destroy(ps);
return NULL;
}
- /* Set IO notifier callback */
- silc_stream_set_notifier(ps->stream, schedule, silc_packet_stream_io, ps);
-
- /* Add to engine */
silc_mutex_lock(engine->lock);
+
+ /* Add per scheduler context */
+ if (!silc_hash_table_find(engine->contexts, schedule, NULL,
+ (void *)&ps->sc)) {
+ ps->sc = silc_calloc(1, sizeof(*ps->sc));
+ if (!ps->sc) {
+ silc_packet_stream_destroy(ps);
+ silc_mutex_unlock(engine->lock);
+ return NULL;
+ }
+ ps->sc->engine = engine;
+ ps->sc->schedule = schedule;
+
+ /* Allocate data input buffer */
+ inbuf = silc_buffer_alloc(SILC_PACKET_DEFAULT_SIZE * 31);
+ if (!inbuf) {
+ silc_free(ps->sc);
+ ps->sc = NULL;
+ silc_packet_stream_destroy(ps);
+ silc_mutex_unlock(engine->lock);
+ return NULL;
+ }
+ silc_buffer_reset(inbuf);
+
+ ps->sc->inbufs = silc_dlist_init();
+ if (!ps->sc->inbufs) {
+ silc_buffer_free(inbuf);
+ silc_free(ps->sc);
+ ps->sc = NULL;
+ silc_packet_stream_destroy(ps);
+ silc_mutex_unlock(engine->lock);
+ return NULL;
+ }
+ silc_dlist_add(ps->sc->inbufs, inbuf);
+
+ /* Add to per scheduler context hash table */
+ if (!silc_hash_table_add(engine->contexts, schedule, ps->sc)) {
+ silc_buffer_free(inbuf);
+ silc_dlist_del(ps->sc->inbufs, inbuf);
+ silc_free(ps->sc);
+ ps->sc = NULL;
+ silc_packet_stream_destroy(ps);
+ silc_mutex_unlock(engine->lock);
+ return NULL;
+ }
+ }
+ ps->sc->stream_count++;
+
+ /* Add the packet stream to engine */
silc_list_add(engine->streams, ps);
- silc_mutex_unlock(engine->lock);
/* If this is UDP stream, allocate UDP remote stream hash table */
if (!engine->udp_remote && silc_socket_stream_is_udp(stream, NULL))
silc_packet_engine_hash_destr,
NULL, TRUE);
+ silc_mutex_unlock(engine->lock);
+
+ /* Set IO notifier callback. This schedules this stream for I/O. */
+ if (!silc_stream_set_notifier(ps->stream, schedule,
+ silc_packet_stream_io, ps)) {
+ SILC_LOG_DEBUG(("Cannot set stream notifier for packet stream"));
+ silc_packet_stream_destroy(ps);
+ return NULL;
+ }
+
return ps;
}
SilcUInt16 remote_port,
SilcPacket packet)
{
- SilcPacketEngine engine = stream->engine;
+ SilcPacketEngine engine = stream->sc->engine;
SilcPacketStream ps;
char *tuple;
void *tmp;
ps = silc_calloc(1, sizeof(*ps));
if (!ps)
return NULL;
+ ps->sc = stream->sc;
- ps->engine = engine;
silc_atomic_init8(&ps->refcnt, 1);
silc_mutex_alloc(&ps->lock);
ps->stream = (SilcStream)stream;
ps->udp = TRUE;
- /* Allocate buffers */
- tmp = silc_malloc(SILC_PACKET_DEFAULT_SIZE);
- if (!tmp) {
- silc_packet_stream_destroy(ps);
- return NULL;
- }
- silc_buffer_set(&ps->inbuf, tmp, SILC_PACKET_DEFAULT_SIZE);
- silc_buffer_reset(&ps->inbuf);
+ /* Allocate out buffer */
tmp = silc_malloc(SILC_PACKET_DEFAULT_SIZE);
if (!tmp) {
silc_packet_stream_destroy(ps);
if (packet) {
/* Inject packet to the new stream */
packet->stream = ps;
+ silc_packet_stream_ref(ps);
silc_schedule_task_add_timeout(silc_stream_get_schedule(stream->stream),
silc_packet_stream_inject_packet, packet,
0, 0);
if (!stream)
return;
- if (silc_atomic_get_int8(&stream->refcnt) > 1) {
+ if (silc_atomic_sub_int8(&stream->refcnt, 1) > 0) {
stream->destroyed = TRUE;
+
+ /* Close the underlaying stream */
+ if (!stream->udp && stream->stream)
+ silc_stream_close(stream->stream);
return;
}
if (!stream->udp) {
/* Delete from engine */
- silc_mutex_lock(stream->engine->lock);
- silc_list_del(stream->engine->streams, stream);
- silc_mutex_unlock(stream->engine->lock);
+ silc_mutex_lock(stream->sc->engine->lock);
+ silc_list_del(stream->sc->engine->streams, stream);
+
+ /* Remove per scheduler context, if it is not used anymore */
+ if (stream->sc) {
+ stream->sc->stream_count--;
+ if (!stream->sc->stream_count)
+ silc_hash_table_del(stream->sc->engine->contexts,
+ stream->sc->schedule);
+ }
+ silc_mutex_unlock(stream->sc->engine->lock);
/* Destroy the underlaying stream */
if (stream->stream)
} else {
/* Delete from UDP remote hash table */
char tuple[64];
- snprintf(tuple, sizeof(tuple), "%d%s", stream->remote_udp->remote_port,
+ silc_snprintf(tuple, sizeof(tuple), "%d%s", stream->remote_udp->remote_port,
stream->remote_udp->remote_ip);
- silc_mutex_lock(stream->engine->lock);
- silc_hash_table_del(stream->engine->udp_remote, tuple);
- silc_mutex_unlock(stream->engine->lock);
+ silc_mutex_lock(stream->sc->engine->lock);
+ silc_hash_table_del(stream->sc->engine->udp_remote, tuple);
+ silc_mutex_unlock(stream->sc->engine->lock);
silc_free(stream->remote_udp->remote_ip);
silc_free(stream->remote_udp);
}
/* Clear and free buffers */
- silc_buffer_clear(&stream->inbuf);
silc_buffer_clear(&stream->outbuf);
- silc_buffer_purge(&stream->inbuf);
silc_buffer_purge(&stream->outbuf);
if (stream->process) {
silc_dlist_uninit(stream->process);
}
- /* XXX */
+ /* Destroy ciphers and HMACs */
+ if (stream->send_key[0])
+ silc_cipher_free(stream->send_key[0]);
+ if (stream->receive_key[0])
+ silc_cipher_free(stream->receive_key[0]);
+ if (stream->send_hmac[0])
+ silc_hmac_free(stream->send_hmac[0]);
+ if (stream->receive_hmac[0])
+ silc_hmac_free(stream->receive_hmac[0]);
+ if (stream->send_key[1])
+ silc_cipher_free(stream->send_key[1]);
+ if (stream->receive_key[1])
+ silc_cipher_free(stream->receive_key[1]);
+ if (stream->send_hmac[1])
+ silc_hmac_free(stream->send_hmac[1]);
+ if (stream->receive_hmac[1])
+ silc_hmac_free(stream->receive_hmac[1]);
+
+ /* Free IDs */
+ silc_free(stream->src_id);
+ silc_free(stream->dst_id);
silc_atomic_uninit8(&stream->refcnt);
silc_mutex_free(stream->lock);
void silc_packet_stream_ref(SilcPacketStream stream)
{
silc_atomic_add_int8(&stream->refcnt, 1);
+ SILC_LOG_DEBUG(("Stream %p, refcnt %d->%d", stream,
+ silc_atomic_get_int8(&stream->refcnt) - 1,
+ silc_atomic_get_int8(&stream->refcnt)));
}
/* Unreference packet stream */
void silc_packet_stream_unref(SilcPacketStream stream)
{
- if (silc_atomic_sub_int8(&stream->refcnt, 1) == 0)
- silc_packet_stream_destroy(stream);
+ SILC_LOG_DEBUG(("Stream %p, refcnt %d->%d", stream,
+ silc_atomic_get_int8(&stream->refcnt),
+ silc_atomic_get_int8(&stream->refcnt) - 1));
+ if (silc_atomic_sub_int8(&stream->refcnt, 1) > 0)
+ return;
+ silc_atomic_add_int8(&stream->refcnt, 1);
+ silc_packet_stream_destroy(stream);
}
/* Return engine */
SilcPacketEngine silc_packet_get_engine(SilcPacketStream stream)
{
- return stream->engine;
+ return stream->sc->engine;
}
/* Set application context for packet stream */
/* Change underlaying stream */
void silc_packet_stream_set_stream(SilcPacketStream ps,
- SilcStream stream,
- SilcSchedule schedule)
+ SilcStream stream)
{
if (ps->stream)
- silc_stream_set_notifier(ps->stream, schedule, NULL, NULL);
+ silc_stream_set_notifier(ps->stream, ps->sc->schedule, NULL, NULL);
ps->stream = stream;
- silc_stream_set_notifier(ps->stream, schedule, silc_packet_stream_io, ps);
+ silc_stream_set_notifier(ps->stream, ps->sc->schedule, silc_packet_stream_io,
+ ps);
}
/* Return underlaying stream */
} else {
if (stream->send_key[0] && send_key)
silc_cipher_free(stream->send_key[0]);
- if (stream->send_key[1] && receive_key)
+ if (stream->receive_key[0] && receive_key)
silc_cipher_free(stream->receive_key[0]);
if (stream->send_hmac[0] && send_hmac)
silc_hmac_free(stream->send_hmac[0]);
packet->src_id = packet->dst_id = NULL;
silc_buffer_reset(&packet->buffer);
- silc_mutex_lock(stream->engine->lock);
+ silc_mutex_lock(stream->sc->engine->lock);
/* Put the packet back to freelist */
- silc_list_add(stream->engine->packet_pool, packet);
- if (silc_list_count(stream->engine->packet_pool) == 1)
- silc_list_start(stream->engine->packet_pool);
+ silc_list_add(stream->sc->engine->packet_pool, packet);
+ if (silc_list_count(stream->sc->engine->packet_pool) == 1)
+ silc_list_start(stream->sc->engine->packet_pool);
- silc_mutex_unlock(stream->engine->lock);
+ silc_mutex_unlock(stream->sc->engine->lock);
}
/****************************** Packet Sending ******************************/
totlen += mac_len;
/* Allocate more space if needed */
- if (silc_buffer_taillen(&stream->outbuf) < totlen) {
+ if (silc_unlikely(silc_buffer_taillen(&stream->outbuf) < totlen)) {
if (!silc_buffer_realloc(&stream->outbuf,
silc_buffer_truelen(&stream->outbuf) + totlen))
return FALSE;
return TRUE;
}
+/* Increments counter when encrypting in counter mode. */
+
+static inline void silc_packet_send_ctr_increment(SilcPacketStream stream,
+ SilcCipher cipher,
+ unsigned char *ret_iv)
+{
+ unsigned char *iv = silc_cipher_get_iv(cipher);
+ SilcUInt32 pc1, pc2;
+
+ /* Increment 64-bit packet counter.*/
+ SILC_GET32_MSB(pc1, iv + 4);
+ SILC_GET32_MSB(pc2, iv + 8);
+ if (++pc2 == 0)
+ ++pc1;
+ SILC_PUT32_MSB(pc1, iv + 4);
+ SILC_PUT32_MSB(pc2, iv + 8);
+
+ /* Reset block counter */
+ memset(iv + 12, 0, 4);
+
+ /* If IV Included flag, return the 64-bit IV for inclusion in packet */
+ if (stream->iv_included) {
+ /* Get new nonce */
+ ret_iv[0] = silc_rng_get_byte_fast(stream->sc->engine->rng);
+ ret_iv[1] = ret_iv[0] + iv[4];
+ ret_iv[2] = ret_iv[0] ^ ret_iv[1];
+ ret_iv[3] = ret_iv[0] + ret_iv[2];
+ SILC_PUT32_MSB(pc2, ret_iv + 4);
+ SILC_LOG_HEXDUMP(("IV"), ret_iv, 8);
+
+ /* Set new nonce to counter block */
+ memcpy(iv + 4, ret_iv, 4);
+ }
+
+ SILC_LOG_HEXDUMP(("Counter Block"), iv, 16);
+}
+
/* Internal routine to assemble outgoing packet. Assembles and encryptes
the packet. The silc_packet_stream_write needs to be called to send it
after this returns TRUE. */
{
unsigned char tmppad[SILC_PACKET_MAX_PADLEN], iv[33], psn[4];
int block_len = (cipher ? silc_cipher_get_block_len(cipher) : 0);
- int i, enclen, truelen, padlen, ivlen = 0, psnlen = 0;
+ int i, enclen, truelen, padlen = 0, ivlen = 0, psnlen = 0;
+ SilcBool ctr;
SilcBufferStruct packet;
SILC_LOG_DEBUG(("Sending packet %s (%d) flags %d, src %d dst %d, "
enclen = truelen = (data_len + SILC_PACKET_HEADER_LEN +
src_id_len + dst_id_len);
- /* If IV is included, the SID, IV and sequence number is added to packet */
- if (stream->iv_included && cipher) {
- psnlen = sizeof(psn);
- ivlen = block_len + 1;
- iv[0] = stream->sid;
- memcpy(iv + 1, silc_cipher_get_iv(cipher), block_len);
+ /* If using CTR mode, increment the counter */
+ ctr = (cipher && silc_cipher_get_mode(cipher) == SILC_CIPHER_MODE_CTR);
+ if (ctr) {
+ silc_packet_send_ctr_increment(stream, cipher, iv + 1);
+
+ /* If IV is included, the SID, IV and sequence number is added to packet */
+ if (stream->iv_included && cipher) {
+ psnlen = sizeof(psn);
+ ivlen = 8 + 1;
+ iv[0] = stream->sid;
+ }
+ } else {
+ /* If IV is included, the SID, IV and sequence number is added to packet */
+ if (stream->iv_included && cipher) {
+ psnlen = sizeof(psn);
+ ivlen = block_len + 1;
+ iv[0] = stream->sid;
+ memcpy(iv + 1, silc_cipher_get_iv(cipher), block_len);
+ }
}
/* We automatically figure out the packet structure from the packet
type == SILC_PACKET_CHANNEL_MESSAGE) {
/* Padding is calculated from header + IDs */
- SILC_PACKET_PADLEN((SILC_PACKET_HEADER_LEN + src_id_len + dst_id_len +
- psnlen), block_len, padlen);
+ if (!ctr)
+ SILC_PACKET_PADLEN((SILC_PACKET_HEADER_LEN + src_id_len + dst_id_len +
+ psnlen), block_len, padlen);
/* Length to encrypt, header + IDs + padding. */
enclen = (SILC_PACKET_HEADER_LEN + src_id_len + dst_id_len +
/* Padding is calculated from true length of the packet */
if (flags & SILC_PACKET_FLAG_LONG_PAD)
SILC_PACKET_PADLEN_MAX(truelen + psnlen, block_len, padlen);
- else
+ else if (!ctr)
SILC_PACKET_PADLEN(truelen + psnlen, block_len, padlen);
enclen += padlen + psnlen;
/* Get random padding */
for (i = 0; i < padlen; i++) tmppad[i] =
- silc_rng_get_byte_fast(stream->engine->rng);
+ silc_rng_get_byte_fast(stream->sc->engine->rng);
silc_mutex_lock(stream->lock);
/* Get packet pointer from the outgoing buffer */
- if (!silc_packet_send_prepare(stream, truelen + padlen + ivlen + psnlen,
- hmac, &packet)) {
+ if (silc_unlikely(!silc_packet_send_prepare(stream, truelen + padlen + ivlen
+ + psnlen, hmac, &packet))) {
silc_mutex_unlock(stream->lock);
return FALSE;
}
SILC_STR_DATA(tmppad, padlen),
SILC_STR_DATA(data, data_len),
SILC_STR_END);
- if (i < 0) {
+ if (silc_unlikely(i < 0)) {
silc_mutex_unlock(stream->lock);
return FALSE;
}
silc_buffer_data(&packet), silc_buffer_len(&packet));
/* Encrypt the packet */
- if (cipher) {
+ if (silc_likely(cipher)) {
SILC_LOG_DEBUG(("Encrypting packet"));
- if (!silc_cipher_encrypt(cipher, packet.data + ivlen,
- packet.data + ivlen, enclen, NULL)) {
+ silc_cipher_set_iv(cipher, NULL);
+ if (silc_unlikely(!silc_cipher_encrypt(cipher, packet.data + ivlen,
+ packet.data + ivlen, enclen,
+ NULL))) {
SILC_LOG_ERROR(("Packet encryption failed"));
silc_mutex_unlock(stream->lock);
return FALSE;
}
/* Compute HMAC */
- if (hmac) {
+ if (silc_likely(hmac)) {
SilcUInt32 mac_len;
/* MAC is computed from the entire encrypted packet data, and put
SilcUInt32 sequence)
{
/* Check MAC */
- if (hmac) {
+ if (silc_likely(hmac)) {
unsigned char mac[32], psn[4];
SilcUInt32 mac_len;
silc_hmac_final(hmac, mac, &mac_len);
/* Compare the MAC's */
- if (memcmp(packet_mac, mac, mac_len)) {
+ if (silc_unlikely(memcmp(packet_mac, mac, mac_len))) {
SILC_LOG_DEBUG(("MAC failed"));
return FALSE;
}
return TRUE;
}
+/* Increments/sets counter when decrypting in counter mode. */
+
+static inline void silc_packet_receive_ctr_increment(SilcPacketStream stream,
+ unsigned char *iv,
+ unsigned char *packet_iv)
+{
+ SilcUInt32 pc1, pc2;
+
+ /* If IV Included flag, set the IV from packet to block counter. */
+ if (stream->iv_included) {
+ memcpy(iv + 4, packet_iv, 8);
+ } else {
+ /* Increment 64-bit packet counter. */
+ SILC_GET32_MSB(pc1, iv + 4);
+ SILC_GET32_MSB(pc2, iv + 8);
+ if (++pc2 == 0)
+ ++pc1;
+ SILC_PUT32_MSB(pc1, iv + 4);
+ SILC_PUT32_MSB(pc2, iv + 8);
+ }
+
+ /* Reset block counter */
+ memset(iv + 12, 0, 4);
+
+ SILC_LOG_HEXDUMP(("Counter Block"), iv, 16);
+}
+
/* Decrypts SILC packet. Handles both normal and special packet decryption.
Return 0 when packet is normal and 1 when it it special, -1 on error. */
SilcBool normal)
{
if (normal == TRUE) {
- if (cipher) {
+ if (silc_likely(cipher)) {
/* Decrypt rest of the packet */
SILC_LOG_DEBUG(("Decrypting the packet"));
- if (!silc_cipher_decrypt(cipher, buffer->data, buffer->data,
- silc_buffer_len(buffer), NULL))
+ if (silc_unlikely(!silc_cipher_decrypt(cipher, buffer->data,
+ buffer->data,
+ silc_buffer_len(buffer), NULL)))
return -1;
}
return 0;
} else {
/* Decrypt rest of the header plus padding */
- if (cipher) {
+ if (silc_likely(cipher)) {
SilcUInt16 len;
SilcUInt32 block_len = silc_cipher_get_block_len(cipher);
block_len);
silc_buffer_pull(buffer, block_len);
- if (len > silc_buffer_len(buffer)) {
+ if (silc_unlikely(len > silc_buffer_len(buffer))) {
SILC_LOG_ERROR(("Garbage in header of packet, bad packet length, "
"packet dropped"));
return -1;
}
- if (!silc_cipher_decrypt(cipher, buffer->data, buffer->data,
- len, NULL))
+ if (silc_unlikely(!silc_cipher_decrypt(cipher, buffer->data,
+ buffer->data, len, NULL)))
return -1;
}
SILC_STR_UI_CHAR(&dst_id_len),
SILC_STR_UI_CHAR(&src_id_type),
SILC_STR_END);
- if (ret == -1) {
+ if (silc_unlikely(ret == -1)) {
if (!packet->stream->udp &&
!silc_socket_stream_is_udp(packet->stream->stream, NULL))
SILC_LOG_ERROR(("Malformed packet header, packet dropped"));
return FALSE;
}
- if (src_id_len > SILC_PACKET_MAX_ID_LEN ||
- dst_id_len > SILC_PACKET_MAX_ID_LEN) {
+ if (silc_unlikely(src_id_len > SILC_PACKET_MAX_ID_LEN ||
+ dst_id_len > SILC_PACKET_MAX_ID_LEN)) {
if (!packet->stream->udp &&
!silc_socket_stream_is_udp(packet->stream->stream, NULL))
SILC_LOG_ERROR(("Bad ID lengths in packet (%d and %d)",
SILC_STR_DATA(&packet->dst_id, dst_id_len),
SILC_STR_OFFSET(padlen),
SILC_STR_END);
- if (ret == -1) {
+ if (silc_unlikely(ret == -1)) {
if (!packet->stream->udp &&
!silc_socket_stream_is_udp(packet->stream->stream, NULL))
SILC_LOG_ERROR(("Malformed packet header, packet dropped"));
return FALSE;
}
- if (src_id_type > SILC_ID_CHANNEL ||
- dst_id_type > SILC_ID_CHANNEL) {
+ if (silc_unlikely(src_id_type > SILC_ID_CHANNEL ||
+ dst_id_type > SILC_ID_CHANNEL)) {
if (!packet->stream->udp &&
!silc_socket_stream_is_udp(packet->stream->stream, NULL))
SILC_LOG_ERROR(("Bad ID types in packet (%d and %d)",
return TRUE;
}
-/* Dispatch packet to application. Called with stream->lock locked. */
+/* Dispatch packet to application. Called with stream->lock locked.
+ Returns FALSE if the stream was destroyed while dispatching a packet. */
-static void silc_packet_dispatch(SilcPacket packet)
+static SilcBool silc_packet_dispatch(SilcPacket packet)
{
SilcPacketStream stream = packet->stream;
SilcPacketProcess p;
/* Dispatch packet to all packet processors that want it */
- if (!stream->process) {
+ if (silc_likely(!stream->process)) {
/* Send to default processor as no others exist */
SILC_LOG_DEBUG(("Dispatching packet to default callbacks"));
silc_mutex_unlock(stream->lock);
- if (!stream->engine->callbacks->
- packet_receive(stream->engine, stream, packet,
- stream->engine->callback_context,
- stream->stream_context))
+ if (silc_unlikely(!stream->sc->engine->callbacks->
+ packet_receive(stream->sc->engine, stream, packet,
+ stream->sc->engine->callback_context,
+ stream->stream_context)))
silc_packet_free(packet);
silc_mutex_lock(stream->lock);
- return;
+ return stream->destroyed == FALSE;
}
silc_dlist_start(stream->process);
SILC_LOG_DEBUG(("Dispatching packet to default callbacks"));
default_sent = TRUE;
silc_mutex_unlock(stream->lock);
- if (stream->engine->callbacks->
- packet_receive(stream->engine, stream, packet,
- stream->engine->callback_context,
+ if (stream->sc->engine->callbacks->
+ packet_receive(stream->sc->engine, stream, packet,
+ stream->sc->engine->callback_context,
stream->stream_context)) {
silc_mutex_lock(stream->lock);
- return;
+ return stream->destroyed == FALSE;
}
silc_mutex_lock(stream->lock);
}
/* Send all packet types */
SILC_LOG_DEBUG(("Dispatching packet to %p callbacks", p->callbacks));
silc_mutex_unlock(stream->lock);
- if (p->callbacks->packet_receive(stream->engine, stream, packet,
+ if (p->callbacks->packet_receive(stream->sc->engine, stream, packet,
p->callback_context,
stream->stream_context)) {
silc_mutex_lock(stream->lock);
- return;
+ return stream->destroyed == FALSE;
}
silc_mutex_lock(stream->lock);
} else {
continue;
SILC_LOG_DEBUG(("Dispatching packet to %p callbacks", p->callbacks));
silc_mutex_unlock(stream->lock);
- if (p->callbacks->packet_receive(stream->engine, stream, packet,
+ if (p->callbacks->packet_receive(stream->sc->engine, stream, packet,
p->callback_context,
stream->stream_context)) {
silc_mutex_lock(stream->lock);
- return;
+ return stream->destroyed == FALSE;
}
silc_mutex_lock(stream->lock);
break;
/* Send to default processor as it has not been sent yet */
SILC_LOG_DEBUG(("Dispatching packet to default callbacks"));
silc_mutex_unlock(stream->lock);
- if (stream->engine->callbacks->
- packet_receive(stream->engine, stream, packet,
- stream->engine->callback_context,
+ if (stream->sc->engine->callbacks->
+ packet_receive(stream->sc->engine, stream, packet,
+ stream->sc->engine->callback_context,
stream->stream_context)) {
silc_mutex_lock(stream->lock);
- return;
+ return stream->destroyed == FALSE;
}
silc_mutex_lock(stream->lock);
}
/* If we got here, no one wanted the packet, so drop it */
silc_packet_free(packet);
+ return stream->destroyed == FALSE;
}
/* Process incoming data and parse packets. Called with stream->lock
static void silc_packet_read_process(SilcPacketStream stream)
{
+ SilcBuffer inbuf;
SilcCipher cipher;
SilcHmac hmac;
SilcPacket packet;
SilcBool normal;
int ret;
+ /* Get inbuf. If there is already some data for this stream in the buffer
+ we already have it. Otherwise get the current one from list, it will
+ include the data. */
+ inbuf = stream->inbuf;
+ if (!inbuf) {
+ silc_dlist_start(stream->sc->inbufs);
+ inbuf = silc_dlist_get(stream->sc->inbufs);
+ }
+
/* Parse the packets from the data */
- while (silc_buffer_len(&stream->inbuf) > 0) {
+ while (silc_buffer_len(inbuf) > 0) {
ivlen = psnlen = 0;
cipher = stream->receive_key[0];
hmac = stream->receive_hmac[0];
normal = FALSE;
- if (silc_buffer_len(&stream->inbuf) <
- (stream->iv_included ? SILC_PACKET_MIN_HEADER_LEN_IV :
- SILC_PACKET_MIN_HEADER_LEN)) {
+ if (silc_unlikely(silc_buffer_len(inbuf) <
+ (stream->iv_included ? SILC_PACKET_MIN_HEADER_LEN_IV :
+ SILC_PACKET_MIN_HEADER_LEN))) {
SILC_LOG_DEBUG(("Partial packet in queue, waiting for the rest"));
+ silc_dlist_del(stream->sc->inbufs, inbuf);
+ stream->inbuf = inbuf;
return;
}
- if (hmac)
+ if (silc_likely(hmac))
mac_len = silc_hmac_len(hmac);
else
mac_len = 0;
/* Decrypt first block of the packet to get the length field out */
- if (cipher) {
+ if (silc_likely(cipher)) {
block_len = silc_cipher_get_block_len(cipher);
if (stream->iv_included) {
/* SID, IV and sequence number is included in the ciphertext */
- sid = (SilcUInt8)stream->inbuf.data[0];
- memcpy(iv, stream->inbuf.data + 1, block_len);
- ivlen = block_len + 1;
+ sid = (SilcUInt8)inbuf->data[0];
+
+ if (silc_cipher_get_mode(cipher) == SILC_CIPHER_MODE_CTR) {
+ /* Set the CTR mode IV from packet to counter block */
+ memcpy(iv, silc_cipher_get_iv(cipher), block_len);
+ silc_packet_receive_ctr_increment(stream, iv, inbuf->data + 1);
+ ivlen = 8 + 1;
+ } else {
+ /* Get IV from packet */
+ memcpy(iv, inbuf->data + 1, block_len);
+ ivlen = block_len + 1;
+ }
psnlen = 4;
/* Check SID, and get correct decryption key */
silc_mutex_unlock(stream->lock);
SILC_PACKET_CALLBACK_ERROR(stream, SILC_PACKET_ERR_UNKNOWN_SID);
silc_mutex_lock(stream->lock);
- silc_buffer_reset(&stream->inbuf);
- return;
+ goto out;
}
}
} else {
memcpy(iv, silc_cipher_get_iv(cipher), block_len);
+
+ /* If using CTR mode, increment the counter */
+ if (silc_cipher_get_mode(cipher) == SILC_CIPHER_MODE_CTR)
+ silc_packet_receive_ctr_increment(stream, iv, NULL);
}
- silc_cipher_decrypt(cipher, stream->inbuf.data + ivlen, tmp,
- block_len, iv);
+ if (silc_cipher_get_mode(cipher) == SILC_CIPHER_MODE_CTR)
+ silc_cipher_set_iv(cipher, NULL);
+ silc_cipher_decrypt(cipher, inbuf->data + ivlen, tmp, block_len, iv);
header = tmp;
if (stream->iv_included) {
header += 4;
}
} else {
+ /* Unencrypted packet */
block_len = SILC_PACKET_MIN_HEADER_LEN;
- header = stream->inbuf.data;
+ header = inbuf->data;
}
/* Get packet length and full packet length with padding */
SILC_PACKET_LENGTH(header, packetlen, paddedlen);
/* Sanity checks */
- if (packetlen < SILC_PACKET_MIN_LEN) {
+ if (silc_unlikely(packetlen < SILC_PACKET_MIN_LEN)) {
if (!stream->udp && !silc_socket_stream_is_udp(stream->stream, NULL))
SILC_LOG_ERROR(("Received too short packet"));
silc_mutex_unlock(stream->lock);
SILC_PACKET_CALLBACK_ERROR(stream, SILC_PACKET_ERR_MALFORMED);
silc_mutex_lock(stream->lock);
memset(tmp, 0, sizeof(tmp));
- silc_buffer_reset(&stream->inbuf);
- return;
+ goto out;
}
- if (silc_buffer_len(&stream->inbuf) < paddedlen + ivlen + mac_len) {
+ if (silc_buffer_len(inbuf) < paddedlen + ivlen + mac_len) {
SILC_LOG_DEBUG(("Received partial packet, waiting for the rest "
"(%d bytes)",
- paddedlen + mac_len - silc_buffer_len(&stream->inbuf)));
+ paddedlen + mac_len - silc_buffer_len(inbuf)));
memset(tmp, 0, sizeof(tmp));
+ silc_dlist_del(stream->sc->inbufs, inbuf);
+ stream->inbuf = inbuf;
return;
}
/* Check MAC of the packet */
- if (!silc_packet_check_mac(hmac, stream->inbuf.data,
- paddedlen + ivlen,
- stream->inbuf.data + ivlen + paddedlen,
- packet_seq, stream->receive_psn)) {
+ if (silc_unlikely(!silc_packet_check_mac(hmac, inbuf->data,
+ paddedlen + ivlen,
+ inbuf->data + ivlen +
+ paddedlen, packet_seq,
+ stream->receive_psn))) {
silc_mutex_unlock(stream->lock);
SILC_PACKET_CALLBACK_ERROR(stream, SILC_PACKET_ERR_MAC_FAILED);
silc_mutex_lock(stream->lock);
memset(tmp, 0, sizeof(tmp));
- silc_buffer_reset(&stream->inbuf);
- return;
+ goto out;
}
/* Get packet */
- packet = silc_packet_alloc(stream->engine);
- if (!packet) {
+ packet = silc_packet_alloc(stream->sc->engine);
+ if (silc_unlikely(!packet)) {
silc_mutex_unlock(stream->lock);
SILC_PACKET_CALLBACK_ERROR(stream, SILC_PACKET_ERR_NO_MEMORY);
silc_mutex_lock(stream->lock);
memset(tmp, 0, sizeof(tmp));
- silc_buffer_reset(&stream->inbuf);
- return;
+ goto out;
}
packet->stream = stream;
/* Allocate more space to packet buffer, if needed */
- if (silc_buffer_truelen(&packet->buffer) < paddedlen) {
+ if (silc_unlikely(silc_buffer_truelen(&packet->buffer) < paddedlen)) {
if (!silc_buffer_realloc(&packet->buffer,
silc_buffer_truelen(&packet->buffer) +
(paddedlen -
silc_mutex_lock(stream->lock);
silc_packet_free(packet);
memset(tmp, 0, sizeof(tmp));
- silc_buffer_reset(&stream->inbuf);
- return;
+ goto out;
}
}
packet->flags = (SilcPacketFlags)header[2];
packet->type = (SilcPacketType)header[3];
- if (stream->engine->local_is_router) {
+ if (stream->sc->engine->local_is_router) {
if (packet->type == SILC_PACKET_PRIVATE_MESSAGE &&
(packet->flags & SILC_PACKET_FLAG_PRIVMSG_KEY))
normal = FALSE;
SILC_LOG_HEXDUMP(("Incoming packet (%d) len %d",
stream->receive_psn, paddedlen + ivlen + mac_len),
- stream->inbuf.data, paddedlen + ivlen + mac_len);
+ inbuf->data, paddedlen + ivlen + mac_len);
/* Put the decrypted part, and rest of the encrypted data, and decrypt */
silc_buffer_pull_tail(&packet->buffer, paddedlen);
silc_buffer_put(&packet->buffer, header, block_len - psnlen);
silc_buffer_pull(&packet->buffer, block_len - psnlen);
- silc_buffer_put(&packet->buffer, (stream->inbuf.data + ivlen +
+ silc_buffer_put(&packet->buffer, (inbuf->data + ivlen +
psnlen + (block_len - psnlen)),
paddedlen - ivlen - psnlen - (block_len - psnlen));
- if (cipher) {
+ if (silc_likely(cipher)) {
silc_cipher_set_iv(cipher, iv);
ret = silc_packet_decrypt(cipher, hmac, stream->receive_psn,
&packet->buffer, normal);
- if (ret < 0) {
+ if (silc_unlikely(ret < 0)) {
silc_mutex_unlock(stream->lock);
SILC_PACKET_CALLBACK_ERROR(stream, SILC_PACKET_ERR_DECRYPTION_FAILED);
silc_mutex_lock(stream->lock);
silc_packet_free(packet);
memset(tmp, 0, sizeof(tmp));
- return;
+ goto out;
}
stream->receive_psn++;
silc_buffer_push(&packet->buffer, block_len);
/* Pull the packet from inbuf thus we'll get the next one in the inbuf. */
- silc_buffer_pull(&stream->inbuf, paddedlen + mac_len);
+ silc_buffer_pull(inbuf, paddedlen + mac_len);
/* Parse the packet */
- if (!silc_packet_parse(packet)) {
+ if (silc_unlikely(!silc_packet_parse(packet))) {
silc_mutex_unlock(stream->lock);
SILC_PACKET_CALLBACK_ERROR(stream, SILC_PACKET_ERR_MALFORMED);
silc_mutex_lock(stream->lock);
silc_packet_free(packet);
memset(tmp, 0, sizeof(tmp));
- return;
+ goto out;
}
/* Dispatch the packet to application */
- silc_packet_dispatch(packet);
+ if (!silc_packet_dispatch(packet))
+ break;
}
- silc_buffer_reset(&stream->inbuf);
-}
+ out:
+ /* Add inbuf back to free list, if we owned it. */
+ if (stream->inbuf) {
+ silc_dlist_add(stream->sc->inbufs, inbuf);
+ stream->inbuf = NULL;
+ }
+ silc_buffer_reset(inbuf);
+}
/****************************** Packet Waiting ******************************/
/* Signal the waiting thread for a new packet */
silc_mutex_lock(pw->wait_lock);
- if (pw->stopped) {
+ if (silc_unlikely(pw->stopped)) {
silc_mutex_unlock(pw->wait_lock);
return FALSE;
}
/* Wait here until packet has arrived */
while (silc_list_count(pw->packet_queue) == 0) {
- if (pw->stopped) {
+ if (silc_unlikely(pw->stopped)) {
silc_mutex_unlock(pw->wait_lock);
return -1;
}
return ret == TRUE ? 1 : 0;
}
+
+/************************** Packet Stream Wrapper ***************************/
+
+/* Packet stream wrapper receive callback */
+static SilcBool
+silc_packet_wrap_packet_receive(SilcPacketEngine engine,
+ SilcPacketStream stream,
+ SilcPacket packet,
+ void *callback_context,
+ void *stream_context);
+
+const SilcStreamOps silc_packet_stream_ops;
+
+/* Packet stream wrapper context */
+typedef struct {
+ const SilcStreamOps *ops;
+ SilcPacketStream stream;
+ SilcMutex lock;
+ void *waiter; /* Waiter context in blocking mode */
+ SilcPacketWrapCoder coder;
+ void *coder_context;
+ SilcBuffer encbuf;
+ SilcStreamNotifier callback;
+ void *context;
+ SilcList in_queue;
+ SilcPacketType type;
+ SilcPacketFlags flags;
+ unsigned int closed : 1;
+ unsigned int blocking : 1;
+ unsigned int read_more : 1;
+} *SilcPacketWrapperStream;
+
+/* Packet wrapper callbacks */
+static SilcPacketCallbacks silc_packet_wrap_cbs =
+{
+ silc_packet_wrap_packet_receive, NULL, NULL
+};
+
+/* Packet stream wrapper receive callback, non-blocking mode */
+
+static SilcBool
+silc_packet_wrap_packet_receive(SilcPacketEngine engine,
+ SilcPacketStream stream,
+ SilcPacket packet,
+ void *callback_context,
+ void *stream_context)
+{
+ SilcPacketWrapperStream pws = callback_context;
+
+ if (pws->closed || !pws->callback)
+ return FALSE;
+
+ silc_mutex_lock(pws->lock);
+ silc_list_add(pws->in_queue, packet);
+ silc_mutex_unlock(pws->lock);
+
+ /* Call notifier callback */
+ pws->callback((SilcStream)pws, SILC_STREAM_CAN_READ, pws->context);
+
+ return TRUE;
+}
+
+/* Task callback to notify more data is available for reading */
+
+SILC_TASK_CALLBACK(silc_packet_wrap_read_more)
+{
+ SilcPacketWrapperStream pws = context;
+
+ if (pws->closed || !pws->callback)
+ return;
+
+ /* Call notifier callback */
+ pws->callback((SilcStream)pws, SILC_STREAM_CAN_READ, pws->context);
+}
+
+/* Read SILC packet */
+
+int silc_packet_wrap_read(SilcStream stream, unsigned char *buf,
+ SilcUInt32 buf_len)
+{
+ SilcPacketWrapperStream pws = stream;
+ SilcPacket packet;
+ SilcBool read_more = FALSE;
+ int len;
+
+ if (pws->closed)
+ return -2;
+
+ if (pws->blocking) {
+ /* Block until packet is received */
+ if ((silc_packet_wait(pws->waiter, 0, &packet)) < 0)
+ return -2;
+ if (pws->closed)
+ return -2;
+ } else {
+ /* Non-blocking mode */
+ silc_mutex_lock(pws->lock);
+ if (!silc_list_count(pws->in_queue)) {
+ silc_mutex_unlock(pws->lock);
+ return -1;
+ }
+
+ silc_list_start(pws->in_queue);
+ packet = silc_list_get(pws->in_queue);
+ silc_list_del(pws->in_queue, packet);
+ silc_mutex_unlock(pws->lock);
+ }
+
+ /* Call decoder if set */
+ if (pws->coder && !pws->read_more)
+ pws->coder(stream, SILC_STREAM_CAN_READ, &packet->buffer,
+ pws->coder_context);
+
+ len = silc_buffer_len(&packet->buffer);
+ if (len > buf_len) {
+ len = buf_len;
+ read_more = TRUE;
+ }
+
+ /* Read data */
+ memcpy(buf, packet->buffer.data, len);
+
+ if (read_more && !pws->blocking) {
+ /* More data will be available (in blocking mode not supported). */
+ silc_buffer_pull(&packet->buffer, len);
+ silc_list_insert(pws->in_queue, NULL, packet);
+ silc_schedule_task_add_timeout(pws->stream->sc->schedule,
+ silc_packet_wrap_read_more, pws, 0, 0);
+ pws->read_more = TRUE;
+ return len;
+ }
+
+ pws->read_more = FALSE;
+ silc_packet_free(packet);
+ return len;
+}
+
+/* Write SILC packet */
+
+int silc_packet_wrap_write(SilcStream stream, const unsigned char *data,
+ SilcUInt32 data_len)
+{
+ SilcPacketWrapperStream pws = stream;
+ SilcBool ret = FALSE;
+
+ /* Call decoder if set */
+ if (pws->coder) {
+ silc_buffer_reset(pws->encbuf);
+ ret = pws->coder(stream, SILC_STREAM_CAN_WRITE, pws->encbuf,
+ pws->coder_context);
+ }
+
+ /* Send the SILC packet */
+ if (ret) {
+ if (!silc_packet_send_va(pws->stream, pws->type, pws->flags,
+ SILC_STR_DATA(silc_buffer_data(pws->encbuf),
+ silc_buffer_len(pws->encbuf)),
+ SILC_STR_DATA(data, data_len),
+ SILC_STR_END))
+ return -2;
+ } else {
+ if (!silc_packet_send(pws->stream, pws->type, pws->flags, data, data_len))
+ return -2;
+ }
+
+ return data_len;
+}
+
+/* Close stream */
+
+SilcBool silc_packet_wrap_close(SilcStream stream)
+{
+ SilcPacketWrapperStream pws = stream;
+
+ if (pws->closed)
+ return TRUE;
+
+ if (pws->blocking) {
+ /* Close packet waiter */
+ silc_packet_wait_uninit(pws->waiter, pws->stream);
+ } else {
+ /* Unlink */
+ if (pws->callback)
+ silc_packet_stream_unlink(pws->stream, &silc_packet_wrap_cbs, pws);
+ }
+ pws->closed = TRUE;
+
+ return TRUE;
+}
+
+/* Destroy wrapper stream */
+
+void silc_packet_wrap_destroy(SilcStream stream)
+
+{
+ SilcPacketWrapperStream pws = stream;
+ SilcPacket packet;
+
+ SILC_LOG_DEBUG(("Destroying wrapped packet stream %p", pws));
+
+ silc_stream_close(stream);
+ silc_list_start(pws->in_queue);
+ while ((packet = silc_list_get(pws->in_queue)))
+ silc_packet_free(packet);
+ if (pws->lock)
+ silc_mutex_free(pws->lock);
+ if (pws->encbuf)
+ silc_buffer_free(pws->encbuf);
+ silc_packet_stream_unref(pws->stream);
+
+ silc_free(pws);
+}
+
+/* Link stream to receive packets */
+
+SilcBool silc_packet_wrap_notifier(SilcStream stream,
+ SilcSchedule schedule,
+ SilcStreamNotifier callback,
+ void *context)
+{
+ SilcPacketWrapperStream pws = stream;
+
+ if (pws->closed || pws->blocking)
+ return FALSE;
+
+ /* Link to receive packets */
+ if (callback)
+ silc_packet_stream_link(pws->stream, &silc_packet_wrap_cbs, pws,
+ 100000, pws->type, -1);
+ else
+ silc_packet_stream_unlink(pws->stream, &silc_packet_wrap_cbs, pws);
+
+ pws->callback = callback;
+ pws->context = context;
+
+ return TRUE;
+}
+
+/* Return schedule */
+
+SilcSchedule silc_packet_wrap_get_schedule(SilcStream stream)
+{
+ return NULL;
+}
+
+/* Wraps packet stream into SilcStream. */
+
+SilcStream silc_packet_stream_wrap(SilcPacketStream stream,
+ SilcPacketType type,
+ SilcPacketFlags flags,
+ SilcBool blocking_mode,
+ SilcPacketWrapCoder coder,
+ void *context)
+{
+ SilcPacketWrapperStream pws;
+
+ pws = silc_calloc(1, sizeof(*pws));
+ if (!pws)
+ return NULL;
+
+ SILC_LOG_DEBUG(("Wrapping packet stream %p to stream %p", stream, pws));
+
+ pws->ops = &silc_packet_stream_ops;
+ pws->stream = stream;
+ pws->type = type;
+ pws->flags = flags;
+ pws->blocking = blocking_mode;
+ pws->coder = coder;
+ pws->coder_context = context;
+
+ /* Allocate small amount for encoder buffer. */
+ if (pws->coder)
+ pws->encbuf = silc_buffer_alloc(8);
+
+ if (pws->blocking) {
+ /* Blocking mode. Use packet waiter to do the thing. */
+ pws->waiter = silc_packet_wait_init(pws->stream, pws->type, -1);
+ if (!pws->waiter) {
+ silc_free(pws);
+ return NULL;
+ }
+ } else {
+ /* Non-blocking mode */
+ silc_mutex_alloc(&pws->lock);
+ silc_list_init(pws->in_queue, struct SilcPacketStruct, next);
+ }
+
+ silc_packet_stream_ref(stream);
+
+ return (SilcStream)pws;
+}
+
+const SilcStreamOps silc_packet_stream_ops =
+{
+ silc_packet_wrap_read,
+ silc_packet_wrap_write,
+ silc_packet_wrap_close,
+ silc_packet_wrap_destroy,
+ silc_packet_wrap_notifier,
+ silc_packet_wrap_get_schedule,
+};
projects / silc.git / blobdiff