projects
/
silc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'topic/mm-fixes' of git://208.110.73.182/silc into silc.1.1.branch
[silc.git]
/
lib
/
silccore
/
silcpacket.c
diff --git
a/lib/silccore/silcpacket.c
b/lib/silccore/silcpacket.c
index ccd821198d9f757f075c265f144911fa3e206973..f552ca6d1741aebf31648e1c694d34c302792ac3 100644
(file)
--- a/
lib/silccore/silcpacket.c
+++ b/
lib/silccore/silcpacket.c
@@
-4,7
+4,7
@@
Author: Pekka Riikonen <priikone@silcnet.org>
Author: Pekka Riikonen <priikone@silcnet.org>
- Copyright (C) 1997 - 200
7
Pekka Riikonen
+ Copyright (C) 1997 - 200
8
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
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
@@
-40,7
+40,7
@@
struct SilcPacketEngineStruct {
SilcMutex lock; /* Engine lock */
SilcRng rng; /* RNG for engine */
SilcHashTable contexts; /* Per scheduler contexts */
SilcMutex lock; /* Engine lock */
SilcRng rng; /* RNG for engine */
SilcHashTable contexts; /* Per scheduler contexts */
-
SilcPacketCallbacks *callbacks;
/* Packet callbacks */
+
const SilcPacketCallbacks *callbacks;
/* Packet callbacks */
void *callback_context; /* Context for callbacks */
SilcList streams; /* All streams in engine */
SilcList packet_pool; /* Free list for received packets */
void *callback_context; /* Context for callbacks */
SilcList streams; /* All streams in engine */
SilcList packet_pool; /* Free list for received packets */
@@
-51,7
+51,7
@@
struct SilcPacketEngineStruct {
/* Packet processor context */
typedef struct SilcPacketProcessStruct {
SilcPacketType *types; /* Packets to process */
/* Packet processor context */
typedef struct SilcPacketProcessStruct {
SilcPacketType *types; /* Packets to process */
-
SilcPacketCallbacks *callbacks;
/* Callbacks or NULL */
+
const SilcPacketCallbacks *callbacks;
/* Callbacks or NULL */
void *callback_context;
SilcInt32 priority; /* Priority */
} *SilcPacketProcess;
void *callback_context;
SilcInt32 priority; /* Priority */
} *SilcPacketProcess;
@@
-81,7
+81,7
@@
struct SilcPacketStreamStruct {
unsigned char *dst_id; /* Destination ID */
SilcUInt32 send_psn; /* Sending sequence */
SilcUInt32 receive_psn; /* Receiving sequence */
unsigned char *dst_id; /* Destination ID */
SilcUInt32 send_psn; /* Sending sequence */
SilcUInt32 receive_psn; /* Receiving sequence */
- SilcAtomic
8 refcnt;
/* Reference counter */
+ SilcAtomic
32 refcnt;
/* Reference counter */
SilcUInt8 sid; /* Security ID, set if IV included */
unsigned int src_id_len : 6;
unsigned int src_id_type : 2;
SilcUInt8 sid; /* Security ID, set if IV included */
unsigned int src_id_len : 6;
unsigned int src_id_type : 2;
@@
-306,7
+306,7
@@
static inline SilcBool silc_packet_stream_read(SilcPacketStream ps,
inbuf = silc_dlist_get(ps->sc->inbufs);
if (!inbuf) {
/* Allocate new data input buffer */
inbuf = silc_dlist_get(ps->sc->inbufs);
if (!inbuf) {
/* Allocate new data input buffer */
- inbuf = silc_buffer_alloc(SILC_PACKET_DEFAULT_SIZE *
31
);
+ inbuf = silc_buffer_alloc(SILC_PACKET_DEFAULT_SIZE *
65
);
if (!inbuf) {
silc_mutex_unlock(ps->lock);
return FALSE;
if (!inbuf) {
silc_mutex_unlock(ps->lock);
return FALSE;
@@
-336,7
+336,6
@@
static inline SilcBool silc_packet_stream_read(SilcPacketStream ps,
silc_mutex_unlock(ps->lock);
if (ret == -1) {
/* Cannot read now, do it later. */
silc_mutex_unlock(ps->lock);
if (ret == -1) {
/* Cannot read now, do it later. */
- silc_buffer_pull(inbuf, silc_buffer_len(inbuf));
return FALSE;
}
return FALSE;
}
@@
-394,7
+393,6
@@
static inline SilcBool silc_packet_stream_read(SilcPacketStream ps,
if (ret == -1) {
/* Cannot read now, do it later. */
if (ret == -1) {
/* Cannot read now, do it later. */
- silc_buffer_pull(inbuf, silc_buffer_len(inbuf));
return FALSE;
}
return FALSE;
}
@@
-542,7
+540,7
@@
static void silc_packet_engine_context_destr(void *key, void *context,
SilcPacketEngine
silc_packet_engine_start(SilcRng rng, SilcBool router,
SilcPacketEngine
silc_packet_engine_start(SilcRng rng, SilcBool router,
- SilcPacketCallbacks *callbacks,
+
const
SilcPacketCallbacks *callbacks,
void *callback_context)
{
SilcPacketEngine engine;
void *callback_context)
{
SilcPacketEngine engine;
@@
-623,7
+621,7
@@
void silc_packet_engine_stop(SilcPacketEngine engine)
silc_free(engine);
}
silc_free(engine);
}
-static const char *packet_error[] = {
+static const char *
const
packet_error[] = {
"Cannot read from stream",
"Cannot write to stream",
"Packet MAC failed",
"Cannot read from stream",
"Cannot write to stream",
"Packet MAC failed",
@@
-638,7
+636,7
@@
static const char *packet_error[] = {
const char *silc_packet_error_string(SilcPacketError error)
{
if (error < SILC_PACKET_ERR_READ || error > SILC_PACKET_ERR_NO_MEMORY)
const char *silc_packet_error_string(SilcPacketError error)
{
if (error < SILC_PACKET_ERR_READ || error > SILC_PACKET_ERR_NO_MEMORY)
- return "";
+ return "
<invalid error code>
";
return packet_error[error];
}
return packet_error[error];
}
@@
-655,13
+653,28
@@
SilcDList silc_packet_engine_get_streams(SilcPacketEngine engine)
silc_mutex_lock(engine->lock);
silc_list_start(engine->streams);
silc_mutex_lock(engine->lock);
silc_list_start(engine->streams);
- while ((ps = silc_list_get(engine->streams)))
+ while ((ps = silc_list_get(engine->streams))) {
+ silc_packet_stream_ref(ps);
silc_dlist_add(list, ps);
silc_dlist_add(list, ps);
+ }
silc_mutex_unlock(engine->lock);
return list;
}
silc_mutex_unlock(engine->lock);
return list;
}
+/* Free list returned by silc_packet_engine_get_streams */
+
+void silc_packet_engine_free_streams_list(SilcDList streams)
+{
+ SilcPacketStream ps;
+
+ silc_dlist_start(streams);
+ while ((ps = silc_dlist_get(streams)))
+ silc_packet_stream_unref(ps);
+
+ silc_dlist_uninit(streams);
+}
+
/* Create new packet stream */
SilcPacketStream silc_packet_stream_create(SilcPacketEngine engine,
/* Create new packet stream */
SilcPacketStream silc_packet_stream_create(SilcPacketEngine engine,
@@
-682,7
+695,7
@@
SilcPacketStream silc_packet_stream_create(SilcPacketEngine engine,
return NULL;
ps->stream = stream;
return NULL;
ps->stream = stream;
- silc_atomic_init
8
(&ps->refcnt, 1);
+ silc_atomic_init
32
(&ps->refcnt, 1);
silc_mutex_alloc(&ps->lock);
/* Allocate out buffer */
silc_mutex_alloc(&ps->lock);
/* Allocate out buffer */
@@
-708,20
+721,20
@@
SilcPacketStream silc_packet_stream_create(SilcPacketEngine engine,
(void *)&ps->sc)) {
ps->sc = silc_calloc(1, sizeof(*ps->sc));
if (!ps->sc) {
(void *)&ps->sc)) {
ps->sc = silc_calloc(1, sizeof(*ps->sc));
if (!ps->sc) {
- silc_packet_stream_destroy(ps);
silc_mutex_unlock(engine->lock);
silc_mutex_unlock(engine->lock);
+ silc_packet_stream_destroy(ps);
return NULL;
}
ps->sc->engine = engine;
ps->sc->schedule = schedule;
/* Allocate data input buffer */
return NULL;
}
ps->sc->engine = engine;
ps->sc->schedule = schedule;
/* Allocate data input buffer */
- inbuf = silc_buffer_alloc(SILC_PACKET_DEFAULT_SIZE *
31
);
+ inbuf = silc_buffer_alloc(SILC_PACKET_DEFAULT_SIZE *
65
);
if (!inbuf) {
silc_free(ps->sc);
ps->sc = NULL;
if (!inbuf) {
silc_free(ps->sc);
ps->sc = NULL;
- silc_packet_stream_destroy(ps);
silc_mutex_unlock(engine->lock);
silc_mutex_unlock(engine->lock);
+ silc_packet_stream_destroy(ps);
return NULL;
}
silc_buffer_reset(inbuf);
return NULL;
}
silc_buffer_reset(inbuf);
@@
-731,8
+744,8
@@
SilcPacketStream silc_packet_stream_create(SilcPacketEngine engine,
silc_buffer_free(inbuf);
silc_free(ps->sc);
ps->sc = NULL;
silc_buffer_free(inbuf);
silc_free(ps->sc);
ps->sc = NULL;
- silc_packet_stream_destroy(ps);
silc_mutex_unlock(engine->lock);
silc_mutex_unlock(engine->lock);
+ silc_packet_stream_destroy(ps);
return NULL;
}
silc_dlist_add(ps->sc->inbufs, inbuf);
return NULL;
}
silc_dlist_add(ps->sc->inbufs, inbuf);
@@
-743,8
+756,8
@@
SilcPacketStream silc_packet_stream_create(SilcPacketEngine engine,
silc_dlist_del(ps->sc->inbufs, inbuf);
silc_free(ps->sc);
ps->sc = NULL;
silc_dlist_del(ps->sc->inbufs, inbuf);
silc_free(ps->sc);
ps->sc = NULL;
- silc_packet_stream_destroy(ps);
silc_mutex_unlock(engine->lock);
silc_mutex_unlock(engine->lock);
+ silc_packet_stream_destroy(ps);
return NULL;
}
}
return NULL;
}
}
@@
-770,6
+783,8
@@
SilcPacketStream silc_packet_stream_create(SilcPacketEngine engine,
return NULL;
}
return NULL;
}
+ SILC_LOG_DEBUG(("Created packet stream %p", ps));
+
return ps;
}
return ps;
}
@@
-801,7
+816,7
@@
SilcPacketStream silc_packet_stream_add_remote(SilcPacketStream stream,
return NULL;
ps->sc = stream->sc;
return NULL;
ps->sc = stream->sc;
- silc_atomic_init
8
(&ps->refcnt, 1);
+ silc_atomic_init
32
(&ps->refcnt, 1);
silc_mutex_alloc(&ps->lock);
/* Set the UDP packet stream as underlaying stream */
silc_mutex_alloc(&ps->lock);
/* Set the UDP packet stream as underlaying stream */
@@
-869,9
+884,13
@@
void silc_packet_stream_destroy(SilcPacketStream stream)
if (!stream)
return;
if (!stream)
return;
- if (silc_atomic_sub_int8(&stream->refcnt, 1) > 0) {
+ if (silc_atomic_sub_int32(&stream->refcnt, 1) > 0) {
+ if (stream->destroyed)
+ return;
stream->destroyed = TRUE;
stream->destroyed = TRUE;
+ SILC_LOG_DEBUG(("Marking packet stream %p destroyed", stream));
+
/* Close the underlaying stream */
if (!stream->udp && stream->stream)
silc_stream_close(stream->stream);
/* Close the underlaying stream */
if (!stream->udp && stream->stream)
silc_stream_close(stream->stream);
@@
-882,17
+901,18
@@
void silc_packet_stream_destroy(SilcPacketStream stream)
if (!stream->udp) {
/* Delete from engine */
if (!stream->udp) {
/* Delete from engine */
- engine = stream->sc->engine;
- silc_mutex_lock(engine->lock);
- silc_list_del(engine->streams, stream);
-
- /* Remove per scheduler context, if it is not used anymore */
if (stream->sc) {
if (stream->sc) {
+ engine = stream->sc->engine;
+ silc_mutex_lock(engine->lock);
+ silc_list_del(engine->streams, stream);
+
+ /* Remove per scheduler context, if it is not used anymore */
stream->sc->stream_count--;
if (!stream->sc->stream_count)
silc_hash_table_del(engine->contexts, stream->sc->schedule);
stream->sc->stream_count--;
if (!stream->sc->stream_count)
silc_hash_table_del(engine->contexts, stream->sc->schedule);
+
+ silc_mutex_unlock(engine->lock);
}
}
- silc_mutex_unlock(engine->lock);
/* Destroy the underlaying stream */
if (stream->stream)
/* Destroy the underlaying stream */
if (stream->stream)
@@
-952,7
+972,7
@@
void silc_packet_stream_destroy(SilcPacketStream stream)
silc_free(stream->src_id);
silc_free(stream->dst_id);
silc_free(stream->src_id);
silc_free(stream->dst_id);
- silc_atomic_uninit
8
(&stream->refcnt);
+ silc_atomic_uninit
32
(&stream->refcnt);
silc_mutex_free(stream->lock);
silc_free(stream);
}
silc_mutex_free(stream->lock);
silc_free(stream);
}
@@
-981,7
+1001,7
@@
void silc_packet_stream_set_iv_included(SilcPacketStream stream)
/* Links `callbacks' to `stream' for specified packet types */
static SilcBool silc_packet_stream_link_va(SilcPacketStream stream,
/* Links `callbacks' to `stream' for specified packet types */
static SilcBool silc_packet_stream_link_va(SilcPacketStream stream,
- SilcPacketCallbacks *callbacks,
+
const
SilcPacketCallbacks *callbacks,
void *callback_context,
int priority, va_list ap)
{
void *callback_context,
int priority, va_list ap)
{
@@
-1010,6
+1030,7
@@
static SilcBool silc_packet_stream_link_va(SilcPacketStream stream,
stream->process = silc_dlist_init();
if (!stream->process) {
silc_mutex_unlock(stream->lock);
stream->process = silc_dlist_init();
if (!stream->process) {
silc_mutex_unlock(stream->lock);
+ silc_free(p);
return FALSE;
}
}
return FALSE;
}
}
@@
-1059,7
+1080,7
@@
static SilcBool silc_packet_stream_link_va(SilcPacketStream stream,
/* Links `callbacks' to `stream' for specified packet types */
SilcBool silc_packet_stream_link(SilcPacketStream stream,
/* Links `callbacks' to `stream' for specified packet types */
SilcBool silc_packet_stream_link(SilcPacketStream stream,
- SilcPacketCallbacks *callbacks,
+
const
SilcPacketCallbacks *callbacks,
void *callback_context,
int priority, ...)
{
void *callback_context,
int priority, ...)
{
@@
-1077,7
+1098,7
@@
SilcBool silc_packet_stream_link(SilcPacketStream stream,
/* Unlinks `callbacks' from `stream'. */
void silc_packet_stream_unlink(SilcPacketStream stream,
/* Unlinks `callbacks' from `stream'. */
void silc_packet_stream_unlink(SilcPacketStream stream,
- SilcPacketCallbacks *callbacks,
+
const
SilcPacketCallbacks *callbacks,
void *callback_context)
{
SilcPacketProcess p;
void *callback_context)
{
SilcPacketProcess p;
@@
-1133,10
+1154,10
@@
SilcBool silc_packet_get_sender(SilcPacket packet,
void silc_packet_stream_ref(SilcPacketStream stream)
{
void silc_packet_stream_ref(SilcPacketStream stream)
{
- silc_atomic_add_int
8
(&stream->refcnt, 1);
+ silc_atomic_add_int
32
(&stream->refcnt, 1);
SILC_LOG_DEBUG(("Stream %p, refcnt %d->%d", stream,
SILC_LOG_DEBUG(("Stream %p, refcnt %d->%d", stream,
- silc_atomic_get_int
8
(&stream->refcnt) - 1,
- silc_atomic_get_int
8
(&stream->refcnt)));
+ silc_atomic_get_int
32
(&stream->refcnt) - 1,
+ silc_atomic_get_int
32
(&stream->refcnt)));
}
/* Unreference packet stream */
}
/* Unreference packet stream */
@@
-1144,11
+1165,11
@@
void silc_packet_stream_ref(SilcPacketStream stream)
void silc_packet_stream_unref(SilcPacketStream stream)
{
SILC_LOG_DEBUG(("Stream %p, refcnt %d->%d", stream,
void silc_packet_stream_unref(SilcPacketStream stream)
{
SILC_LOG_DEBUG(("Stream %p, refcnt %d->%d", stream,
- silc_atomic_get_int
8
(&stream->refcnt),
- silc_atomic_get_int
8
(&stream->refcnt) - 1));
- if (silc_atomic_sub_int
8
(&stream->refcnt, 1) > 0)
+ silc_atomic_get_int
32
(&stream->refcnt),
+ silc_atomic_get_int
32
(&stream->refcnt) - 1));
+ if (silc_atomic_sub_int
32
(&stream->refcnt, 1) > 0)
return;
return;
- silc_atomic_add_int
8
(&stream->refcnt, 1);
+ silc_atomic_add_int
32
(&stream->refcnt, 1);
silc_packet_stream_destroy(stream);
}
silc_packet_stream_destroy(stream);
}
@@
-1303,40
+1324,45
@@
SilcBool silc_packet_set_ids(SilcPacketStream stream,
{
SilcUInt32 len;
unsigned char tmp[32];
{
SilcUInt32 len;
unsigned char tmp[32];
+ void *tmp_id;
if (!src_id && !dst_id)
return FALSE;
if (!src_id && !dst_id)
return FALSE;
- SILC_LOG_DEBUG(("Setting new IDs to packet stream"));
-
silc_mutex_lock(stream->lock);
if (src_id) {
silc_mutex_lock(stream->lock);
if (src_id) {
- silc_free(stream->src_id);
+ SILC_LOG_DEBUG(("Setting source ID to packet stream %p", stream));
+
if (!silc_id_id2str(src_id, src_id_type, tmp, sizeof(tmp), &len)) {
silc_mutex_unlock(stream->lock);
return FALSE;
}
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) {
+
tmp
_id = silc_memdup(tmp, len);
+ if (!
tmp
_id) {
silc_mutex_unlock(stream->lock);
return FALSE;
}
silc_mutex_unlock(stream->lock);
return FALSE;
}
+ silc_free(stream->src_id);
+ stream->src_id = tmp_id;
stream->src_id_type = src_id_type;
stream->src_id_len = len;
}
if (dst_id) {
stream->src_id_type = src_id_type;
stream->src_id_len = len;
}
if (dst_id) {
- silc_free(stream->dst_id);
+ SILC_LOG_DEBUG(("Setting destination ID to packet stream %p", stream));
+
if (!silc_id_id2str(dst_id, dst_id_type, tmp, sizeof(tmp), &len)) {
silc_mutex_unlock(stream->lock);
return FALSE;
}
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) {
+
tmp
_id = silc_memdup(tmp, len);
+ if (!
tmp
_id) {
silc_mutex_unlock(stream->lock);
return FALSE;
}
silc_mutex_unlock(stream->lock);
return FALSE;
}
+ silc_free(stream->dst_id);
+ stream->dst_id = tmp_id;
stream->dst_id_type = dst_id_type;
stream->dst_id_len = len;
}
stream->dst_id_type = dst_id_type;
stream->dst_id_len = len;
}
@@
-1352,37
+1378,19
@@
SilcBool silc_packet_get_ids(SilcPacketStream stream,
SilcBool *src_id_set, SilcID *src_id,
SilcBool *dst_id_set, SilcID *dst_id)
{
SilcBool *src_id_set, SilcID *src_id,
SilcBool *dst_id_set, SilcID *dst_id)
{
- if (src_id && stream->src_id) {
- (*src_id).type = stream->src_id_type;
- switch (stream->src_id_type) {
- case SILC_ID_CLIENT:
- (*src_id).u.client_id = *(SilcClientID *)stream->src_id;
- break;
- case SILC_ID_SERVER:
- (*src_id).u.server_id = *(SilcServerID *)stream->src_id;
- break;
- case SILC_ID_CHANNEL:
- (*src_id).u.channel_id = *(SilcChannelID *)stream->src_id;
- break;
- }
- }
+ if (src_id && stream->src_id)
+ if (!silc_id_str2id2(stream->src_id, stream->src_id_len,
+ stream->src_id_type, src_id))
+ return FALSE;
+
if (stream->src_id && src_id_set)
*src_id_set = TRUE;
if (stream->src_id && src_id_set)
*src_id_set = TRUE;
- if (dst_id && stream->dst_id) {
- (*dst_id).type = stream->dst_id_type;
- switch (stream->dst_id_type) {
- case SILC_ID_CLIENT:
- (*dst_id).u.client_id = *(SilcClientID *)stream->dst_id;
- break;
- case SILC_ID_SERVER:
- (*dst_id).u.server_id = *(SilcServerID *)stream->dst_id;
- break;
- case SILC_ID_CHANNEL:
- (*dst_id).u.channel_id = *(SilcChannelID *)stream->dst_id;
- break;
- }
- }
+ if (dst_id && stream->dst_id)
+ if (!silc_id_str2id2(stream->dst_id, stream->dst_id_len,
+ stream->dst_id_type, dst_id))
+ return FALSE;
+
if (stream->dst_id && dst_id_set)
*dst_id_set = TRUE;
if (stream->dst_id && dst_id_set)
*dst_id_set = TRUE;
@@
-1468,14
+1476,6
@@
static inline void silc_packet_send_ctr_increment(SilcPacketStream stream,
unsigned char *iv = silc_cipher_get_iv(cipher);
SilcUInt32 pc1, pc2;
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);
/* Reset block counter */
memset(iv + 12, 0, 4);
@@
-1486,11
+1486,24
@@
static inline void silc_packet_send_ctr_increment(SilcPacketStream stream,
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];
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);
+
+ /* Increment 32-bit packet counter */
+ SILC_GET32_MSB(pc1, iv + 8);
+ pc1++;
+ SILC_PUT32_MSB(pc1, ret_iv + 4);
+
SILC_LOG_HEXDUMP(("IV"), ret_iv, 8);
/* Set new nonce to counter block */
SILC_LOG_HEXDUMP(("IV"), ret_iv, 8);
/* Set new nonce to counter block */
- memcpy(iv + 4, ret_iv, 4);
+ memcpy(iv + 4, ret_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);
}
SILC_LOG_HEXDUMP(("Counter Block"), iv, 16);
}
SILC_LOG_HEXDUMP(("Counter Block"), iv, 16);
@@
-1973,8
+1986,8
@@
static inline SilcBool silc_packet_parse(SilcPacket packet)
silc_buffer_len(buffer)), buffer->head,
silc_buffer_headlen(buffer) + silc_buffer_len(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)));
+ SILC_LOG_DEBUG(("Incoming packet type: %d (%s)
, flags %d
", packet->type,
+ silc_get_packet_name(packet->type)
, packet->flags
));
return TRUE;
}
return TRUE;
}
@@
-2331,7
+2344,7
@@
silc_packet_wait_packet_receive(SilcPacketEngine engine,
void *stream_context);
/* Packet waiting callbacks */
void *stream_context);
/* Packet waiting callbacks */
-static SilcPacketCallbacks silc_packet_wait_cbs =
+static
const
SilcPacketCallbacks silc_packet_wait_cbs =
{
silc_packet_wait_packet_receive, NULL, NULL
};
{
silc_packet_wait_packet_receive, NULL, NULL
};
@@
-2341,6
+2354,9
@@
typedef struct {
SilcMutex wait_lock;
SilcCond wait_cond;
SilcList packet_queue;
SilcMutex wait_lock;
SilcCond wait_cond;
SilcList packet_queue;
+ unsigned char id[28];
+ unsigned int id_type : 2;
+ unsigned int id_len : 5;
unsigned int stopped : 1;
} *SilcPacketWait;
unsigned int stopped : 1;
} *SilcPacketWait;
@@
-2355,6
+2371,13
@@
silc_packet_wait_packet_receive(SilcPacketEngine engine,
{
SilcPacketWait pw = callback_context;
{
SilcPacketWait pw = callback_context;
+ /* If source ID is specified check for it */
+ if (pw->id_len) {
+ if (pw->id_type != packet->src_id_type ||
+ memcmp(pw->id, packet->src_id, pw->id_len))
+ return FALSE;
+ }
+
/* Signal the waiting thread for a new packet */
silc_mutex_lock(pw->wait_lock);
/* Signal the waiting thread for a new packet */
silc_mutex_lock(pw->wait_lock);
@@
-2373,7
+2396,8
@@
silc_packet_wait_packet_receive(SilcPacketEngine engine,
/* Initialize packet waiting */
/* Initialize packet waiting */
-void *silc_packet_wait_init(SilcPacketStream stream, ...)
+void *silc_packet_wait_init(SilcPacketStream stream,
+ const SilcID *source_id, ...)
{
SilcPacketWait pw;
SilcBool ret;
{
SilcPacketWait pw;
SilcBool ret;
@@
-2395,7
+2419,7
@@
void *silc_packet_wait_init(SilcPacketStream stream, ...)
}
/* Link to the packet stream for the requested packet types */
}
/* Link to the packet stream for the requested packet types */
- va_start(ap, s
tream
);
+ va_start(ap, s
ource_id
);
ret = silc_packet_stream_link_va(stream, &silc_packet_wait_cbs, pw,
10000000, ap);
va_end(ap);
ret = silc_packet_stream_link_va(stream, &silc_packet_wait_cbs, pw,
10000000, ap);
va_end(ap);
@@
-2409,6
+2433,14
@@
void *silc_packet_wait_init(SilcPacketStream stream, ...)
/* Initialize packet queue */
silc_list_init(pw->packet_queue, struct SilcPacketStruct, next);
/* Initialize packet queue */
silc_list_init(pw->packet_queue, struct SilcPacketStruct, next);
+ if (source_id) {
+ SilcUInt32 id_len;
+ silc_id_id2str(SILC_ID_GET_ID(*source_id), source_id->type, pw->id,
+ sizeof(pw->id), &id_len);
+ pw->id_type = source_id->type;
+ pw->id_len = id_len;
+ }
+
return (void *)pw;
}
return (void *)pw;
}
@@
-2501,7
+2533,7
@@
typedef struct {
} *SilcPacketWrapperStream;
/* Packet wrapper callbacks */
} *SilcPacketWrapperStream;
/* Packet wrapper callbacks */
-static SilcPacketCallbacks silc_packet_wrap_cbs =
+static
const
SilcPacketCallbacks silc_packet_wrap_cbs =
{
silc_packet_wrap_packet_receive, NULL, NULL
};
{
silc_packet_wrap_packet_receive, NULL, NULL
};
@@
-2744,7
+2776,7
@@
SilcStream silc_packet_stream_wrap(SilcPacketStream stream,
if (pws->blocking) {
/* Blocking mode. Use packet waiter to do the thing. */
if (pws->blocking) {
/* Blocking mode. Use packet waiter to do the thing. */
- pws->waiter = silc_packet_wait_init(pws->stream, pws->type, -1);
+ pws->waiter = silc_packet_wait_init(pws->stream,
NULL,
pws->type, -1);
if (!pws->waiter) {
silc_free(pws);
return NULL;
if (!pws->waiter) {
silc_free(pws);
return NULL;