Author: Pekka Riikonen <priikone@silcnet.org>
- Copyright (C) 1997 - 2008 Pekka Riikonen
+ Copyright (C) 1997 - 2014 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
(s)->stream_context); \
} while(0)
-static SilcBool silc_packet_dispatch(SilcPacket packet);
+static SilcBool silc_packet_dispatch(SilcPacket packet,
+ SilcPacketReceiveCb ignore_handler);
static void silc_packet_read_process(SilcPacketStream stream);
static inline SilcBool silc_packet_send_raw(SilcPacketStream stream,
SilcPacketType type,
silc_mutex_lock(stream->lock);
if (!stream->destroyed)
- silc_packet_dispatch(packet);
+ silc_packet_dispatch(packet, NULL);
silc_mutex_unlock(stream->lock);
silc_packet_stream_unref(stream);
}
/* Initialize packet procesors list */
ps->process = silc_dlist_init();
if (!ps->process) {
+ ps->stream = NULL;
silc_packet_stream_destroy(ps);
return NULL;
}
ps->sc = silc_calloc(1, sizeof(*ps->sc));
if (!ps->sc) {
silc_mutex_unlock(engine->lock);
+ ps->stream = NULL;
silc_packet_stream_destroy(ps);
return NULL;
}
silc_free(ps->sc);
ps->sc = NULL;
silc_mutex_unlock(engine->lock);
+ ps->stream = NULL;
silc_packet_stream_destroy(ps);
return NULL;
}
silc_free(ps->sc);
ps->sc = NULL;
silc_mutex_unlock(engine->lock);
+ ps->stream = NULL;
silc_packet_stream_destroy(ps);
return NULL;
}
silc_free(ps->sc);
ps->sc = NULL;
silc_mutex_unlock(engine->lock);
+ ps->stream = NULL;
silc_packet_stream_destroy(ps);
return NULL;
}
if (!silc_stream_set_notifier(ps->stream, schedule,
silc_packet_stream_io, ps)) {
SILC_LOG_DEBUG(("Cannot set stream notifier for packet stream"));
+ ps->stream = NULL;
silc_packet_stream_destroy(ps);
return NULL;
}
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);
+ silc_packet_stream_inject(ps, packet);
}
return ps;
}
+/* Inject packet to packet stream */
+
+SilcBool silc_packet_stream_inject(SilcPacketStream stream,
+ SilcPacket packet)
+{
+ packet->stream = stream;
+ silc_packet_stream_ref(stream);
+ return !!silc_schedule_task_add_timeout(
+ silc_stream_get_schedule(stream->stream),
+ silc_packet_stream_inject_packet, packet,
+ 0, 0);
+}
+
/* Destroy packet stream */
void silc_packet_stream_destroy(SilcPacketStream stream)
/* Get packet pointer from the outgoing buffer */
if (silc_unlikely(!silc_packet_send_prepare(stream, truelen + padlen + ivlen
+ psnlen, hmac, &packet))) {
+ SILC_LOG_ERROR(("Error preparing for packet sending"));
silc_mutex_unlock(stream->lock);
return FALSE;
}
SILC_STR_DATA(data, data_len),
SILC_STR_END);
if (silc_unlikely(i < 0)) {
+ SILC_LOG_ERROR(("Error encoding outgoing packet"));
silc_mutex_unlock(stream->lock);
return FALSE;
}
silc_buffer_purge(&buf);
va_end(va);
- return TRUE;
+ return ret;
}
/***************************** Packet Receiving *****************************/
SILC_LOG_HEXDUMP(("Counter Block"), iv, 16);
}
+/* Return special packet's encrypted length */
+
+static inline int silc_packet_special_len(unsigned char *data)
+{
+ return (((SilcUInt8)data[4] + (SilcUInt8)data[6] +
+ (SilcUInt8)data[7] + SILC_PACKET_HEADER_LEN));
+}
+
/* 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. */
/* Padding length + src id len + dst id len + header length - 16
bytes already decrypted, gives the rest of the encrypted packet */
silc_buffer_push(buffer, block_len);
- len = (((SilcUInt8)buffer->data[4] + (SilcUInt8)buffer->data[6] +
- (SilcUInt8)buffer->data[7] + SILC_PACKET_HEADER_LEN) -
- block_len);
+ len = silc_packet_special_len(buffer->data) - block_len;
silc_buffer_pull(buffer, block_len);
if (silc_unlikely(len > silc_buffer_len(buffer))) {
/* Dispatch packet to application. Called with stream->lock locked.
Returns FALSE if the stream was destroyed while dispatching a packet. */
-static SilcBool silc_packet_dispatch(SilcPacket packet)
+static SilcBool silc_packet_dispatch(SilcPacket packet,
+ SilcPacketReceiveCb ignore_handler)
{
SilcPacketStream stream = packet->stream;
SilcPacketProcess p;
} else {
/* Send specific types */
for (pt = p->types; *pt; pt++) {
- if (*pt != packet->type)
+ if (*pt != packet->type ||
+ ignore_handler == p->callbacks->packet_receive)
continue;
SILC_LOG_DEBUG(("Dispatching packet to %p callbacks", p->callbacks));
silc_mutex_unlock(stream->lock);
SilcCipher cipher;
SilcHmac hmac;
SilcPacket packet;
- SilcUInt8 sid;
+ SilcUInt8 sid, flags, type;
SilcUInt16 packetlen;
SilcUInt32 paddedlen, mac_len, block_len, ivlen, psnlen;
unsigned char tmp[SILC_PACKET_MIN_HEADER_LEN], *header;
/* Get packet length and full packet length with padding */
SILC_PACKET_LENGTH(header, packetlen, paddedlen);
+ /* Parse packet header */
+ flags = (SilcPacketFlags)header[2];
+ type = (SilcPacketType)header[3];
+
+ if (stream->sc->engine->local_is_router) {
+ if (type == SILC_PACKET_PRIVATE_MESSAGE &&
+ (flags & SILC_PACKET_FLAG_PRIVMSG_KEY))
+ normal = FALSE;
+ else if (type != SILC_PACKET_CHANNEL_MESSAGE ||
+ (type == SILC_PACKET_CHANNEL_MESSAGE &&
+ stream->is_router == TRUE))
+ normal = TRUE;
+ } else {
+ if (type == SILC_PACKET_PRIVATE_MESSAGE &&
+ (flags & SILC_PACKET_FLAG_PRIVMSG_KEY))
+ normal = FALSE;
+ else if (type != SILC_PACKET_CHANNEL_MESSAGE)
+ normal = TRUE;
+ }
+
/* Padding sanity checks */
- if (cipher && (paddedlen % block_len) != 0) {
+ if (cipher && silc_cipher_get_mode(cipher) != SILC_CIPHER_MODE_CTR &&
+ ((normal && block_len && paddedlen % block_len != 0) ||
+ (!normal && block_len &&
+ silc_packet_special_len(header) % block_len != 0))) {
SILC_LOG_DEBUG(("Packet length %d not multiple by cipher block length",
paddedlen));
silc_mutex_unlock(stream->lock);
}
if (silc_buffer_len(inbuf) < paddedlen + ivlen + mac_len) {
- SILC_LOG_DEBUG(("Received partial packet, waiting for the rest "
- "(%d bytes)",
+ SILC_LOG_DEBUG(("Received partial packet (%d %s flags:%x normal:%d "
+ "len:%u paddedlen:%u), waiting for the rest (%d bytes)",
+ type, silc_get_packet_name(type), flags,
+ normal, packetlen, paddedlen,
paddedlen + mac_len - silc_buffer_len(inbuf)));
memset(tmp, 0, sizeof(tmp));
silc_dlist_del(stream->sc->inbufs, inbuf);
goto out;
}
packet->stream = stream;
+ packet->flags = flags;
+ packet->type = type;
/* Allocate more space to packet buffer, if needed */
if (silc_unlikely(silc_buffer_truelen(&packet->buffer) < paddedlen)) {
}
}
- /* Parse packet header */
- packet->flags = (SilcPacketFlags)header[2];
- packet->type = (SilcPacketType)header[3];
-
- if (stream->sc->engine->local_is_router) {
- if (packet->type == SILC_PACKET_PRIVATE_MESSAGE &&
- (packet->flags & SILC_PACKET_FLAG_PRIVMSG_KEY))
- normal = FALSE;
- else if (packet->type != SILC_PACKET_CHANNEL_MESSAGE ||
- (packet->type == SILC_PACKET_CHANNEL_MESSAGE &&
- stream->is_router == TRUE))
- normal = TRUE;
- } else {
- if (packet->type == SILC_PACKET_PRIVATE_MESSAGE &&
- (packet->flags & SILC_PACKET_FLAG_PRIVMSG_KEY))
- normal = FALSE;
- else if (packet->type != SILC_PACKET_CHANNEL_MESSAGE)
- normal = TRUE;
- }
-
SILC_LOG_HEXDUMP(("Incoming packet (%d) len %d",
stream->receive_psn, paddedlen + ivlen + mac_len),
inbuf->data, paddedlen + ivlen + mac_len);
}
/* Dispatch the packet to application */
- if (!silc_packet_dispatch(packet))
+ if (!silc_packet_dispatch(packet, NULL))
break;
}
SilcList in_queue;
SilcPacketType type;
SilcPacketFlags flags;
+ void *src_id;
+ void *dst_id;
+ SilcIdType src_id_type;
+ SilcIdType dst_id_type;
unsigned int closed : 1;
unsigned int blocking : 1;
unsigned int read_more : 1;
void *stream_context)
{
SilcPacketWrapperStream pws = callback_context;
+ SilcID id;
if (pws->closed || !pws->callback)
return FALSE;
+ /* If dst_id was set, the incoming packet must use that id as its
+ source id. This will not work if the id is channel id because
+ the source is never the channel id, but will work with other ids. */
+ if ((pws->dst_id && pws->dst_id_type != SILC_ID_CHANNEL)) {
+ silc_id_str2id2(packet->src_id, packet->src_id_len,
+ packet->src_id_type, &id);
+ if (!SILC_ID_COMPARE_TYPE(pws->dst_id, SILC_ID_GET_ID(id),
+ packet->src_id_len)) {
+ SILC_LOG_DEBUG(("Packet is not from wanted sender"));
+ return FALSE;
+ }
+ }
+
silc_mutex_lock(pws->lock);
silc_list_add(pws->in_queue, packet);
silc_mutex_unlock(pws->lock);
{
SilcPacketWrapperStream pws = stream;
SilcPacket packet;
- SilcBool read_more = FALSE;
+ SilcBool read_more = FALSE, ret = TRUE;
int len;
if (pws->closed)
/* Call decoder if set */
if (pws->coder && !pws->read_more)
- pws->coder(stream, SILC_STREAM_CAN_READ, &packet->buffer,
- pws->coder_context);
+ ret = pws->coder(stream, SILC_STREAM_CAN_READ, &packet->buffer,
+ pws->coder_context);
+
+ if (!ret) {
+ /* If error occurred during decoding (or handler doesn't want this
+ packet), we'll reprocess this packet and try to give it to some
+ other handler that may want it. For this stream nothing was
+ received. */
+ silc_packet_dispatch(packet, silc_packet_wrap_packet_receive);
+ return -1;
+ }
len = silc_buffer_len(&packet->buffer);
if (len > buf_len) {
SilcUInt32 data_len)
{
SilcPacketWrapperStream pws = stream;
- SilcBool ret = FALSE;
+ SilcBool ret = TRUE;
- /* Call encoder if set */
- if (pws->coder) {
- silc_buffer_reset(pws->encbuf);
- ret = pws->coder(stream, SILC_STREAM_CAN_WRITE, pws->encbuf,
- pws->coder_context);
+ if (!pws->coder) {
+ if (!silc_packet_send_ext(pws->stream, pws->type, pws->flags,
+ pws->src_id_type, pws->src_id,
+ pws->dst_id_type, pws->dst_id,
+ data, data_len, NULL, NULL))
+ return -2;
+ return data_len;
}
+ silc_buffer_reset(pws->encbuf);
+ if (!silc_buffer_enlarge(pws->encbuf, data_len + 16))
+ return -2;
+ silc_buffer_pull(pws->encbuf, 16); /* Room for adding headers */
+ silc_buffer_put(pws->encbuf, data, data_len);
+
+ 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))
+ if (!silc_packet_send_ext(pws->stream, pws->type, pws->flags,
+ pws->src_id_type, pws->src_id,
+ pws->dst_id_type, pws->dst_id,
+ silc_buffer_datalen(pws->encbuf),
+ NULL, NULL))
return -2;
+ return data_len;
}
- return data_len;
+ /* Error */
+ return -2;
}
/* Close stream */
SilcSchedule silc_packet_wrap_get_schedule(SilcStream stream)
{
- return NULL;
+ SilcPacketWrapperStream pws = stream;
+ return silc_stream_get_schedule(pws->stream->stream);
}
/* Wraps packet stream into SilcStream. */
SilcPacketType type,
SilcPacketFlags flags,
SilcBool blocking_mode,
+ SilcIdType src_id_type, void *src_id,
+ SilcIdType dst_id_type, void *dst_id,
SilcPacketWrapCoder coder,
void *context)
{
pws->coder = coder;
pws->coder_context = context;
+ if (src_id) {
+ pws->src_id = silc_id_dup(src_id, src_id_type);
+ if (!pws->src_id) {
+ silc_free(pws);
+ return NULL;
+ }
+ pws->src_id_type = src_id_type;
+ }
+
+ if (dst_id) {
+ pws->dst_id = silc_id_dup(dst_id, dst_id_type);
+ if (!pws->dst_id) {
+ silc_free(pws);
+ return NULL;
+ }
+ pws->dst_id_type = dst_id_type;
+ }
+
/* Allocate small amount for encoder buffer. */
if (pws->coder)
pws->encbuf = silc_buffer_alloc(8);