move avl and list library into src/common
authorHannes Gredler <hannes@gredler.at>
Wed, 16 Apr 2008 07:53:42 +0000 (09:53 +0200)
committerHannes Gredler <hannes@gredler.at>
Wed, 16 Apr 2008 07:53:42 +0000 (09:53 +0200)
15 files changed:
Makefile.inc
lib/nameservice/src/nameservice.h
src/common/avl.c [moved from src/lq_avl.c with 99% similarity]
src/common/avl.h [moved from src/lq_avl.h with 98% similarity]
src/duplicate_set.c
src/duplicate_set.h
src/link_set.h
src/lq_route.c
src/olsr.c
src/process_routes.c
src/routing_table.c
src/routing_table.h
src/scheduler.h
src/tc_set.c
src/tc_set.h

index 5db06bd..f387340 100644 (file)
@@ -154,8 +154,8 @@ CPPFLAGS += $(EXTRA_CPPFLAGS)
 CPPFLAGS +=     -DUSE_FPM
 
 # search sources and headers in current dir and in src/
-SRCS +=                $(wildcard src/*.c *.c)
-HDRS +=                $(wildcard src/*.h *.h)
+SRCS +=                $(wildcard src/common/*.c src/*.c *.c)
+HDRS +=                $(wildcard src/common/*.h src/*.h *.h)
 
 # OS detection
 ifeq ($(OS),Windows_NT)
index dd895d0..78fce58 100644 (file)
@@ -43,7 +43,7 @@
 #include "olsr_types.h"
 #include "interfaces.h"
 #include "olsr_protocol.h"
-#include "lq_list.h"
+#include "common/list.h"
 
 #include "olsrd_plugin.h"
 #include "nameservice_msg.h"
similarity index 99%
rename from src/lq_avl.c
rename to src/common/avl.c
index 27011cd..2d98706 100644 (file)
@@ -44,7 +44,7 @@
 #include <string.h>
 
 #include "ipcalc.h"
-#include "lq_avl.h"
+#include "common/avl.h"
 #include "net_olsr.h"
 
 /*
similarity index 98%
rename from src/lq_avl.h
rename to src/common/avl.h
index 8a870a4..d37f042 100644 (file)
@@ -39,8 +39,8 @@
  *
  */
 
-#ifndef _LQ_AVL_H
-#define _LQ_AVL_H
+#ifndef _AVL_H
+#define _AVL_H
 
 /* must be declared here because of circular dependency through "defs.h" */
 
@@ -94,7 +94,7 @@ extern int avl_comp_ipv4(const void *, const void *);
 extern int avl_comp_ipv6(const void *, const void *);
 extern int avl_comp_mac(const void *, const void *);
 
-#endif
+#endif /* _AVL_H */
 
 /*
  * Local Variables:
index f117f2a..1c00d54 100644 (file)
@@ -41,7 +41,7 @@
 
 #include "duplicate_set.h"
 #include "ipcalc.h"
-#include "lq_avl.h"
+#include "common/avl.h"
 #include "olsr.h"
 #include "mid_set.h"
 
index 11ab99a..e421345 100644 (file)
@@ -42,7 +42,7 @@
 #ifndef DUPLICATE_SET_H_
 #define DUPLICATE_SET_H_
 
-#include "lq_avl.h"
+#include "common/avl.h"
 #include "olsr.h"
 
 struct duplicate_entry {
index a589dbf..26a58b1 100644 (file)
@@ -48,7 +48,7 @@
 
 #include "lq_plugin.h"
 #include "packet.h"
-#include "lq_list.h"
+#include "common/list.h"
 
 #define MID_ALIAS_HACK_VTIME  10.0
 
index 90a9804..4049327 100644 (file)
@@ -60,8 +60,8 @@
 #include "routing_table.h"
 #include "mid_set.h"
 #include "hna_set.h"
-#include "lq_list.h"
-#include "lq_avl.h"
+#include "common/list.h"
+#include "common/avl.h"
 #include "lq_route.h"
 #include "net_olsr.h"
 #include "lq_plugin.h"
index cebfcc8..6f638c3 100644 (file)
@@ -59,7 +59,7 @@
 #include "neighbor_table.h"
 #include "log.h"
 #include "lq_packet.h"
-#include "lq_avl.h"
+#include "common/avl.h"
 #include "net_olsr.h"
 
 #include <stdarg.h>
index a4d56a7..5f5a68e 100644 (file)
@@ -47,7 +47,7 @@
 #include "olsr.h"
 #include "log.h"
 #include "kernel_routes.h"
-#include "lq_avl.h"
+#include "common/avl.h"
 #include "net_olsr.h"
 #include "tc_set.h"
 
index ee75e14..0280859 100644 (file)
@@ -48,7 +48,7 @@
 #include "neighbor_table.h"
 #include "olsr.h"
 #include "link_set.h"
-#include "lq_avl.h"
+#include "common/avl.h"
 #include "lq_route.h"
 #include "net_olsr.h"
 
index 1430ec3..f22d757 100644 (file)
@@ -49,8 +49,8 @@
 #include <net/route.h>
 #include "hna_set.h"
 #include "link_set.h"
-#include "lq_avl.h"
-#include "lq_list.h"
+#include "common/avl.h"
+#include "common/list.h"
 
 #define NETMASK_HOST 0xffffffff
 #define NETMASK_DEFAULT 0x0
index 165878c..0168f28 100644 (file)
@@ -43,7 +43,7 @@
 #ifndef _OLSR_SCHEDULER
 #define _OLSR_SCHEDULER
 
-#include "lq_list.h"
+#include "common/list.h"
 
 #define TIMER_WHEEL_SLOTS 256
 #define TIMER_WHEEL_MASK (TIMER_WHEEL_SLOTS - 1)
index cb964f6..5e8ee9e 100644 (file)
@@ -46,7 +46,7 @@
 #include "olsr.h"
 #include "scheduler.h"
 #include "lq_route.h"
-#include "lq_avl.h"
+#include "common/avl.h"
 #include "lq_packet.h"
 #include "net_olsr.h"
 #include "lq_plugin.h"
index 13a0d65..6b73911 100644 (file)
@@ -44,8 +44,8 @@
 
 #include "defs.h"
 #include "packet.h"
-#include "lq_avl.h"
-#include "lq_list.h"
+#include "common/avl.h"
+#include "common/list.h"
 #include "scheduler.h"
 
 /*