Moved table.txt and neighbors_file from source directory to /var/log/adhoc_routing

Author: Dmitrii Dugaev

NeighborDiscovery.py

@@ -24,9 +24,9 @@
 # Import the necessary modules of the program
 import routing_logging
 
-## @var ABSOLUTE_PATH
-# This constant stores a string with an absolute path to the program's main directory.
-ABSOLUTE_PATH = routing_logging.ABSOLUTE_PATH
+## @var PATH_TO_LOGS
+# This constant stores a string with an absolute path to log files directory.
+PATH_TO_LOGS = routing_logging.PATH_TO_LOGS
 ## @var NEIGHBOR_LOG
 # Global routing_logging.LogWrapper object for logging NeighborDiscovery activity.
 NEIGHBOR_LOG = routing_logging.create_routing_log("routing.neighbor_discovery.log", "neighbor_discovery")
@@ -59,7 +59,7 @@ class NeighborDiscovery:
     # @return None
     def __init__(self, raw_transport_obj, table_obj):
         # Create initial empty neighbors file
-        f = open(ABSOLUTE_PATH + "/neighbors_file", "w")
+        f = open(PATH_TO_LOGS + "neighbors_file", "w")
         f.close()
         # Create listening and advertising threads
         ## @var listen_neighbors_handler
@@ -281,7 +281,7 @@ def process_neighbor(self, src_mac, dsr_hello_message):
     # @param self The object pointer.
     # @return None
     def update_neighbors_file(self):
-        f = open(ABSOLUTE_PATH + "/neighbors_file", "w")
+        f = open(PATH_TO_LOGS + "neighbors_file", "w")
         for mac in self.neighbors_list:
 
             NEIGHBOR_LOG.debug("Neighbor's IPs: %s", str(self.neighbors_list[mac].l3_addresses))

RouteTable.py

@@ -17,9 +17,9 @@
 import rl_logic
 import routing_logging
 
-## @var ABSOLUTE_PATH
-# This constant stores a string with an absolute path to the program's main directory.
-ABSOLUTE_PATH = routing_logging.ABSOLUTE_PATH
+## @var PATH_TO_LOGS
+# This constant stores a string with an absolute path to log files directory.
+PATH_TO_LOGS = routing_logging.PATH_TO_LOGS
 
 ## @var TABLE_LOG
 # Global routing_logging.LogWrapper object for logging RouteTable activity.
@@ -105,7 +105,7 @@ class Table:
     def __init__(self, node_mac):
         ## @var table_filename
         # Define a filename to write the table entries to. Default filename is "table.txt".
-        self.table_filename = "/table.txt"
+        self.table_filename = "table.txt"
         ## @var node_mac
         # MAC address of the node's network interface.
         self.node_mac = node_mac
@@ -239,7 +239,7 @@ def get_neighbors_l3_addresses(self):
     def print_table(self):
         current_entries_list = self.get_list_of_entries()
 
-        f = open(ABSOLUTE_PATH + self.table_filename, "w")
+        f = open(PATH_TO_LOGS + self.table_filename, "w")
         f.write("-" * 90 + "\n")
 
         for dst_ip in current_entries_list: