[#2630] Removed link-addr from relay

1 files changed, 11 insertions, 16 deletions

diff --git a/src/lib/dhcpsrv/pgsql_lease_mgr.h b/src/lib/dhcpsrv/pgsql_lease_mgr.h
index 24e2ec58af..373f84fa04 100644
--- a/src/lib/dhcpsrv/pgsql_lease_mgr.h
+++ b/src/lib/dhcpsrv/pgsql_lease_mgr.h
@@ -1015,8 +1015,9 @@ private:
 
     /// @brief Returns existing IPv6 leases with a given relay-id.
     ///
-    /// @param relay_id DUID for relay_id of interest
-    /// @param link_addr limit results to leases on this link when not ::
+    /// @param relay_id DUID for relay_id of interest.
+    /// @param link_addr limit results to leases on this link (prefix).
+    /// @param link_len limit results to leases on this link (length).
     /// @param lower_bound_address IPv4 address used as lower bound for the
     /// returned range.
     /// @param page_size maximum size of the page returned.
@@ -1025,13 +1026,15 @@ private:
     virtual Lease6Collection
     getLeases6ByRelayId(const DUID& relay_id,
                         const asiolink::IOAddress& link_addr,
+                        uint8_t link_len,
                         const asiolink::IOAddress& lower_bound_address,
                         const LeasePageSize& page_size) override;
 
     /// @brief Returns existing IPv6 leases with a given remote-id.
     ///
-    /// @param remote_id remote-id option data of interest
-    /// @param link_addr limit results to leases on this link when not ::
+    /// @param remote_id remote-id option data of interest.
+    /// @param link_addr limit results to leases on this link (prefix).
+    /// @param link_len limit results to leases on this link (length).
     /// @param lower_bound_address IPv4 address used as lower bound for the
     /// returned range.
     /// @param page_size maximum size of the page returned.
@@ -1040,12 +1043,14 @@ private:
     virtual Lease6Collection
     getLeases6ByRemoteId(const OptionBuffer& remote_id,
                          const asiolink::IOAddress& link_addr,
+                         uint8_t link_len,
                          const asiolink::IOAddress& lower_bound_address,
                          const LeasePageSize& page_size) override;
 
     /// @brief Returns existing IPv6 leases with on a given link.
     ///
-    /// @param link_addr limit results to leases on this link.
+    /// @param link_addr limit results to leases on this link (prefix).
+    /// @param link_len limit results to leases on this link (length).
     /// @param lower_bound_address IPv4 address used as lower bound for the
     /// returned range.
     /// @param page_size maximum size of the page returned.
@@ -1053,6 +1058,7 @@ private:
     /// @return collection of IPv6 leases
     virtual Lease6Collection
     getLeases6ByLink(const asiolink::IOAddress& link_addr,
+                     uint8_t link_len,
                      const asiolink::IOAddress& lower_bound_address,
                      const LeasePageSize& page_size) override;
 
@@ -1120,28 +1126,17 @@ protected:
     /// @brief Add lease6 extended info into by-relay-id table.
     ///
     /// @param lease_addr The address of the lease.
-    /// @param link_addr The link address from the relay header.
     /// @param relay_id The relay id from the relay header options.
     virtual void addRelayId6(const isc::asiolink::IOAddress& lease_addr,
-                             const isc::asiolink::IOAddress& link_addr,
                              const std::vector<uint8_t>& relay_id) override;
 
     /// @brief Add lease6 extended info into by-remote-id table.
     ///
     /// @param lease_addr The address of the lease.
-    /// @param link_addr The link address from the remote header.
     /// @param remote_id The remote id from the relay header options.
     virtual void addRemoteId6(const isc::asiolink::IOAddress& lease_addr,
-                              const isc::asiolink::IOAddress& link_addr,
                               const std::vector<uint8_t>& remote_id) override;
 
-    /// @brief Add lease6 extended info into by-link-addr table.
-    ///
-    /// @param lease_addr The address of the lease.
-    /// @param link_addr The link address from the remote header.
-    virtual void addLinkAddr6(const isc::asiolink::IOAddress& lease_addr,
-                              const isc::asiolink::IOAddress& link_addr) override;
-
 private:
 
     // Members