Bugfix for logging praeprocessor directives

diff --git a/lib/bmf/src/NetworkInterfaces.c b/lib/bmf/src/NetworkInterfaces.c
index 92bc0cf..6684230 100644 (file)
--- a/lib/bmf/src/NetworkInterfaces.c
+++ b/lib/bmf/src/NetworkInterfaces.c
@@ -531,7 +531,7 @@ void FindNeighbors(
       }
       else
       {
-#if !defined REMOVE_DEBUG
+#if !defined REMOVE_LOG_DEBUG
         struct interface* bestIntf = if_ifwithaddr(&bestLinkToNeighbor->local_iface_addr);
         struct lqtextbuffer lqbuffer;
 #endif
@@ -548,7 +548,7 @@ void FindNeighbors(
 
     if (forwardedBy != NULL)
     {
-#if !defined REMOVE_DEBUG
+#if !defined REMOVE_LOG_DEBUG
 struct ipaddr_str forwardedByBuf, niaBuf;
       struct lqtextbuffer lqbuffer;
 #endif
@@ -579,7 +579,7 @@ struct ipaddr_str forwardedByBuf, niaBuf;
 
           if (previousLinkEtx + currEtx > tcEtx)
           {
-#if !defined REMOVE_DEBUG
+#if !defined REMOVE_LOG_DEBUG
             struct ipaddr_str neighbor_iface_buf, forw_buf;
             struct lqtextbuffer lqbuffer;
             olsr_ip_to_string(&neighbor_iface_buf, &walker->neighbor_iface_addr);

diff --git a/lib/dyn_gw_plain/src/olsrd_dyn_gw_plain.c b/lib/dyn_gw_plain/src/olsrd_dyn_gw_plain.c
index 36ba27a..5b894ff 100644 (file)
--- a/lib/dyn_gw_plain/src/olsrd_dyn_gw_plain.c
+++ b/lib/dyn_gw_plain/src/olsrd_dyn_gw_plain.c
@@ -133,7 +133,7 @@ check_gw(union olsr_ip_addr *net, union olsr_ip_addr *mask)
      "Flags Metric Ref    Use Iface\n");
    */
   while (fgets(buff, 1023, fp)) {
-#if !defined REMOVE_DEBUG
+#if !defined REMOVE_LOG_DEBUG
     struct ipaddr_str buf;
 #endif
     num =

diff --git a/src/build_msg.c b/src/build_msg.c
index 2760b6e..0371754 100644 (file)
--- a/src/build_msg.c
+++ b/src/build_msg.c
@@ -162,7 +162,7 @@ serialize_mid4(struct interface *ifp)
   union olsr_message *m;
   struct midaddr *addrs;
   struct interface *ifs;
-#if !defined REMOVE_DEBUG
+#if !defined REMOVE_LOG_DEBUG
   struct ipaddr_str buf;
 #endif
   if ((olsr_cnf->ip_version != AF_INET) || (!ifp) ||
@@ -254,7 +254,7 @@ serialize_mid6(struct interface *ifp)
   union olsr_message *m;
   struct midaddr6 *addrs6;
   struct interface *ifs;
-#if !defined REMOVE_DEBUG
+#if !defined REMOVE_LOG_DEBUG
   struct ipaddr_str buf;
 #endif
 
@@ -345,7 +345,7 @@ serialize_hna4(struct interface *ifp)
   union olsr_message *m;
   struct hnapair *pair;
   struct ip_prefix_entry *h;
-#if !defined REMOVE_DEBUG
+#if !defined REMOVE_LOG_DEBUG
   struct ipprefix_str prefixstr;
 #endif
   /* No hna nets */
@@ -434,7 +434,7 @@ serialize_hna6(struct interface *ifp)
   struct hnapair6 *pair6;
   union olsr_ip_addr tmp_netmask;
   struct ip_prefix_entry *h;
-#if !defined REMOVE_DEBUG
+#if !defined REMOVE_LOG_DEBUG
   struct ipprefix_str prefixstr;
 #endif
 

diff --git a/src/hna_set.c b/src/hna_set.c
index 05eb53b..706ac4e 100644 (file)
--- a/src/hna_set.c
+++ b/src/hna_set.c
@@ -150,7 +150,7 @@ static void
 olsr_expire_hna_net_entry(void *context)
 {
   struct hna_net *hna_net = context;
-#if !defined REMOVE_DEBUG
+#if !defined REMOVE_LOG_DEBUG
   struct ipaddr_str buf;
   struct ipprefix_str prefixstr;
 #endif
@@ -217,7 +217,7 @@ void
 olsr_print_hna_set(void)
 {
   /* The whole function doesn't do anything else. */
-#if !defined REMOVE_INFO
+#if !defined REMOVE_LOG_INFO
   struct tc_entry *tc;
   struct ipaddr_str buf;
   struct ipprefix_str prefixstr;
@@ -249,7 +249,7 @@ olsr_input_hna(union olsr_message *msg,
   struct olsrmsg_hdr msg_hdr;
   struct olsr_ip_prefix prefix;
   const uint8_t *curr, *curr_end;
-#if !defined REMOVE_DEBUG
+#if !defined REMOVE_LOG_DEBUG
   struct ipaddr_str buf;
 #endif
 

diff --git a/src/link_set.c b/src/link_set.c
index eaec768..0adfdad 100644 (file)
--- a/src/link_set.c
+++ b/src/link_set.c
@@ -594,7 +594,7 @@ lookup_link_entry(const union olsr_ip_addr *remote,
       if (NULL != remote_main && olsr_ipcmp(remote_main, &link->neighbor->neighbor_main_addr) != 0)
       {
         /* Neighbor has changed it's main_addr, update */
-#if !defined REMOVE_DEBUG
+#if !defined REMOVE_LOG_DEBUG
         struct ipaddr_str oldbuf, newbuf;
 #endif
         OLSR_DEBUG(LOG_LINKS, "Neighbor changed main_ip, updating %s -> %s\n",
@@ -740,7 +740,7 @@ check_link_status(const struct lq_hello_message *message,
 void
 olsr_print_link_set(void)
 {
-#if !defined REMOVE_INFO
+#if !defined REMOVE_LOG_INFO
   /* The whole function makes no sense without it. */
   struct link_entry *walker;
   const int addrsize = olsr_cnf->ip_version == AF_INET ? 15 : 39;

diff --git a/src/lq_packet.c b/src/lq_packet.c
index 7ec3384..93d8fdf 100644 (file)
--- a/src/lq_packet.c
+++ b/src/lq_packet.c
@@ -66,7 +66,7 @@ static void
 create_lq_hello(struct lq_hello_message *lq_hello, struct interface *outif)
 {
   struct link_entry *walker;
-#if !defined REMOVE_WARN
+#if !defined REMOVE_LOG_WARN
   struct ipaddr_str buf;
 #endif
 

diff --git a/src/mid_set.c b/src/mid_set.c
index 6bb737d..2a9bb9f 100644 (file)
--- a/src/mid_set.c
+++ b/src/mid_set.c
@@ -94,7 +94,7 @@ static void
 olsr_expire_mid_entries(void *context)
 {
   struct tc_entry *tc = context;
-#if !defined REMOVE_DEBUG
+#if !defined REMOVE_LOG_DEBUG
   struct ipaddr_str buf;
 #endif
 
@@ -128,7 +128,7 @@ static void
 olsr_flush_nbr2_duplicates(struct mid_entry *alias)
 {
   struct tc_entry *tc = alias->mid_tc;
-#if !defined REMOVE_DEBUG
+#if !defined REMOVE_LOG_DEBUG
   struct ipaddr_str buf1, buf2;
 #endif
 
@@ -181,7 +181,7 @@ olsr_fixup_mid_main_addr(const union olsr_ip_addr *main_addr,
   struct neighbor_entry *nbr_new, *nbr_old = olsr_lookup_neighbor_table_alias(alias_addr);
   struct mid_entry *mid_old;
   int ne_ref_rp_count;
-#if !defined REMOVE_DEBUG
+#if !defined REMOVE_LOG_DEBUG
   struct ipaddr_str buf1, buf2;
 #endif
 
@@ -232,7 +232,7 @@ olsr_insert_mid_entry(const union olsr_ip_addr *main_addr,
 {
   struct tc_entry *tc;
   struct mid_entry *alias;
-#if !defined REMOVE_DEBUG
+#if !defined REMOVE_LOG_DEBUG
   struct ipaddr_str buf1, buf2;
 #endif
 
@@ -459,7 +459,7 @@ olsr_prune_mid_entries(const union olsr_ip_addr *main_addr, uint16_t mid_seqno)
 void
 olsr_print_mid_set(void)
 {
-#if !defined REMOVE_INFO
+#if !defined REMOVE_LOG_INFO
   struct tc_entry *tc;
   struct mid_entry *alias;
   struct ipaddr_str buf;
@@ -493,7 +493,7 @@ olsr_input_mid(union olsr_message *msg,
   olsr_reltime vtime;
   union olsr_ip_addr originator, alias;
   int alias_count;
-#if !defined REMOVE_DEBUG
+#if !defined REMOVE_LOG_DEBUG
   struct ipaddr_str buf;
 #endif
 

diff --git a/src/mpr.c b/src/mpr.c
index 96f3586..d62486c 100644 (file)
--- a/src/mpr.c
+++ b/src/mpr.c
@@ -107,7 +107,7 @@ olsr_find_2_hop_neighbors_with_1_link(int willingness)
   struct neighbor_2_list_entry *two_hop_list = NULL;
   struct neighbor_entry        *dup_neighbor;
   struct neighbor_2_entry      *two_hop_neighbor = NULL;
-#if !defined REMOVE_DEBUG
+#if !defined REMOVE_LOG_DEBUG
   struct ipaddr_str buf;
 #endif
   for(idx=0;idx<HASHSIZE;idx++)
@@ -171,7 +171,7 @@ olsr_chosen_mpr(struct neighbor_entry *one_hop_neighbor, uint16_t *two_hop_cover
   struct neighbor_2_list_entry *second_hop_entries;
   struct neighbor_entry        *dup_neighbor;
   uint16_t                   count;
-#if !defined REMOVE_DEBUG
+#if !defined REMOVE_LOG_DEBUG
   struct ipaddr_str            buf;
 #endif
   count = *two_hop_covered_count;
@@ -246,7 +246,7 @@ olsr_find_maximum_covered(int willingness)
   uint16_t                  maximum;
   struct neighbor_entry       *a_neighbor;
   struct neighbor_entry       *mpr_candidate = NULL;
-#if !defined REMOVE_DEBUG
+#if !defined REMOVE_LOG_DEBUG
   struct ipaddr_str buf;
 #endif
   maximum = 0;
@@ -411,7 +411,7 @@ add_will_always_nodes(void)
 {
   struct neighbor_entry *a_neighbor;
   uint16_t count = 0;
-#if !defined REMOVE_DEBUG
+#if !defined REMOVE_LOG_DEBUG
   struct ipaddr_str buf;
 #endif
   OLSR_FOR_ALL_NBR_ENTRIES(a_neighbor) {
@@ -511,7 +511,7 @@ static void
 olsr_optimize_mpr_set(void)
 {
   int i;
-#if !defined REMOVE_DEBUG
+#if !defined REMOVE_LOG_DEBUG
   struct ipaddr_str buf;
 #endif
   OLSR_DEBUG(LOG_MPR, "\n**MPR OPTIMIZING**\n\n");
@@ -559,7 +559,7 @@ olsr_optimize_mpr_set(void)
 void
 olsr_print_mpr_set(void)
 {
-#if !defined REMOVE_INFO
+#if !defined REMOVE_LOG_INFO
   /* The whole function makes no sense without it. */
   struct neighbor_entry *a_neighbor;
 

diff --git a/src/mpr_selector_set.c b/src/mpr_selector_set.c
index ed6af03..0f66082 100644 (file)
--- a/src/mpr_selector_set.c
+++ b/src/mpr_selector_set.c
@@ -71,7 +71,7 @@ static void
 olsr_expire_mpr_sel_entry(void *context)
 {
   struct mpr_selector *mpr_sel = context;
-#if !defined REMOVE_DEBUG
+#if !defined REMOVE_LOG_DEBUG
   struct ipaddr_str buf;
 #endif
   OLSR_DEBUG(LOG_MPRS, "MPRS: Timing out %st\n",
@@ -124,7 +124,7 @@ int
 olsr_update_mprs_set(const union olsr_ip_addr *addr, olsr_reltime vtime)
 {
   int rv;
-#if !defined REMOVE_DEBUG
+#if !defined REMOVE_LOG_DEBUG
   struct ipaddr_str buf;
 #endif
   struct mpr_selector *mprs = olsr_lookup_mprs_set(addr);
@@ -163,7 +163,7 @@ olsr_update_mprs_set(const union olsr_ip_addr *addr, olsr_reltime vtime)
 void
 olsr_print_mprs_set(void)
 {
-#if !defined REMOVE_INFO
+#if !defined REMOVE_LOG_INFO
   struct ipaddr_str buf;
   struct mpr_selector *mprs;
 

diff --git a/src/neighbor_table.c b/src/neighbor_table.c
index d6c21df..ffc1c8a 100644 (file)
--- a/src/neighbor_table.c
+++ b/src/neighbor_table.c
@@ -181,7 +181,7 @@ olsr_delete_neighbor_table(const union olsr_ip_addr *neighbor_addr)
   uint32_t                    hash;
   struct neighbor_entry         *entry;
 
-#if !defined REMOVE_DEBUG
+#if !defined REMOVE_LOG_DEBUG
   struct ipaddr_str buf;
 #endif
   OLSR_DEBUG(LOG_NEIGHTABLE, "delete neighbor: %s\n", olsr_ip_to_string(&buf, neighbor_addr));
@@ -243,7 +243,7 @@ olsr_insert_neighbor_table(const union olsr_ip_addr *main_addr)
 {
   uint32_t             hash;
   struct neighbor_entry  *new_neigh;
-#if !defined REMOVE_DEBUG
+#if !defined REMOVE_LOG_DEBUG
   struct ipaddr_str buf;
 #endif
 
@@ -409,7 +409,7 @@ olsr_expire_nbr2_list(void *context)
 void
 olsr_print_neighbor_table(void)
 {
-#if !defined REMOVE_INFO
+#if !defined REMOVE_LOG_INFO
   /* The whole function doesn't do anything else. */
   const int ipwidth = olsr_cnf->ip_version == AF_INET ?  15 : 39;
   int idx;

diff --git a/src/net_olsr.c b/src/net_olsr.c
index b526af3..0b70340 100644 (file)
--- a/src/net_olsr.c
+++ b/src/net_olsr.c
@@ -375,7 +375,7 @@ net_output(struct interface *ifp)
                  &dstaddr.sin,
                  dstaddr_size) < 0) {
     const int save_errno = errno;
-#if !defined REMOVE_DEBUG
+#if !defined REMOVE_LOG_DEBUG
     char sabuf[1024];
 #endif
     dstaddr.sin.sa_family = olsr_cnf->ip_version;
@@ -403,7 +403,7 @@ net_output(struct interface *ifp)
 static void
 olsr_add_invalid_address(const union olsr_ip_addr *addr)
 {
-#if !defined REMOVE_INFO
+#if !defined REMOVE_LOG_INFO
   struct ipaddr_str buf;
 #endif
   struct filter_entry *filter;
@@ -432,7 +432,7 @@ olsr_validate_address(const union olsr_ip_addr *addr)
   const struct filter_entry *filter = filter_tree2filter(avl_find(&filter_tree, addr));
 
   if (filter) {
-#if !defined REMOVE_DEBUG
+#if !defined REMOVE_LOG_DEBUG
     struct ipaddr_str buf;
 #endif
     OLSR_DEBUG(LOG_NETWORKING, "Validation of address %s failed!\n",

diff --git a/src/olsr_cookie.c b/src/olsr_cookie.c
index 37817db..43e87bb 100644 (file)
--- a/src/olsr_cookie.c
+++ b/src/olsr_cookie.c
@@ -274,7 +274,7 @@ olsr_cookie_malloc(struct olsr_cookie_info *ci)
   void *ptr;
   struct olsr_cookie_mem_brand *branding;
   struct list_node *free_list_node;
-#if !defined REMOVE_DEBUG
+#if !defined REMOVE_LOG_DEBUG
   bool reuse = false;
 #endif
   size_t size;
@@ -342,7 +342,7 @@ olsr_cookie_malloc(struct olsr_cookie_info *ci)
     }
 
     ci->ci_free_list_usage--;
-#if !defined REMOVE_DEBUG
+#if !defined REMOVE_LOG_DEBUG
     reuse = true;
 #endif
   }
@@ -375,7 +375,7 @@ void
 olsr_cookie_free(struct olsr_cookie_info *ci, void *ptr)
 {
   struct list_node *free_list_node;
-#if !defined REMOVE_DEBUG
+#if !defined REMOVE_LOG_DEBUG
   bool reuse = false;
 #endif
   struct olsr_cookie_mem_brand *branding = (struct olsr_cookie_mem_brand *)
@@ -421,7 +421,7 @@ olsr_cookie_free(struct olsr_cookie_info *ci, void *ptr)
     }
 
     ci->ci_free_list_usage++;
-#if !defined REMOVE_DEBUG
+#if !defined REMOVE_LOG_DEBUG
     reuse = true;
 #endif
 

diff --git a/src/olsr_spf.c b/src/olsr_spf.c
index 34a534c..1035505 100644 (file)
--- a/src/olsr_spf.c
+++ b/src/olsr_spf.c
@@ -80,7 +80,7 @@ static void
 olsr_spf_add_cand_tree (struct avl_tree *tree,
                         struct tc_entry *tc)
 {
-#if !defined REMOVE_DEBUG
+#if !defined REMOVE_LOG_DEBUG
   struct ipaddr_str buf;
   struct lqtextbuffer lqbuffer;
 #endif
@@ -103,7 +103,7 @@ olsr_spf_del_cand_tree (struct avl_tree *tree,
                         struct tc_entry *tc)
 {
 
-#if !defined REMOVE_DEBUG
+#if !defined REMOVE_LOG_DEBUG
   struct ipaddr_str buf;
   struct lqtextbuffer lqbuffer;
 #endif
@@ -123,7 +123,7 @@ static void
 olsr_spf_add_path_list (struct list_node *head, int *path_count,
                         struct tc_entry *tc)
 {
-#if !defined REMOVE_DEBUG
+#if !defined REMOVE_LOG_DEBUG
   struct ipaddr_str pathbuf, nbuf;
   struct lqtextbuffer lqbuffer;
 #endif
@@ -165,7 +165,7 @@ olsr_spf_relax (struct avl_tree *cand_tree, struct tc_entry *tc)
   struct avl_node *edge_node;
   olsr_linkcost new_cost;
 
-#if !defined REMOVE_DEBUG
+#if !defined REMOVE_LOG_DEBUG
   struct ipaddr_str buf, nbuf;
   struct lqtextbuffer lqbuffer;
 #endif
@@ -391,7 +391,7 @@ olsr_calculate_routing_table (void)
        * does not contain a next-hop.
        */
       if (tc != tc_myself) {
-#if !defined REMOVE_DEBUG
+#if !defined REMOVE_LOG_DEBUG
         struct ipaddr_str buf;
 #endif
         OLSR_DEBUG(LOG_ROUTING, "SPF: %s no next-hop\n", olsr_ip_to_string(&buf, &tc->addr));

diff --git a/src/process_package.c b/src/process_package.c
index d47b8cc..bcc9db9 100644 (file)
--- a/src/process_package.c
+++ b/src/process_package.c
@@ -81,7 +81,7 @@ process_message_neighbors(struct neighbor_entry *neighbor, const struct lq_hello
   for (message_neighbors = message->neigh;
        message_neighbors != NULL;
        message_neighbors = message_neighbors->next) {
-#if !defined REMOVE_DEBUG
+#if !defined REMOVE_LOG_DEBUG
     struct ipaddr_str buf;
 #endif
     union olsr_ip_addr *neigh_addr;

diff --git a/src/routing_table.c b/src/routing_table.c
index 11dc1ae..18d3be6 100644 (file)
--- a/src/routing_table.c
+++ b/src/routing_table.c
@@ -745,7 +745,7 @@ void
 olsr_print_routing_table(struct avl_tree *tree USED_ONLY_FOR_DEBUG)
 {
   /* The whole function makes no sense without it. */
-#if !defined REMOVE_INFO
+#if !defined REMOVE_LOG_INFO
   struct avl_node *rt_tree_node;
   struct lqtextbuffer lqbuffer;
 

diff --git a/src/tc_set.c b/src/tc_set.c
index fed883a..cfc6bf3 100644 (file)
--- a/src/tc_set.c
+++ b/src/tc_set.c
@@ -128,7 +128,7 @@ olsr_seq_inrange_high(int beg, int end, uint16_t seq)
 static struct tc_entry *
 olsr_add_tc_entry(const union olsr_ip_addr *adr)
 {
-#if !defined REMOVE_DEBUG
+#if !defined REMOVE_LOG_DEBUG
   struct ipaddr_str buf;
 #endif
   struct tc_entry *tc;
@@ -256,7 +256,7 @@ olsr_delete_tc_entry(struct tc_entry *tc)
 {
   struct tc_edge_entry *tc_edge;
   struct rt_path *rtp;
-#if !defined REMOVE_DEBUG
+#if !defined REMOVE_LOG_DEBUG
   struct ipaddr_str buf;
 #endif
   OLSR_DEBUG(LOG_TC, "TC: del entry %s\n", olsr_ip_to_string(&buf, &tc->addr));
@@ -393,7 +393,7 @@ olsr_add_tc_edge_entry(struct tc_entry *tc, union olsr_ip_addr *addr,
 {
   struct tc_entry *tc_neighbor;
   struct tc_edge_entry *tc_edge = olsr_malloc_tc_edge_entry();
-#if !defined REMOVE_DEBUG
+#if !defined REMOVE_LOG_DEBUG
   struct ipaddr_str buf;
 #endif
   if (!tc_edge) {
@@ -654,7 +654,7 @@ olsr_lookup_tc_edge(struct tc_entry *tc, union olsr_ip_addr *edge_addr)
 void
 olsr_print_tc_table(void)
 {
-#if !defined REMOVE_INFO
+#if !defined REMOVE_LOG_INFO
   /* The whole function makes no sense without it. */
   struct tc_entry *tc;
   const int ipwidth = olsr_cnf->ip_version == AF_INET ? 15 : 30;
@@ -757,7 +757,7 @@ olsr_input_tc(union olsr_message *msg,
   const unsigned char *limit, *curr;
   struct tc_entry *tc;
   bool relevantTc;
-#if !defined REMOVE_DEBUG
+#if !defined REMOVE_LOG_DEBUG
   struct ipaddr_str buf;
 #endif
   union olsr_ip_addr lower_border_ip, upper_border_ip;

diff --git a/src/two_hop_neighbor_table.c b/src/two_hop_neighbor_table.c
index b2132ab..c61b444 100644 (file)
--- a/src/two_hop_neighbor_table.c
+++ b/src/two_hop_neighbor_table.c
@@ -141,7 +141,7 @@ olsr_delete_two_hop_neighbor_table(struct neighbor_2_entry *two_hop_neighbor)
 void
 olsr_insert_two_hop_neighbor_table(struct neighbor_2_entry *two_hop_neighbor)
 {
-#if !defined REMOVE_DEBUG
+#if !defined REMOVE_LOG_DEBUG
   struct ipaddr_str buf;
 #endif
   uint32_t hash = olsr_ip_hashing(&two_hop_neighbor->neighbor_2_addr);
@@ -217,7 +217,7 @@ olsr_lookup_two_hop_neighbor_table_mid(const union olsr_ip_addr *dest)
 void
 olsr_print_two_hop_neighbor_table(void)
 {
-#if !defined REMOVE_INFO
+#if !defined REMOVE_LOG_INFO
   /* The whole function makes no sense without it. */
   int i;