Patches from Sven-Ola

diff --git a/lib/httpinfo/src/olsrd_httpinfo.c b/lib/httpinfo/src/olsrd_httpinfo.c
index 83ca3ac..49199d3 100644 (file)
--- a/lib/httpinfo/src/olsrd_httpinfo.c
+++ b/lib/httpinfo/src/olsrd_httpinfo.c
@@ -36,7 +36,7 @@
  * to the project. For more information see the website or contact
  * the copyright holders.
  *
- * $Id: olsrd_httpinfo.c,v 1.56 2005/12/17 17:22:26 kattemat Exp $
+ * $Id: olsrd_httpinfo.c,v 1.57 2005/12/22 15:06:52 kattemat Exp $
  */
 
 /*
@@ -808,6 +808,8 @@ build_config_body(char *buf, olsr_u32_t bufsize)
 
     size += sprintf(&buf[size], "</tr>\n<tr>\n");
 
+    size += sprintf(&buf[size], "<td>Fisheye: %s</td>\n", olsr_cnf->lq_fish ? "Enabled" : "Disabled");
+
     size += sprintf(&buf[size], "<td>TOS: 0x%04x</td>\n", olsr_cnf->tos);
 
     size += sprintf(&buf[size], "<td>Willingness: %d %s</td>\n", olsr_cnf->willingness, olsr_cnf->willingness_auto ? "(auto)" : "");

diff --git a/src/net_olsr.c b/src/net_olsr.c
index 7bc5a3c..a4e182d 100644 (file)
--- a/src/net_olsr.c
+++ b/src/net_olsr.c
@@ -36,7 +36,7 @@
  * to the project. For more information see the website or contact
  * the copyright holders.
  *
- * $Id: net_olsr.c,v 1.5 2005/10/23 20:58:14 tlopatic Exp $
+ * $Id: net_olsr.c,v 1.6 2005/12/22 15:06:52 kattemat Exp $
  */
 
 #include "net_olsr.h"
@@ -151,7 +151,8 @@ net_add_buffer(struct interface *ifp)
   /* Fill struct */
   new_buf->bufsize = ifp->int_mtu;
   new_buf->if_index = ifp->if_nr;
-  new_buf->maxsize = ifp->int_mtu - OLSR_HEADERSIZE;
+  new_buf->maxsize = ifp->int_mtu - OLSR_HEADERSIZE - (olsr_cnf->ip_version == AF_INET ? 28 : 0);
+
   new_buf->pending = 0;
   new_buf->reserved = 0;