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;
};
-/* Packet procesor context */
+/* Packet processor context */
typedef struct SilcPacketProcessStruct {
SilcInt32 priority; /* Priority */
SilcPacketType *types; /* Packets to process */
void *callback_context;
} *SilcPacketProcess;
+/* UDP remote stream tuple */
+typedef struct {
+ char *remote_ip; /* Remote IP address */
+ SilcUInt16 remote_port; /* Remote port */
+} *SilcPacketRemoteUDP;
+
/* Packet stream */
struct SilcPacketStreamStruct {
struct SilcPacketStreamStruct *next;
SilcPacketEngine engine; /* Packet engine */
SilcStream stream; /* Underlaying stream */
SilcMutex lock; /* Stream lock */
- SilcDList process; /* Packet processors, it set */
- SilcHashTable streamers; /* Valid if streamers exist */
+ 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 */
- SilcUInt32 send_psn; /* Sending sequence */
- SilcCipher send_key; /* Sending key */
- SilcHmac send_hmac; /* Sending HMAC */
- SilcUInt32 receive_psn; /* Receiving sequence */
- SilcCipher receive_key; /* Receiving key */
- SilcHmac receive_hmac; /* Receiving HMAC */
+ SilcCipher send_key[2]; /* Sending key */
+ SilcHmac send_hmac[2]; /* Sending HMAC */
+ SilcCipher receive_key[2]; /* Receiving key */
+ SilcHmac receive_hmac[2]; /* Receiving HMAC */
unsigned char *src_id; /* Source ID */
unsigned char *dst_id; /* Destination ID */
+ SilcUInt32 send_psn; /* Sending sequence */
+ SilcUInt32 receive_psn; /* Receiving sequence */
+ SilcAtomic8 refcnt; /* Reference counter */
+ SilcUInt8 sid; /* Security ID, set if IV included */
unsigned int src_id_len : 6;
unsigned int src_id_type : 2;
unsigned int dst_id_len : 6;
unsigned int dst_id_type : 2;
- SilcUInt8 refcnt; /* Reference counter */
unsigned int is_router : 1; /* Set if router stream */
unsigned int destroyed : 1; /* Set if destroyed */
+ unsigned int iv_included : 1; /* Set if IV included */
+ unsigned int udp : 1; /* UDP remote stream */
};
/* Initial size of stream buffers */
/* Header length without source and destination ID's. */
#define SILC_PACKET_HEADER_LEN 10
-/* Minimum length of SILC Packet Header. This much is decrypted always
- when packet is received to be able to get all the relevant data out
- from the header. */
+/* Minimum length of SILC Packet Header. */
#define SILC_PACKET_MIN_HEADER_LEN 16
+#define SILC_PACKET_MIN_HEADER_LEN_IV 32 + 1
/* Maximum padding length */
#define SILC_PACKET_MAX_PADLEN 128
/* Minimum packet length */
#define SILC_PACKET_MIN_LEN (SILC_PACKET_HEADER_LEN + 1)
-
-/* Macros */
-
/* Returns true length of the packet. */
#define SILC_PACKET_LENGTH(__packetdata, __ret_truelen, __ret_paddedlen) \
do { \
(s)->stream_context); \
} while(0)
+static void silc_packet_dispatch(SilcPacket packet);
+static void silc_packet_read_process(SilcPacketStream stream);
/************************ Static utility functions **************************/
-static void silc_packet_read_process(SilcPacketStream stream);
+/* Injects packet to new stream created with silc_packet_stream_add_remote. */
-/* Our stream IO notifier callback. */
+SILC_TASK_CALLBACK(silc_packet_stream_inject_packet)
+{
+ SilcPacket packet = context;
+ SilcPacketStream stream = packet->stream;
-static void silc_packet_stream_io(SilcStream stream, SilcStreamStatus status,
- void *context)
+ SILC_LOG_DEBUG(("Injecting packet %p to stream %p", packet, packet->stream));
+
+ silc_mutex_lock(stream->lock);
+ silc_packet_dispatch(packet);
+ silc_mutex_unlock(stream->lock);
+}
+
+/* Write data to the stream. Must be called with ps->lock locked. Unlocks
+ the lock inside this function. */
+
+static inline SilcBool silc_packet_stream_write(SilcPacketStream ps)
{
- SilcPacketStream ps = context;
- int ret;
+ SilcStream stream;
+ SilcBool connected;
+ int i;
- silc_mutex_lock(ps->lock);
+ if (ps->udp)
+ stream = ((SilcPacketStream)ps->stream)->stream;
+ else
+ stream = ps->stream;
+
+ if (ps->udp && silc_socket_stream_is_udp(stream, &connected)) {
+ if (!connected) {
+ /* Connectionless UDP stream */
+ while (silc_buffer_len(&ps->outbuf) > 0) {
+ 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) {
+ /* Error */
+ silc_buffer_reset(&ps->outbuf);
+ silc_mutex_unlock(ps->lock);
+ SILC_PACKET_CALLBACK_ERROR(ps, SILC_PACKET_ERR_WRITE);
+ return FALSE;
+ }
- if (ps->destroyed) {
- silc_mutex_unlock(ps->lock);
- return;
+ if (i == -1) {
+ /* Cannot write now, write later. */
+ silc_mutex_unlock(ps->lock);
+ return TRUE;
+ }
+
+ /* Wrote data */
+ silc_buffer_pull(&ps->outbuf, i);
+ }
+
+ silc_buffer_reset(&ps->outbuf);
+ silc_mutex_unlock(ps->lock);
+
+ return TRUE;
+ }
}
- switch (status) {
+ /* Write the data to the stream */
+ while (silc_buffer_len(&ps->outbuf) > 0) {
+ i = silc_stream_write(stream, ps->outbuf.data,
+ silc_buffer_len(&ps->outbuf));
+ if (i == 0) {
+ /* EOS */
+ silc_buffer_reset(&ps->outbuf);
+ silc_mutex_unlock(ps->lock);
+ SILC_PACKET_CALLBACK_EOS(ps);
+ return FALSE;
+ }
- case SILC_STREAM_CAN_WRITE:
- if (!silc_buffer_headlen(&ps->outbuf)) {
+ if (i == -2) {
+ /* Error */
+ silc_buffer_reset(&ps->outbuf);
silc_mutex_unlock(ps->lock);
- return;
+ SILC_PACKET_CALLBACK_ERROR(ps, SILC_PACKET_ERR_WRITE);
+ return FALSE;
}
- SILC_LOG_DEBUG(("Writing pending data to stream"));
+ if (i == -1) {
+ /* Cannot write now, write later. */
+ silc_mutex_unlock(ps->lock);
+ return TRUE;
+ }
- /* Write pending data to stream */
- while (silc_buffer_len(&ps->outbuf) > 0) {
- ret = silc_stream_write(ps->stream, ps->outbuf.data,
- silc_buffer_len(&ps->outbuf));
- if (ret == 0) {
- /* EOS */
- silc_buffer_reset(&ps->outbuf);
- silc_mutex_unlock(ps->lock);
- SILC_PACKET_CALLBACK_EOS(ps);
- return;
- }
+ /* Wrote data */
+ silc_buffer_pull(&ps->outbuf, i);
+ }
+
+ silc_buffer_reset(&ps->outbuf);
+ silc_mutex_unlock(ps->lock);
+
+ return TRUE;
+}
+
+/* Reads data from stream. Must be called with the 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
+ the sender of the packet. */
+
+static inline SilcBool silc_packet_stream_read(SilcPacketStream ps,
+ SilcPacketStream *ret_ps)
+{
+ SilcStream stream;
+ 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;
+ }
+
+ if (silc_socket_stream_is_udp(stream, &connected)) {
+ if (!connected) {
+ /* Connectionless UDP stream, read one UDP packet */
+ char remote_ip[64], tuple[64];
+ int remote_port;
+ 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->outbuf);
+ silc_buffer_reset(&ps->inbuf);
silc_mutex_unlock(ps->lock);
- SILC_PACKET_CALLBACK_ERROR(ps, SILC_PACKET_ERR_WRITE);
- return;
+ SILC_PACKET_CALLBACK_ERROR(ps, SILC_PACKET_ERR_READ);
+ return FALSE;
}
if (ret == -1) {
- /* Cannot write now, write later. */
+ /* Cannot read now, do it later. */
+ silc_buffer_pull(&ps->inbuf, silc_buffer_len(&ps->inbuf));
silc_mutex_unlock(ps->lock);
- return;
+ 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,
+ (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_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);
+
+ /* Unknown sender */
+ if (!ps->remote_udp) {
+ ps->remote_udp = silc_calloc(1, sizeof(*ps->remote_udp));
+ if (!ps->remote_udp) {
+ silc_mutex_unlock(ps->lock);
+ SILC_PACKET_CALLBACK_ERROR(ps, SILC_PACKET_ERR_NO_MEMORY);
+ return FALSE;
+ }
}
- /* Wrote data */
- silc_buffer_pull(&ps->outbuf, ret);
+ /* Save sender IP and port */
+ silc_free(ps->remote_udp->remote_ip);
+ ps->remote_udp->remote_ip = strdup(remote_ip);
+ ps->remote_udp->remote_port = remote_port;
+
+ silc_buffer_pull_tail(&ps->inbuf, ret);
+ return TRUE;
}
+ }
- silc_buffer_reset(&ps->outbuf);
+ /* 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);
silc_mutex_unlock(ps->lock);
- break;
+ SILC_PACKET_CALLBACK_EOS(ps);
+ return FALSE;
+ }
- case SILC_STREAM_CAN_READ:
- /* Packet receiving can only happen in one thread for one SilcPacketStream,
- so locking is not required in packet receiving procedure. */
+ 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;
+ }
- SILC_LOG_DEBUG(("Reading data from stream"));
+ 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;
+ }
- /* 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))
- return;
+ silc_buffer_pull_tail(&ps->inbuf, ret);
+ return TRUE;
+}
- /* Read data from stream */
- ret = silc_stream_read(ps->stream, ps->inbuf.tail,
- silc_buffer_taillen(&ps->inbuf));
+/* Our stream IO notifier callback. */
- if (ret == 0) {
- /* EOS */
- silc_buffer_reset(&ps->inbuf);
- SILC_PACKET_CALLBACK_EOS(ps);
- return;
- }
+static void silc_packet_stream_io(SilcStream stream, SilcStreamStatus status,
+ void *context)
+{
+ SilcPacketStream remote = NULL, ps = context;
- if (ret == -2) {
- /* Error */
- silc_buffer_reset(&ps->inbuf);
- SILC_PACKET_CALLBACK_ERROR(ps, SILC_PACKET_ERR_READ);
- return;
- }
+ silc_mutex_lock(ps->lock);
- if (ret == -1) {
- /* Cannot read now, do it later. */
- silc_buffer_pull(&ps->inbuf, silc_buffer_len(&ps->inbuf));
+ if (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;
}
- /* Read some data */
- silc_buffer_pull_tail(&ps->inbuf, ret);
+ /* Write pending data to stream */
+ silc_packet_stream_write(ps);
+ break;
+
+ case SILC_STREAM_CAN_READ:
+ SILC_LOG_DEBUG(("Reading data from stream"));
- /* Now process the data */
- silc_packet_read_process(ps);
+ /* Read data from stream */
+ if (!silc_packet_stream_read(ps, &remote))
+ return;
+ /* Now process the data */
+ if (!remote) {
+ silc_packet_read_process(ps);
+ silc_mutex_unlock(ps->lock);
+ } else {
+ silc_packet_read_process(remote);
+ silc_mutex_unlock(remote->lock);
+ }
break;
default:
return packet;
}
+/* UDP remote stream hash table destructor */
+
+static void silc_packet_engine_hash_destr(void *key, void *context,
+ void *user_context)
+{
+ silc_free(key);
+}
+
/******************************** Packet API ********************************/
silc_list_init(engine->packet_pool, struct SilcPacketStruct, next);
for (i = 0; i < 5; i++) {
packet = silc_calloc(1, sizeof(*packet));
- if (!packet)
+ if (!packet) {
+ silc_packet_engine_stop(engine);
return NULL;
+ }
tmp = silc_malloc(SILC_PACKET_DEFAULT_SIZE);
- if (!tmp)
+ if (!tmp) {
+ silc_packet_engine_stop(engine);
return NULL;
+ }
silc_buffer_set(&packet->buffer, tmp, SILC_PACKET_DEFAULT_SIZE);
silc_buffer_reset(&packet->buffer);
ps->engine = engine;
ps->stream = stream;
- ps->refcnt++;
+ silc_atomic_init8(&ps->refcnt, 1);
+ silc_mutex_alloc(&ps->lock);
/* Allocate buffers */
tmp = silc_malloc(SILC_PACKET_DEFAULT_SIZE);
- if (!tmp)
+ if (!tmp) {
+ silc_packet_stream_destroy(ps);
return NULL;
+ }
silc_buffer_set(&ps->inbuf, tmp, SILC_PACKET_DEFAULT_SIZE);
silc_buffer_reset(&ps->inbuf);
tmp = silc_malloc(SILC_PACKET_DEFAULT_SIZE);
- if (!tmp)
+ if (!tmp) {
+ silc_packet_stream_destroy(ps);
return NULL;
+ }
silc_buffer_set(&ps->outbuf, tmp, SILC_PACKET_DEFAULT_SIZE);
silc_buffer_reset(&ps->outbuf);
/* Initialize packet procesors list */
ps->process = silc_dlist_init();
+ if (!ps->process) {
+ silc_packet_stream_destroy(ps);
+ return NULL;
+ }
/* Set IO notifier callback */
silc_stream_set_notifier(ps->stream, schedule, silc_packet_stream_io, ps);
- silc_mutex_alloc(&ps->lock);
-
/* Add to engine */
silc_mutex_lock(engine->lock);
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))
+ engine->udp_remote = silc_hash_table_alloc(0, silc_hash_string, NULL,
+ silc_hash_string_compare, NULL,
+ silc_packet_engine_hash_destr,
+ NULL, TRUE);
+
+ return ps;
+}
+
+/* Add new remote packet stream for UDP packet streams */
+
+SilcPacketStream silc_packet_stream_add_remote(SilcPacketStream stream,
+ const char *remote_ip,
+ SilcUInt16 remote_port,
+ SilcPacket packet)
+{
+ SilcPacketEngine engine = stream->engine;
+ SilcPacketStream ps;
+ char *tuple;
+ void *tmp;
+
+ SILC_LOG_DEBUG(("Adding UDP remote %s:%d to packet stream %p",
+ remote_ip, remote_port, stream));
+
+ if (!stream || !remote_ip || !remote_port)
+ return NULL;
+
+ if (!silc_socket_stream_is_udp(stream->stream, NULL)) {
+ SILC_LOG_ERROR(("Stream is not UDP stream, cannot add remote IP"));
+ return NULL;
+ }
+
+ ps = silc_calloc(1, sizeof(*ps));
+ if (!ps)
+ return NULL;
+
+ ps->engine = engine;
+ silc_atomic_init8(&ps->refcnt, 1);
+ silc_mutex_alloc(&ps->lock);
+
+ /* Set the UDP packet stream as underlaying stream */
+ silc_packet_stream_ref(stream);
+ 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);
+ tmp = silc_malloc(SILC_PACKET_DEFAULT_SIZE);
+ if (!tmp) {
+ silc_packet_stream_destroy(ps);
+ return NULL;
+ }
+ silc_buffer_set(&ps->outbuf, tmp, SILC_PACKET_DEFAULT_SIZE);
+ silc_buffer_reset(&ps->outbuf);
+
+ /* Initialize packet procesors list */
+ ps->process = silc_dlist_init();
+ if (!ps->process) {
+ silc_packet_stream_destroy(ps);
+ return NULL;
+ }
+
+ /* Add to engine with this IP and port pair */
+ tuple = silc_format("%d%s", remote_port, remote_ip);
+ silc_mutex_lock(engine->lock);
+ if (!tuple || !silc_hash_table_add(engine->udp_remote, tuple, ps)) {
+ silc_mutex_unlock(engine->lock);
+ silc_packet_stream_destroy(ps);
+ return NULL;
+ }
+ silc_mutex_unlock(engine->lock);
+
+ /* Save remote IP and port pair */
+ ps->remote_udp = silc_calloc(1, sizeof(*ps->remote_udp));
+ if (!ps->remote_udp) {
+ silc_packet_stream_destroy(ps);
+ return NULL;
+ }
+ ps->remote_udp->remote_port = remote_port;
+ ps->remote_udp->remote_ip = strdup(remote_ip);
+ if (!ps->remote_udp->remote_ip) {
+ silc_packet_stream_destroy(ps);
+ return NULL;
+ }
+
+ if (packet) {
+ /* Inject packet to the new stream */
+ packet->stream = ps;
+ silc_schedule_task_add_timeout(silc_stream_get_schedule(stream->stream),
+ silc_packet_stream_inject_packet, packet,
+ 0, 0);
+ }
+
return ps;
}
if (!stream)
return;
- if (stream->refcnt > 1) {
+ if (silc_atomic_get_int8(&stream->refcnt) > 1) {
stream->destroyed = TRUE;
return;
}
SILC_LOG_DEBUG(("Destroying packet stream %p", stream));
- /* Delete from engine */
- silc_mutex_lock(stream->engine->lock);
- silc_list_del(stream->engine->streams, stream);
- silc_mutex_unlock(stream->engine->lock);
+ 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);
+
+ /* Destroy the underlaying stream */
+ if (stream->stream)
+ silc_stream_destroy(stream->stream);
+ } else {
+ /* Delete from UDP remote hash table */
+ char tuple[64];
+ 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_free(stream->remote_udp->remote_ip);
+ silc_free(stream->remote_udp);
+
+ /* Unreference the underlaying packet stream */
+ silc_packet_stream_unref((SilcPacketStream)stream->stream);
+ }
/* Clear and free buffers */
silc_buffer_clear(&stream->inbuf);
silc_buffer_clear(&stream->outbuf);
- silc_free(silc_buffer_steal(&stream->inbuf, NULL));
- silc_free(silc_buffer_steal(&stream->outbuf, NULL));
-
- silc_dlist_uninit(stream->process);
+ silc_buffer_purge(&stream->inbuf);
+ silc_buffer_purge(&stream->outbuf);
/* XXX */
+ silc_atomic_uninit8(&stream->refcnt);
+ silc_dlist_uninit(stream->process);
+ silc_mutex_free(stream->lock);
silc_free(stream);
}
stream->is_router = TRUE;
}
+/* Mark to include IV in ciphertext */
+
+void silc_packet_stream_set_iv_included(SilcPacketStream stream)
+{
+ stream->iv_included = TRUE;
+}
/* Links `callbacks' to `stream' for specified packet types */
if (!stream->process) {
stream->process = silc_dlist_init();
- if (!stream->process)
+ if (!stream->process) {
+ silc_mutex_unlock(stream->lock);
return FALSE;
+ }
}
/* According to priority set the procesor to correct position. First
silc_packet_stream_unref(stream);
}
+/* Return packet sender IP and port for UDP packet stream */
+
+SilcBool silc_packet_get_sender(SilcPacket packet,
+ const char **sender_ip,
+ SilcUInt16 *sender_port)
+{
+ if (!packet->stream->remote_udp)
+ return FALSE;
+
+ *sender_ip = packet->stream->remote_udp->remote_ip;
+ *sender_port = packet->stream->remote_udp->remote_port;
+
+ return TRUE;
+}
+
/* Reference packet stream */
void silc_packet_stream_ref(SilcPacketStream stream)
{
- silc_mutex_lock(stream->lock);
- stream->refcnt++;
- silc_mutex_unlock(stream->lock);
+ silc_atomic_add_int8(&stream->refcnt, 1);
}
/* Unreference packet stream */
void silc_packet_stream_unref(SilcPacketStream stream)
{
- silc_mutex_lock(stream->lock);
- stream->refcnt--;
- silc_mutex_unlock(stream->lock);
- if (stream->refcnt == 0)
+ if (silc_atomic_sub_int8(&stream->refcnt, 1) == 0)
silc_packet_stream_destroy(stream);
}
void silc_packet_set_context(SilcPacketStream stream, void *stream_context)
{
+ silc_mutex_lock(stream->lock);
stream->stream_context = stream_context;
+ silc_mutex_unlock(stream->lock);
}
/* Return application context from packet stream */
void *silc_packet_get_context(SilcPacketStream stream)
{
- return stream->stream_context;
+ void *context;
+ silc_mutex_lock(stream->lock);
+ context = stream->stream_context;
+ silc_mutex_unlock(stream->lock);
+ return context;
+}
+
+/* Change underlaying stream */
+
+void silc_packet_stream_set_stream(SilcPacketStream ps,
+ SilcStream stream,
+ SilcSchedule schedule)
+{
+ if (ps->stream)
+ silc_stream_set_notifier(ps->stream, schedule, NULL, NULL);
+ ps->stream = stream;
+ silc_stream_set_notifier(ps->stream, schedule, silc_packet_stream_io, ps);
}
/* Return underlaying stream */
SilcCipher receive)
{
SILC_LOG_DEBUG(("Setting new ciphers to packet stream"));
- stream->send_key = send;
- stream->receive_key = receive;
+
+ silc_mutex_lock(stream->lock);
+
+ /* In case IV Included is set, save the old key */
+ if (stream->iv_included) {
+ if (stream->send_key[1]) {
+ silc_cipher_free(stream->send_key[1]);
+ stream->send_key[1] = stream->send_key[0];
+ }
+ if (stream->receive_key[1]) {
+ silc_cipher_free(stream->receive_key[1]);
+ stream->receive_key[1] = stream->receive_key[0];
+ }
+ } else {
+ if (stream->send_key[0])
+ silc_cipher_free(stream->send_key[0]);
+ if (stream->send_key[1])
+ silc_cipher_free(stream->receive_key[0]);
+ }
+
+ stream->send_key[0] = send;
+ stream->receive_key[0] = receive;
+
+ silc_mutex_unlock(stream->lock);
}
/* Return current ciphers from packet stream */
SilcBool silc_packet_get_ciphers(SilcPacketStream stream, SilcCipher *send,
SilcCipher *receive)
{
- if (!stream->send_key && !stream->receive_key)
+ if (!stream->send_key[0] && !stream->receive_key[0])
return FALSE;
+ silc_mutex_lock(stream->lock);
+
if (send)
- *send = stream->send_key;
+ *send = stream->send_key[0];
if (receive)
- *receive = stream->receive_key;
+ *receive = stream->receive_key[0];
+
+ silc_mutex_unlock(stream->lock);
return TRUE;
}
SilcHmac receive)
{
SILC_LOG_DEBUG(("Setting new HMACs to packet stream"));
- stream->send_hmac = send;
- stream->receive_hmac = receive;
+
+ silc_mutex_lock(stream->lock);
+
+ /* In case IV Included is set, save the old HMAC */
+ if (stream->iv_included) {
+ if (stream->send_hmac[1]) {
+ silc_hmac_free(stream->send_hmac[1]);
+ stream->send_hmac[1] = stream->send_hmac[0];
+ }
+ if (stream->receive_hmac[1]) {
+ silc_hmac_free(stream->receive_hmac[1]);
+ stream->receive_hmac[1] = stream->receive_hmac[0];
+ }
+ } else {
+ if (stream->send_hmac[0])
+ silc_hmac_free(stream->send_hmac[0]);
+ if (stream->receive_hmac[0])
+ silc_hmac_free(stream->receive_hmac[0]);
+ }
+
+ stream->send_hmac[0] = send;
+ stream->receive_hmac[0] = receive;
+
+ silc_mutex_unlock(stream->lock);
}
/* Return current HMACs from packet stream */
SilcBool silc_packet_get_hmacs(SilcPacketStream stream, SilcHmac *send,
SilcHmac *receive)
{
- if (!stream->send_hmac && !stream->receive_hmac)
+ if (!stream->send_hmac[0] && !stream->receive_hmac[0])
return FALSE;
+ silc_mutex_lock(stream->lock);
+
if (send)
- *send = stream->send_hmac;
+ *send = stream->send_hmac[0];
if (receive)
- *receive = stream->receive_hmac;
+ *receive = stream->receive_hmac[0];
+
+ silc_mutex_unlock(stream->lock);
return TRUE;
}
SILC_LOG_DEBUG(("Setting new IDs to packet stream"));
+ silc_mutex_lock(stream->lock);
+
if (src_id) {
silc_free(stream->src_id);
- if (!silc_id_id2str(src_id, src_id_type, tmp, sizeof(tmp), &len))
+ if (!silc_id_id2str(src_id, src_id_type, tmp, sizeof(tmp), &len)) {
+ silc_mutex_unlock(stream->lock);
return FALSE;
+ }
stream->src_id = silc_memdup(tmp, len);
- if (!stream->src_id)
+ if (!stream->src_id) {
+ silc_mutex_unlock(stream->lock);
return FALSE;
+ }
stream->src_id_type = src_id_type;
stream->src_id_len = len;
}
if (dst_id) {
silc_free(stream->dst_id);
- if (!silc_id_id2str(dst_id, dst_id_type, tmp, sizeof(tmp), &len))
+ if (!silc_id_id2str(dst_id, dst_id_type, tmp, sizeof(tmp), &len)) {
+ silc_mutex_unlock(stream->lock);
return FALSE;
+ }
stream->dst_id = silc_memdup(tmp, len);
- if (!stream->dst_id)
+ if (!stream->dst_id) {
+ silc_mutex_unlock(stream->lock);
return FALSE;
+ }
stream->dst_id_type = dst_id_type;
stream->dst_id_len = len;
}
+ silc_mutex_unlock(stream->lock);
+
+ return TRUE;
+}
+
+/* Adds Security ID (SID) */
+
+SilcBool silc_packet_set_sid(SilcPacketStream stream, SilcUInt8 sid)
+{
+ if (!stream->iv_included)
+ return FALSE;
+
+ SILC_LOG_DEBUG(("Set packet stream %p SID to %d", stream, sid));
+
+ stream->sid = sid;
return TRUE;
}
SILC_LOG_DEBUG(("Freeing packet %p", packet));
-#if defined(SILC_DEBUG)
/* Check for double free */
- assert(packet->stream != NULL);
-#endif /* SILC_DEBUG */
-
- silc_mutex_lock(stream->engine->lock);
+ SILC_ASSERT(packet->stream != NULL);
packet->stream = NULL;
packet->src_id = packet->dst_id = NULL;
silc_buffer_reset(&packet->buffer);
+ silc_mutex_lock(stream->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_mutex_unlock(stream->engine->lock);
}
-/* Creates streamer */
-
-SilcStream silc_packet_streamer_create(SilcPacketStream stream,
- SilcPacketType packet_type,
- SilcPacketFlags packet_flags)
-{
- /* XXX TODO */
- return NULL;
-}
-
-/* Destroyes streamer */
-
-void silc_packet_streamer_destroy(SilcStream stream)
-{
-
-}
-
-
/****************************** Packet Sending ******************************/
/* Prepare outgoing data buffer for packet sending. Returns the
SilcCipher cipher,
SilcHmac hmac)
{
- unsigned char tmppad[SILC_PACKET_MAX_PADLEN];
+ 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;
+ int i, enclen, truelen, padlen, ivlen = 0, psnlen = 0;
SilcBufferStruct packet;
- SILC_LOG_DEBUG(("Sending packet %s (%d) flags %d, src %d dst %d,"
+ SILC_LOG_DEBUG(("Sending packet %s (%d) flags %d, src %d dst %d, "
"data len %d", silc_get_packet_name(type), stream->send_psn,
flags, src_id_type, dst_id_type, data_len));
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);
+ }
+
/* We automatically figure out the packet structure from the packet
type and flags, and calculate correct length. Private messages with
private keys and channel messages are special packets as their
type == SILC_PACKET_CHANNEL_MESSAGE) {
/* Padding is calculated from header + IDs */
- SILC_PACKET_PADLEN((SILC_PACKET_HEADER_LEN +
- src_id_len +
- dst_id_len), block_len, padlen);
+ 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 + padlen;
+ enclen = (SILC_PACKET_HEADER_LEN + src_id_len + dst_id_len +
+ padlen + psnlen);
} else {
/* Padding is calculated from true length of the packet */
if (flags & SILC_PACKET_FLAG_LONG_PAD)
- SILC_PACKET_PADLEN_MAX(truelen, block_len, padlen);
+ SILC_PACKET_PADLEN_MAX(truelen + psnlen, block_len, padlen);
else
- SILC_PACKET_PADLEN(truelen, block_len, padlen);
+ SILC_PACKET_PADLEN(truelen + psnlen, block_len, padlen);
- enclen += padlen;
+ enclen += padlen + psnlen;
}
/* Remove implementation specific flags */
silc_mutex_lock(stream->lock);
/* Get packet pointer from the outgoing buffer */
- if (!silc_packet_send_prepare(stream, truelen + padlen, hmac, &packet)) {
+ if (!silc_packet_send_prepare(stream, truelen + padlen + ivlen + psnlen,
+ hmac, &packet)) {
silc_mutex_unlock(stream->lock);
return FALSE;
}
+ SILC_PUT32_MSB(stream->send_psn, psn);
+
/* Create the packet. This creates the SILC header, adds padding, and
the actual packet data. */
i = silc_buffer_format(&packet,
+ SILC_STR_DATA(iv, ivlen),
+ SILC_STR_DATA(psn, psnlen),
SILC_STR_UI_SHORT(truelen),
SILC_STR_UI_CHAR(flags),
SILC_STR_UI_CHAR(type),
SILC_STR_UI_CHAR(src_id_len),
SILC_STR_UI_CHAR(dst_id_len),
SILC_STR_UI_CHAR(src_id_type),
- SILC_STR_UI_XNSTRING(src_id, src_id_len),
+ SILC_STR_DATA(src_id, src_id_len),
SILC_STR_UI_CHAR(dst_id_type),
- SILC_STR_UI_XNSTRING(dst_id, dst_id_len),
- SILC_STR_UI_XNSTRING(tmppad, padlen),
- SILC_STR_UI_XNSTRING(data, data_len),
+ SILC_STR_DATA(dst_id, dst_id_len),
+ SILC_STR_DATA(tmppad, padlen),
+ SILC_STR_DATA(data, data_len),
SILC_STR_END);
if (i < 0) {
silc_mutex_unlock(stream->lock);
}
SILC_LOG_HEXDUMP(("Assembled packet, len %d", silc_buffer_len(&packet)),
- packet.data, silc_buffer_len(&packet));
+ silc_buffer_data(&packet), silc_buffer_len(&packet));
/* Encrypt the packet */
if (cipher) {
SILC_LOG_DEBUG(("Encrypting packet"));
- if (!silc_cipher_encrypt(cipher, packet.data, packet.data,
- enclen, NULL)) {
+ if (!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) {
- unsigned char psn[4];
SilcUInt32 mac_len;
/* MAC is computed from the entire encrypted packet data, and put
to the end of the packet. */
silc_hmac_init(hmac);
- SILC_PUT32_MSB(stream->send_psn, psn);
- silc_hmac_update(hmac, psn, 4);
+ silc_hmac_update(hmac, psn, sizeof(psn));
silc_hmac_update(hmac, packet.data, silc_buffer_len(&packet));
silc_hmac_final(hmac, packet.tail, &mac_len);
silc_buffer_pull_tail(&packet, mac_len);
}
/* Write the packet to the stream */
- while (silc_buffer_len(&stream->outbuf) > 0) {
- i = silc_stream_write(stream->stream, stream->outbuf.data,
- silc_buffer_len(&stream->outbuf));
- if (i == 0) {
- /* EOS */
- silc_buffer_reset(&stream->outbuf);
- silc_mutex_unlock(stream->lock);
- SILC_PACKET_CALLBACK_EOS(stream);
- return FALSE;
- }
-
- if (i == -2) {
- /* Error */
- silc_buffer_reset(&stream->outbuf);
- silc_mutex_unlock(stream->lock);
- SILC_PACKET_CALLBACK_ERROR(stream, SILC_PACKET_ERR_WRITE);
- return FALSE;
- }
-
- if (i == -1) {
- /* Cannot write now, write later. */
- silc_mutex_unlock(stream->lock);
- return TRUE;
- }
-
- /* Wrote data */
- silc_buffer_pull(&stream->outbuf, i);
- }
- silc_buffer_reset(&stream->outbuf);
-
- silc_mutex_unlock(stream->lock);
- return TRUE;
+ return silc_packet_stream_write(stream);
}
/* Sends a packet */
stream->dst_id,
stream->dst_id_len,
data, data_len,
- stream->send_key,
- stream->send_hmac);
+ stream->send_key[0],
+ stream->send_hmac[0]);
}
/* Sends a packet, extended routine */
return FALSE;
return silc_packet_send_raw(stream, type, flags,
- src_id_type,
- src_id_data,
- src_id_len,
- dst_id_type,
- dst_id_data,
- dst_id_len,
+ src_id ? src_id_type : stream->src_id_type,
+ src_id ? src_id_data : stream->src_id,
+ src_id ? src_id_len : stream->src_id_len,
+ dst_id ? dst_id_type : stream->dst_id_type,
+ dst_id ? dst_id_data : stream->dst_id,
+ dst_id ? dst_id_len : stream->dst_id_len,
data, data_len,
- cipher,
- hmac);
+ cipher ? cipher : stream->send_key[0],
+ hmac ? hmac : stream->send_hmac[0]);
}
+/* Sends packet after formatting the arguments to buffer */
+
+SilcBool silc_packet_send_va(SilcPacketStream stream,
+ SilcPacketType type, SilcPacketFlags flags, ...)
+{
+ SilcBufferStruct buf;
+ SilcBool ret;
+ va_list va;
+
+ va_start(va, flags);
+
+ memset(&buf, 0, sizeof(buf));
+ if (silc_buffer_format_vp(&buf, va) < 0) {
+ va_end(va);
+ return FALSE;
+ }
+
+ ret = silc_packet_send(stream, type, flags, silc_buffer_data(&buf),
+ silc_buffer_len(&buf));
+
+ silc_buffer_purge(&buf);
+ va_end(va);
+
+ return ret;
+}
+
+/* Sends packet after formatting the arguments to buffer, extended routine */
+
+SilcBool silc_packet_send_va_ext(SilcPacketStream stream,
+ SilcPacketType type, SilcPacketFlags flags,
+ SilcIdType src_id_type, void *src_id,
+ SilcIdType dst_id_type, void *dst_id,
+ SilcCipher cipher, SilcHmac hmac, ...)
+{
+ SilcBufferStruct buf;
+ SilcBool ret;
+ va_list va;
+
+ va_start(va, hmac);
+
+ memset(&buf, 0, sizeof(buf));
+ if (silc_buffer_format_vp(&buf, va) < 0) {
+ va_end(va);
+ return FALSE;
+ }
+
+ ret = silc_packet_send_ext(stream, type, flags, src_id_type, src_id,
+ dst_id_type, dst_id, silc_buffer_data(&buf),
+ silc_buffer_len(&buf), cipher, hmac);
+
+ silc_buffer_purge(&buf);
+ va_end(va);
+
+ return TRUE;
+}
/***************************** Packet Receiving *****************************/
/* Checks MAC in the packet. Returns TRUE if MAC is Ok. */
-static SilcBool silc_packet_check_mac(SilcHmac hmac,
- const unsigned char *data,
- SilcUInt32 data_len,
- const unsigned char *packet_mac,
- SilcUInt32 sequence)
+static inline SilcBool silc_packet_check_mac(SilcHmac hmac,
+ const unsigned char *data,
+ SilcUInt32 data_len,
+ const unsigned char *packet_mac,
+ const unsigned char *packet_seq,
+ SilcUInt32 sequence)
{
/* Check MAC */
if (hmac) {
/* Compute HMAC of packet */
silc_hmac_init(hmac);
- SILC_PUT32_MSB(sequence, psn);
- silc_hmac_update(hmac, psn, 4);
+
+ if (!packet_seq) {
+ SILC_PUT32_MSB(sequence, psn);
+ silc_hmac_update(hmac, psn, 4);
+ } else
+ silc_hmac_update(hmac, packet_seq, 4);
+
silc_hmac_update(hmac, data, data_len);
silc_hmac_final(hmac, mac, &mac_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. */
-static int silc_packet_decrypt(SilcCipher cipher, SilcHmac hmac,
- SilcUInt32 sequence, SilcBuffer buffer,
- SilcBool normal)
+static inline int silc_packet_decrypt(SilcCipher cipher, SilcHmac hmac,
+ SilcUInt32 sequence, SilcBuffer buffer,
+ SilcBool normal)
{
if (normal == TRUE) {
if (cipher) {
parsed. The buffer sent must be already decrypted before calling this
function. */
-static SilcBool silc_packet_parse(SilcPacket packet)
+static inline SilcBool silc_packet_parse(SilcPacket packet)
{
SilcBuffer buffer = &packet->buffer;
SilcUInt8 padlen = (SilcUInt8)buffer->data[4];
SilcUInt8 src_id_len, dst_id_len, src_id_type, dst_id_type;
- int len, ret;
+ int ret;
SILC_LOG_DEBUG(("Parsing incoming packet"));
/* Parse the buffer. This parses the SILC header of the packet. */
- len = silc_buffer_unformat(buffer,
+ ret = silc_buffer_unformat(buffer,
+ SILC_STR_ADVANCE,
SILC_STR_OFFSET(6),
SILC_STR_UI_CHAR(&src_id_len),
SILC_STR_UI_CHAR(&dst_id_len),
SILC_STR_UI_CHAR(&src_id_type),
SILC_STR_END);
- if (len == -1) {
- SILC_LOG_ERROR(("Malformed packet header, packet dropped"));
+ if (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) {
- SILC_LOG_ERROR(("Bad ID lengths in packet (%d and %d)",
- packet->src_id_len, packet->dst_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)",
+ packet->src_id_len, packet->dst_id_len));
return FALSE;
}
ret = silc_buffer_unformat(buffer,
- SILC_STR_OFFSET(len),
- SILC_STR_UI_XNSTRING(&packet->src_id,
- src_id_len),
+ SILC_STR_ADVANCE,
+ SILC_STR_DATA(&packet->src_id, src_id_len),
SILC_STR_UI_CHAR(&dst_id_type),
- SILC_STR_UI_XNSTRING(&packet->dst_id,
- dst_id_len),
+ SILC_STR_DATA(&packet->dst_id, dst_id_len),
SILC_STR_OFFSET(padlen),
SILC_STR_END);
if (ret == -1) {
- SILC_LOG_ERROR(("Malformed packet header, packet dropped"));
+ 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) {
- SILC_LOG_ERROR(("Bad ID types in packet (%d and %d)",
- src_id_type, dst_id_type));
+ if (!packet->stream->udp &&
+ !silc_socket_stream_is_udp(packet->stream->stream, NULL))
+ SILC_LOG_ERROR(("Bad ID types in packet (%d and %d)",
+ src_id_type, dst_id_type));
return FALSE;
}
packet->src_id_type = src_id_type;
packet->dst_id_type = dst_id_type;
- SILC_LOG_HEXDUMP(("Parsed packet, len %d", silc_buffer_len(buffer)),
- buffer->data, silc_buffer_len(buffer));
-
- /* Pull SILC header and padding from packet to get the data payload */
- silc_buffer_pull(buffer, SILC_PACKET_HEADER_LEN +
- packet->src_id_len + packet->dst_id_len + padlen);
+ SILC_LOG_HEXDUMP(("Parsed packet, len %d", silc_buffer_headlen(buffer) +
+ silc_buffer_len(buffer)), buffer->head,
+ silc_buffer_headlen(buffer) + silc_buffer_len(buffer));
SILC_LOG_DEBUG(("Incoming packet type: %d (%s)", packet->type,
silc_get_packet_name(packet->type)));
return TRUE;
}
-/* Dispatch packet to application */
+/* Dispatch packet to application. Called with stream->lock locked. */
static void silc_packet_dispatch(SilcPacket packet)
{
SilcBool default_sent = FALSE;
SilcPacketType *pt;
- /* Parse the packet */
- if (!silc_packet_parse(packet)) {
- SILC_PACKET_CALLBACK_ERROR(stream, SILC_PACKET_ERR_MALFORMED);
- silc_packet_free(packet);
- return;
- }
-
/* Dispatch packet to all packet processors that want it */
if (!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))
silc_packet_free(packet);
+ silc_mutex_lock(stream->lock);
return;
}
if (!default_sent && p->priority <= 0) {
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,
stream->stream_context)) {
+ silc_mutex_lock(stream->lock);
return;
}
+ silc_mutex_lock(stream->lock);
}
/* Send to processor */
if (!p->types) {
/* 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,
p->callback_context,
- stream->stream_context))
+ stream->stream_context)) {
+ silc_mutex_lock(stream->lock);
return;
+ }
+ silc_mutex_lock(stream->lock);
} else {
/* Send specific types */
- for (pt = p->types; *pt; pt++)
- if (*pt == packet->type) {
- SILC_LOG_DEBUG(("Dispatching packet to %p callbacks",
- p->callbacks));
- if (p->callbacks->packet_receive(stream->engine, stream, packet,
- p->callback_context,
- stream->stream_context))
- return;
- break;
+ for (pt = p->types; *pt; pt++) {
+ if (*pt != packet->type)
+ 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,
+ p->callback_context,
+ stream->stream_context)) {
+ silc_mutex_lock(stream->lock);
+ return;
}
+ silc_mutex_lock(stream->lock);
+ break;
+ }
}
}
if (!default_sent) {
/* 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,
- stream->stream_context))
+ stream->stream_context)) {
+ silc_mutex_lock(stream->lock);
return;
+ }
+ silc_mutex_lock(stream->lock);
}
/* If we got here, no one wanted the packet, so drop it */
silc_packet_free(packet);
}
-/* Process incoming data and parse packets. */
+/* Process incoming data and parse packets. Called with stream->lock
+ locked. */
static void silc_packet_read_process(SilcPacketStream stream)
{
+ SilcCipher cipher;
+ SilcHmac hmac;
SilcPacket packet;
+ SilcUInt8 sid;
SilcUInt16 packetlen;
- SilcUInt32 paddedlen, mac_len, block_len;
+ SilcUInt32 paddedlen, mac_len, block_len, ivlen, psnlen;
unsigned char tmp[SILC_PACKET_MIN_HEADER_LEN], *header;
- unsigned char iv[SILC_CIPHER_MAX_IV_SIZE];
- SilcBool normal = TRUE;
+ unsigned char iv[SILC_CIPHER_MAX_IV_SIZE], *packet_seq = NULL;
+ SilcBool normal;
int ret;
/* Parse the packets from the data */
while (silc_buffer_len(&stream->inbuf) > 0) {
-
- if (silc_buffer_len(&stream->inbuf) < SILC_PACKET_MIN_HEADER_LEN) {
+ 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)) {
SILC_LOG_DEBUG(("Partial packet in queue, waiting for the rest"));
return;
}
- if (stream->receive_hmac)
- mac_len = silc_hmac_len(stream->receive_hmac);
+ if (hmac)
+ mac_len = silc_hmac_len(hmac);
else
mac_len = 0;
/* Decrypt first block of the packet to get the length field out */
- if (stream->receive_key) {
- block_len = silc_cipher_get_block_len(stream->receive_key);
- memcpy(iv, silc_cipher_get_iv(stream->receive_key), block_len);
- silc_cipher_decrypt(stream->receive_key, stream->inbuf.data,
- tmp, block_len, iv);
+ if (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;
+ psnlen = 4;
+
+ /* Check SID, and get correct decryption key */
+ if (sid != stream->sid) {
+ /* If SID is recent get the previous key and use it */
+ if (sid > 0 && stream->sid > 0 && stream->sid - 1 == sid &&
+ stream->receive_key[1] && !stream->receive_hmac[1]) {
+ cipher = stream->receive_key[1];
+ hmac = stream->receive_hmac[1];
+ } else {
+ /* The SID is unknown, drop rest of the data in buffer */
+ SILC_LOG_DEBUG(("Unknown Security ID %d in packet, expected %d",
+ sid, stream->sid));
+ 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;
+ }
+ }
+ } else {
+ memcpy(iv, silc_cipher_get_iv(cipher), block_len);
+ }
+
+ silc_cipher_decrypt(cipher, stream->inbuf.data + ivlen, tmp,
+ block_len, iv);
+
header = tmp;
+ if (stream->iv_included) {
+ /* Take sequence number from packet */
+ packet_seq = header;
+ header += 4;
+ }
} else {
block_len = SILC_PACKET_MIN_HEADER_LEN;
header = stream->inbuf.data;
/* Sanity checks */
if (packetlen < SILC_PACKET_MIN_LEN) {
- SILC_LOG_ERROR(("Received too short packet"));
+ 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;
}
- if (silc_buffer_len(&stream->inbuf) < paddedlen + mac_len) {
+ if (silc_buffer_len(&stream->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)));
}
/* Check MAC of the packet */
- if (!silc_packet_check_mac(stream->receive_hmac, stream->inbuf.data,
- paddedlen, stream->inbuf.data + paddedlen,
- stream->receive_psn)) {
+ if (!silc_packet_check_mac(hmac, stream->inbuf.data,
+ paddedlen + ivlen,
+ stream->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;
/* Get packet */
packet = silc_packet_alloc(stream->engine);
if (!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;
}
+ packet->stream = stream;
/* Allocate more space to packet buffer, if needed */
if (silc_buffer_truelen(&packet->buffer) < paddedlen) {
silc_buffer_truelen(&packet->buffer) +
(paddedlen -
silc_buffer_truelen(&packet->buffer)))) {
+ silc_mutex_unlock(stream->lock);
SILC_PACKET_CALLBACK_ERROR(stream, SILC_PACKET_ERR_NO_MEMORY);
+ silc_mutex_lock(stream->lock);
silc_packet_free(packet);
memset(tmp, 0, sizeof(tmp));
silc_buffer_reset(&stream->inbuf);
}
SILC_LOG_HEXDUMP(("Incoming packet (%d) len %d",
- stream->receive_psn, paddedlen + mac_len),
- stream->inbuf.data, paddedlen + mac_len);
+ stream->receive_psn, paddedlen + ivlen + mac_len),
+ stream->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);
- silc_buffer_pull(&packet->buffer, block_len);
- silc_buffer_put(&packet->buffer, stream->inbuf.data + block_len,
- paddedlen - block_len);
- if (stream->receive_key) {
- silc_cipher_set_iv(stream->receive_key, iv);
- ret = silc_packet_decrypt(stream->receive_key, stream->receive_hmac,
- stream->receive_psn, &packet->buffer, normal);
+ 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 +
+ psnlen + (block_len - psnlen)),
+ paddedlen - ivlen - psnlen - (block_len - psnlen));
+ if (cipher) {
+ silc_cipher_set_iv(cipher, iv);
+ ret = silc_packet_decrypt(cipher, hmac, stream->receive_psn,
+ &packet->buffer, normal);
if (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;
/* Pull the packet from inbuf thus we'll get the next one in the inbuf. */
silc_buffer_pull(&stream->inbuf, paddedlen + mac_len);
+ /* Parse the packet */
+ if (!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;
+ }
+
/* Dispatch the packet to application */
- packet->stream = stream;
silc_packet_dispatch(packet);
}
SilcMutex wait_lock;
SilcCond wait_cond;
SilcList packet_queue;
- SilcBool waiting;
+ unsigned int stopped : 1;
} *SilcPacketWait;
/* Packet wait receive callback */
/* Signal the waiting thread for a new packet */
silc_mutex_lock(pw->wait_lock);
- if (!pw->waiting) {
+ if (pw->stopped) {
silc_mutex_unlock(pw->wait_lock);
return FALSE;
}
/* Uninitialize packet waiting */
-void silc_packet_wait_uninit(void *context, SilcPacketStream stream)
+void silc_packet_wait_uninit(void *waiter, SilcPacketStream stream)
{
- SilcPacketWait pw = context;
+ SilcPacketWait pw = waiter;
SilcPacket packet;
+ /* Signal any threads to stop waiting */
+ silc_mutex_lock(pw->wait_lock);
+ pw->stopped = TRUE;
+ silc_cond_broadcast(pw->wait_cond);
+ silc_mutex_unlock(pw->wait_lock);
+
+ /* Re-acquire lock and free resources */
silc_mutex_lock(pw->wait_lock);
silc_packet_stream_unlink(stream, &silc_packet_wait_cbs, pw);
silc_packet_free(packet);
silc_mutex_unlock(pw->wait_lock);
-
silc_cond_free(pw->wait_cond);
silc_mutex_free(pw->wait_lock);
silc_free(pw);
/* Blocks thread until a packet has been received. */
-int silc_packet_wait(void *context, int timeout, SilcPacket *return_packet)
+int silc_packet_wait(void *waiter, int timeout, SilcPacket *return_packet)
{
- SilcPacketWait pw = context;
+ SilcPacketWait pw = waiter;
SilcBool ret = FALSE;
silc_mutex_lock(pw->wait_lock);
/* Wait here until packet has arrived */
- pw->waiting = TRUE;
- while (silc_list_count(pw->packet_queue) == 0)
+ while (silc_list_count(pw->packet_queue) == 0) {
+ if (pw->stopped) {
+ silc_mutex_unlock(pw->wait_lock);
+ return -1;
+ }
ret = silc_cond_timedwait(pw->wait_cond, pw->wait_lock, timeout);
+ }
/* Return packet */
silc_list_start(pw->packet_queue);
projects / silc.git / blobdiff