Changeset 79531 in vbox for trunk/src

Timestamp:

Jul 4, 2019 6:27:21 PM (6 years ago)

Author:

vboxsync

Message:

Dhcpd: Went over the Db and IPv4Pool code adding comments and and such. [doxygen+scm] bugref:9288

Location:

trunk/src/VBox/NetworkServices/Dhcpd

Files:

• Db.h (modified) (1 diff)
• IPv4Pool.cpp (modified) (2 diffs)
• IPv4Pool.h (modified) (2 diffs)

trunk/src/VBox/NetworkServices/Dhcpd/Db.h

@@ -136 +136 @@
     typedef std::list<Binding *> bindings_t;
 
-    /** Configuration (set at init). */
+    /** Configuration (set at init).
+     * @note Currently not used.  */
     const Config   *m_pConfig;
     /** The lease database. */

trunk/src/VBox/NetworkServices/Dhcpd/IPv4Pool.cpp

@@ -48 +48 @@
  * @param   a_Range         The range to insert.
  */
-int IPv4Pool::insert(const IPv4Range &a_Range)
+int IPv4Pool::i_insert(const IPv4Range &a_Range)
 {
     /*
@@ -152 +152 @@
             {
                 if (haddr == first)
-                    insert(++first, last);
+                    i_insert(++first, last);
                 else if (haddr == last)
-                    insert(first, --last);
+                    i_insert(first, --last);
                 else
                 {
-                    insert(first, haddr - 1);
-                    insert(haddr + 1, last);
+                    i_insert(first, haddr - 1);
+                    i_insert(haddr + 1, last);
                 }
             }

trunk/src/VBox/NetworkServices/Dhcpd/IPv4Pool.h

@@ -121 +121 @@
     int init(RTNETADDRIPV4 aFirstAddr, RTNETADDRIPV4 aLastAddr);
 
+    RTNETADDRIPV4 allocate();
+    bool          allocate(RTNETADDRIPV4);
+
     /**
      * Checks if the pool range includes @a addr (allocation status not considered).
@@ -129 +132 @@
     }
 
-    RTNETADDRIPV4 allocate();
-    bool          allocate(RTNETADDRIPV4);
-
 private:
-    int insert(const IPv4Range &range);
+    int i_insert(const IPv4Range &range);
 #if 0
-    int insert(IPV4HADDR single)                            { return insert(IPv4Range(single)); }
+    int i_insert(IPV4HADDR single)                            { return i_insert(IPv4Range(single)); }
 #endif
-    int insert(IPV4HADDR first, IPV4HADDR last)             { return insert(IPv4Range(first, last)); }
-    int insert(RTNETADDRIPV4 single)                        { return insert(IPv4Range(single)); }
-    int insert(RTNETADDRIPV4 first, RTNETADDRIPV4 last)     { return insert(IPv4Range(first, last)); }
+    int i_insert(IPV4HADDR first, IPV4HADDR last)             { return i_insert(IPv4Range(first, last)); }
+    int i_insert(RTNETADDRIPV4 single)                        { return i_insert(IPv4Range(single)); }
+    int i_insert(RTNETADDRIPV4 first, RTNETADDRIPV4 last)     { return i_insert(IPv4Range(first, last)); }
 };