Increased read buffer size to 64K

[silc.git] / lib / silccore / silcpacket.c

diff --git a/lib/silccore/silcpacket.c b/lib/silccore/silcpacket.c
index 57bf5148d712613903f83381b48a9759da409ba7..021041b03c9441e8f6e71531a1f83e6ae19f0c6a 100644 (file)
--- a/lib/silccore/silcpacket.c
+++ b/lib/silccore/silcpacket.c
@@ -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_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;
@@ -623,6 +623,25 @@ void silc_packet_engine_stop(SilcPacketEngine engine)
   silc_free(engine);
 }
 
+static const char *packet_error[] = {
+  "Cannot read from stream",
+  "Cannot write to stream",
+  "Packet MAC failed",
+  "Packet decryption failed",
+  "Unknown SID",
+  "Packet is malformed",
+  "System out of memory",
+};
+
+/* Return packet error string */
+
+const char *silc_packet_error_string(SilcPacketError error)
+{
+  if (error < SILC_PACKET_ERR_READ || error > SILC_PACKET_ERR_NO_MEMORY)
+    return "";
+  return packet_error[error];
+}
+
 /* Return list of packet streams in the engine */
 
 SilcDList silc_packet_engine_get_streams(SilcPacketEngine engine)
@@ -697,7 +716,7 @@ SilcPacketStream silc_packet_stream_create(SilcPacketEngine 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;
@@ -1346,9 +1365,9 @@ SilcBool silc_packet_get_ids(SilcPacketStream stream,
       (*src_id).u.channel_id = *(SilcChannelID *)stream->src_id;
       break;
     }
-    if (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;
@@ -1363,9 +1382,9 @@ SilcBool silc_packet_get_ids(SilcPacketStream stream,
       (*dst_id).u.channel_id = *(SilcChannelID *)stream->dst_id;
       break;
     }
-    if (dst_id_set)
-      *dst_id_set = TRUE;
   }
+  if (stream->dst_id && dst_id_set)
+    *dst_id_set = TRUE;
 
   return TRUE;
 }
@@ -2322,6 +2341,9 @@ typedef struct {
   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;
 
@@ -2336,6 +2358,13 @@ silc_packet_wait_packet_receive(SilcPacketEngine engine,
 {
   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);
 
@@ -2354,7 +2383,8 @@ silc_packet_wait_packet_receive(SilcPacketEngine engine,
 
 /* 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;
@@ -2376,7 +2406,7 @@ void *silc_packet_wait_init(SilcPacketStream stream, ...)
   }
 
   /* Link to the packet stream for the requested packet types */
-  va_start(ap, stream);
+  va_start(ap, source_id);
   ret = silc_packet_stream_link_va(stream, &silc_packet_wait_cbs, pw,
                                   10000000, ap);
   va_end(ap);
@@ -2390,6 +2420,14 @@ void *silc_packet_wait_init(SilcPacketStream stream, ...)
   /* 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;
 }
 
@@ -2725,7 +2763,7 @@ SilcStream silc_packet_stream_wrap(SilcPacketStream stream,
 
   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;