remove old debugoutput to stderr, small fixes for RtProto and OlsrPort

diff --git a/src/link_set.c b/src/link_set.c
index 7dafb78..84c1891 100644 (file)
--- a/src/link_set.c
+++ b/src/link_set.c
@@ -468,7 +468,7 @@ olsr_set_link_timer(struct link_entry *link, unsigned int rel_timer)
 {
   struct ipaddr_str buf;
 
-  fprintf(stderr, "reset link timer: %s = %u\n",
+  OLSR_PRINTF(3, "reset link timer: %s = %u\n",
     olsr_ip_to_string(&buf, &link->neighbor_iface_addr),
     (unsigned int)(olsr_times() + rel_timer/1000));
   olsr_set_timer(&link->link_timer, rel_timer, OLSR_LINK_JITTER, OLSR_TIMER_ONESHOT, &olsr_expire_link_entry, link, 0);

diff --git a/src/linux/kernel_routes.c b/src/linux/kernel_routes.c
index 51deed8..0aa8691 100644 (file)
--- a/src/linux/kernel_routes.c
+++ b/src/linux/kernel_routes.c
@@ -127,7 +127,7 @@ olsr_netlink_route_int(const struct rt_entry *rt, uint8_t family, uint8_t rttabl
     /*do not specify much if we wanna delete similar routes*/
     /*this currently works for different interfaces, src-ips metrics, gateways, protos*/
     if ((flag != RT_DELETE_SIMILAR_ROUTE) & (flag != RT_DELETE_SIMILAR_AUTO_ROUTE)) {
-      req.r.rtm_protocol = RTPROT_BOOT;
+      req.r.rtm_protocol = ((olsr_cnf->rtproto<1)?RTPROT_BOOT:((olsr_cnf->rtproto==1)?0:olsr_cnf->rtproto));
       req.r.rtm_scope = RT_SCOPE_LINK;
       /*add interface*/
       olsr_netlink_addreq(&req, RTA_OIF, &nexthop->iif_index, sizeof(nexthop->iif_index));

diff --git a/src/win32/net.c b/src/win32/net.c
index f7c1a69..3f6af85 100644 (file)
--- a/src/win32/net.c
+++ b/src/win32/net.c
@@ -132,7 +132,7 @@ getsocket(int BuffSize, char *Int __attribute__ ((unused)))
 
   memset(&Addr, 0, sizeof(Addr));
   Addr.sin_family = AF_INET;
-  Addr.sin_port = htons(OLSRPORT);
+  Addr.sin_port = htons(olsr_cnf->olsrport);
   Addr.sin_addr.s_addr = INADDR_ANY;
   if (bind(Sock, (struct sockaddr *)&Addr, sizeof(Addr)) < 0) {
     WinSockPError("getsocket/bind()");