Debugs

[crypto.git] / apps / silcmap / silcmap_client.c

diff --git a/apps/silcmap/silcmap_client.c b/apps/silcmap/silcmap_client.c
index 03cc47e6c55c913770c2c9dcc488ab6f61fa2f5a..b97bf77e481a5bf4b2542eb197e59c51fbcc6f0f 100644 (file)
--- a/apps/silcmap/silcmap_client.c
+++ b/apps/silcmap/silcmap_client.c
@@ -39,6 +39,7 @@ void silc_map_process_data(SilcMap map, SilcMapConnection mapconn)
   SilcMapCommand cmd;
   SilcMap ret_map;
   SilcInt16 r, g, b, lr, lg, lb;
+  int i;
 
   map->conn_num++;
   SILC_LOG_DEBUG(("Processing the data from server (%d/%d)",
@@ -131,10 +132,10 @@ void silc_map_process_data(SilcMap map, SilcMapConnection mapconn)
     /* Produce output */
     if (map->writemap.writemap)
       silc_map_write_ppm(map, map->writemap.filename);
-    if (map->cut.cut) {
-      if (silc_map_cut(map, map->cut.x, map->cut.y, map->cut.width,
-                      map->cut.height, &ret_map)) {
-       silc_map_write_ppm(ret_map, map->cut.filename);
+    for (i = 0; i < map->cut_count; i++) {
+      if (silc_map_cut(map, map->cut[i].x, map->cut[i].y, map->cut[i].width,
+                      map->cut[i].height, &ret_map)) {
+       silc_map_write_ppm(ret_map, map->cut[i].filename);
        silc_map_free(ret_map);
       }
     }
@@ -143,9 +144,8 @@ void silc_map_process_data(SilcMap map, SilcMapConnection mapconn)
     if (map->writehtml.writehtml)
       silc_map_writehtml_index(map);
 
-    /* Write the HTML map file */
-    if (map->writemaphtml.writemaphtml)
-      silc_map_writemaphtml(map);
+    /* Write the HTML map file(s) */
+    silc_map_writemaphtml(map);
 
     /* Schedule to stop */
     silc_schedule_task_add(map->client->schedule, 0,
@@ -413,7 +413,8 @@ silc_connected(SilcClient client, SilcClientConnection conn,
   silc_schedule_task_del_by_context(client->schedule, mapconn);
 
   if (status == SILC_CLIENT_CONN_ERROR) {
-    fprintf(stderr, "Could not connect to server\n");
+    fprintf(stderr, "Could not connect to server %s\n",
+                    conn->remote_host ? conn->remote_host : "");
     silc_client_close_connection(client, conn);
 
     /* Mark that this server is down. */
@@ -425,6 +426,7 @@ silc_connected(SilcClient client, SilcClientConnection conn,
 
   if (mapconn->down) {
     /* Already timeouted */
+    SILC_LOG_DEBUG(("Connection already timedout"));
     silc_client_close_connection(client, conn);
     return;
   }