From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Sun, 24 Oct 2021 15:37:45 +0000 (+0900)
Subject: sd-radv: make several constants not exposed
X-Git-Tag: v250-rc1~409^2~5
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=03ec10fdf4cd7a6c72d09f63f994581cf4d7e786;p=thirdparty%2Fsystemd.git

sd-radv: make several constants not exposed
---

diff --git a/src/libsystemd-network/radv-internal.h b/src/libsystemd-network/radv-internal.h
index 9bc719f8226..e8e89f4f83e 100644
--- a/src/libsystemd-network/radv-internal.h
+++ b/src/libsystemd-network/radv-internal.h
@@ -12,7 +12,8 @@
 #include "sparse-endian.h"
 #include "time-util.h"
 
-assert_cc(SD_RADV_DEFAULT_MIN_TIMEOUT_USEC <= SD_RADV_DEFAULT_MAX_TIMEOUT_USEC);
+#define RADV_DEFAULT_MAX_TIMEOUT_USEC             (600 * USEC_PER_SEC)
+#define RADV_DEFAULT_MIN_TIMEOUT_USEC             (200 * USEC_PER_SEC)
 
 #define RADV_MAX_INITIAL_RTR_ADVERT_INTERVAL_USEC (16 * USEC_PER_SEC)
 #define RADV_MAX_INITIAL_RTR_ADVERTISEMENTS       3
diff --git a/src/libsystemd-network/sd-radv.c b/src/libsystemd-network/sd-radv.c
index 062e5f12781..462b153ac2f 100644
--- a/src/libsystemd-network/sd-radv.c
+++ b/src/libsystemd-network/sd-radv.c
@@ -293,7 +293,7 @@ static int radv_recv(sd_event_source *s, int fd, uint32_t revents, void *userdat
 }
 
 static usec_t radv_compute_timeout(usec_t min, usec_t max) {
-        assert_return(min <= max, SD_RADV_DEFAULT_MIN_TIMEOUT_USEC);
+        assert_return(min <= max, RADV_DEFAULT_MIN_TIMEOUT_USEC);
 
         /* RFC 4861: min must be no less than 3s, max must be no less than 4s */
         min = MAX(min, 3*USEC_PER_SEC);
@@ -324,8 +324,8 @@ static int radv_timeout(sd_event_source *s, uint64_t usec, void *userdata) {
                 max_timeout = RADV_MAX_INITIAL_RTR_ADVERT_INTERVAL_USEC;
                 min_timeout = RADV_MAX_INITIAL_RTR_ADVERT_INTERVAL_USEC / 3;
         } else {
-                max_timeout = SD_RADV_DEFAULT_MAX_TIMEOUT_USEC;
-                min_timeout = SD_RADV_DEFAULT_MIN_TIMEOUT_USEC;
+                max_timeout = RADV_DEFAULT_MAX_TIMEOUT_USEC;
+                min_timeout = RADV_DEFAULT_MIN_TIMEOUT_USEC;
         }
 
         /* RFC 4861, Section 6.2.1, lifetime must be at least MaxRtrAdvInterval,
diff --git a/src/systemd/sd-radv.h b/src/systemd/sd-radv.h
index 658c87fa450..820cbd872f3 100644
--- a/src/systemd/sd-radv.h
+++ b/src/systemd/sd-radv.h
@@ -30,11 +30,6 @@
 
 _SD_BEGIN_DECLARATIONS;
 
-#define SD_RADV_DEFAULT_MIN_TIMEOUT_USEC        (200*USEC_PER_SEC)
-#define SD_RADV_DEFAULT_MAX_TIMEOUT_USEC        (600*USEC_PER_SEC)
-
-#define SD_RADV_DEFAULT_DNS_LIFETIME_USEC       (3*SD_RADV_DEFAULT_MAX_TIMEOUT_USEC)
-
 typedef struct sd_radv sd_radv;
 typedef struct sd_radv_prefix sd_radv_prefix;
 typedef struct sd_radv_route_prefix sd_radv_route_prefix;