mirror of
https://github.com/apache/nuttx.git
synced 2026-08-04 05:39:01 +00:00
POSIX leaves the signedness of time_t and clock_t unspecified, but
mainstream implementations (Linux glibc/musl, the BSDs, macOS, RTEMS,
Zephyr's POSIX layer, Windows _time64) expose time_t as signed 64-bit.
NuttX has historically used uint64_t only because it was tied to the
CONFIG_SYSTEM_TIME64 knob; with that gone, switch:
time_t : uint64_t -> int64_t
clock_t : uint64_t -> int64_t
CLOCK_MAX: UINT64_MAX -> INT64_MAX
This lets (time_t)-1 sentinels, negative tick deltas, and host-side
headers behave as on every other POSIX system without source churn.
Headers updated:
- include/sys/types.h, include/limits.h, include/nuttx/clock.h
- include/nuttx/fs/hostfs.h (nuttx_time_t alias)
- include/nuttx/{mqueue.h,wdog.h,wqueue.h,timers/clkcnt.h}
Because clock_t is now signed 64-bit, the NuttX-internal sclock_t
alias becomes redundant: every sclock_t/SCLOCK_MAX use is folded
back to clock_t/CLOCK_MAX (notably in sched/wdog, sched/mqueue,
sched/sched, sched/clock, sched/timer, libs/libc/time, fs/vfs and
the drivers/arch consumers below).
Tick/period constants (NSEC_PER_SEC, USEC_PER_SEC, MSEC_PER_SEC,
SEC_PER_MIN, ...) in include/nuttx/clock.h are retyped from "long"
literals to INT64_C(...) so that 64-bit arithmetic no longer
depends on the host's long width.
Strip now-redundant (time_t)/(clock_t)/(unsigned long) casts and
unsigned-only branches across the tree:
- arch RTC / oneshot / tickless lowerhalfs:
arm: cxd56xx, efm32, imxrt, lc823450, max326xx, sam34, sama5,
samd5e5, samv7, stm32, stm32f7, stm32h7, stm32l4, stm32wb,
xmc4
mips: pic32mz sparc: bm3803 x86_64: intel64
risc-v/xtensa: espressif (esp_i2c[_slave], esp_rtc,
esp32c3{_i2c,_rtc,_wifi_adapter}, esp32{,s2,s3}_*),
mpfs_perf
- drivers: audio/tone, input/aw86225, power/pm/{activity,
stability}_governor, rpmsg/rpmsg_ping,
timers/{ds3231,mcp794xx,pcf85263,rx8010},
wireless/ieee80211/bcm43xxx, wireless/spirit/spirit_spi
- core: fs/vfs/{fs_poll,fs_timerfd}, mm/iob/iob_alloc,
libs/libc/{netdb/lib_dnscache,time/{lib_calendar2utc,
lib_time}}, net/icmp/icmp_pmtu, net/icmpv6/icmpv6_pmtu,
net/ipfrag, net/tcp/{tcp.h,tcp_timer},
net/utils/net_snoop, net/mld/mld_query (drop the now-dead
mld_mrc2mrd helper since signed math handles it directly),
sched/clock/{clock,clock_initialize},
sched/sched/{sched_profil,sched_setparam,sched_setscheduler},
sched/pthread/pthread_create,
sched/wdog/{wd_gettime,wd_start,wdog.h},
sched/timer/timer_gettime, sched/mqueue/*
Flip the few in-tree printf format strings that assumed an
unsigned 64-bit tv_sec:
* drivers/rpmsg/rpmsg_ping.c PRIu64 -> PRId64
* arch/xtensa/src/esp32{,s2,s3}/esp32*_oneshot_lowerhalf.c
PRIu32 (already wrong) -> PRId64
Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
294 lines
8.2 KiB
C
294 lines
8.2 KiB
C
/****************************************************************************
|
|
* libs/libc/netdb/lib_dnscache.c
|
|
*
|
|
* SPDX-License-Identifier: Apache-2.0
|
|
*
|
|
* Licensed to the Apache Software Foundation (ASF) under one or more
|
|
* contributor license agreements. See the NOTICE file distributed with
|
|
* this work for additional information regarding copyright ownership. The
|
|
* ASF licenses this file to you under the Apache License, Version 2.0 (the
|
|
* "License"); you may not use this file except in compliance with the
|
|
* License. You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
* License for the specific language governing permissions and limitations
|
|
* under the License.
|
|
*
|
|
****************************************************************************/
|
|
|
|
/****************************************************************************
|
|
* Included Files
|
|
****************************************************************************/
|
|
|
|
#include <nuttx/config.h>
|
|
|
|
#include <sys/time.h>
|
|
#include <string.h>
|
|
#include <time.h>
|
|
#include <assert.h>
|
|
#include <errno.h>
|
|
#include <nuttx/debug.h>
|
|
|
|
#include "netdb/lib_dns.h"
|
|
#include "netdb/lib_netdb.h"
|
|
|
|
#if CONFIG_NETDB_DNSCLIENT_ENTRIES > 0
|
|
|
|
/****************************************************************************
|
|
* Private Types
|
|
****************************************************************************/
|
|
|
|
/* This described one entry in the cache of resolved hostnames.
|
|
*
|
|
* REVISIT: this consumes extra space, especially when multiple
|
|
* addresses per name are stored.
|
|
*/
|
|
|
|
struct dns_cache_s
|
|
{
|
|
#if CONFIG_NETDB_DNSCLIENT_LIFESEC > 0
|
|
time_t ctime; /* Creation time */
|
|
#endif
|
|
char name[CONFIG_NETDB_DNSCLIENT_NAMESIZE];
|
|
uint8_t naddr; /* How many addresses per name */
|
|
union dns_addr_u addr[CONFIG_NETDB_MAX_IPADDR];
|
|
uint32_t ttl;
|
|
};
|
|
|
|
/****************************************************************************
|
|
* Private Data
|
|
****************************************************************************/
|
|
|
|
static uint8_t g_dns_head; /* Head of the circular, DNS resolver cache */
|
|
static uint8_t g_dns_tail; /* Tail of the circular, DNS resolver cache */
|
|
|
|
/* This is the DNS resolver cache */
|
|
|
|
static struct dns_cache_s g_dns_cache[CONFIG_NETDB_DNSCLIENT_ENTRIES];
|
|
|
|
/****************************************************************************
|
|
* Private Functions
|
|
****************************************************************************/
|
|
|
|
/****************************************************************************
|
|
* Public Functions
|
|
****************************************************************************/
|
|
|
|
/****************************************************************************
|
|
* Name: dns_save_answer
|
|
*
|
|
* Description:
|
|
* Save the last resolved hostname in the DNS cache
|
|
*
|
|
* Input Parameters:
|
|
* hostname - The hostname string to be cached.
|
|
* addr - The IP addresses associated with the hostname.
|
|
* naddr - The count of the IP addresses.
|
|
* ttl - The TTL of the IP addresses.
|
|
*
|
|
* Returned Value:
|
|
* None
|
|
*
|
|
****************************************************************************/
|
|
|
|
void dns_save_answer(FAR const char *hostname,
|
|
FAR const union dns_addr_u *addr, int naddr,
|
|
uint32_t ttl)
|
|
{
|
|
FAR struct dns_cache_s *entry;
|
|
#if CONFIG_NETDB_DNSCLIENT_LIFESEC > 0
|
|
struct timespec now;
|
|
#endif
|
|
int next;
|
|
int ndx;
|
|
|
|
naddr = MIN(naddr, CONFIG_NETDB_MAX_IPADDR);
|
|
DEBUGASSERT(naddr >= 1 && naddr <= UCHAR_MAX);
|
|
|
|
/* Get exclusive access to the DNS cache */
|
|
|
|
dns_lock();
|
|
|
|
/* Get the index to the new head of the list */
|
|
|
|
ndx = g_dns_head;
|
|
next = ndx + 1;
|
|
if (next >= CONFIG_NETDB_DNSCLIENT_ENTRIES)
|
|
{
|
|
next = 0;
|
|
}
|
|
|
|
/* If the next head pointer would match the tail index, then increment
|
|
* the tail index, discarding the oldest mapping in the cache.
|
|
*/
|
|
|
|
if (next == g_dns_tail)
|
|
{
|
|
int tmp = g_dns_tail + 1;
|
|
if (tmp >= CONFIG_NETDB_DNSCLIENT_ENTRIES)
|
|
{
|
|
tmp = 0;
|
|
}
|
|
|
|
g_dns_tail = tmp;
|
|
}
|
|
|
|
/* Save the answer in the cache */
|
|
|
|
entry = &g_dns_cache[ndx];
|
|
|
|
#if CONFIG_NETDB_DNSCLIENT_LIFESEC > 0
|
|
/* Get the current time */
|
|
|
|
clock_gettime(CLOCK_MONOTONIC, &now);
|
|
entry->ctime = now.tv_sec;
|
|
#endif
|
|
|
|
strlcpy(entry->name, hostname, CONFIG_NETDB_DNSCLIENT_NAMESIZE);
|
|
memcpy(&entry->addr, addr, naddr * sizeof(*addr));
|
|
entry->naddr = naddr;
|
|
entry->ttl = ttl;
|
|
|
|
/* Save the updated head index */
|
|
|
|
g_dns_head = next;
|
|
dns_unlock();
|
|
}
|
|
|
|
/****************************************************************************
|
|
* Name: dns_clear_answer
|
|
*
|
|
* Description:
|
|
* Clear the resolved hostname in the DNS cache
|
|
*
|
|
* Returned Value:
|
|
* None
|
|
*
|
|
****************************************************************************/
|
|
|
|
void dns_clear_answer(void)
|
|
{
|
|
/* Get exclusive access to the DNS cache */
|
|
|
|
dns_lock();
|
|
|
|
/* Reset the circular of DNS cache */
|
|
|
|
g_dns_head = 0;
|
|
g_dns_tail = 0;
|
|
|
|
dns_unlock();
|
|
}
|
|
|
|
/****************************************************************************
|
|
* Name: dns_find_answer
|
|
*
|
|
* Description:
|
|
* Check if we already have the resolved hostname address in the cache.
|
|
*
|
|
* Input Parameters:
|
|
* hostname - The hostname string to be resolved.
|
|
* addr - The location to return the IP addresses associated with the
|
|
* hostname.
|
|
* naddr - On entry, the count of addresses backing up the 'addr'
|
|
* pointer. On return, this location will hold the actual count of
|
|
* the returned addresses.
|
|
*
|
|
* Returned Value:
|
|
* If the host name was successfully found in the DNS name resolution
|
|
* cache, zero (OK) will be returned. Otherwise, some negated errno
|
|
* value will be returned, typically -ENOENT meaning that the hostname
|
|
* was not found in the cache.
|
|
*
|
|
****************************************************************************/
|
|
|
|
int dns_find_answer(FAR const char *hostname, FAR union dns_addr_u *addr,
|
|
FAR int *naddr)
|
|
{
|
|
FAR struct dns_cache_s *entry;
|
|
#if CONFIG_NETDB_DNSCLIENT_LIFESEC > 0
|
|
struct timespec now;
|
|
time_t elapsed;
|
|
int ret;
|
|
#endif
|
|
int next;
|
|
int ndx;
|
|
|
|
/* Get exclusive access to the DNS cache */
|
|
|
|
dns_lock();
|
|
|
|
#if CONFIG_NETDB_DNSCLIENT_LIFESEC > 0
|
|
/* Get the current time */
|
|
|
|
ret = clock_gettime(CLOCK_MONOTONIC, &now);
|
|
#endif
|
|
|
|
for (ndx = g_dns_tail; ndx != g_dns_head; ndx = next)
|
|
{
|
|
entry = &g_dns_cache[ndx];
|
|
|
|
/* Advance the index for the next time through the loop, handling
|
|
* wrapping to the beginning of the circular buffer.
|
|
*/
|
|
|
|
next = ndx + 1;
|
|
if (next >= CONFIG_NETDB_DNSCLIENT_ENTRIES)
|
|
{
|
|
next = 0;
|
|
}
|
|
|
|
#if CONFIG_NETDB_DNSCLIENT_LIFESEC > 0
|
|
/* Check if this entry has expired */
|
|
|
|
elapsed = now.tv_sec - entry->ctime;
|
|
if (ret >= 0 &&
|
|
(elapsed > CONFIG_NETDB_DNSCLIENT_LIFESEC || elapsed > entry->ttl))
|
|
{
|
|
/* This entry has expired. Increment the tail index to exclude
|
|
* this entry on future traversals.
|
|
*/
|
|
|
|
g_dns_tail = next;
|
|
}
|
|
else
|
|
#endif
|
|
{
|
|
/* The entry has not expired, check for a name match. Because
|
|
* the names are truncated to CONFIG_NETDB_DNSCLIENT_NAMESIZE,
|
|
* this has the possibility of aliasing two names and returning
|
|
* the wrong entry from the cache.
|
|
*/
|
|
|
|
if (strncmp(hostname, entry->name,
|
|
CONFIG_NETDB_DNSCLIENT_NAMESIZE) == 0)
|
|
{
|
|
/* We have a match. Return the resolved host address */
|
|
|
|
/* Make sure that the address will fit in the caller-provided
|
|
* buffer.
|
|
*/
|
|
|
|
*naddr = MIN(*naddr, entry->naddr);
|
|
|
|
/* Return the address information */
|
|
|
|
memcpy(addr, &entry->addr, *naddr * sizeof(*addr));
|
|
|
|
dns_unlock();
|
|
return OK;
|
|
}
|
|
}
|
|
}
|
|
|
|
ret = -ENOENT;
|
|
|
|
dns_unlock();
|
|
return ret;
|
|
}
|
|
|
|
#endif /* CONFIG_NETDB_DNSCLIENT_ENTRIES > 0 */
|