(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);
ret = silc_net_udp_receive(stream, remote_ip, sizeof(remote_ip),
&remote_port, ps->inbuf.tail,
silc_buffer_taillen(&ps->inbuf));
- if (ret == -2) {
+ if (silc_unlikely(ret == -2)) {
/* Error */
silc_buffer_reset(&ps->inbuf);
silc_mutex_unlock(ps->lock);
silc_mutex_lock(remote->lock);
if (ret > silc_buffer_taillen(&remote->inbuf))
- if (!silc_buffer_realloc(&remote->inbuf, ret)) {
+ if (silc_unlikely(!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);
/* 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;
ret = silc_stream_read(ps->stream, ps->inbuf.tail,
silc_buffer_taillen(&ps->inbuf));
- if (ret == 0) {
+ if (silc_unlikely(ret == 0)) {
/* EOS */
silc_buffer_reset(&ps->inbuf);
silc_mutex_unlock(ps->lock);
return FALSE;
}
- if (ret == -2) {
+ if (silc_unlikely(ret == -2)) {
/* Error */
silc_buffer_reset(&ps->inbuf);
silc_mutex_unlock(ps->lock);
silc_mutex_lock(ps->lock);
- if (ps->destroyed) {
+ if (silc_unlikely(ps->destroyed)) {
silc_mutex_unlock(ps->lock);
return;
}
case SILC_STREAM_CAN_WRITE:
SILC_LOG_DEBUG(("Writing pending data to stream"));
- if (!silc_buffer_headlen(&ps->outbuf)) {
+ if (silc_unlikely(!silc_buffer_headlen(&ps->outbuf))) {
silc_mutex_unlock(ps->lock);
return;
}
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;
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;
}
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);
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;
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)) {
+ 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;
}
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->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;
+ return stream->destroyed == FALSE;
}
silc_dlist_start(stream->process);
stream->engine->callback_context,
stream->stream_context)) {
silc_mutex_lock(stream->lock);
- return;
+ return stream->destroyed == FALSE;
}
silc_mutex_lock(stream->lock);
}
p->callback_context,
stream->stream_context)) {
silc_mutex_lock(stream->lock);
- return;
+ return stream->destroyed == FALSE;
}
silc_mutex_lock(stream->lock);
} else {
p->callback_context,
stream->stream_context)) {
silc_mutex_lock(stream->lock);
- return;
+ return stream->destroyed == FALSE;
}
silc_mutex_lock(stream->lock);
break;
stream->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
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(&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 (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) {
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);
}
/* 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, 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);
/* Get packet */
packet = silc_packet_alloc(stream->engine);
- if (!packet) {
+ if (silc_unlikely(!packet)) {
silc_mutex_unlock(stream->lock);
SILC_PACKET_CALLBACK_ERROR(stream, SILC_PACKET_ERR_NO_MEMORY);
silc_mutex_lock(stream->lock);
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_buffer_put(&packet->buffer, (stream->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_buffer_pull(&stream->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);
}
/* Dispatch the packet to application */
- silc_packet_dispatch(packet);
+ if (!silc_packet_dispatch(packet))
+ break;
}
silc_buffer_reset(&stream->inbuf);
/* 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;
}
projects / silc.git / blobdiff