Merge branch 'topic/mm-fixes' of git://208.110.73.182/silc into silc.1.1.branch

[silc.git] / lib / silcutil / silcsocketstream.c

diff --git a/lib/silcutil/silcsocketstream.c b/lib/silcutil/silcsocketstream.c
index a617f45c2fffb3d376fb19e55cdd3445a93a2b66..af8f2c34cba0b60f6584b07dd57b10931fe115ab 100644 (file)
--- a/lib/silcutil/silcsocketstream.c
+++ b/lib/silcutil/silcsocketstream.c
@@ -4,7 +4,7 @@
 
   Author: Pekka Riikonen <priikone@silcnet.org>
 
-  Copyright (C) 2005 - 2006 Pekka Riikonen
+  Copyright (C) 2005 - 2008 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
@@ -72,7 +72,7 @@ SILC_TASK_CALLBACK(silc_socket_host_lookup_finish)
   }
 
   if (lookup->status != SILC_SOCKET_OK) {
-    SILC_LOG_DEBUG(("Socket stream failed"));
+    SILC_LOG_DEBUG(("Socket stream lookup failed"));
     stream->schedule = NULL;
     silc_socket_stream_destroy(stream);
     stream = lookup->stream = NULL;
@@ -152,7 +152,8 @@ silc_socket_tcp_stream_create(SilcSocket sock, SilcBool lookup,
   SilcSocketStream stream;
   SilcSocketHostLookup l;
 
-  if (!sock) {
+  if (!sock || !schedule) {
+    SILC_LOG_ERROR(("Missing arguments to silc_socket_tcp_stream_create"));
     if (callback)
       callback(SILC_SOCKET_ERROR, NULL, context);
     return NULL;
@@ -170,6 +171,7 @@ silc_socket_tcp_stream_create(SilcSocket sock, SilcBool lookup,
   stream->ops = &silc_socket_stream_ops;
   stream->sock = sock;
   stream->schedule = schedule;
+  stream->connected = TRUE;
 
   l = silc_calloc(1, sizeof(*l));
   if (!l) {
@@ -261,20 +263,20 @@ SilcBool silc_socket_stream_get_info(SilcStream stream,
 
   if (sock)
     *sock = socket_stream->sock;
-  if (hostname) {
-    if (!socket_stream->hostname)
+  if (port) {
+    if (!socket_stream->port)
       return FALSE;
-    *hostname = socket_stream->hostname;
+    *port = socket_stream->port;
   }
   if (ip) {
     if (!socket_stream->ip)
       return FALSE;
     *ip = socket_stream->ip;
   }
-  if (port) {
-    if (!socket_stream->port)
+  if (hostname) {
+    if (!socket_stream->hostname)
       return FALSE;
-    *port = socket_stream->port;
+    *hostname = socket_stream->hostname;
   }
 
   return TRUE;
@@ -348,6 +350,7 @@ SilcBool silc_socket_stream_set_qos(SilcStream stream,
       !limit_sec && !limit_usec) {
     silc_schedule_task_del_by_context(socket_stream->schedule,
                                      socket_stream->qos);
+    silc_free(socket_stream->qos->buffer);
     silc_free(socket_stream->qos);
     socket_stream->qos = NULL;
     return TRUE;
@@ -368,7 +371,8 @@ SilcBool silc_socket_stream_set_qos(SilcStream stream,
   socket_stream->qos->cur_rate = 0;
   socket_stream->qos->sock = socket_stream;
 
-  socket_stream->qos->buffer = silc_malloc(read_limit_bytes);
+  socket_stream->qos->buffer = silc_realloc(socket_stream->qos->buffer,
+                                           read_limit_bytes);
   if (!socket_stream->qos->buffer)
     return FALSE;