diff --git a/isisd/ChangeLog b/isisd/ChangeLog
index c34f827..4fed28f 100644
--- a/isisd/ChangeLog
+++ b/isisd/ChangeLog
@@ -1,3 +1,13 @@
+2005-09-01 Hasso Tepper <hasso at quagga.net>
+
+	* isis_adjacency.c, isis_lsp.c, isisd.c: Replace XMALLOC && memset
+	  with XCALLOC.
+	* isis_lsp.c (lsp_build_pseudo): Fix adding ES neighbour.
+	* isis_tlv.c: More compact free_tlvs() function.
+	* isis_lsp.c (lsp_build_nonpseudo) : Try to fix one more regression
+	  introduced by stream cleanup. Seek enp to the right place before
+	  starting to fill stream with TLVs.
+
 2005-08-16 Hasso Tepper <hasso at quagga.net>
 
 	* isis_misc.[ch]: Fix some warnings, making some strings const.
diff --git a/isisd/isis_adjacency.c b/isisd/isis_adjacency.c
index af4e963..3d84773 100644
--- a/isisd/isis_adjacency.c
+++ b/isisd/isis_adjacency.c
@@ -54,8 +54,7 @@
 {
   struct isis_adjacency *adj;
 
-  adj = XMALLOC (MTYPE_ISIS_ADJACENCY, sizeof (struct isis_adjacency));
-  memset (adj, 0, sizeof (struct isis_adjacency));
+  adj = XCALLOC (MTYPE_ISIS_ADJACENCY, sizeof (struct isis_adjacency));
   memcpy (adj->sysid, id, ISIS_SYS_ID_LEN);
 
   return adj;
diff --git a/isisd/isis_lsp.c b/isisd/isis_lsp.c
index 0860b15..52896c4 100644
--- a/isisd/isis_lsp.c
+++ b/isisd/isis_lsp.c
@@ -437,9 +437,7 @@
 {
   struct isis_lsp *lsp;
 
-  lsp = XMALLOC (MTYPE_ISIS_LSP, sizeof (struct isis_lsp));
-  memset (lsp, 0, sizeof (struct isis_lsp));
-
+  lsp = XCALLOC (MTYPE_ISIS_LSP, sizeof (struct isis_lsp));
   lsp_update_data (lsp, stream, area);
 
   if (lsp0 == NULL)
@@ -467,14 +465,13 @@
 {
   struct isis_lsp *lsp;
 
-  lsp = XMALLOC (MTYPE_ISIS_LSP, sizeof (struct isis_lsp));
+  lsp = XCALLOC (MTYPE_ISIS_LSP, sizeof (struct isis_lsp));
   if (!lsp)
     {
       /* FIXME: set lspdbol bit */
       zlog_warn ("lsp_new(): out of memory");
       return NULL;
     }
-  memset (lsp, 0, sizeof (struct isis_lsp));
 #ifdef LSP_MEMORY_PREASSIGN
   lsp->pdu = stream_new (1514);	/*Should be minimal mtu? yup... */
 #else
@@ -924,7 +921,7 @@
 #else /* otherwise we have to move all pointers */
   u_char *newpdu;
   newpdu = stream_new (ntohs (lsp->lsp_header->pdu_len) + size);
-  stream_put (newpdu, STREAM_DATA(lsp->pdu), ntohs (lsp->lsp_header->pdu_len);
+  stream_put (newpdu, STREAM_DATA(lsp->pdu), ntohs (lsp->lsp_header->pdu_len));
   XFREE (memorytype, lsp->pdu);
   lsp->pdu = newpdu;
   lsp->isis_header = (struct isis_fixed_hdr *) STREAM_DATA (lsp->pdu);
@@ -1004,8 +1001,7 @@
     {
       if (lsp->tlv_data.is_neighs == NULL)
 	lsp->tlv_data.is_neighs = list_new ();
-      is_neigh = XMALLOC (MTYPE_ISIS_TLV, sizeof (struct is_neigh));
-      memset (is_neigh, 0, sizeof (struct is_neigh));
+      is_neigh = XCALLOC (MTYPE_ISIS_TLV, sizeof (struct is_neigh));
       memcpy (&is_neigh->neigh_id, area->topology_baseis, ISIS_SYS_ID_LEN);
       /* connected to the first */
       is_neigh->neigh_id[ISIS_SYS_ID_LEN - 1] = (0x01);
@@ -1041,7 +1037,7 @@
           for (ALL_LIST_ELEMENTS (circuit->ip_addrs, ipnode, ipnnode, ipv4))
 	    {
 	      ipreach =
-		XMALLOC (MTYPE_ISIS_TLV, sizeof (struct ipv4_reachability));
+		XCALLOC (MTYPE_ISIS_TLV, sizeof (struct ipv4_reachability));
 	      ipreach->metrics = circuit->metrics[level - 1];
 	      ipreach->prefix = ipv4->prefix;
 	      masklen2ip (ipv4->prefixlen, &ipreach->mask);
@@ -1064,8 +1060,7 @@
                                   ipnnode, ipv6))
 	    {
 	      ip6reach =
-		XMALLOC (MTYPE_ISIS_TLV, sizeof (struct ipv6_reachability));
-	      memset (ip6reach, 0, sizeof (struct ipv6_reachability));
+		XCALLOC (MTYPE_ISIS_TLV, sizeof (struct ipv6_reachability));
 	      ip6reach->metric =
 		htonl (circuit->metrics[level - 1].metric_default);
 	      ip6reach->control_info = 0;
@@ -1087,8 +1082,7 @@
 		  lsp->tlv_data.is_neighs = list_new ();
 		  lsp->tlv_data.is_neighs->del = free_tlv;
 		}
-	      is_neigh = XMALLOC (MTYPE_ISIS_TLV, sizeof (struct is_neigh));
-	      memset (is_neigh, 0, sizeof (struct is_neigh));
+	      is_neigh = XCALLOC (MTYPE_ISIS_TLV, sizeof (struct is_neigh));
 	      if (level == 1)
 		memcpy (&is_neigh->neigh_id,
 			circuit->u.bc.l1_desig_is, ISIS_SYS_ID_LEN + 1);
@@ -1108,8 +1102,7 @@
 		  lsp->tlv_data.is_neighs = list_new ();
 		  lsp->tlv_data.is_neighs->del = free_tlv;
 		}
-	      is_neigh = XMALLOC (MTYPE_ISIS_TLV, sizeof (struct is_neigh));
-	      memset (is_neigh, 0, sizeof (struct is_neigh));
+	      is_neigh = XCALLOC (MTYPE_ISIS_TLV, sizeof (struct is_neigh));
 	      memcpy (&is_neigh->neigh_id, nei->sysid, ISIS_SYS_ID_LEN);
 	      is_neigh->metrics = circuit->metrics[level - 1];
 	      listnode_add (lsp->tlv_data.is_neighs, is_neigh);
@@ -1275,7 +1268,7 @@
 #endif /* HAVE_IPV6 */
     )
     {
-      lsp->tlv_data.nlpids = XMALLOC (MTYPE_ISIS_TLV, sizeof (struct nlpids));
+      lsp->tlv_data.nlpids = XCALLOC (MTYPE_ISIS_TLV, sizeof (struct nlpids));
       lsp->tlv_data.nlpids->count = 0;
       if (area->ip_circuits > 0)
 	{
@@ -1305,6 +1298,13 @@
   /*
    * Building the zero lsp
    */
+
+  /* Reset stream endp. Stream is always there and on every LSP refresh only
+   * TLV part of it is overwritten. So we must seek past header we will not
+   * touch. */
+  lsp->pdu->endp = 0;
+  stream_forward_endp (lsp->pdu, ISIS_FIXED_HDR_LEN + ISIS_LSP_HDR_LEN);
+
   /*
    * Add the authentication info if its present
    */
@@ -1366,7 +1366,7 @@
           for (ALL_LIST_ELEMENTS (circuit->ip_addrs, ipnode, ipnnode, ipv4))
 	    {
 	      ipreach =
-		XMALLOC (MTYPE_ISIS_TLV, sizeof (struct ipv4_reachability));
+		XCALLOC (MTYPE_ISIS_TLV, sizeof (struct ipv4_reachability));
 	      ipreach->metrics = circuit->metrics[level - 1];
 	      masklen2ip (ipv4->prefixlen, &ipreach->mask);
 	      ipreach->prefix.s_addr = ((ipreach->mask.s_addr) &
@@ -1391,8 +1391,7 @@
                                   ipv6))
 	    {
 	      ip6reach =
-		XMALLOC (MTYPE_ISIS_TLV, sizeof (struct ipv6_reachability));
-	      memset (ip6reach, 0, sizeof (struct ipv6_reachability));
+		XCALLOC (MTYPE_ISIS_TLV, sizeof (struct ipv6_reachability));
 	      ip6reach->metric =
 		htonl (circuit->metrics[level - 1].metric_default);
 	      ip6reach->control_info = 0;
@@ -1415,8 +1414,7 @@
 		{
 		  tlv_data.is_neighs = list_new ();
 		}
-	      is_neigh = XMALLOC (MTYPE_ISIS_TLV, sizeof (struct is_neigh));
-	      memset (is_neigh, 0, sizeof (struct is_neigh));
+	      is_neigh = XCALLOC (MTYPE_ISIS_TLV, sizeof (struct is_neigh));
 	      if (level == 1)
 		memcpy (is_neigh->neigh_id,
 			circuit->u.bc.l1_desig_is, ISIS_SYS_ID_LEN + 1);
@@ -1436,8 +1434,7 @@
 		  tlv_data.is_neighs = list_new ();
 		  tlv_data.is_neighs->del = free_tlv;
 		}
-	      is_neigh = XMALLOC (MTYPE_ISIS_TLV, sizeof (struct is_neigh));
-	      memset (is_neigh, 0, sizeof (struct is_neigh));
+	      is_neigh = XCALLOC (MTYPE_ISIS_TLV, sizeof (struct is_neigh));
 	      memcpy (is_neigh->neigh_id, nei->sysid, ISIS_SYS_ID_LEN);
 	      is_neigh->metrics = circuit->metrics[level - 1];
 	      listnode_add (tlv_data.is_neighs, is_neigh);
@@ -1903,7 +1900,7 @@
 	      es_neigh = XCALLOC (MTYPE_ISIS_TLV, sizeof (struct es_neigh));
 	      
 	      memcpy (&es_neigh->first_es_neigh, adj->sysid, ISIS_SYS_ID_LEN);
-	      listnode_add (lsp->tlv_data.es_neighs, is_neigh);
+	      listnode_add (lsp->tlv_data.es_neighs, es_neigh);
 	    }
 	}
     }
@@ -2213,8 +2210,7 @@
    * We need to create the LSP to be purged 
    */
   zlog_debug ("LSP PURGE NON EXIST");
-  lsp = XMALLOC (MTYPE_ISIS_LSP, sizeof (struct isis_lsp));
-  memset (lsp, 0, sizeof (struct isis_lsp));
+  lsp = XCALLOC (MTYPE_ISIS_LSP, sizeof (struct isis_lsp));
   /*FIXME: BUG BUG BUG! the lsp doesn't exist here! */
   /*did smt here, maybe good probably not */
   lsp->level = ((lsp_hdr->lsp_bits & LSPBIT_IST) == IS_LEVEL_1) ? 1 : 2;
diff --git a/isisd/isis_tlv.c b/isisd/isis_tlv.c
index 1194f04..1850e15 100644
--- a/isisd/isis_tlv.c
+++ b/isisd/isis_tlv.c
@@ -61,59 +61,34 @@
 free_tlvs (struct tlvs *tlvs)
 {
   if (tlvs->area_addrs)
-    {
-      list_delete (tlvs->area_addrs);
-    }
+    list_delete (tlvs->area_addrs);
   if (tlvs->is_neighs)
-    {
-      list_delete (tlvs->is_neighs);
-    }
+    list_delete (tlvs->is_neighs);
   if (tlvs->te_is_neighs)
-    {
-      list_delete (tlvs->te_is_neighs);
-    }
+    list_delete (tlvs->te_is_neighs);
   if (tlvs->es_neighs)
-    {
-      list_delete (tlvs->es_neighs);
-    }
+    list_delete (tlvs->es_neighs);
   if (tlvs->lsp_entries)
-    {
-      list_delete (tlvs->lsp_entries);
-    }
+    list_delete (tlvs->lsp_entries);
   if (tlvs->lan_neighs)
-    {
-      list_delete (tlvs->lan_neighs);
-    }
+    list_delete (tlvs->lan_neighs);
   if (tlvs->prefix_neighs)
-    {
-      list_delete (tlvs->prefix_neighs);
-    }
+    list_delete (tlvs->prefix_neighs);
   if (tlvs->ipv4_addrs)
-    {
-      list_delete (tlvs->ipv4_addrs);
-    }
+    list_delete (tlvs->ipv4_addrs);
   if (tlvs->ipv4_int_reachs)
-    {
-      list_delete (tlvs->ipv4_int_reachs);
-    }
+    list_delete (tlvs->ipv4_int_reachs);
   if (tlvs->ipv4_ext_reachs)
-    {
-      list_delete (tlvs->ipv4_ext_reachs);
-    }
+    list_delete (tlvs->ipv4_ext_reachs);
   if (tlvs->te_ipv4_reachs)
-    {
-      list_delete (tlvs->te_ipv4_reachs);
-    }
+    list_delete (tlvs->te_ipv4_reachs);
 #ifdef HAVE_IPV6
   if (tlvs->ipv6_addrs)
-    {
-      list_delete (tlvs->ipv6_addrs);
-    }
+    list_delete (tlvs->ipv6_addrs);
   if (tlvs->ipv6_reachs)
-    {
-      list_delete (tlvs->ipv6_reachs);
-    }
+    list_delete (tlvs->ipv6_reachs);
 #endif /* HAVE_IPV6 */
+  
   return;
 }
 
diff --git a/isisd/isisd.c b/isisd/isisd.c
index 5ab1f27..e6679cf 100644
--- a/isisd/isisd.c
+++ b/isisd/isisd.c
@@ -65,8 +65,7 @@
 void
 isis_new (unsigned long process_id)
 {
-  isis = XMALLOC (MTYPE_ISIS, sizeof (struct isis));
-  bzero (isis, sizeof (struct isis));
+  isis = XCALLOC (MTYPE_ISIS, sizeof (struct isis));
   /*
    * Default values
    */
@@ -91,8 +90,7 @@
 {
   struct isis_area *area;
 
-  area = XMALLOC (MTYPE_ISIS_AREA, sizeof (struct isis_area));
-  memset (area, 0, sizeof (struct isis_area));
+  area = XCALLOC (MTYPE_ISIS_AREA, sizeof (struct isis_area));
 
   /*
    * The first instance is level-1-2 rest are level-1, unless otherwise