updates.

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

diff --git a/lib/silcutil/silcutil.c b/lib/silcutil/silcutil.c
index 2f0f69e00af6ef2286a5601538d88dec1def4e2e..6b118ee8a07a0bf2e6dbfd5d723880ba340520d1 100644 (file)
--- a/lib/silcutil/silcutil.c
+++ b/lib/silcutil/silcutil.c
@@ -274,6 +274,7 @@ char *silc_encode_pem_file(unsigned char *data, uint32 data_len)
     pem2[i] = pem[j++];
   }
 
+  silc_free(pem);
   return pem2;
 }
 
@@ -486,7 +487,15 @@ char *silc_id_render(void *id, uint16 type)
   case SILC_ID_SERVER:
     {
       SilcServerID *server_id = (SilcServerID *)id;
-      strcat(rid, inet_ntoa(server_id->ip));
+      struct in_addr ipv4;
+
+      if (server_id->ip.data_len > 4) {
+
+      } else {
+       SILC_GET32_MSB(ipv4.s_addr, server_id->ip.data);
+       strcat(rid, inet_ntoa(ipv4));
+      }
+
       memset(tmp, 0, sizeof(tmp));
       snprintf(tmp, sizeof(tmp), ",%d,", ntohs(server_id->port));
       strcat(rid, tmp);
@@ -499,7 +508,15 @@ char *silc_id_render(void *id, uint16 type)
   case SILC_ID_CLIENT:
     {
       SilcClientID *client_id = (SilcClientID *)id;
-      strcat(rid, inet_ntoa(client_id->ip));
+      struct in_addr ipv4;
+
+      if (client_id->ip.data_len > 4) {
+
+      } else {
+       SILC_GET32_MSB(ipv4.s_addr, client_id->ip.data);
+       strcat(rid, inet_ntoa(ipv4));
+      }
+
       memset(tmp, 0, sizeof(tmp));
       snprintf(tmp, sizeof(tmp), ",%02x,", client_id->rnd);
       strcat(rid, tmp);
@@ -513,7 +530,15 @@ char *silc_id_render(void *id, uint16 type)
   case SILC_ID_CHANNEL:
     {
       SilcChannelID *channel_id = (SilcChannelID *)id;
-      strcat(rid, inet_ntoa(channel_id->ip));
+      struct in_addr ipv4;
+
+      if (channel_id->ip.data_len > 4) {
+
+      } else {
+       SILC_GET32_MSB(ipv4.s_addr, channel_id->ip.data);
+       strcat(rid, inet_ntoa(ipv4));
+      }
+
       memset(tmp, 0, sizeof(tmp));
       snprintf(tmp, sizeof(tmp), ",%d,", ntohs(channel_id->port));
       strcat(rid, tmp);
@@ -555,7 +580,7 @@ int silc_string_compare(char *string1, char *string2)
   tmpstr2 = silc_calloc(slen2 + 1, sizeof(char));
   memcpy(tmpstr2, string2, slen2);
   
-  for (i = 0; i < slen2; i++) {
+  for (i = 0; i < slen1; i++) {
     
     /* * wildcard. Only one * wildcard is possible. */
     if (tmpstr1[i] == '*')
@@ -576,11 +601,6 @@ int silc_string_compare(char *string1, char *string2)
        if (!(slen1 < slen2))
          tmpstr2[i] = '?';
       }
-#if 0
-    } else {
-      if (strncmp(tmpstr1, tmpstr2, i))
-       strncpy(tmpstr2, string2, slen2);
-#endif
     }
   }