mirror of
https://github.com/apache/nuttx.git
synced 2026-06-06 08:36:24 +08:00
Undo part of a previous change. Move get/sethostname back from net/netdb to libc/unistd
This commit is contained in:
+1
-1
Submodule configs updated: ef0ed726cc...6112bb0384
@@ -172,6 +172,8 @@ struct hostent
|
|||||||
* terminated by a null pointer. */
|
* terminated by a null pointer. */
|
||||||
};
|
};
|
||||||
|
|
||||||
|
#define h_addr h_addr_list[0] /* For backward compatibility */
|
||||||
|
|
||||||
struct netent
|
struct netent
|
||||||
{
|
{
|
||||||
FAR char *n_name; /* Official, fully-qualified (including the domain)
|
FAR char *n_name; /* Official, fully-qualified (including the domain)
|
||||||
|
|||||||
@@ -1,127 +0,0 @@
|
|||||||
/****************************************************************************
|
|
||||||
* include/nuttx/net/netdb.h
|
|
||||||
*
|
|
||||||
* Copyright (C) 2015 Gregory Nutt. All rights reserved.
|
|
||||||
* Author: Gregory Nutt <gnutt@nuttx.org>
|
|
||||||
*
|
|
||||||
* Includes some definitions that a compatible with the LGPL GNU C Library
|
|
||||||
* header file of the same name.
|
|
||||||
*
|
|
||||||
* Redistribution and use in source and binary forms, with or without
|
|
||||||
* modification, are permitted provided that the following conditions
|
|
||||||
* are met:
|
|
||||||
*
|
|
||||||
* 1. Redistributions of source code must retain the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer.
|
|
||||||
* 2. Redistributions in binary form must reproduce the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer in
|
|
||||||
* the documentation and/or other materials provided with the
|
|
||||||
* distribution.
|
|
||||||
* 3. Neither the name NuttX nor the names of its contributors may be
|
|
||||||
* used to endorse or promote products derived from this software
|
|
||||||
* without specific prior written permission.
|
|
||||||
*
|
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
|
||||||
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
|
||||||
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
|
|
||||||
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
|
|
||||||
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
|
|
||||||
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
|
|
||||||
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
|
|
||||||
* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
|
|
||||||
* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
||||||
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
|
|
||||||
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
|
||||||
* POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
*
|
|
||||||
****************************************************************************/
|
|
||||||
|
|
||||||
#ifndef __INCLUDE_NUTTX_NET_NETDB_H
|
|
||||||
#define __INCLUDE_NUTTX_NET_NETDB_H
|
|
||||||
|
|
||||||
/****************************************************************************
|
|
||||||
* Included Files
|
|
||||||
****************************************************************************/
|
|
||||||
|
|
||||||
#include <nuttx/config.h>
|
|
||||||
|
|
||||||
#include <sys/types.h>
|
|
||||||
|
|
||||||
#include <nuttx/net/netconfig.h>
|
|
||||||
|
|
||||||
/****************************************************************************
|
|
||||||
* Public Type Definitions
|
|
||||||
****************************************************************************/
|
|
||||||
|
|
||||||
/****************************************************************************
|
|
||||||
* Public Data
|
|
||||||
****************************************************************************/
|
|
||||||
|
|
||||||
/****************************************************************************
|
|
||||||
* Public Data
|
|
||||||
****************************************************************************/
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
#define EXTERN extern "C"
|
|
||||||
extern "C"
|
|
||||||
{
|
|
||||||
#else
|
|
||||||
#define EXTERN extern
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/****************************************************************************
|
|
||||||
* Public Function Prototypes
|
|
||||||
****************************************************************************/
|
|
||||||
|
|
||||||
/****************************************************************************
|
|
||||||
* Name: netdb_gethostname
|
|
||||||
*
|
|
||||||
* Description:
|
|
||||||
* The netdb_gethostname() function will return the standard host name for
|
|
||||||
* the current machine. The namelen argument will specify the size of the
|
|
||||||
* array pointed to by the name argument. The returned name will be null-
|
|
||||||
* terminated, except that if namelen is an insufficient length to hold the
|
|
||||||
* host name, then the returned name will be truncated and it is
|
|
||||||
* unspecified whether the returned name is null-terminated.
|
|
||||||
*
|
|
||||||
* Host names are limited to {HOST_NAME_MAX} bytes.
|
|
||||||
*
|
|
||||||
* Input Parameters:
|
|
||||||
* name - The user-provided buffer to receive the host name.
|
|
||||||
* namelen - The size of the user provided buffer in bytes.
|
|
||||||
*
|
|
||||||
* Returned Value:
|
|
||||||
* Upon successful completion, 0 will be returned; otherwise, -1 will be
|
|
||||||
* returned. No errors are defined; errno variable is not set.
|
|
||||||
*
|
|
||||||
****************************************************************************/
|
|
||||||
|
|
||||||
int netdb_gethostname(FAR char *name, size_t namelen);
|
|
||||||
|
|
||||||
/****************************************************************************
|
|
||||||
* Name: netdb_sethostname
|
|
||||||
*
|
|
||||||
* Description:
|
|
||||||
*
|
|
||||||
* netdb_sethostname() sets the hostname to the value given in the
|
|
||||||
* character array name. The len argument specifies the number of bytes in
|
|
||||||
* name. (Thus, name does not require a terminating null byte.)
|
|
||||||
*
|
|
||||||
* Input Parameters:
|
|
||||||
* name - The user buffer to providing the new host name.
|
|
||||||
* namelen - The size of the user buffer in bytes.
|
|
||||||
*
|
|
||||||
* Returned Value:
|
|
||||||
* Upon successful completion, 0 will be returned; otherwise, -1 will be
|
|
||||||
* returned. No errors are defined; errno variable is not set.
|
|
||||||
*
|
|
||||||
****************************************************************************/
|
|
||||||
|
|
||||||
int netdb_sethostname(FAR const char *name, size_t size);
|
|
||||||
|
|
||||||
#undef EXTERN
|
|
||||||
#ifdef __cplusplus
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif /* __INCLUDE_NUTTX_NET_NETDB_H */
|
|
||||||
@@ -43,7 +43,6 @@
|
|||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
#include <nuttx/version.h>
|
#include <nuttx/version.h>
|
||||||
#include <nuttx/net/netdb.h>
|
|
||||||
|
|
||||||
/* In the protected and kernel build modes where kernel and application code
|
/* In the protected and kernel build modes where kernel and application code
|
||||||
* are separated, some of these common system property must reside only in
|
* are separated, some of these common system property must reside only in
|
||||||
@@ -101,7 +100,7 @@ int uname(FAR struct utsname *name)
|
|||||||
#ifdef CONFIG_NET
|
#ifdef CONFIG_NET
|
||||||
/* Get the hostname */
|
/* Get the hostname */
|
||||||
|
|
||||||
if (-1 == netdb_gethostname(name->nodename, HOST_NAME_MAX))
|
if (-1 == gethostname(name->nodename, HOST_NAME_MAX))
|
||||||
{
|
{
|
||||||
ret = -1;
|
ret = -1;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,7 +2,9 @@
|
|||||||
* libc/unistd/lib_gethostname.c
|
* libc/unistd/lib_gethostname.c
|
||||||
*
|
*
|
||||||
* Copyright (C) 2015 Stavros Polymenis. All rights reserved.
|
* Copyright (C) 2015 Stavros Polymenis. All rights reserved.
|
||||||
|
* Copyright (C) 2015 Gregory Nutt. All rights reserved.
|
||||||
* Author: Stavros Polymenis <sp@orbitalfox.com>
|
* Author: Stavros Polymenis <sp@orbitalfox.com>
|
||||||
|
* Gregory Nutt <gnutt@nuttx.org>
|
||||||
*
|
*
|
||||||
* Redistribution and use in source and binary forms, with or without
|
* Redistribution and use in source and binary forms, with or without
|
||||||
* modification, are permitted provided that the following conditions
|
* modification, are permitted provided that the following conditions
|
||||||
@@ -43,7 +45,7 @@
|
|||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
|
|
||||||
#include <nuttx/net/netdb.h>
|
#include <arch/irq.h>
|
||||||
|
|
||||||
/* This file is only compiled if network support is enabled */
|
/* This file is only compiled if network support is enabled */
|
||||||
|
|
||||||
@@ -53,6 +55,22 @@
|
|||||||
* Pre-processor Definitions
|
* Pre-processor Definitions
|
||||||
****************************************************************************/
|
****************************************************************************/
|
||||||
|
|
||||||
|
/* The default host name is a system configuration setting. This may be
|
||||||
|
* changed via sethostname(), however.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef CONFIG_NET_HOSTNAME
|
||||||
|
# define CONFIG_NET_HOSTNAME ""
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/****************************************************************************
|
||||||
|
* Public Data
|
||||||
|
****************************************************************************/
|
||||||
|
|
||||||
|
/* This is the system hostname */
|
||||||
|
|
||||||
|
char g_hostname[HOST_NAME_MAX + 1] = CONFIG_NET_HOSTNAME;
|
||||||
|
|
||||||
/****************************************************************************
|
/****************************************************************************
|
||||||
* Public Functions
|
* Public Functions
|
||||||
****************************************************************************/
|
****************************************************************************/
|
||||||
@@ -94,6 +112,21 @@ int gethostname(FAR char *name, size_t namelen)
|
|||||||
#if (!defined(CONFIG_BUILD_PROTECTED) && !defined(CONFIG_BUILD_KERNEL)) || \
|
#if (!defined(CONFIG_BUILD_PROTECTED) && !defined(CONFIG_BUILD_KERNEL)) || \
|
||||||
defined(__KERNEL__)
|
defined(__KERNEL__)
|
||||||
|
|
||||||
|
irqstate_t flags;
|
||||||
|
|
||||||
|
/* Return the host name, truncating to fit into the user provided buffer.
|
||||||
|
* The hostname is global resource. There is a microscopic possibility
|
||||||
|
* that it could change while we are copying it.
|
||||||
|
*/
|
||||||
|
|
||||||
|
flags = irqsave();
|
||||||
|
strncpy(name, g_hostname, namelen);
|
||||||
|
irqrestore(flags);
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
|
||||||
|
#else
|
||||||
|
|
||||||
struct utsname info;
|
struct utsname info;
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
@@ -110,12 +143,6 @@ int gethostname(FAR char *name, size_t namelen)
|
|||||||
strncpy(name, info.nodename, namelen);
|
strncpy(name, info.nodename, namelen);
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
#else
|
|
||||||
/* Otherwise, this function is just a thin wrapper around
|
|
||||||
* netdb_gethostname().
|
|
||||||
*/
|
|
||||||
|
|
||||||
return netdb_gethostname(name, namelen);
|
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -39,9 +39,10 @@
|
|||||||
|
|
||||||
#include <nuttx/config.h>
|
#include <nuttx/config.h>
|
||||||
|
|
||||||
|
#include <string.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
|
|
||||||
#include <nuttx/net/netdb.h>
|
#include <arch/irq.h>
|
||||||
|
|
||||||
/* This file is only compiled if network support is enabled */
|
/* This file is only compiled if network support is enabled */
|
||||||
|
|
||||||
@@ -60,6 +61,26 @@
|
|||||||
* Pre-processor Definitions
|
* Pre-processor Definitions
|
||||||
****************************************************************************/
|
****************************************************************************/
|
||||||
|
|
||||||
|
/****************************************************************************
|
||||||
|
* Pre-processor Definitions
|
||||||
|
****************************************************************************/
|
||||||
|
|
||||||
|
#ifndef MIN
|
||||||
|
# define MIN(a,b) ((a) < (b) ? (a) : (b))
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifndef MAX
|
||||||
|
# define MAX(a,b) ((a) > (b) ? (a) : (b))
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/****************************************************************************
|
||||||
|
* Public Functions
|
||||||
|
****************************************************************************/
|
||||||
|
|
||||||
|
/* This is the system hostname (defined in lib_gethostname). */
|
||||||
|
|
||||||
|
extern char g_hostname[HOST_NAME_MAX + 1];
|
||||||
|
|
||||||
/****************************************************************************
|
/****************************************************************************
|
||||||
* Public Functions
|
* Public Functions
|
||||||
****************************************************************************/
|
****************************************************************************/
|
||||||
@@ -89,9 +110,20 @@
|
|||||||
|
|
||||||
int sethostname(FAR const char *name, size_t size)
|
int sethostname(FAR const char *name, size_t size)
|
||||||
{
|
{
|
||||||
/* This is just a thin layer over netdb_sethostname() */
|
irqstate_t flags;
|
||||||
|
|
||||||
return netdb_sethostname(name, size);
|
/* Save the new host name, truncating to HOST_NAME_MAX if necessary. This
|
||||||
|
* internal copy is always NUL terminated. The hostname is global resource.
|
||||||
|
* There is a microscopic possibility that it could be accessed while we
|
||||||
|
* are setting it.
|
||||||
|
*/
|
||||||
|
|
||||||
|
flags = irqsave();
|
||||||
|
strncpy(g_hostname, name, MIN(HOST_NAME_MAX, size));
|
||||||
|
g_hostname[HOST_NAME_MAX] = '\0';
|
||||||
|
irqrestore(flags);
|
||||||
|
|
||||||
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif /* CONFIG_NET */
|
#endif /* CONFIG_NET */
|
||||||
|
|||||||
@@ -68,7 +68,6 @@ include local/Make.defs
|
|||||||
include tcp/Make.defs
|
include tcp/Make.defs
|
||||||
include udp/Make.defs
|
include udp/Make.defs
|
||||||
include devif/Make.defs
|
include devif/Make.defs
|
||||||
include netdb/Make.defs
|
|
||||||
include route/Make.defs
|
include route/Make.defs
|
||||||
include utils/Make.defs
|
include utils/Make.defs
|
||||||
endif
|
endif
|
||||||
|
|||||||
@@ -21,7 +21,6 @@ Directory Structure
|
|||||||
+- route - Routing table support
|
+- route - Routing table support
|
||||||
+- tcp - Transmission Control Protocol
|
+- tcp - Transmission Control Protocol
|
||||||
+- udp - User Datagram Protocol
|
+- udp - User Datagram Protocol
|
||||||
+- netdb - Host name support
|
|
||||||
`- utils - Miscellaneous utility functions
|
`- utils - Miscellaneous utility functions
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -1,43 +0,0 @@
|
|||||||
############################################################################
|
|
||||||
# net/netdb/Make.defs
|
|
||||||
#
|
|
||||||
# Copyright (C) 2015 Gregory Nutt. All rights reserved.
|
|
||||||
# Author: Gregory Nutt <gnutt@nuttx.org>
|
|
||||||
#
|
|
||||||
# Redistribution and use in source and binary forms, with or without
|
|
||||||
# modification, are permitted provided that the following conditions
|
|
||||||
# are met:
|
|
||||||
#
|
|
||||||
# 1. Redistributions of source code must retain the above copyright
|
|
||||||
# notice, this list of conditions and the following disclaimer.
|
|
||||||
# 2. Redistributions in binary form must reproduce the above copyright
|
|
||||||
# notice, this list of conditions and the following disclaimer in
|
|
||||||
# the documentation and/or other materials provided with the
|
|
||||||
# distribution.
|
|
||||||
# 3. Neither the name NuttX nor the names of its contributors may be
|
|
||||||
# used to endorse or promote products derived from this software
|
|
||||||
# without specific prior written permission.
|
|
||||||
#
|
|
||||||
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
|
||||||
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
|
||||||
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
|
|
||||||
# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
|
|
||||||
# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
|
|
||||||
# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
|
|
||||||
# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
|
|
||||||
# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
|
|
||||||
# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
||||||
# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
|
|
||||||
# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
|
||||||
# POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
#
|
|
||||||
############################################################################
|
|
||||||
|
|
||||||
# Network database interface source files
|
|
||||||
|
|
||||||
NET_CSRCS += netdb_gethostname.c netdb_sethostname.c netdb_globals.c
|
|
||||||
|
|
||||||
# Include database device interface build support
|
|
||||||
|
|
||||||
DEPPATH += --dep-path netdb
|
|
||||||
VPATH += :netdb
|
|
||||||
@@ -1,76 +0,0 @@
|
|||||||
/****************************************************************************
|
|
||||||
* net/netdb/netdb.h
|
|
||||||
*
|
|
||||||
* Copyright (C) 2015 Gregory Nutt. All rights reserved.
|
|
||||||
* Author: Gregory Nutt <gnutt@nuttx.org>
|
|
||||||
*
|
|
||||||
* Redistribution and use in source and binary forms, with or without
|
|
||||||
* modification, are permitted provided that the following conditions
|
|
||||||
* are met:
|
|
||||||
*
|
|
||||||
* 1. Redistributions of source code must retain the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer.
|
|
||||||
* 2. Redistributions in binary form must reproduce the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer in
|
|
||||||
* the documentation and/or other materials provided with the
|
|
||||||
* distribution.
|
|
||||||
* 3. Neither the name NuttX nor the names of its contributors may be
|
|
||||||
* used to endorse or promote products derived from this software
|
|
||||||
* without specific prior written permission.
|
|
||||||
*
|
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
|
||||||
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
|
||||||
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
|
|
||||||
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
|
|
||||||
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
|
|
||||||
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
|
|
||||||
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
|
|
||||||
* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
|
|
||||||
* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
||||||
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
|
|
||||||
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
|
||||||
* POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
*
|
|
||||||
****************************************************************************/
|
|
||||||
|
|
||||||
#ifndef _NET_NETDB_NETDB_H
|
|
||||||
#define _NET_NETDB_NETDB_H
|
|
||||||
|
|
||||||
/****************************************************************************
|
|
||||||
* Included Files
|
|
||||||
****************************************************************************/
|
|
||||||
|
|
||||||
#include <nuttx/config.h>
|
|
||||||
|
|
||||||
#include <unistd.h>
|
|
||||||
|
|
||||||
/****************************************************************************
|
|
||||||
* Pre-processor Definitions
|
|
||||||
****************************************************************************/
|
|
||||||
|
|
||||||
/****************************************************************************
|
|
||||||
* Public Data
|
|
||||||
****************************************************************************/
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
#define EXTERN extern "C"
|
|
||||||
extern "C"
|
|
||||||
{
|
|
||||||
#else
|
|
||||||
#define EXTERN extern
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* This is the system hostname */
|
|
||||||
|
|
||||||
EXTERN char g_hostname[HOST_NAME_MAX + 1];
|
|
||||||
|
|
||||||
/****************************************************************************
|
|
||||||
* Public Function Prototypes
|
|
||||||
****************************************************************************/
|
|
||||||
|
|
||||||
#undef EXTERN
|
|
||||||
#ifdef __cplusplus
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif /* _NET_NETDB_NETDB_H */
|
|
||||||
@@ -1,98 +0,0 @@
|
|||||||
/****************************************************************************
|
|
||||||
* net/netdb/netdb_gethostname.c
|
|
||||||
*
|
|
||||||
* Copyright (C) 2015 Stavros Polymenis. All rights reserved.
|
|
||||||
* Copyright (C) 2015 Gregory Nutt. All rights reserved.
|
|
||||||
* Author: Stavros Polymenis <sp@orbitalfox.com>
|
|
||||||
* Gregory Nutt <gnutt@nuttx.org>
|
|
||||||
*
|
|
||||||
* Redistribution and use in source and binary forms, with or without
|
|
||||||
* modification, are permitted provided that the following conditions
|
|
||||||
* are met:
|
|
||||||
*
|
|
||||||
* 1. Redistributions of source code must retain the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer.
|
|
||||||
* 2. Redistributions in binary form must reproduce the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer in
|
|
||||||
* the documentation and/or other materials provided with the
|
|
||||||
* distribution.
|
|
||||||
* 3. Neither the name NuttX nor the names of its contributors may be
|
|
||||||
* used to endorse or promote products derived from this software
|
|
||||||
* without specific prior written permission.
|
|
||||||
*
|
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
|
||||||
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
|
||||||
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
|
|
||||||
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
|
|
||||||
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
|
|
||||||
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
|
|
||||||
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
|
|
||||||
* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
|
|
||||||
* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
||||||
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
|
|
||||||
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
|
||||||
* POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
*
|
|
||||||
****************************************************************************/
|
|
||||||
|
|
||||||
/****************************************************************************
|
|
||||||
* Included Files
|
|
||||||
****************************************************************************/
|
|
||||||
|
|
||||||
#include <nuttx/config.h>
|
|
||||||
|
|
||||||
#include <string.h>
|
|
||||||
#include <unistd.h>
|
|
||||||
#include <unistd.h>
|
|
||||||
|
|
||||||
#include <nuttx/net/netdb.h>
|
|
||||||
#include <arch/irq.h>
|
|
||||||
|
|
||||||
#include "netdb/netdb.h"
|
|
||||||
|
|
||||||
/****************************************************************************
|
|
||||||
* Pre-processor Definitions
|
|
||||||
****************************************************************************/
|
|
||||||
|
|
||||||
/****************************************************************************
|
|
||||||
* Public Functions
|
|
||||||
****************************************************************************/
|
|
||||||
|
|
||||||
/****************************************************************************
|
|
||||||
* Name: netdb_gethostname
|
|
||||||
*
|
|
||||||
* Description:
|
|
||||||
* The netdb_gethostname() function will return the standard host name for
|
|
||||||
* the current machine. The namelen argument will specify the size of the
|
|
||||||
* array pointed to by the name argument. The returned name will be null-
|
|
||||||
* terminated, except that if namelen is an insufficient length to hold the
|
|
||||||
* host name, then the returned name will be truncated and it is
|
|
||||||
* unspecified whether the returned name is null-terminated.
|
|
||||||
*
|
|
||||||
* Host names are limited to {HOST_NAME_MAX} bytes.
|
|
||||||
*
|
|
||||||
* Input Parameters:
|
|
||||||
* name - The user-provided buffer to receive the host name.
|
|
||||||
* namelen - The size of the user provided buffer in bytes.
|
|
||||||
*
|
|
||||||
* Returned Value:
|
|
||||||
* Upon successful completion, 0 will be returned; otherwise, -1 will be
|
|
||||||
* returned. No errors are defined; errno variable is not set.
|
|
||||||
*
|
|
||||||
****************************************************************************/
|
|
||||||
|
|
||||||
int netdb_gethostname(FAR char *name, size_t namelen)
|
|
||||||
{
|
|
||||||
irqstate_t flags;
|
|
||||||
|
|
||||||
/* Return the host name, truncating to fit into the user provided buffer.
|
|
||||||
* The hostname is global resource. There is a microscopic possibility
|
|
||||||
* that it could change while we are copying it.
|
|
||||||
*/
|
|
||||||
|
|
||||||
flags = irqsave();
|
|
||||||
strncpy(name, g_hostname, namelen);
|
|
||||||
irqrestore(flags);
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
@@ -1,68 +0,0 @@
|
|||||||
/****************************************************************************
|
|
||||||
* net/netdb/netdb_globals.c
|
|
||||||
*
|
|
||||||
* Copyright (C) 2015 Stavros Polymenis. All rights reserved.
|
|
||||||
* Copyright (C) 2015 Gregory Nutt. All rights reserved.
|
|
||||||
* Author: Stavros Polymenis <sp@orbitalfox.com>
|
|
||||||
* Gregory Nutt <gnutt@nuttx.org>
|
|
||||||
*
|
|
||||||
* Redistribution and use in source and binary forms, with or without
|
|
||||||
* modification, are permitted provided that the following conditions
|
|
||||||
* are met:
|
|
||||||
*
|
|
||||||
* 1. Redistributions of source code must retain the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer.
|
|
||||||
* 2. Redistributions in binary form must reproduce the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer in
|
|
||||||
* the documentation and/or other materials provided with the
|
|
||||||
* distribution.
|
|
||||||
* 3. Neither the name NuttX nor the names of its contributors may be
|
|
||||||
* used to endorse or promote products derived from this software
|
|
||||||
* without specific prior written permission.
|
|
||||||
*
|
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
|
||||||
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
|
||||||
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
|
|
||||||
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
|
|
||||||
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
|
|
||||||
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
|
|
||||||
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
|
|
||||||
* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
|
|
||||||
* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
||||||
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
|
|
||||||
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
|
||||||
* POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
*
|
|
||||||
****************************************************************************/
|
|
||||||
|
|
||||||
/****************************************************************************
|
|
||||||
* Included Files
|
|
||||||
****************************************************************************/
|
|
||||||
|
|
||||||
#include <nuttx/config.h>
|
|
||||||
|
|
||||||
#include "netdb/netdb.h"
|
|
||||||
|
|
||||||
/****************************************************************************
|
|
||||||
* Pre-processor Definitions
|
|
||||||
****************************************************************************/
|
|
||||||
|
|
||||||
/* The default host name is a system configuration setting. This may be
|
|
||||||
* changed via sethostname(), however.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef CONFIG_NET_HOSTNAME
|
|
||||||
# define CONFIG_NET_HOSTNAME ""
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/****************************************************************************
|
|
||||||
* Public Data
|
|
||||||
****************************************************************************/
|
|
||||||
|
|
||||||
/* This is the system hostname */
|
|
||||||
|
|
||||||
char g_hostname[HOST_NAME_MAX + 1] = CONFIG_NET_HOSTNAME;
|
|
||||||
|
|
||||||
/****************************************************************************
|
|
||||||
* Public Functions
|
|
||||||
****************************************************************************/
|
|
||||||
@@ -1,103 +0,0 @@
|
|||||||
/****************************************************************************
|
|
||||||
* net/netdb/netdb_sethostname.c
|
|
||||||
*
|
|
||||||
* Copyright (C) 2015 Stavros Polymenis. All rights reserved.
|
|
||||||
* Copyright (C) 2015 Gregory Nutt. All rights reserved.
|
|
||||||
* Author: Stavros Polymenis <sp@orbitalfox.com>
|
|
||||||
* Gregory Nutt <gnutt@nuttx.org>
|
|
||||||
*
|
|
||||||
* Redistribution and use in source and binary forms, with or without
|
|
||||||
* modification, are permitted provided that the following conditions
|
|
||||||
* are met:
|
|
||||||
*
|
|
||||||
* 1. Redistributions of source code must retain the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer.
|
|
||||||
* 2. Redistributions in binary form must reproduce the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer in
|
|
||||||
* the documentation and/or other materials provided with the
|
|
||||||
* distribution.
|
|
||||||
* 3. Neither the name NuttX nor the names of its contributors may be
|
|
||||||
* used to endorse or promote products derived from this software
|
|
||||||
* without specific prior written permission.
|
|
||||||
*
|
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
|
||||||
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
|
||||||
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
|
|
||||||
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
|
|
||||||
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
|
|
||||||
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
|
|
||||||
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
|
|
||||||
* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
|
|
||||||
* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
||||||
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
|
|
||||||
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
|
||||||
* POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
*
|
|
||||||
****************************************************************************/
|
|
||||||
|
|
||||||
/****************************************************************************
|
|
||||||
* Included Files
|
|
||||||
****************************************************************************/
|
|
||||||
|
|
||||||
#include <nuttx/config.h>
|
|
||||||
|
|
||||||
#include <string.h>
|
|
||||||
#include <unistd.h>
|
|
||||||
|
|
||||||
#include <nuttx/net/netdb.h>
|
|
||||||
#include <arch/irq.h>
|
|
||||||
|
|
||||||
#include "netdb/netdb.h"
|
|
||||||
|
|
||||||
/****************************************************************************
|
|
||||||
* Pre-processor Definitions
|
|
||||||
****************************************************************************/
|
|
||||||
|
|
||||||
#ifndef MIN
|
|
||||||
# define MIN(a,b) ((a) < (b) ? (a) : (b))
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef MAX
|
|
||||||
# define MAX(a,b) ((a) > (b) ? (a) : (b))
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/****************************************************************************
|
|
||||||
* Public Functions
|
|
||||||
****************************************************************************/
|
|
||||||
|
|
||||||
/****************************************************************************
|
|
||||||
* Name: netdb_sethostname
|
|
||||||
*
|
|
||||||
* Description:
|
|
||||||
*
|
|
||||||
* netdb_sethostname() sets the hostname to the value given in the
|
|
||||||
* character array name. The len argument specifies the number of bytes in
|
|
||||||
* name. (Thus, name does not require a terminating null byte.)
|
|
||||||
*
|
|
||||||
* Input Parameters:
|
|
||||||
* name - The user buffer to providing the new host name.
|
|
||||||
* namelen - The size of the user buffer in bytes.
|
|
||||||
*
|
|
||||||
* Returned Value:
|
|
||||||
* Upon successful completion, 0 will be returned; otherwise, -1 will be
|
|
||||||
* returned. No errors are defined; errno variable is not set.
|
|
||||||
*
|
|
||||||
****************************************************************************/
|
|
||||||
|
|
||||||
int netdb_sethostname(FAR const char *name, size_t size)
|
|
||||||
{
|
|
||||||
irqstate_t flags;
|
|
||||||
|
|
||||||
/* Save the new host name, truncating to HOST_NAME_MAX if necessary. This
|
|
||||||
* internal copy is always NUL terminated. The hostname is global resource.
|
|
||||||
* There is a microscopic possibility that it could be accessed while we
|
|
||||||
* are setting it.
|
|
||||||
*/
|
|
||||||
|
|
||||||
flags = irqsave();
|
|
||||||
strncpy(g_hostname, name, MIN(HOST_NAME_MAX, size));
|
|
||||||
g_hostname[HOST_NAME_MAX] = '\0';
|
|
||||||
irqrestore(flags);
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
Reference in New Issue
Block a user