mirror of
https://github.com/apache/nuttx.git
synced 2026-08-04 22:00:21 +00:00
b5d3d30378
getaddrinfo() and getservbyname() use the built-in service table when
resolving service names. The table only contained ntp, so common
service names such as http and https could not be resolved without a
numeric port.
Add http and https entries for both TCP and UDP to match the existing
service table style.
Testing:
- Host: Ubuntu 22.04 x86_64.
- Board/config: sim:nsh with CONFIG_LIBC_NETDB=y and
CONFIG_EXAMPLES_HELLO=y.
- make clean && make -j16.
- Ran a temporary hello example that called getservbyname("http",
"tcp") and getservbyname("https", "tcp"). The app verified ports
80 and 443 and printed "getservbyname http/https test passed".
Assisted-by: Claude:Claude-Fable-5
Signed-off-by: Lingao Meng <menglingao@xiaomi.com>
122 lines
3.6 KiB
C
122 lines
3.6 KiB
C
/****************************************************************************
|
|
* libs/libc/netdb/lib_getservbynamer.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 <string.h>
|
|
#include <stdlib.h>
|
|
#include <errno.h>
|
|
#include <assert.h>
|
|
#include <nuttx/net/ip.h>
|
|
|
|
#include <netdb.h>
|
|
|
|
#include "lib_netdb.h"
|
|
|
|
/****************************************************************************
|
|
* Private Data
|
|
****************************************************************************/
|
|
|
|
/* Declare your services here. TODO: read from /etc/services?
|
|
* REVISIT: This is just an example, lets not add full list here.
|
|
*/
|
|
|
|
const struct services_db_s g_services_db[] =
|
|
{
|
|
{ "http", 80, IP_PROTO_TCP },
|
|
{ "http", 80, IP_PROTO_UDP },
|
|
{ "https", 443, IP_PROTO_TCP },
|
|
{ "https", 443, IP_PROTO_UDP },
|
|
{ "ntp", 123, IP_PROTO_TCP },
|
|
{ "ntp", 123, IP_PROTO_UDP },
|
|
{ NULL, 0, 0 }
|
|
};
|
|
|
|
/****************************************************************************
|
|
* Public Functions
|
|
****************************************************************************/
|
|
|
|
/****************************************************************************
|
|
* Name: getservbyname_r
|
|
****************************************************************************/
|
|
|
|
int getservbyname_r(FAR const char *name, FAR const char *proto,
|
|
FAR struct servent *result_buf, FAR char *buf,
|
|
size_t buflen, FAR struct servent **result)
|
|
{
|
|
int protocol;
|
|
int i;
|
|
|
|
DEBUGASSERT(name != NULL);
|
|
DEBUGASSERT(result_buf != NULL && result != NULL);
|
|
|
|
/* Linux man page says result must be NULL in case of failure. */
|
|
|
|
*result = NULL;
|
|
|
|
if (proto == NULL)
|
|
{
|
|
protocol = 0;
|
|
}
|
|
else if (strcmp(proto, "tcp") == 0)
|
|
{
|
|
protocol = IPPROTO_TCP;
|
|
}
|
|
else if (strcmp(proto, "udp") == 0)
|
|
{
|
|
protocol = IPPROTO_UDP;
|
|
}
|
|
else
|
|
{
|
|
return -EINVAL;
|
|
}
|
|
|
|
for (i = 0; g_services_db[i].s_name; i++)
|
|
{
|
|
if (strcmp(name, g_services_db[i].s_name) == 0 &&
|
|
(protocol == 0 || protocol == g_services_db[i].s_protocol))
|
|
{
|
|
result_buf->s_name = (FAR char *)name;
|
|
result_buf->s_aliases = NULL;
|
|
result_buf->s_port = HTONS(g_services_db[i].s_port);
|
|
|
|
if (g_services_db[i].s_protocol == IPPROTO_TCP)
|
|
{
|
|
result_buf->s_proto = "tcp";
|
|
}
|
|
else
|
|
{
|
|
result_buf->s_proto = "udp";
|
|
}
|
|
|
|
*result = result_buf;
|
|
return 0;
|
|
}
|
|
}
|
|
|
|
return ENOENT;
|
|
}
|
|
|